From 022b17044ab6bb284fd6313da91d1d1dfb2d5079 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Mon, 03 Jun 2024 13:20:42 +0800
Subject: [PATCH] update
---
assess-framework/src/main/java/com/gkhy/assess/framework/shiro/realm/UserRealm.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/assess-framework/src/main/java/com/gkhy/assess/framework/shiro/realm/UserRealm.java b/assess-framework/src/main/java/com/gkhy/assess/framework/shiro/realm/UserRealm.java
index 84bdc4d..cd24912 100644
--- a/assess-framework/src/main/java/com/gkhy/assess/framework/shiro/realm/UserRealm.java
+++ b/assess-framework/src/main/java/com/gkhy/assess/framework/shiro/realm/UserRealm.java
@@ -1,9 +1,10 @@
package com.gkhy.assess.framework.shiro.realm;
+import com.gkhy.assess.common.domain.CustomerUsernamePasswordToken;
import com.gkhy.assess.common.enums.UserIdentityEnum;
import com.gkhy.assess.common.utils.RequestUtil;
import com.gkhy.assess.common.utils.SpringContextUtils;
-import com.gkhy.assess.framework.shiro.JwtToken;
+import com.gkhy.assess.common.domain.JwtToken;
import com.gkhy.assess.framework.shiro.service.SysLoginService;
import com.gkhy.assess.system.domain.SysUser;
import lombok.extern.slf4j.Slf4j;
@@ -65,7 +66,6 @@
if(authenticationToken instanceof JwtToken){
String token= (String) authenticationToken.getCredentials();
if(token==null){
-
log.info("————————身份认证失败——————————IP地址: "+ RequestUtil.getRequestIp(req) +"，URL:"+req.getRequestURI());
throw new AuthenticationException("token为空!");
}
@@ -74,10 +74,10 @@
return new SimpleAuthenticationInfo(sysUser,token,this.getName());
}
}else{
- UsernamePasswordToken upToken = (UsernamePasswordToken) authenticationToken;
+ CustomerUsernamePasswordToken upToken = (CustomerUsernamePasswordToken) authenticationToken;
String username = upToken.getUsername();
String password=new String(upToken.getPassword());
- sysUser=sysLoginService.login(username,password);
+ sysUser=sysLoginService.login(username,password,upToken.getIdentity());
if(sysUser!=null){
return new SimpleAuthenticationInfo(sysUser,password,this.getName());
}
--
Gitblit v1.9.2