修改前端集成接口

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/LoginController.java

@@ -23,8 +23,11 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -66,8 +69,11 @@ public class LoginController {
         if (ObjectUtils.isEmpty(userId)){
             throw new Exception("用户信息不存在");
         }
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder
+                .getRequestAttributes()).getRequest();
+        String token = (String) request.getHeader("token");
         ReginParams reginParams;
-        reginParams = JSON.parseObject(redisTemplate.opsForValue().get(buildKey(userId)), ReginParams.class);
+        reginParams = JSON.parseObject(redisTemplate.opsForValue().get(buildKey(userId, token)), ReginParams.class);
         if(reginParams == null){
             reginParams = new ReginParams();
             Map<String, String> param = new HashMap<>();
@@ -79,25 +85,26 @@ public class LoginController {
             }
 
             Map<String ,String > re = (Map<String ,String >) result;
-            String token = re.get("token");
-            privilegeFeign.warrant(appKey, product, token);
+            String amosToken = re.get("token");
+            privilegeFeign.warrant(appKey, product, amosToken);
 
-            RequestContext.setToken(token);
+            RequestContext.setToken(amosToken);
             RequestContext.setProduct(product);
             RequestContext.setAppKey(appKey);
 
             AgencyUserModel userModel  =  (AgencyUserModel) Privilege.agencyUserClient.getme().getResult();
             CompanyModel companyModel = userModel.getCompanys().get(0);
-            List<DepartmentModel> deptList = remoteSecurityService.getDepartmentTreeByCompanyId(token, product, appKey, companyModel.getSequenceNbr().toString());
+            List<DepartmentModel> deptList = remoteSecurityService.getDepartmentTreeByCompanyId(amosToken, product, appKey, companyModel.getSequenceNbr().toString());
             if(deptList.size() > 0){
                 CompanyBo companyBo = convertCompanyModelToBo(companyModel);
                 DepartmentBo departmentBo = convertDepartmentModelToBo(deptList.get(0));
                 reginParams.setDepartment(departmentBo);
                 reginParams.setCompany(companyBo);
             }
-            reginParams.setToken(token);
+            reginParams.setToken(amosToken);
             reginParams.setUserModel(userModel);
-            redisTemplate.opsForValue().set(buildKey(userId), JSONObject.toJSONString(reginParams));
+            redisTemplate.opsForValue().set(buildKey(userId, token), JSONObject.toJSONString(reginParams));
+            redisTemplate.opsForValue().set(buildKey(userId, amosToken), JSONObject.toJSONString(reginParams));
         }
         return reginParams;
     }
@@ -147,8 +154,8 @@ public class LoginController {
         return roleBo;
     }
 
-    private String buildKey(String userId) {
-        return "region_" + userId;
+    private String buildKey(String userId, String token) {
+        return "region_" + userId + "_" + token;
 
     }
 }