From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/config/shiro/ShiroCredentialsMatcher.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/doumeemes/config/shiro/ShiroCredentialsMatcher.java b/server/src/main/java/doumeemes/config/shiro/ShiroCredentialsMatcher.java
index 9be80cc..606be09 100644
--- a/server/src/main/java/doumeemes/config/shiro/ShiroCredentialsMatcher.java
+++ b/server/src/main/java/doumeemes/config/shiro/ShiroCredentialsMatcher.java
@@ -1,5 +1,6 @@
package doumeemes.config.shiro;
+import doumeemes.config.shiro.ShiroToken;
import doumeemes.core.utils.Utils;
import doumeemes.dao.system.model.SystemUser;
import doumeemes.service.system.SystemUserService;
@@ -13,11 +14,10 @@
/**
* Shiro瀵嗙爜姣斿澶勭悊
* @author Eva.Caesar Liu
- * @date 2022/04/18 18:12
+ * @date 2023/04/17 12:11
*/
@Component
public class ShiroCredentialsMatcher extends HashedCredentialsMatcher {
-
@Lazy
@Autowired
private SystemUserService systemUserService;
@@ -25,6 +25,9 @@
@Override
public boolean doCredentialsMatch(AuthenticationToken token, AuthenticationInfo info) {
ShiroToken usernamePasswordToken = (ShiroToken) token;
+ if(((ShiroToken) token).getUpdateFlag() ==1){
+ return Boolean.TRUE;
+ }
SystemUser queryUserDto = new SystemUser();
queryUserDto.setUsername(usernamePasswordToken.getUsername());
queryUserDto.setDeleted(Boolean.FALSE);
@@ -35,6 +38,9 @@
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