From 7396f1b61c80d13aefb42305c2db6b0c93bbe56e Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 05 九月 2023 14:04:52 +0800 Subject: [PATCH] 框架整理 --- server/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java b/server/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java index 39398c9..890ade0 100644 --- a/server/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java +++ b/server/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java @@ -5,7 +5,6 @@ import com.doumee.service.system.SystemUserService; import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.AuthenticationToken; -import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.authc.credential.HashedCredentialsMatcher; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -14,18 +13,17 @@ /** * Shiro瀵嗙爜姣斿澶勭悊 * @author Eva.Caesar Liu - * @date 2023/02/14 11:14 + * @date 2023/04/17 12:11 */ @Component public class ShiroCredentialsMatcher extends HashedCredentialsMatcher { - @Lazy @Autowired private SystemUserService systemUserService; @Override public boolean doCredentialsMatch(AuthenticationToken token, AuthenticationInfo info) { - UsernamePasswordToken usernamePasswordToken = (UsernamePasswordToken) token; + ShiroToken usernamePasswordToken = (ShiroToken) token; SystemUser queryUserDto = new SystemUser(); queryUserDto.setUsername(usernamePasswordToken.getUsername()); queryUserDto.setDeleted(Boolean.FALSE); @@ -33,6 +31,12 @@ if (systemUser == null) { return Boolean.FALSE; } + if(usernamePasswordToken.getDdLogin()){ + return Boolean.TRUE; + } + if(usernamePasswordToken.getWxLogin()){ + return Boolean.TRUE; + } // 鍔犲瘑瀵嗙爜 String pwd = Utils.Secure.encryptPassword(new String(usernamePasswordToken.getPassword()), systemUser.getSalt()); // 姣旇緝瀵嗙爜 -- Gitblit v1.9.3