From ec79466779a36dc5ff8098b3befe15e146e7704b Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 2 Mar 2019 13:57:34 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E7=99=BB=E5=BD=95][=E4=BF=AE=E6=94=B9]:=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=99=BB=E5=BD=95=EF=BC=8C=E5=8F=91=E9=AA=8C=E8=AF=81=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=EF=BC=8C=E6=A3=80=E6=9F=A5=E7=94=A8=E6=88=B7status?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/HomeController.java | 10 ++++++++++ .../src/main/java/com/iformall/shiro/MyShiroRealm.java | 3 --- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java index 5ef64e6e0..a33a5f01d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java @@ -7,6 +7,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.vo.MallUserInfoVo; +import com.iformall.enums.EnumMallUserStatus; import com.iformall.enums.EnumMsgModel; import com.iformall.exception.MallinkException; import com.iformall.service.*; @@ -112,6 +113,7 @@ public class HomeController extends BaseController { if(StringUtils.isNotBlank(info.getWebOpenId())) { info.setWebOpenId("保密"); } + String menus = mallUserRoleService.getPermissionsByUser(info); if(menus != null) { info.setMenus(menus); @@ -214,6 +216,14 @@ public class HomeController extends BaseController { return new ResultData(ErrorCode.USER_IS_MULTI); } MallUserInfoVo user = users.get(0); + if (user==null) { + logger.error("用户不存在, userName: " + user.getUsername()); + return new ResultData(ErrorCode.USER_IS_EMPTY); + } + if(user.getStatus() == EnumMallUserStatus.NOT_VALID.getCode()){ + logger.error("用户已停用, userName: " + user.getUsername()); + return new ResultData(ErrorCode.USER_IS_LOCKED); + } WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setTenantId(user.getTenantId()); diff --git a/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java b/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java index 67e519c1c..865b1addc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java +++ b/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java @@ -55,9 +55,6 @@ public class MyShiroRealm extends AuthorizingRealm { if(user == null) { throw new UnknownAccountException("用户名不存在"); } -// if (0==user.getEnable()) { -// throw new LockedAccountException(); // 帐号锁定 -// } if(user.getStatus()==null || !EnumMallUserStatus.VALID.getCode().equals(user.getStatus())) {//用户被禁用 throw new UnknownAccountException("用户被禁用");