From 2997d9ee723f47274b695203983f13a5390c1cb5 Mon Sep 17 00:00:00 2001 From: hello-hao <923453645@qq.com> Date: Thu, 17 Mar 2022 13:42:57 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/hellohao/controller/AdminController.java | 14 +++++--------- .../hellohao/controller/AdminRootController.java | 3 --- .../cn/hellohao/controller/IndexController.java | 10 +--------- .../cn/hellohao/controller/UserController.java | 2 -- src/main/resources/mapper/ImgMapper.xml | 5 ++++- 5 files changed, 10 insertions(+), 24 deletions(-) diff --git a/src/main/java/cn/hellohao/controller/AdminController.java b/src/main/java/cn/hellohao/controller/AdminController.java index 2d19a67..86c09c6 100644 --- a/src/main/java/cn/hellohao/controller/AdminController.java +++ b/src/main/java/cn/hellohao/controller/AdminController.java @@ -96,10 +96,10 @@ public class AdminController { if(user.getLevel()>1){ ok = "true"; //管理员 - jsonObject.put("imgTotal", imgService.counts(null) ); //admin 站点图片数 - jsonObject.put("userTotal", userService.getUserTotal()); //admin 用户个数 - jsonObject.put("ViolationImgTotal", imgreview.getCount()); //admin 非法图片 - jsonObject.put("ViolationSwitch", isImgreviewOK==null?0:isImgreviewOK.getId()); //admin 非法图片开关 + jsonObject.put("imgTotal", imgService.counts(null) ); //站点图片数 + jsonObject.put("userTotal", userService.getUserTotal()); + jsonObject.put("ViolationImgTotal", imgreview.getCount()); //非法图片 + jsonObject.put("ViolationSwitch", isImgreviewOK==null?0:isImgreviewOK.getId()); //非法图片开关 jsonObject.put("VisitorUpload", uploadConfig.getIsupdate());//是否禁用了游客上传 jsonObject.put("VisitorMemory", SetFiles.readableFileSize(Long.valueOf(uploadConfig.getVisitormemory())));//访客共大小 if(uploadConfig.getIsupdate()!=1){ @@ -130,7 +130,6 @@ public class AdminController { return msg; } - @PostMapping(value = "/SpaceExpansion")//new @ResponseBody public Msg SpaceExpansion(@RequestParam(value = "data", defaultValue = "") String data) { @@ -167,7 +166,6 @@ public class AdminController { } } - @PostMapping("/getRecently")//new @ResponseBody public Msg getRecently(@RequestParam(value = "data", defaultValue = "") String data) { @@ -416,7 +414,6 @@ public class AdminController { return msg; } - @PostMapping("/deleImages") //new @ResponseBody public Msg deleImages(@RequestParam(value = "data", defaultValue = "") String data) { @@ -467,7 +464,7 @@ public class AdminController { }else if (key.getStorageType() == 8) { isDele = uFileImageupload.delUFile(key.getId(), imgname); }else { - System.err.println("未获取到对象存储参数，删除失败。"); + System.err.println("未获取到对象存储参数，删除失败"); } }catch (Exception e){ e.printStackTrace(); @@ -494,7 +491,6 @@ public class AdminController { return msg; } - //工具函数 private static String getChinaes(int v){ String ch = ""; diff --git a/src/main/java/cn/hellohao/controller/AdminRootController.java b/src/main/java/cn/hellohao/controller/AdminRootController.java index a7af2db..3ed9b72 100644 --- a/src/main/java/cn/hellohao/controller/AdminRootController.java +++ b/src/main/java/cn/hellohao/controller/AdminRootController.java @@ -62,7 +62,6 @@ public class AdminRootController { map.put("count", rolePageInfo.getTotal()); map.put("users", rolePageInfo.getList()); return map; - } @@ -253,7 +252,6 @@ public class AdminRootController { return msg; } - @PostMapping("/getSettingConfig") //new @ResponseBody public Msg getSettingConfig(@RequestParam(value = "data", defaultValue = "") String data) { @@ -376,7 +374,6 @@ public class AdminRootController { EmailConfig emailConfig = JSON.toJavaObject(jsonObj,EmailConfig.class); if(null==emailConfig.getEmails() || null==emailConfig.getEmailkey() || null==emailConfig.getEmailurl() || null==emailConfig.getPort() || null==emailConfig.getEmailname() || null==tomail){ -// if(jsonObj.size()==0){ msg.setCode("110400"); msg.setInfo("邮箱配置参数不能为空"); }else{ diff --git a/src/main/java/cn/hellohao/controller/IndexController.java b/src/main/java/cn/hellohao/controller/IndexController.java index 30a2a21..7ceea09 100644 --- a/src/main/java/cn/hellohao/controller/IndexController.java +++ b/src/main/java/cn/hellohao/controller/IndexController.java @@ -84,8 +84,7 @@ public class IndexController { return msg; } - - @PostMapping(value = "/upload")//upimg new + @PostMapping(value = "/upload")// new @ResponseBody public Msg upimg(HttpServletRequest request,HttpSession httpSession , @RequestParam(value = "file", required = false) MultipartFile multipartFile,Integer day) { @@ -119,21 +118,16 @@ public class IndexController { if(syscounts>=temp){ Msg msg = uploadServicel.uploadForLoc(request, null, setday, URLArr[i]); if(!msg.getCode().equals("200")){ - //失败的个数 errcounts++; }else{ retArray.add(msg); } }else{ - //超额的个数 excess++; } } - //共传过来的数量 jsonObject.put("counts",URLArr.length); - //上传失败的个数 jsonObject.put("errcounts",errcounts); - //超过系统定义值 不上传的数量 jsonObject.put("excess",excess); jsonObject.put("urls",retArray); retMsg.setData(jsonObject); @@ -206,8 +200,6 @@ public class IndexController { return msg; } - - @GetMapping("/verifyCode") public void verifyCode(HttpServletRequest request, HttpServletResponse response,HttpSession httpSession) { IVerifyCodeGen iVerifyCodeGen = new SimpleCharVerifyCodeGenImpl(); diff --git a/src/main/java/cn/hellohao/controller/UserController.java b/src/main/java/cn/hellohao/controller/UserController.java index 49981d4..01dd833 100644 --- a/src/main/java/cn/hellohao/controller/UserController.java +++ b/src/main/java/cn/hellohao/controller/UserController.java @@ -39,8 +39,6 @@ public class UserController { @Autowired private SysConfigService sysConfigService; @Autowired - private UserGroupService userGroupService; - @Autowired IRedisService iRedisService; @PostMapping("/register") diff --git a/src/main/resources/mapper/ImgMapper.xml b/src/main/resources/mapper/ImgMapper.xml index a0fd8c2..89a6555 100644 --- a/src/main/resources/mapper/ImgMapper.xml +++ b/src/main/resources/mapper/ImgMapper.xml @@ -62,7 +62,10 @@ - + + and + a.imguid = #{imguid} + order by a.id desc