github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

update resources\template\generator\front\index.ftl

pull/111/head^2
dqjdda 2019-08-05 10:52:26 +08:00
parent 1d517316ea
commit 1b574b5971
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/RedisServiceImpl.java
View File

@ -48,8 +48,6 @@ public class RedisServiceImpl implements RedisService {
return page; return page;
} }
@Override @Override
public void delete(String key) { public void delete(String key) {
redisTemplate.delete(key); redisTemplate.delete(key);

2
eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java
View File

@ -171,6 +171,8 @@ public class UserController {
return new ResponseEntity(HttpStatus.OK); return new ResponseEntity(HttpStatus.OK);
} }
/** /**
* 如果当前用户的角色级别低于创建用户的角色级别，则抛出权限不足的错误 * 如果当前用户的角色级别低于创建用户的角色级别，则抛出权限不足的错误
* @param resources * @param resources

2
eladmin-system/src/main/resources/template/generator/front/index.ftl
View File

@ -62,8 +62,8 @@
<!--分页组件--> <!--分页组件-->
<el-pagination <el-pagination
:total="total" :total="total"
style="margin-top: 8px;"
:current-page="page + 1" :current-page="page + 1"
style="margin-top: 8px;"
layout="total, prev, pager, next, sizes" layout="total, prev, pager, next, sizes"
@size-change="sizeChange" @size-change="sizeChange"
@current-change="pageChange"/> @current-change="pageChange"/>

3
eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java
View File

@ -48,7 +48,6 @@ public class PictureServiceImpl implements PictureService {
@Transactional(rollbackFor = Throwable.class) @Transactional(rollbackFor = Throwable.class)
public Picture upload(MultipartFile multipartFile, String username) { public Picture upload(MultipartFile multipartFile, String username) {
File file = FileUtil.toFile(multipartFile); File file = FileUtil.toFile(multipartFile);
HashMap<String, Object> paramMap = new HashMap<>(1); HashMap<String, Object> paramMap = new HashMap<>(1);
paramMap.put("smfile", file); paramMap.put("smfile", file);
@ -66,7 +65,7 @@ public class PictureServiceImpl implements PictureService {
picture.setFilename(FileUtil.getFileNameNoEx(multipartFile.getOriginalFilename())+"."+FileUtil.getExtensionName(multipartFile.getOriginalFilename())); picture.setFilename(FileUtil.getFileNameNoEx(multipartFile.getOriginalFilename())+"."+FileUtil.getExtensionName(multipartFile.getOriginalFilename()));
pictureRepository.save(picture); pictureRepository.save(picture);
//删除临时文件 //删除临时文件
FileUtil.deleteFile(file); FileUtil.del(file);
return picture; return picture;
} }