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

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;
@@ -89,12 +86,7 @@ public class LoginController {
             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));
+            if (!TokenOperation.refresh(reginParams.getToken())) {
                 reginParams = getLogin(userId, token);
             }
         }
@@ -106,7 +98,7 @@ public class LoginController {
         ReginParams reginParams = new ReginParams();
         IdPasswordAuthModel  dPasswordAuthModel = new IdPasswordAuthModel();
         dPasswordAuthModel.setLoginId(userId);
-         dPasswordAuthModel.setPassword(PwdUtil.encode(password));
+        dPasswordAuthModel.setPassword(DesUtil.encode(password, "qaz"));
         RequestContext.setProduct(product);
         FeignClientResult feignClientResult = Privilege.authClient.idpassword(dPasswordAuthModel);
         if (ObjectUtils.isEmpty(feignClientResult.getResult())){

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/RemoteSecurityService.java

 package com.yeejoin.amos.fas.business.feign;
 
 
-import java.io.IOException;
-import java.security.GeneralSecurityException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -13,7 +11,6 @@ import java.util.stream.Collectors;
 
 
 import com.yeejoin.amos.component.robot.AmosRequestContext;
-import com.yeejoin.amos.feign.privilege.util.PwdUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -37,6 +34,7 @@ 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.PermissionModel;
+import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 
@@ -142,7 +140,7 @@ public class RemoteSecurityService {
 		List<AgencyUserModel> agencyUserModel=null;
 		FeignClientResult feignClientResult;
 		try {
-  			feignClientResult = Privilege.agencyUserClient.queryByRoleId(RoleIds,null, null);
+			feignClientResult = Privilege.agencyUserClient.queryByRoleId(RoleIds,null);
 			agencyUserModel = (List<AgencyUserModel>)feignClientResult.getResult();
 
 		} catch (InnerInvokException e) {
@@ -154,13 +152,7 @@ public class RemoteSecurityService {
 	public Toke getServerToken() {
 		IdPasswordAuthModel  dPasswordAuthModel=new IdPasswordAuthModel();
 		dPasswordAuthModel.setLoginId(amosRequestContext.getUserName());
-		try {
-			dPasswordAuthModel.setPassword(PwdUtil.encode(password));
-		} catch (GeneralSecurityException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
+		dPasswordAuthModel.setPassword(DesUtil.encode(password, "qaz"));
 		Toke toke = null;
 		try {
 			toke = JSON.parseObject(redisTemplate.opsForValue().get(buildKey(amosRequestContext.getUserName())), Toke.class);