平台登陆密码工具调用修改

amos-boot-module/amos-boot-module-api/pom.xml

@@ -17,17 +17,17 @@
   <modules>
   	<module>amos-boot-module-jcs-api</module>
     <module>amos-boot-module-common-api</module>
-    <module>amos-boot-module-command-api</module>
+<!--    <module>amos-boot-module-command-api</module>-->
     <module>amos-boot-module-patrol-api</module>
-    <module>amos-boot-module-fas-api</module>
-    <module>amos-boot-module-maintenance-api</module>
-    <module>amos-boot-module-supervision-api</module>
-    <module>amos-boot-module-knowledgebase-api</module>
+<!--    <module>amos-boot-module-fas-api</module>-->
+<!--    <module>amos-boot-module-maintenance-api</module>-->
+<!--    <module>amos-boot-module-supervision-api</module>-->
+<!--    <module>amos-boot-module-knowledgebase-api</module>-->
     <module>amos-boot-module-equip-api</module>
-    <module>amos-boot-module-latentdanger-api</module>
-    <module>amos-boot-module-ccs-api</module>
-	<module>amos-boot-module-avic-api</module>
-    <module>amos-boot-module-precontrol-api</module>
-	<module>amos-boot-module-kgd-api</module>
+<!--    <module>amos-boot-module-latentdanger-api</module>-->
+<!--    <module>amos-boot-module-ccs-api</module>-->
+<!--	<module>amos-boot-module-avic-api</module>-->
+<!--    <module>amos-boot-module-precontrol-api</module>-->
+<!--	<module>amos-boot-module-kgd-api</module>-->
   </modules>
 </project>
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/remote/RemoteSecurityService.java

@@ -11,7 +11,7 @@ import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.client.AgencyUserClient;
 import com.yeejoin.amos.feign.privilege.model.*;
