diff --git a/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java b/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java index abddf23a6..0ab445f19 100644 --- a/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java +++ b/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java @@ -47,10 +47,11 @@ public class MyShiroRealm extends AuthorizingRealm { throw new UnknownAccountException(ErrorCode.USER_IS_EMPTY.getMessage()); } // 租户1为预留系统管理端 - if(user.getTenantId().equals("1")) { - // 只支持租户为1的用户 - throw new UnknownAccountException("租户不支持"); - } +// if(user.getTenantId().equals("1")) { +// // 只支持租户为1的用户 +// throw new UnknownAccountException("租户不支持"); +// } + if(user.getStatus()==null || !EnumMallUserStatus.VALID.getCode().equals(user.getStatus())) {//用户被禁用 throw new DisabledAccountException(ErrorCode.USER_IS_LOCKED.getMessage()); diff --git a/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java b/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java index 085389270..73b38e436 100644 --- a/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java +++ b/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java @@ -23,8 +23,8 @@ public class PasswordHelper { public static void main(String[] args) { MallUserInfo user = new MallUserInfo(); - user.setUsername("sadmin"); - user.setPassword("fm2020admin"); + user.setUsername("fmoperator"); + user.setPassword("fm202008admin"); PasswordHelper passwordHelper = new PasswordHelper(); passwordHelper.encryptPassword(user); System.out.println(user);