平台登陆接口替换

YeeAmosFireAutoSysService/pom.xml

@@ -73,7 +73,7 @@
 	 <dependency>
 	  <groupId>com.yeejoin</groupId>
 	  <artifactId>amos-feign-privilege</artifactId>
-	  <version>1.7.1</version>
+	  <version>1.8.8-DL</version>
      </dependency> 
     <dependency>
 	  <groupId>com.yeejoin</groupId>

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

@@ -17,7 +17,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.RoleModel;
-import com.yeejoin.amos.feign.privilege.util.DesUtil;
+import com.yeejoin.amos.feign.privilege.util.AesUtil;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -98,7 +98,7 @@ public class LoginController {
 		 ReginParams reginParams = new ReginParams();
 		 IdPasswordAuthModel  dPasswordAuthModel = new IdPasswordAuthModel();
          dPasswordAuthModel.setLoginId(userId);
-         dPasswordAuthModel.setPassword(DesUtil.encode(password, "qaz"));
+         dPasswordAuthModel.setPassword(AesUtil.encode(password));
          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;
@@ -11,6 +13,7 @@ import java.util.stream.Collectors;
 
 
 import com.yeejoin.amos.component.robot.AmosRequestContext;
+import com.yeejoin.amos.feign.privilege.util.AesUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -34,7 +37,6 @@ 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;
 
@@ -140,7 +142,7 @@ public class RemoteSecurityService {
       	List<AgencyUserModel> agencyUserModel=null;
       	FeignClientResult feignClientResult;
   		try {
-  			feignClientResult = Privilege.agencyUserClient.queryByRoleId(RoleIds,null);
+  			feignClientResult = Privilege.agencyUserClient.queryByRoleId(RoleIds,null, null);
   			agencyUserModel = (List<AgencyUserModel>)feignClientResult.getResult();
 
   		} catch (InnerInvokException e) {
@@ -152,8 +154,14 @@ public class RemoteSecurityService {
 	public Toke getServerToken() {
     	IdPasswordAuthModel  dPasswordAuthModel=new IdPasswordAuthModel();
     	dPasswordAuthModel.setLoginId(amosRequestContext.getUserName());
-    	dPasswordAuthModel.setPassword(DesUtil.encode(password, "qaz"));
-    	Toke toke = null;
+		try {
+			dPasswordAuthModel.setPassword(AesUtil.encode(password));
+		} catch (GeneralSecurityException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		Toke toke = null;
 		try {
 			 toke = JSON.parseObject(redisTemplate.opsForValue().get(buildKey(amosRequestContext.getUserName())), Toke.class);
 			 if(ObjectUtils.isEmpty(toke)){