From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java b/server/service/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java
index cde2c50..24ef699 100644
--- a/server/service/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java
+++ b/server/service/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java
@@ -26,15 +26,21 @@
public boolean doCredentialsMatch(AuthenticationToken token, AuthenticationInfo info) {
ShiroToken usernamePasswordToken = (ShiroToken) token;
SystemUser queryUserDto = new SystemUser();
- queryUserDto.setUsername(usernamePasswordToken.getUsername());
queryUserDto.setDeleted(Boolean.FALSE);
+ if(!usernamePasswordToken.isNeedPassword()){
+ queryUserDto.setMobile(usernamePasswordToken.getUsername());
+ SystemUser systemUser = systemUserService.findOne(queryUserDto);
+ if (systemUser == null) {
+ return Boolean.FALSE;
+ }
+ return Boolean.TRUE;
+ }
+ queryUserDto.setUsername(usernamePasswordToken.getUsername());
SystemUser systemUser = systemUserService.findOne(queryUserDto);
if (systemUser == null) {
return Boolean.FALSE;
}
- if(!usernamePasswordToken.isNeedPassword()){
- return Boolean.TRUE;
- }
+
// 鍔犲瘑瀵嗙爜
String pwd = Utils.Secure.encryptPassword(new String(usernamePasswordToken.getPassword()), systemUser.getSalt());
// 姣旇緝瀵嗙爜
--
Gitblit v1.9.3