From aaea4819b873c5ca7b9be1a87af173ee2015a12a Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 25 一月 2024 14:52:24 +0800 Subject: [PATCH] 开发业务接口 --- server/service/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/server/company/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java b/server/service/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java similarity index 83% rename from server/company/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java rename to server/service/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java index 8550e9d..cde2c50 100644 --- a/server/company/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java +++ b/server/service/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java @@ -24,7 +24,7 @@ @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); @@ -32,12 +32,9 @@ if (systemUser == null) { return Boolean.FALSE; } -// if(usernamePasswordToken.getDdLogin()){ -// return Boolean.TRUE; -// } -// if(usernamePasswordToken.getWxLogin()){ -// return Boolean.TRUE; -// } + if(!usernamePasswordToken.isNeedPassword()){ + return Boolean.TRUE; + } // 鍔犲瘑瀵嗙爜 String pwd = Utils.Secure.encryptPassword(new String(usernamePasswordToken.getPassword()), systemUser.getSalt()); // 姣旇緝瀵嗙爜 -- Gitblit v1.9.3