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

xingdaolin · Aug 5, 2019 · 1b574b5 · 1b574b5
1 parent 1d51731
commit 1b574b5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/RedisServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/RedisServiceImpl.java
@@ -48,8 +48,6 @@ public Page<RedisVo> findByKey(String key, Pageable pageable){
         return page;
     }
 
-
-
     @Override
     public void delete(String key) {
         redisTemplate.delete(key);

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java
@@ -171,6 +171,8 @@ public ResponseEntity updateEmail(@PathVariable String code,@RequestBody User us
         return new ResponseEntity(HttpStatus.OK);
     }
 
+
+
     /**
      * 如果当前用户的角色级别低于创建用户的角色级别，则抛出权限不足的错误
      * @param resources

diff --git a/eladmin-system/src/main/resources/template/generator/front/index.ftl b/eladmin-system/src/main/resources/template/generator/front/index.ftl
@@ -62,8 +62,8 @@
     <!--分页组件-->
     <el-pagination
       :total="total"
-      style="margin-top: 8px;"
       :current-page="page + 1"
+      style="margin-top: 8px;"
       layout="total, prev, pager, next, sizes"
       @size-change="sizeChange"
       @current-change="pageChange"/>

diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java
@@ -48,7 +48,6 @@ public Object queryAll(PictureQueryCriteria criteria, Pageable pageable){
     @Transactional(rollbackFor = Throwable.class)
     public Picture upload(MultipartFile multipartFile, String username) {
         File file = FileUtil.toFile(multipartFile);
-
         HashMap<String, Object> paramMap = new HashMap<>(1);
 
         paramMap.put("smfile", file);
@@ -66,7 +65,7 @@ public Picture upload(MultipartFile multipartFile, String username) {
         picture.setFilename(FileUtil.getFileNameNoEx(multipartFile.getOriginalFilename())+"."+FileUtil.getExtensionName(multipartFile.getOriginalFilename()));
         pictureRepository.save(picture);
         //删除临时文件
-        FileUtil.deleteFile(file);
+        FileUtil.del(file);
         return picture;
 
     }
-Original file line number
+Diff line change
@@ Expand Up @@
             return new ResponseEntity(HttpStatus.OK);
         }
         /**
          * 如果当前用户的角色级别低于创建用户的角色级别，则抛出权限不足的错误
          * @param resources
@@ Expand Down @@