Преглед на файлове

登录会话登录日志

vincent преди 3 години
родител
ревизия
997cf0c3a4

+ 2 - 4
maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java

@@ -42,6 +42,7 @@ import org.maxkey.authn.support.jwt.JwtLoginService;
 import org.maxkey.authn.support.socialsignon.service.SocialsAssociate;
 import org.maxkey.constants.ConstantsLoginType;
 import org.maxkey.constants.ConstantsPasswordSetType;
+import org.maxkey.entity.HistoryLogin;
 import org.maxkey.entity.HistoryLogs;
 import org.maxkey.entity.SocialsProvider;
 import org.maxkey.entity.UserInfo;
@@ -97,8 +98,6 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint
     @Autowired
     RedisConnectionFactory redisConnectionFactory;
 
-    @Autowired
-    LoginHistoryService loginHistoryService;
 
 
     final static Logger _logger = LoggerFactory.getLogger(SocialSignOnEndpoint.class);
@@ -360,8 +359,7 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint
                 redisConnection.setex(ticket, 60 * 60 * 24 * 1, result.toJSONString());
                 redisConnection.close();
                 _logger.debug("token >>>" + token);
-                 // 拼接 sessionid
-                loginHistoryService.login(userInfo,WebContext.genId(), ConstantsLoginType.JWT,"","",provider,"","",1);
+
                 // TODO  整合前端的地址
                 return WebContext.redirect(curl + ticket + "&sessionId="+ WebContext.getSession().getId());
             } else

+ 1 - 1
maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ThirdLoginController.java

@@ -129,7 +129,7 @@ public class ThirdLoginController
             // 登录
             // 认证信息
             LoginCredential loginCredential = new LoginCredential(
-                    userInfo.getUsername(), "", ConstantsLoginType.SOCIALSIGNON);
+                    userInfo.getUsername(), "", ConstantsLoginType.JWT);
             authenticationProvider.authentication(loginCredential, true);
             data.put("sessionId", request.getSession().getId());
             loginHistoryService.login(userInfo, WebContext.genId(), ConstantsLoginType.JWT, "success", "", "", "", "", 1);