update

kongzy

2024-07-12 28aaf2ffa1dbb860a292ba330a7e9362e60e7832

 assess-framework/src/main/java/com/gkhy/assess/framework/shiro/realm/UserRealm.java

@@ -1,10 +1,11 @@
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.exception.ApiException;
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.common.utils.StringUtils;
import com.gkhy.assess.framework.shiro.service.SysLoginService;
import com.gkhy.assess.system.domain.SysUser;
import lombok.extern.slf4j.Slf4j;
@@ -65,8 +66,7 @@
        SysUser sysUser=null;
        if(authenticationToken instanceof JwtToken){
            String token= (String) authenticationToken.getCredentials();
            if(token==null){

            if(StringUtils.isBlank(token)){
                log.info("————————身份认证失败——————————IP地址:  "+ RequestUtil.getRequestIp(req) +"，URL:"+req.getRequestURI());
                throw new AuthenticationException("token为空!");
            }
@@ -75,10 +75,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());
            }