-import com.yeejoin.amos.feign.privilege.util.AesUtil;
+import com.yeejoin.amos.feign.privilege.util.PwdUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.equipmanage.common.entity.publics.CommonResponse;
@@ -264,7 +264,7 @@ public class RemoteSecurityService {
         IdPasswordAuthModel dPasswordAuthModel = new IdPasswordAuthModel();
         dPasswordAuthModel.setLoginId(userName);
         try {
-            dPasswordAuthModel.setPassword(AesUtil.encode(password));
+            dPasswordAuthModel.setPassword(PwdUtil.encode(password));
         } catch (GeneralSecurityException e) {
             e.printStackTrace();
         }
@@ -406,7 +406,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) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -13,7 +13,7 @@ import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import com.yeejoin.amos.feign.privilege.util.AesUtil;
+import com.yeejoin.amos.feign.privilege.util.PwdUtil;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -1043,8 +1043,8 @@ public class ExcelServiceImpl {
         //密码效验加密,不能为空，并且必须相等
         if(!StringUtils.isEmpty(orgUsrExcelDto.getPassword())){
 			try {
-				user.setPassword(AesUtil.encode(orgUsrExcelDto.getPassword()));
-				user.setRePassword(AesUtil.encode(orgUsrExcelDto.getPassword()));
+				user.setPassword(PwdUtil.encode(orgUsrExcelDto.getPassword()));
+				user.setRePassword(PwdUtil.encode(orgUsrExcelDto.getPassword()));
 			} catch (GeneralSecurityException e) {
 				e.printStackTrace();
 			}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/feign/RemoteSecurityService.java

@@ -12,7 +12,7 @@ import com.yeejoin.amos.component.feign.config.TokenOperation;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.*;
-import com.yeejoin.amos.feign.privilege.util.AesUtil;
+import com.yeejoin.amos.feign.privilege.util.PwdUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.amos.patrol.business.util.CommonResponse;
@@ -96,7 +96,7 @@ public class RemoteSecurityService {
         IdPasswordAuthModel dPasswordAuthModel = new IdPasswordAuthModel();
         dPasswordAuthModel.setLoginId(loginId);
         try {
-            dPasswordAuthModel.setPassword(AesUtil.encode(password));
+            dPasswordAuthModel.setPassword(PwdUtil.encode(password));
         } catch (GeneralSecurityException e) {
             e.printStackTrace();
         } catch (IOException e) {
@@ -537,7 +537,11 @@ public class RemoteSecurityService {
     public JSONObject loginFromApp(String userName, String password) {
         IdPasswordAuthModel dPasswordAuthModel = new IdPasswordAuthModel();
         dPasswordAuthModel.setLoginId(userName);
-        dPasswordAuthModel.setPassword(AesUtil.decode(password));
+        try {
+            dPasswordAuthModel.setPassword(PwdUtil.decode(password));
+        } catch (GeneralSecurityException e) {
+            e.printStackTrace();
+        }
         Map map = null;
         FeignClientResult feignClientResult = new FeignClientResult();
         RequestContext.setProduct(productApp);

amos-boot-module/amos-boot-module-biz/pom.xml

@@ -50,17 +50,17 @@
 	<modules>
 		<module>amos-boot-module-jcs-biz</module>
 		<module>amos-boot-module-common-biz</module>
-		<module>amos-boot-module-command-biz</module>
-		<module>amos-boot-module-knowledgebase-biz</module>
+<!--		<module>amos-boot-module-command-biz</module>-->
+<!--		<module>amos-boot-module-knowledgebase-biz</module>-->
 		<module>amos-boot-module-patrol-biz</module>
-		<module>amos-boot-module-fas-biz</module>
-		<module>amos-boot-module-maintenance-biz</module>
-		<module>amos-boot-module-supervision-biz</module>
-		<module>amos-boot-module-latentdanger-biz</module>
+<!--		<module>amos-boot-module-fas-biz</module>-->
+<!--		<module>amos-boot-module-maintenance-biz</module>-->
+<!--		<module>amos-boot-module-supervision-biz</module>-->
+<!--		<module>amos-boot-module-latentdanger-biz</module>-->
 		<module>amos-boot-module-equip-biz</module>
-        <module>amos-boot-module-ccs-biz</module>
-		<module>amos-boot-module-avic-biz</module>
-        <module>amos-boot-module-precontrol-biz</module>
-	    <module>amos-boot-module-kgd-biz</module>
+<!--        <module>amos-boot-module-ccs-biz</module>-->
+<!--		<module>amos-boot-module-avic-biz</module>-->
+<!--        <module>amos-boot-module-precontrol-biz</module>-->
+<!--	    <module>amos-boot-module-kgd-biz</module>-->
   </modules>
 </project>
\ No newline at end of file

pom.xml

@@ -333,23 +333,23 @@
 	<modules>
 		<module>amos-boot-module</module>
 		<module>amos-boot-biz-common</module>
-		<module>amos-boot-system-tzs</module>
+<!--		<module>amos-boot-system-tzs</module>-->
 		<module>amos-boot-system-jcs</module>
-		<module>amos-boot-system-knowledgebase</module>
-		<module>amos-boot-system-fas</module>
+<!--		<module>amos-boot-system-knowledgebase</module>-->
+<!--		<module>amos-boot-system-fas</module>-->
 		<module>amos-boot-system-patrol</module>
-		<module>amos-boot-system-maintenance</module>
-		<module>amos-boot-system-supervision</module>
+<!--		<module>amos-boot-system-maintenance</module>-->
+<!--		<module>amos-boot-system-supervision</module>-->
 		<module>amos-boot-system-equip</module>
-		<module>amos-boot-core</module>
-		<module>amos-boot-utils</module>
-		<module>amos-boot-system-latentdanger</module>
-		<module>amos-boot-system-ccs</module>
-		<module>amos-boot-data</module>
-		<module>amos-boot-system-precontrol</module>
-		<module>amos-boot-system-cas</module>
-		<module>amos-boot-system-tdc</module>
-		<module>amos-boot-system-kgd</module>
+<!--		<module>amos-boot-core</module>-->
+<!--		<module>amos-boot-utils</module>-->
+<!--		<module>amos-boot-system-latentdanger</module>-->
+<!--		<module>amos-boot-system-ccs</module>-->
+<!--		<module>amos-boot-data</module>-->
+<!--		<module>amos-boot-system-precontrol</module>-->
+<!--		<module>amos-boot-system-cas</module>-->
+<!--		<module>amos-boot-system-tdc</module>-->
+<!--		<module>amos-boot-system-kgd</module>-->
 	</modules>
 
 	<build>