登陆token 不变

src/main/java/cn/quantgroup/cashloanflowboss/api/login/service/LoginServiceImpl.java

@@ -22,8 +22,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.util.Date;
@@ -54,6 +56,9 @@ public class LoginServiceImpl implements LoginService {
     @Autowired
     private StringRedisTemplate redisTemplate;
 
+    @Resource(name = "redisTemplate")
+    private ValueOperations<String, Principal> loginOperations;
+
     /**
      * 登入
      *
@@ -120,8 +125,11 @@ public class LoginServiceImpl implements LoginService {
         long currentTimeMillis = System.currentTimeMillis();
         principal.setLoginTimeMillis(currentTimeMillis);
 
-        String bossToken = Application.getBossToken(request);
-        String token = StringUtils.isEmpty(bossToken) ? UUID.randomUUID().toString() : bossToken;
+        String token = Application.getBossToken(request);
+        if (principalService.getPrincipal() == null || StringUtils.isEmpty(token)) {
+            // 是否redis中存在token
+            token = UUID.randomUUID().toString();
+        }
         principalService.pushPrincipal(token, principal);
 
         // session登陆时间，毫秒值

src/main/java/cn/quantgroup/cashloanflowboss/core/configuration/ApplicationSecurityHandler.java

@@ -2,8 +2,6 @@ package cn.quantgroup.cashloanflowboss.core.configuration;
 
 import cn.quantgroup.cashloanflowboss.api.login.model.Principal;
 import cn.quantgroup.cashloanflowboss.api.login.service.LoginService;
-import cn.quantgroup.cashloanflowboss.api.login.service.LoginServiceImpl;
-import cn.quantgroup.cashloanflowboss.api.login.service.PrincipalService;
 import cn.quantgroup.cashloanflowboss.api.role.entity.Role;
 import cn.quantgroup.cashloanflowboss.component.security.Authority;
 import cn.quantgroup.cashloanflowboss.component.security.SecurityHandler;
@@ -11,17 +9,12 @@ import cn.quantgroup.cashloanflowboss.core.Application;
 import cn.quantgroup.cashloanflowboss.core.asserts.Assert;
 import cn.quantgroup.cashloanflowboss.core.base.Tuple;
 import cn.quantgroup.cashloanflowboss.core.dictionary.ApplicationStatus;
-import cn.quantgroup.cashloanflowboss.core.exception.ApplicationException;
 import lombok.extern.slf4j.Slf4j;
 import org.aopalliance.intercept.MethodInvocation;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.core.ValueOperations;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -35,17 +28,9 @@ public class ApplicationSecurityHandler implements SecurityHandler {
     @Autowired
     private LoginService loginService;
 
-//    @Autowired
-//    private HttpServletRequest request;
-
-    @Autowired
-    private PrincipalService principalService;
-
     @Override
     public Tuple<Boolean, ApplicationStatus> doAuthentication(MethodInvocation invocation, String authorityId, Authority[] authority) {
 
-//        Principal principal = principalService.getPrincipal();
-
         Principal principal = Application.getPrincipal();
 
         // 检查是否已登录