平台登陆接口替换

YeeAmosFireAutoSysService/pom.xml

@@ -78,13 +78,13 @@
     <dependency>
 	  <groupId>com.yeejoin</groupId>
 	  <artifactId>amos-feign-systemctl</artifactId>
-	  <version>1.7.1</version>
+	  <version>1.8.8-DL</version>
      </dependency>
      
      <dependency>
 	  <groupId>com.yeejoin</groupId>
 	  <artifactId>amos-component-feign</artifactId>
-	  <version>1.4.8-SNAPSHOT</version>
+	  <version>1.8.8-DL</version>
      </dependency>
 
 		<!-- <dependency>

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/mq/WebMqttSubscribe.java

@@ -19,6 +19,8 @@ import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
 
+import java.util.UUID;
+
 /**
  * @author keyong
  * @title: WebMqttSubscribe
@@ -76,7 +78,7 @@ public class WebMqttSubscribe {
 
     @Bean
     public MessageProducer inbound() {
-        adapter = new MqttPahoMessageDrivenChannelAdapter(clientId, mqttPahoClientFactory(), defaultTopic);
+        adapter = new MqttPahoMessageDrivenChannelAdapter(clientId+ UUID.randomUUID(), mqttPahoClientFactory(), defaultTopic);
         adapter.setConverter(new DefaultPahoMessageConverter());
         adapter.setQos(0);
         adapter.setOutputChannel(mqttInputChannel());

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.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.fas.business.feign.PrivilegeFeign;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.vo.CompanyBo;
 import com.yeejoin.amos.fas.business.vo.DepartmentBo;
@@ -19,6 +19,7 @@ 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.PwdUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -98,9 +99,9 @@ public class LoginController {
 		 ReginParams reginParams = new ReginParams();
 		 IdPasswordAuthModel  dPasswordAuthModel = new IdPasswordAuthModel();
          dPasswordAuthModel.setLoginId(userId);
-         dPasswordAuthModel.setPassword(AesUtil.encode(password));
+         dPasswordAuthModel.setPassword(PwdUtil.encode(password));
          RequestContext.setProduct(product);
- 		FeignClientResult feignClientResult = Privilege.authClient.idpassword(dPasswordAuthModel);
+        FeignClientResult feignClientResult = Privilege.authClient.idpassword(dPasswordAuthModel);
          if (ObjectUtils.isEmpty(feignClientResult.getResult())){
              throw new Exception("缺失登录信息");
          }

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

@@ -13,7 +13,7 @@ import java.util.stream.Collectors;
 
 
 import com.yeejoin.amos.component.robot.AmosRequestContext;
-import com.yeejoin.amos.feign.privilege.util.AesUtil;
+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;
@@ -155,7 +155,7 @@ public class RemoteSecurityService {
     	IdPasswordAuthModel  dPasswordAuthModel=new IdPasswordAuthModel();
     	dPasswordAuthModel.setLoginId(amosRequestContext.getUserName());
 		try {
-			dPasswordAuthModel.setPassword(AesUtil.encode(password));
+			dPasswordAuthModel.setPassword(PwdUtil.encode(password));
 		} catch (GeneralSecurityException e) {
 			e.printStackTrace();
 		} catch (IOException e) {