From b5ac2c4a1b971b2fa645a3ca2033839b217b23c3 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sun, 17 Apr 2022 22:44:29 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=8E=BB?= =?UTF-8?q?=E9=99=A4error500=E6=96=B9=E6=B3=95=EF=BC=8C=E5=85=A8=E9=83=BD?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=BAerror=20=E3=80=90=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E6=94=B9token=E8=BF=87=E6=9C=9F=EF=BC=8C?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E6=8E=A5=E5=8F=A3=E8=AE=BF=E9=97=AE=E4=BE=9D?= =?UTF-8?q?=E7=84=B6=E4=B8=8D=E8=BF=94=E5=9B=9E=E7=99=BB=E5=BD=95=E9=A1=B5?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/common/api/vo/Result.java | 7 ---- .../controller/OnlCgformAuthController.java | 8 ++--- .../controller/OnlCgformButtonController.java | 12 +++---- .../controller/OnlCgformFieldController.java | 10 +++--- .../controller/OnlCgformHeadController.java | 8 ++--- .../controller/OnlCgformIndexController.java | 10 +++--- .../controller/OnlCgreportHeadController.java | 2 +- .../modules/demo/mock/MockController.java | 2 +- .../test/controller/JoaDemoController.java | 10 +++--- .../SysMessageTemplateController.java | 4 +-- .../controller/ActuatorRedisController.java | 2 +- .../oss/controller/OSSFileController.java | 6 ++-- .../controller/SysAnnouncementController.java | 16 ++++----- .../SysAnnouncementSendController.java | 10 +++--- .../controller/SysCategoryController.java | 10 +++--- .../controller/SysDepartController.java | 8 ++--- .../system/controller/SysDictController.java | 31 +++++++--------- .../controller/SysDictItemController.java | 8 ++--- .../system/controller/SysLogController.java | 4 +-- .../controller/SysPermissionController.java | 26 +++++++------- .../system/controller/SysRoleController.java | 10 +++--- .../controller/SysTenantController.java | 12 +++---- .../controller/SysUserAgentController.java | 12 +++---- .../system/controller/SysUserController.java | 35 +++++++++---------- .../system/service/impl/LoginServiceImpl.java | 33 +++++++---------- .../service/impl/SysUserServiceImpl.java | 9 ++--- jero-web/src/utils/request.js | 15 ++------ 27 files changed, 141 insertions(+), 179 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java index 1336e08e..77e85e83 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java @@ -107,13 +107,6 @@ public class Result implements Serializable { return r; } - public static Result error500(String message) { - Result r = new Result(); - r.message = message; - r.code = CommonConstant.SC_INTERNAL_SERVER_ERROR_500; - r.success = false; - return r; - } /** * 无权限访问返回结果 */ diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java index 9cced1dc..8f52e432 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java @@ -82,7 +82,7 @@ public class OnlCgformAuthController { return Result.OK("添加成功！"); } catch (Exception exception) { log.error(exception.getMessage(), exception); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -146,7 +146,7 @@ public class OnlCgformAuthController { return Result.OK("操作成功！", paramOnlAuthPage); } catch (Exception exception) { log.error(exception.getMessage(), exception); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -224,7 +224,7 @@ public class OnlCgformAuthController { return Result.OK("操作成功！"); } catch (Exception exception) { log.error(exception.getMessage(), exception); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -236,7 +236,7 @@ public class OnlCgformAuthController { return Result.OK("操作成功！"); } catch (Exception exception) { log.error(exception.getMessage(), exception); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java index b3222a92..62861c1d 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java @@ -54,7 +54,7 @@ public class OnlCgformButtonController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -69,7 +69,7 @@ public class OnlCgformButtonController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -77,7 +77,7 @@ public class OnlCgformButtonController { public Result edit(@RequestBody OnlCgformButton cgformButton) { OnlCgformButton existCgformButton = (OnlCgformButton)this.onlCgformButtonService.getById(cgformButton.getId()); if (existCgformButton == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { boolean flag = this.onlCgformButtonService.updateById(cgformButton); if (flag) { @@ -92,7 +92,7 @@ public class OnlCgformButtonController { public Result delete(@RequestParam(name = "id",required = true) String id) { OnlCgformButton cgformButton = (OnlCgformButton)this.onlCgformButtonService.getById(id); if (cgformButton == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { boolean flag = this.onlCgformButtonService.removeById(id); if (flag) { @@ -109,7 +109,7 @@ public class OnlCgformButtonController { this.onlCgformButtonService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("删除成功!"); } else { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); } } @@ -117,7 +117,7 @@ public class OnlCgformButtonController { public Result queryById(@RequestParam(name = "id",required = true) String id) { OnlCgformButton cgformButton = (OnlCgformButton)this.onlCgformButtonService.getById(id); if (cgformButton == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { return Result.OK(cgformButton); } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java index 01fa57a8..7de989fd 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java @@ -72,7 +72,7 @@ public class OnlCgformFieldController { return Result.OK("添加成功！"); } catch (Exception var4) { log.error(var4.getMessage(), var4); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -80,7 +80,7 @@ public class OnlCgformFieldController { public Result edit(@RequestBody OnlCgformField var1) { OnlCgformField var3 = (OnlCgformField)this.onlCgformFieldService.getById(var1.getId()); if (var3 == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { boolean var4 = this.onlCgformFieldService.updateById(var1); if (var4) { @@ -94,7 +94,7 @@ public class OnlCgformFieldController { public Result delete(@RequestParam(name = "id",required = true) String var1) { OnlCgformField var3 = (OnlCgformField)this.onlCgformFieldService.getById(var1); if (var3 == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { boolean var4 = this.onlCgformFieldService.removeById(var1); if (var4) { @@ -111,7 +111,7 @@ public class OnlCgformFieldController { this.onlCgformFieldService.removeByIds(Arrays.asList(var1.split(","))); return Result.OK("删除成功!"); } else { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); } } @@ -119,7 +119,7 @@ public class OnlCgformFieldController { public Result queryById(@RequestParam(name = "id",required = true) String var1) { OnlCgformField var3 = (OnlCgformField)this.onlCgformFieldService.getById(var1); if (var3 == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { return Result.OK(var3); } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java index 283eaa86..92f299d7 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java @@ -92,7 +92,7 @@ public class OnlCgformHeadController { return Result.OK("添加成功！"); } catch (Exception var4) { log.error(var4.getMessage(), var4); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -100,7 +100,7 @@ public class OnlCgformHeadController { public Result edit(@RequestBody OnlCgformHead var1) { OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var1.getId()); if (var3 == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { boolean var4 = this.onlCgformHeadService.updateById(var1); if (var4) { @@ -142,7 +142,7 @@ public class OnlCgformHeadController { this.onlCgformHeadService.deleteBatch(var1, var2); return Result.OK("删除成功!"); } else { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); } } @@ -150,7 +150,7 @@ public class OnlCgformHeadController { public Result queryById(@RequestParam(name = "id",required = true) String id) { OnlCgformHead cgformHead = (OnlCgformHead)this.onlCgformHeadService.getById(id); if (cgformHead == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { return Result.OK(cgformHead); } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java index 05f124bf..826f4590 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java @@ -61,7 +61,7 @@ public class OnlCgformIndexController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -69,7 +69,7 @@ public class OnlCgformIndexController { public Result edit(@RequestBody OnlCgformIndex cgformIndex) { OnlCgformIndex existCgformIndex = (OnlCgformIndex)this.onlCgformIndexService.getById(cgformIndex.getId()); if (existCgformIndex == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { boolean flag = this.onlCgformIndexService.updateById(cgformIndex); if (flag) { @@ -84,7 +84,7 @@ public class OnlCgformIndexController { public Result delete(@RequestParam(name = "id",required = true) String id) { OnlCgformIndex cgformIndex = (OnlCgformIndex)this.onlCgformIndexService.getById(id); if (cgformIndex == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { boolean flag = this.onlCgformIndexService.removeById(id); if (flag) { @@ -101,7 +101,7 @@ public class OnlCgformIndexController { this.onlCgformIndexService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("删除成功!"); } else { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); } } @@ -109,7 +109,7 @@ public class OnlCgformIndexController { public Result queryById(@RequestParam(name = "id",required = true) String var1) { OnlCgformIndex cgformIndex = (OnlCgformIndex)this.onlCgformIndexService.getById(var1); if (cgformIndex == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { return Result.OK(cgformIndex); } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java index 353256af..92a42840 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java @@ -167,7 +167,7 @@ public class OnlCgreportHeadController { return Result.OK("添加成功！"); } catch (Exception var9) { log.error(var9.getMessage(), var9); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/MockController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/MockController.java index d48741e8..f32cae46 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/MockController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/MockController.java @@ -144,7 +144,7 @@ public class MockController { res.setResult(list); res.setMessage("查询成功"); } catch (Exception e) { - res.error500("查询失败"+e.getMessage()); + return Result.error("查询失败"+e.getMessage()); } return res; } diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java index f45ef921..78a123b6 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java @@ -88,7 +88,7 @@ public class JoaDemoController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -101,7 +101,7 @@ public class JoaDemoController { public Result edit(@RequestBody JoaDemo joaDemo) { JoaDemo joaDemoEntity = joaDemoService.getById(joaDemo.getId()); if(joaDemoEntity==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = joaDemoService.updateById(joaDemo); if(ok) { @@ -121,7 +121,7 @@ public class JoaDemoController { public Result delete(@RequestParam(name="id",required=true) String id) { JoaDemo joaDemo = joaDemoService.getById(id); if(joaDemo==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = joaDemoService.removeById(id); if(ok) { @@ -139,7 +139,7 @@ public class JoaDemoController { @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids==null || "".equals(ids.trim())) { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); }else { this.joaDemoService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("删除成功!"); @@ -155,7 +155,7 @@ public class JoaDemoController { public Result queryById(@RequestParam(name="id",required=true) String id) { JoaDemo joaDemo = joaDemoService.getById(id); if(joaDemo==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { return Result.OK(joaDemo); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java index 38a80960..d9b8a26f 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java @@ -155,13 +155,13 @@ public class SysMessageTemplateController extends JeroController) JSON.parse(msgParams.getTestData()); } catch (Exception e) { - return Result.error500("解析Json出错！"); + return Result.error("解析Json出错！"); } boolean is_sendSuccess = pushMsgUtil.sendMessage(msgParams.getMsgType(), msgParams.getTemplateCode(), map, msgParams.getReceiver()); if (is_sendSuccess) { return Result.OK("发送消息任务添加成功！"); } else { - return Result.error500("发送消息任务添加失败！"); + return Result.error("发送消息任务添加失败！"); } } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java index 15047492..4a8d5495 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java @@ -111,7 +111,7 @@ public class ActuatorRedisController { res.setResult(list); res.setMessage("查询成功"); } catch (Exception e) { - return Result.error500("查询失败"+e.getMessage()); + return Result.error("查询失败"+e.getMessage()); } return res; } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java index 1cdc46ab..c7e65634 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java @@ -53,7 +53,7 @@ public class OSSFileController { } catch (Exception ex) { log.info(ex.getMessage(), ex); - return Result.error500("上传失败"); + return Result.error("上传失败"); } } @@ -62,7 +62,7 @@ public class OSSFileController { public Result delete(@RequestParam(name = "id") String id) { OSSFile file = ossFileService.getById(id); if (file == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { boolean ok = ossFileService.delete(file); if (ok) { @@ -81,7 +81,7 @@ public class OSSFileController { Result result = new Result<>(); OSSFile file = ossFileService.getById(id); if (file == null) { - result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { result.setResult(file); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java index 2f34be16..c9ed68d3 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java @@ -126,7 +126,7 @@ public class SysAnnouncementController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -139,7 +139,7 @@ public class SysAnnouncementController { public Result eidt(@RequestBody SysAnnouncement sysAnnouncement) { SysAnnouncement sysAnnouncementEntity = sysAnnouncementService.getById(sysAnnouncement.getId()); if(sysAnnouncementEntity==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { // update-begin-author:liusq date:20210804 for:标题处理xss攻击的问题 String title = XSSUtils.striptXSS(sysAnnouncement.getTitile()); @@ -163,7 +163,7 @@ public class SysAnnouncementController { public Result delete(@RequestParam(name="id",required=true) String id) { SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id); if(sysAnnouncement==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_1.toString()); boolean ok = sysAnnouncementService.updateById(sysAnnouncement); @@ -183,7 +183,7 @@ public class SysAnnouncementController { @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids==null || "".equals(ids.trim())) { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); }else { String[] id = ids.split(","); for(int i=0;i result = new Result(); SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id); if(sysAnnouncement==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { return Result.OK(sysAnnouncement); } @@ -220,7 +220,7 @@ public class SysAnnouncementController { public Result doReleaseData(@RequestParam(name="id",required=true) String id, HttpServletRequest request) { SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id); if(sysAnnouncement==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { sysAnnouncement.setSendStatus(CommonSendStatus.PUBLISHED_STATUS_1);//发布中 sysAnnouncement.setSendTime(new Date()); @@ -262,7 +262,7 @@ public class SysAnnouncementController { public Result doReovkeData(@RequestParam(name="id",required=true) String id, HttpServletRequest request) { SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id); if(sysAnnouncement==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { sysAnnouncement.setSendStatus(CommonSendStatus.REVOKE_STATUS_2);//撤销发布 sysAnnouncement.setCancelTime(new Date()); @@ -401,7 +401,7 @@ public class SysAnnouncementController { if(StringUtils.isNotBlank(anntId)){ SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(anntId); if(sysAnnouncement==null) { - result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { if(sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_ALL)) { obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java index 7b184e95..ae7243a7 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java @@ -94,7 +94,7 @@ public class SysAnnouncementSendController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -107,7 +107,7 @@ public class SysAnnouncementSendController { public Result edit(@RequestBody SysAnnouncementSend sysAnnouncementSend) { SysAnnouncementSend sysAnnouncementSendEntity = sysAnnouncementSendService.getById(sysAnnouncementSend.getId()); if(sysAnnouncementSendEntity==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = sysAnnouncementSendService.updateById(sysAnnouncementSend); if(ok) { @@ -127,7 +127,7 @@ public class SysAnnouncementSendController { public Result delete(@RequestParam(name="id",required=true) String id) { SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id); if(sysAnnouncementSend==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = sysAnnouncementSendService.removeById(id); if(ok) { @@ -146,7 +146,7 @@ public class SysAnnouncementSendController { @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids == null || "".equals(ids.trim())) { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); }else { this.sysAnnouncementSendService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("删除成功!"); @@ -163,7 +163,7 @@ public class SysAnnouncementSendController { Result result = new Result(); SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id); if(sysAnnouncementSend==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { return Result.OK(sysAnnouncementSend); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index 6648cdfc..bd94e192 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -104,7 +104,7 @@ public class SysCategoryController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -118,7 +118,7 @@ public class SysCategoryController { public Result edit(@RequestBody SysCategory sysCategory) { SysCategory sysCategoryEntity = sysCategoryService.getById(sysCategory.getId()); if(sysCategoryEntity==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { sysCategoryService.updateSysCategory(sysCategory); return Result.OK("修改成功!"); @@ -135,7 +135,7 @@ public class SysCategoryController { public Result delete(@RequestParam(name="id",required=true) String id) { SysCategory sysCategory = sysCategoryService.getById(id); if(sysCategory==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { this.sysCategoryService.deleteSysCategory(id); return Result.OK("删除成功!"); @@ -151,7 +151,7 @@ public class SysCategoryController { @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids==null || "".equals(ids.trim())) { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); }else { this.sysCategoryService.deleteSysCategory(ids); return Result.OK("删除成功!"); @@ -168,7 +168,7 @@ public class SysCategoryController { public Result queryById(@RequestParam(name="id",required=true) String id) { SysCategory sysCategory = sysCategoryService.getById(id); if(sysCategory==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { return Result.OK(sysCategory); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index a8e23312..37ac69b7 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -182,7 +182,7 @@ public class SysDepartController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -201,7 +201,7 @@ public class SysDepartController { sysDepart.setUpdateBy(username); SysDepart sysDepartEntity = sysDepartService.getById(sysDepart.getId()); if (sysDepartEntity == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { boolean ok = sysDepartService.updateDepartDataById(sysDepart, username); if (ok) { @@ -223,7 +223,7 @@ public class SysDepartController { public Result delete(@RequestParam(name="id",required=true) String id) { SysDepart sysDepart = sysDepartService.getById(id); if(sysDepart==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = sysDepartService.delete(id); if(ok) { @@ -246,7 +246,7 @@ public class SysDepartController { @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { if (ids == null || "".equals(ids.trim())) { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); } else { this.sysDepartService.deleteBatchWithChildren(Arrays.asList(ids.split(","))); return Result.OK("删除成功!"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 5627712a..91f1abad 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -146,8 +146,7 @@ public class SysDictController { result.setResult(text); } catch (Exception e) { log.error(e.getMessage(),e); - result.error500("操作失败"); - return result; + return Result.error("操作失败"); } return result; } @@ -165,16 +164,14 @@ public class SysDictController { try { List ls = sysDictService.getDictItems(dictCode); if (ls == null) { - result.error500("字典Code格式不正确！"); - return result; + return Result.error("字典Code格式不正确！"); } result.setSuccess(true); result.setResult(ls); log.debug(result.toString()); } catch (Exception e) { log.error(e.getMessage(), e); - result.error500("操作失败"); - return result; + return Result.error("操作失败"); } return result; } @@ -196,8 +193,7 @@ public class SysDictController { try { List ls = sysDictService.loadDict(dictCode, keyword, pageSize); if (ls == null) { - result.error500("字典Code格式不正确！"); - return result; + return Result.error("字典Code格式不正确！"); } result.setSuccess(true); result.setResult(ls); @@ -205,8 +201,7 @@ public class SysDictController { return result; } catch (Exception e) { log.error(e.getMessage(),e); - result.error500("操作失败"); - return result; + return Result.error("操作失败"); } } @@ -267,8 +262,7 @@ public class SysDictController { if(dictCode.indexOf(",")!=-1) { String[] params = dictCode.split(","); if(params.length!=3) { - result.error500("字典Code格式不正确！"); - return result; + return Result.error("字典Code格式不正确！"); } List texts = sysDictService.queryTableDictByKeys(params[0], params[1], params[2], keys, delNotExist); @@ -276,12 +270,11 @@ public class SysDictController { result.setResult(texts); log.info(result.toString()); }else { - result.error500("字典Code格式不正确！"); + return Result.error("字典Code格式不正确！"); } } catch (Exception e) { log.error(e.getMessage(),e); - result.error500("操作失败"); - return result; + return Result.error("操作失败"); } return result; @@ -348,7 +341,7 @@ public class SysDictController { return Result.OK("保存成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -362,7 +355,7 @@ public class SysDictController { public Result edit(@RequestBody SysDict sysDict) { SysDict sysdict = sysDictService.getById(sysDict.getId()); if(sysdict==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { sysDict.setUpdateTime(new Date()); boolean ok = sysDictService.updateById(sysDict); @@ -388,7 +381,7 @@ public class SysDictController { if(ok) { return Result.OK("删除成功!"); }else{ - return Result.error500("删除失败!"); + return Result.error("删除失败!"); } } @@ -402,7 +395,7 @@ public class SysDictController { @CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(oConvertUtils.isEmpty(ids)) { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); }else { sysDictService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("删除成功!"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 5e27d093..2241ab9b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -84,7 +84,7 @@ public class SysDictItemController { return Result.OK("保存成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -100,7 +100,7 @@ public class SysDictItemController { public Result edit(@RequestBody SysDictItem sysDictItem) { SysDictItem sysdict = sysDictItemService.getById(sysDictItem.getId()); if(sysdict==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { sysDictItem.setUpdateTime(new Date()); boolean ok = sysDictItemService.updateById(sysDictItem); @@ -123,7 +123,7 @@ public class SysDictItemController { public Result delete(@RequestParam(name="id",required=true) String id) { SysDictItem joinSystem = sysDictItemService.getById(id); if(joinSystem==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = sysDictItemService.removeById(id); if(ok) { @@ -144,7 +144,7 @@ public class SysDictItemController { @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids==null || "".equals(ids.trim())) { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); }else { this.sysDictItemService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("删除成功!"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java index 8ef59466..95bc46d8 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java @@ -78,7 +78,7 @@ public class SysLogController { public Result delete(@RequestParam(name="id",required=true) String id) { SysLog sysLog = sysLogService.getById(id); if(sysLog==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = sysLogService.removeById(id); if(ok) { @@ -96,7 +96,7 @@ public class SysLogController { @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids==null || "".equals(ids.trim())) { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); }else { if("allclear".equals(ids)) { this.sysLogService.removeAll(); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java index cdd625e4..1d11e42f 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java @@ -187,7 +187,7 @@ public class SysPermissionController { // result.setResult(jsonArray); // result.success("查询成功"); // } catch (Exception e) { -// result.error500("查询失败:" + e.getMessage()); +// result.error("查询失败:" + e.getMessage()); // log.error(e.getMessage(), e); // } // return result; @@ -231,8 +231,8 @@ public class SysPermissionController { result.setResult(json); result.setMessage("查询成功"); } catch (Exception e) { - result.error500("查询失败:" + e.getMessage()); log.error(e.getMessage(), e); + return Result.error("查询失败:" + e.getMessage()); } return result; } @@ -251,7 +251,7 @@ public class SysPermissionController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -269,7 +269,7 @@ public class SysPermissionController { return Result.OK("修改成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -286,7 +286,7 @@ public class SysPermissionController { return Result.OK("删除成功!"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500(e.getMessage()); + return Result.error(e.getMessage()); } } @@ -308,7 +308,7 @@ public class SysPermissionController { return Result.OK("删除成功!"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("删除成功!"); + return Result.error("删除成功!"); } } @@ -355,7 +355,7 @@ public class SysPermissionController { try { List list = sysPermissionService.queryListByParentId(parentId); if (list == null || list.size() <= 0) { - result.error500("未找到角色信息"); + return Result.error("未找到角色信息"); } else { result.setResult(list); result.setSuccess(true); @@ -403,7 +403,7 @@ public class SysPermissionController { return Result.OK("保存成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("授权失败！"); + return Result.error("授权失败！"); } } @@ -687,7 +687,7 @@ public class SysPermissionController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -699,7 +699,7 @@ public class SysPermissionController { return Result.OK("更新成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -717,7 +717,7 @@ public class SysPermissionController { return Result.OK("删除成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -734,7 +734,7 @@ public class SysPermissionController { return Result.OK("查询成功", permRuleList); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -774,7 +774,7 @@ public class SysPermissionController { return Result.OK("保存成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("授权失败！"); + return Result.error("授权失败！"); } } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java index 35901c3e..ed91abaa 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java @@ -120,7 +120,7 @@ public class SysRoleController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -135,7 +135,7 @@ public class SysRoleController { public Result edit(@RequestBody SysRole role) { SysRole sysrole = sysRoleService.getById(role.getId()); if(sysrole==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { role.setUpdateTime(new Date()); boolean ok = sysRoleService.updateById(role); @@ -170,7 +170,7 @@ public class SysRoleController { @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(oConvertUtils.isEmpty(ids)) { - return Result.error500("未选中角色！"); + return Result.error("未选中角色！"); }else { sysRoleService.deleteBatchRole(ids.split(",")); return Result.OK("删除角色成功!"); @@ -187,7 +187,7 @@ public class SysRoleController { public Result queryById(@RequestParam(name="id",required=true) String id) { SysRole sysRole = sysRoleService.getById(id); if(sysRole==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { return Result.OK(sysRole); } @@ -197,7 +197,7 @@ public class SysRoleController { public Result> queryall() { List list = sysRoleService.list(); if(list==null||list.size()<=0) { - return Result.error500("未找到角色信息"); + return Result.error("未找到角色信息"); }else { return Result.OK(list); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java index feb914ce..d051ebf6 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java @@ -60,7 +60,7 @@ public class SysTenantController { @RequestMapping(value = "/add", method = RequestMethod.POST) public Result add(@RequestBody SysTenant sysTenant) { if(sysTenantService.getById(sysTenant.getId())!=null){ - return Result.error500("该编号已存在!"); + return Result.error("该编号已存在!"); } try { @@ -68,7 +68,7 @@ public class SysTenantController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -81,7 +81,7 @@ public class SysTenantController { public Result edit(@RequestBody SysTenant tenant) { SysTenant sysTenant = sysTenantService.getById(tenant.getId()); if(sysTenant==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = sysTenantService.updateById(tenant); if(ok) { @@ -110,7 +110,7 @@ public class SysTenantController { @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(oConvertUtils.isEmpty(ids)) { - return Result.error500("未选中租户！"); + return Result.error("未选中租户！"); }else { String[] ls = ids.split(","); // 过滤掉已被引用的租户 @@ -130,7 +130,7 @@ public class SysTenantController { return Result.OK("部分删除成功！（被引用的租户无法删除）"); } }else { - return Result.error500("选择的租户都已被引用，无法删除！"); + return Result.error("选择的租户都已被引用，无法删除！"); } } } @@ -144,7 +144,7 @@ public class SysTenantController { public Result queryById(@RequestParam(name="id",required=true) String id) { SysTenant sysTenant = sysTenantService.getById(id); if(sysTenant==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { return Result.OK(sysTenant); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserAgentController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserAgentController.java index eef39e9d..efc876c5 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserAgentController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserAgentController.java @@ -96,7 +96,7 @@ public class SysUserAgentController { return Result.OK("代理人设置成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -109,7 +109,7 @@ public class SysUserAgentController { public Result edit(@RequestBody SysUserAgent sysUserAgent) { SysUserAgent sysUserAgentEntity = sysUserAgentService.getById(sysUserAgent.getId()); if(sysUserAgentEntity==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = sysUserAgentService.updateById(sysUserAgent); if(ok) { @@ -129,7 +129,7 @@ public class SysUserAgentController { public Result delete(@RequestParam(name="id",required=true) String id) { SysUserAgent sysUserAgent = sysUserAgentService.getById(id); if(sysUserAgent==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { boolean ok = sysUserAgentService.removeById(id); if(ok) { @@ -147,7 +147,7 @@ public class SysUserAgentController { @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids==null || "".equals(ids.trim())) { - return Result.error500("参数不识别！"); + return Result.error("参数不识别！"); }else { this.sysUserAgentService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("删除成功!"); @@ -163,7 +163,7 @@ public class SysUserAgentController { public Result queryById(@RequestParam(name="id",required=true) String id) { SysUserAgent sysUserAgent = sysUserAgentService.getById(id); if(sysUserAgent==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { return Result.OK(sysUserAgent); } @@ -180,7 +180,7 @@ public class SysUserAgentController { queryWrapper.eq(SysUserAgent::getUserName, userName); SysUserAgent sysUserAgent = sysUserAgentService.getOne(queryWrapper); if(sysUserAgent==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { return Result.OK(sysUserAgent); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index c3420add..504dbe92 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -159,7 +159,7 @@ public class SysUserController { return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -174,7 +174,7 @@ public class SysUserController { SysUser sysUser = sysUserService.getById(jsonObject.getString("id")); baseCommonService.addLog("编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 2); if(sysUser==null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); }else { SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class); String email = null; @@ -202,7 +202,7 @@ public class SysUserController { } } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"); + return Result.error("操作失败"); } } @@ -236,7 +236,7 @@ public class SysUserController { } } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error500("操作失败"+e.getMessage()); + return Result.error("操作失败"+e.getMessage()); } return Result.OK("操作成功!"); @@ -246,7 +246,7 @@ public class SysUserController { public Result queryById(@RequestParam(name = "id", required = true) String id) { SysUser sysUser = sysUserService.getById(id); if (sysUser == null) { - return Result.error500("未找到对应实体"); + return Result.error("未找到对应实体"); } else { return Result.OK(sysUser); } @@ -258,7 +258,7 @@ public class SysUserController { List list = new ArrayList(); List userRole = sysUserRoleService.list(new QueryWrapper().lambda().eq(SysUserRole::getUserId, userid)); if (userRole == null || userRole.size() <= 0) { - return Result.error500("未找到用户相关角色信息"); + return Result.error("未找到用户相关角色信息"); } else { for (SysUserRole sysUserRole : userRole) { list.add(sysUserRole.getRoleId()); @@ -636,7 +636,7 @@ public class SysUserController { return Result.OK("删除成功!"); }catch(Exception e) { log.error(e.getMessage(), e); - return Result.error500("删除失败！"); + return Result.error("删除失败！"); } } @@ -657,7 +657,7 @@ public class SysUserController { return Result.OK("删除成功!"); }catch(Exception e) { log.error(e.getMessage(), e); - return Result.error500("删除失败！"); + return Result.error("删除失败！"); } } @@ -766,7 +766,7 @@ public class SysUserController { return Result.OK("删除成功!"); }catch(Exception e) { log.error(e.getMessage(), e); - return Result.error500("删除失败！"); + return Result.error("删除失败！"); } } @@ -790,7 +790,7 @@ public class SysUserController { return Result.OK("删除成功!"); }catch(Exception e) { log.error(e.getMessage(), e); - return Result.error500("删除失败！"); + return Result.error("删除失败！"); } } @@ -810,7 +810,7 @@ public class SysUserController { return Result.OK(map); }catch(Exception e) { log.error(e.getMessage(), e); - return Result.error500("查询失败！"); + return Result.error("查询失败！"); } } @@ -889,7 +889,7 @@ public class SysUserController { sysUserService.addUserWithRole(user,"ee8626f80f7c2619917b6236f3a7f02b");//默认临时角色 test result.setMessage("注册成功"); } catch (Exception e) { - result.error500("注册失败"); + return Result.error("注册失败"); } return result; } @@ -1117,13 +1117,12 @@ public class SysUserController { Date birthday=jsonObject.getDate("birthday"); SysUser userPhone = sysUserService.getUserByPhone(phone); if(sysUser==null) { - result.error500("未找到对应用户!"); + return Result.error("未找到对应用户!"); }else { if(userPhone!=null){ String userPhonename = userPhone.getUsername(); if(!userPhonename.equals(username)){ - result.error500("手机号已存在!"); - return result; + return Result.error("手机号已存在!"); } } if(StringUtils.isNotBlank(realname)){ @@ -1149,7 +1148,7 @@ public class SysUserController { } } catch (Exception e) { log.error(e.getMessage(), e); - result.error500("操作失败!"); + return Result.error("操作失败!"); } return result; } @@ -1165,14 +1164,14 @@ public class SysUserController { String username = JwtUtil.getUserNameByToken(request); SysUser sysUser = sysUserService.getUserByName(username); if(sysUser==null) { - result.error500("未找到对应用户!"); + return Result.error("未找到对应用户!"); }else { sysUser.setClientId(clientId); sysUserService.updateById(sysUser); } } catch (Exception e) { log.error(e.getMessage(), e); - result.error500("操作失败!"); + return Result.error("操作失败!"); } return result; } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java index 3c6e36ff..e391fe39 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java @@ -75,7 +75,7 @@ public class LoginServiceImpl implements ILoginService { String rsaPrivateKey = redisUtil.get(rsaPublicKey) != null ? String.valueOf(redisUtil.get(rsaPublicKey)) : null; if(StrUtil.isEmpty(rsaPrivateKey)){ - return result.error500("页面过期，请刷新页面"); + return Result.error("页面过期，请刷新页面"); } //update-begin--Author:scott Date:20190805 for：暂时注释掉密码加密逻辑，有点问题 @@ -85,16 +85,14 @@ public class LoginServiceImpl implements ILoginService { //update-begin-author:taoyan date:20190828 for:校验验证码 String captcha = sysLoginModel.getCaptcha(); if(captcha==null){ - result.error500("验证码无效"); - return result; + return Result.error("验证码无效"); } String lowerCaseCaptcha = captcha.toLowerCase(); String realKey = MD5Util.MD5Encode(lowerCaseCaptcha+sysLoginModel.getCheckKey(), "utf-8"); Object checkCode = redisUtil.get(realKey); //当进入登录页时，有一定几率出现验证码错误 #1714 if(checkCode==null || !checkCode.toString().equals(lowerCaseCaptcha)) { - result.error500("验证码错误"); - return result; + return Result.error("验证码错误"); } try { //解密获取密码和用户名 @@ -120,8 +118,7 @@ public class LoginServiceImpl implements ILoginService { retryCount = (int) redisUtil.get(RETRY_LOGIN_PREFIX + username); } if (retryCount >= RETRY_LOGIN_MAX_COUNT){ - result.error500("密码错误次数过多，请稍后重试"); - return result; + return Result.error("密码错误次数过多，请稍后重试"); } //2. 校验用户名或密码是否正确 String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); @@ -135,8 +132,7 @@ public class LoginServiceImpl implements ILoginService { redisUtil.set(RETRY_LOGIN_PREFIX + username,retryCount,redisUtil.getExpire(RETRY_LOGIN_PREFIX + username)); } String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请稍后重试":"用户名或密码错误，剩余可登录次数:"+(RETRY_LOGIN_MAX_COUNT - retryCount); - result.error500(msg); - return result; + return Result.error(msg); } //登录成功，清除错误登录次数 redisUtil.del(RETRY_LOGIN_PREFIX + username); @@ -273,9 +269,8 @@ public class LoginServiceImpl implements ILoginService { if (CommonConstant.SMS_TPL_TYPE_1.equals(smsmode)) { SysUser sysUser = sysUserService.getUserByPhone(mobile); if(sysUser!=null) { - result.error500(" 手机号已经注册，请直接登录！"); baseCommonService.addLog("手机号已经注册，请直接登录！", CommonConstant.LOG_TYPE_1, null); - return result; + return Result.error(" 手机号已经注册，请直接登录！"); } b = DySmsHelper.sendSms(mobile, obj, DySmsEnum.REGISTER_TEMPLATE_CODE); }else { @@ -285,7 +280,7 @@ public class LoginServiceImpl implements ILoginService { if(!result.isSuccess()) { String message = result.getMessage(); if("该用户不存在，请注册".equals(message)){ - result.error500("该用户不存在或未绑定手机号"); + return Result.error("该用户不存在或未绑定手机号"); } return result; } @@ -316,8 +311,7 @@ public class LoginServiceImpl implements ILoginService { } catch (ClientException e) { e.printStackTrace(); - result.error500(" 短信接口未配置，请联系管理员！"); - return result; + return Result.error(" 短信接口未配置，请联系管理员！"); } return result; } @@ -370,7 +364,7 @@ public class LoginServiceImpl implements ILoginService { res.setSuccess(true); res.setResult(base64); } catch (Exception e) { - res.error500("获取验证码出错"+e.getMessage()); + res.error("获取验证码出错"+e.getMessage()); e.printStackTrace(); } return res; @@ -393,8 +387,7 @@ public class LoginServiceImpl implements ILoginService { String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); String syspassword = sysUser.getPassword(); if (!syspassword.equals(userpassword)) { - result.error500("用户名或密码错误"); - return result; + return Result.error("用户名或密码错误"); } String orgCode = sysUser.getOrgCode(); @@ -402,8 +395,7 @@ public class LoginServiceImpl implements ILoginService { //如果当前用户无选择部门 查看部门关联信息 List departs = sysDepartService.queryUserDeparts(sysUser.getId()); if (departs == null || departs.size() == 0) { - result.error500("用户暂未归属部门,不可登录!"); - return result; + return Result.error("用户暂未归属部门,不可登录!"); } orgCode = departs.get(0).getOrgCode(); sysUser.setOrgCode(orgCode); @@ -494,8 +486,7 @@ public class LoginServiceImpl implements ILoginService { // 该方法仅查询有效的租户，如果返回0个就说明所有的租户均无效。 List tenantList = sysTenantService.queryEffectiveTenant(tenantIdList); if (tenantList.size() == 0) { - result.error500("与该用户关联的租户均已被冻结，无法登录！"); - return result; + return Result.error("与该用户关联的租户均已被冻结，无法登录！"); } else { obj.put("tenantList", tenantList); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index ded17dc2..edeccd1f 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -329,23 +329,20 @@ public class SysUserServiceImpl extends ServiceImpl impl Result result = new Result(); //情况1：根据用户信息查询，该用户不存在 if (sysUser == null) { - result.error500("该用户不存在，请注册"); baseCommonService.addLog("用户登录失败，用户不存在！", CommonConstant.LOG_TYPE_1, null); - return result; + return Result.error("该用户不存在，请注册"); } //情况2：根据用户信息查询，该用户已注销 //update-begin---author:王帅 Date:20200601 for：if条件永远为falsebug------------ if (CommonConstant.DEL_FLAG_1.equals(sysUser.getDelFlag())) { //update-end---author:王帅 Date:20200601 for：if条件永远为falsebug------------ baseCommonService.addLog("用户登录失败，用户名:" + sysUser.getUsername() + "已注销！", CommonConstant.LOG_TYPE_1, null); - result.error500("该用户已注销"); - return result; + return Result.error("该用户已注销"); } //情况3：根据用户信息查询，该用户已冻结 if (CommonConstant.USER_FREEZE.equals(sysUser.getStatus())) { baseCommonService.addLog("用户登录失败，用户名:" + sysUser.getUsername() + "已冻结！", CommonConstant.LOG_TYPE_1, null); - result.error500("该用户已冻结"); - return result; + return Result.error("该用户已冻结"); } return result; } diff --git a/jero-web/src/utils/request.js b/jero-web/src/utils/request.js index d36f3cfb..76d34c3a 100644 --- a/jero-web/src/utils/request.js +++ b/jero-web/src/utils/request.js @@ -39,7 +39,7 @@ const err = (error) => { break; } // update-end- --- author:liusq ------ date:20200910 ---- for:处理Blob情况---- - if(token && data.message.includes("Token失效")){ + if(token && data.includes("Token失效")){ // update-begin- --- author:scott ------ date:20190225 ---- for:Token失效采用弹框模式，不直接跳转---- if (/wxwork|dingtalk/i.test(navigator.userAgent)) { Vue.prototype.$Jmessage.loading('登录已过期，正在重新登陆', 0) @@ -50,18 +50,7 @@ const err = (error) => { okText: '重新登录', mask: false, onOk: () => { - store.dispatch('Logout').then(() => { - Vue.ls.remove(ACCESS_TOKEN) - try { - let path = window.document.location.pathname - console.log('location pathname -> ' + path) - if (path != '/' && path.indexOf('/user/login') == -1) { - window.location.reload() - } - } catch (e) { - window.location.reload() - } - }) + store.dispatch('Logout') } }) }