全景监控设备动作信号修改添加动作类信号筛选,自动登陆失效问题

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

@@ -3,8 +3,8 @@ package com.yeejoin.amos.fas.business.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.component.feign.config.TokenOperation;
-import com.yeejoin.amos.fas.business.feign.PrivilegeFeign;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.fas.business.feign.PrivilegeFeign;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.vo.CompanyBo;
 import com.yeejoin.amos.fas.business.vo.DepartmentBo;
@@ -17,9 +17,8 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
-import com.yeejoin.amos.feign.privilege.util.AesUtil;
+import com.yeejoin.amos.feign.privilege.util.DesUtil;
 
-import com.yeejoin.amos.feign.privilege.util.PwdUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -31,8 +30,6 @@ 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.component.cache.Redis;
-import org.typroject.tyboot.component.cache.enumeration.CacheType;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import javax.servlet.http.HttpServletRequest;
@@ -82,39 +79,34 @@ public class LoginController {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder
                 .getRequestAttributes()).getRequest();
         String token = "szhlz";
-        		//ObjectUtils.isEmpty(request.getHeader("token"))?"szhlz":request.getHeader("token").toString() ;
+        //ObjectUtils.isEmpty(request.getHeader("token"))?"szhlz":request.getHeader("token").toString() ;
         ReginParams reginParams;
         reginParams = JSON.parseObject(redisTemplate.opsForValue().get(buildKey(userId, token)), ReginParams.class);
         if(reginParams == null){
-        	reginParams = getLogin(userId, token);
+            reginParams = getLogin(userId, token);
         }else{
-        	RequestContext.setProduct(product);
-            String cacheKey = Redis.genKey(new String[]{CacheType.ERASABLE.name(), "SESSION_TOKEN", RequestContext.getProduct(), reginParams.getToken()});
-            boolean hasKey = Redis.getRedisTemplate().hasKey(cacheKey);
-            if (hasKey) {
-                return reginParams;
-            } else {
-                logger.info("Auto自动登陆=====:{}", JSON.toJSONString(reginParams));
+            RequestContext.setProduct(product);
+            if (!TokenOperation.refresh(reginParams.getToken())) {
                 reginParams = getLogin(userId, token);
             }
         }
         return reginParams;
     }
-    
-
-	private   ReginParams getLogin(String userId, String token) throws Exception{
-		 ReginParams reginParams = new ReginParams();
-		 IdPasswordAuthModel  dPasswordAuthModel = new IdPasswordAuthModel();
-         dPasswordAuthModel.setLoginId(userId);
-         dPasswordAuthModel.setPassword(PwdUtil.encode(password));
-         RequestContext.setProduct(product);
+
+
+    private   ReginParams getLogin(String userId, String token) throws Exception{
+        ReginParams reginParams = new ReginParams();
+        IdPasswordAuthModel  dPasswordAuthModel = new IdPasswordAuthModel();
+        dPasswordAuthModel.setLoginId(userId);
+        dPasswordAuthModel.setPassword(DesUtil.encode(password, "qaz"));
+        RequestContext.setProduct(product);
         FeignClientResult feignClientResult = Privilege.authClient.idpassword(dPasswordAuthModel);
-         if (ObjectUtils.isEmpty(feignClientResult.getResult())){
-             throw new Exception("缺失登录信息");
-         }
-         // 调用平台授权接口
-         Map<String ,String > re = (Map<String, String>) feignClientResult.getResult();
-         String amosToken = re.get("token");
+        if (ObjectUtils.isEmpty(feignClientResult.getResult())){
+            throw new Exception("缺失登录信息");
+        }
+        // 调用平台授权接口
+        Map<String ,String > re = (Map<String, String>) feignClientResult.getResult();
+        String amosToken = re.get("token");
 
         logger.info("应用授权开始======================================"+amosToken);
         RequestContext.setToken(amosToken);
@@ -126,23 +118,23 @@ public class LoginController {
 
         logger.info("应用授权结束======================================"+JSON.toJSONString(fd)+amosToken);
 
-         AgencyUserModel userModel  =  (AgencyUserModel) Privilege.agencyUserClient.getme().getResult();
-         CompanyModel companyModel = userModel.getCompanys().get(0);
-         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(amosToken);
-         reginParams.setUserModel(userModel);
-         redisTemplate.opsForValue().set(buildKey(userId, token), JSONObject.toJSONString(reginParams),28, TimeUnit.DAYS);
-         // redisTemplate.opsForValue().set(buildKey(userId, amosToken), JSONObject.toJSONString(reginParams),28, TimeUnit.DAYS);
-		return reginParams;
-	}
-	
-	
+        AgencyUserModel userModel  =  (AgencyUserModel) Privilege.agencyUserClient.getme().getResult();
+        CompanyModel companyModel = userModel.getCompanys().get(0);
+        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(amosToken);
+        reginParams.setUserModel(userModel);
+        redisTemplate.opsForValue().set(buildKey(userId, token), JSONObject.toJSONString(reginParams),28, TimeUnit.DAYS);
+        // redisTemplate.opsForValue().set(buildKey(userId, amosToken), JSONObject.toJSONString(reginParams),28, TimeUnit.DAYS);
+        return reginParams;
+    }
+
+
     private DepartmentBo convertDepartmentModelToBo(DepartmentModel departmentModel){
         DepartmentBo departmentBo = new DepartmentBo();
         if(departmentModel != null) {