KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【修改】去除error500方法，全都替换为error

Browse Source 
【修改】修改token过期，但是接口访问依然不返回登录页的bug
This commit is contained in:
zer0Black
2022-04-17 22:44:29 +08:00
parent 725a72a178
commit b5ac2c4a1b
27 changed files with 141 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java
-7
View File
@@ -107,13 +107,6 @@ public class Result<T> implements Serializable {
return r;
}
public static<T> Result<T> error500(String message) {
Result<T> r = new Result<T>();
r.message = message;
r.code = CommonConstant.SC_INTERNAL_SERVER_ERROR_500;
r.success = false;
return r;
}
/**
* 无权限访问返回结果
*/
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java
+4 -4
View File
@@ -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("操作失败");
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java
+6 -6
View File
@@ -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<Object> 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<Object> 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<OnlCgformButton> 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);
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java
+5 -5
View File
@@ -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<Object> 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<Object> 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<Object> 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);
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java
+4 -4
View File
@@ -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<Object> 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<OnlCgformHead> 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);
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java
+5 -5
View File
@@ -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<Object> 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<Object> 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<OnlCgformIndex> 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);
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java
+1 -1
View File
@@ -167,7 +167,7 @@ public class OnlCgreportHeadController {
return Result.OK("添加成功！");
} catch (Exception var9) {
log.error(var9.getMessage(), var9);
return Result.error500("操作失败");
return Result.error("操作失败");
}
}
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/MockController.java
+1 -1
View File
@@ -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;
}
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java
+5 -5
View File
@@ -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<Object> 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<Object> 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<Object> 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<JoaDemo> 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);
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java
+2 -2
View File
@@ -155,13 +155,13 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
try {
map = (Map<String, String>) 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("发送消息任务添加失败！");
}
}
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java
+1 -1
View File
@@ -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;
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java
+3 -3
View File
@@ -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<OSSFile> result = new Result<>();
OSSFile file = ossFileService.getById(id);
if (file == null) {
result.error500("未找到对应实体");
return Result.error("未找到对应实体");
}
else {
result.setResult(file);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java
+8 -8
View File
@@ -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<Object> 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<Object> 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<Object> 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<id.length;i++) {
@@ -205,7 +205,7 @@ public class SysAnnouncementController {
Result<SysAnnouncement> result = new Result<SysAnnouncement>();
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<SysAnnouncement> 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<Object> 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);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java
+5 -5
View File
@@ -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<Object> 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<Object> 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<Object> 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<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id);
if(sysAnnouncementSend==null) {
return Result.error500("未找到对应实体");
return Result.error("未找到对应实体");
}else {
return Result.OK(sysAnnouncementSend);
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
+5 -5
View File
@@ -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<Object> 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<Object> 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<Object> 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<SysCategory> 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);
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java
+4 -4
View File
@@ -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<Object> 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<Object> 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("删除成功!");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java
+12 -19
View File
@@ -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<DictModel> 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<DictModel> 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<String> 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<Object> 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<Object> 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("删除成功!");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
+4 -4
View File
@@ -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<Object> 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<Object> 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<Object> 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("删除成功!");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java
+2 -2
View File
@@ -78,7 +78,7 @@ public class SysLogController {
public Result<Object> 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<Object> 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();
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java
+13 -13
View File
@@ -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<TreeModel> 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("授权失败！");
}
}
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java
+5 -5
View File
@@ -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<Object> 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<Object> 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<SysRole> 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<List<SysRole>> queryall() {
List<SysRole> list = sysRoleService.list();
if(list==null||list.size()<=0) {
return Result.error500("未找到角色信息");
return Result.error("未找到角色信息");
}else {
return Result.OK(list);
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java
+6 -6
View File
@@ -60,7 +60,7 @@ public class SysTenantController {
@RequestMapping(value = "/add", method = RequestMethod.POST)
public Result<Object> 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<Object> 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<SysTenant> 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);
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserAgentController.java
+6 -6
View File
@@ -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<Object> 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<Object> 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<Object> 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<SysUserAgent> 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);
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+17 -18
View File
@@ -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<SysUser> 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<String> list = new ArrayList<String>();
List<SysUserRole> userRole = sysUserRoleService.list(new QueryWrapper<SysUserRole>().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;
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java
+12 -21
View File
@@ -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<SysDepart> 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<SysTenant> tenantList = sysTenantService.queryEffectiveTenant(tenantIdList);
if (tenantList.size() == 0) {
result.error500("与该用户关联的租户均已被冻结，无法登录！");
return result;
return Result.error("与该用户关联的租户均已被冻结，无法登录！");
} else {
obj.put("tenantList", tenantList);
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+3 -6
View File
@@ -329,23 +329,20 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
Result<?> result = new Result<Object>();
//情况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;
}
jero-web/src/utils/request.js
+2 -13
View File
@@ -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')
}
})
}