平台登陆接口替换

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.DesUtil;
+import com.yeejoin.amos.feign.privilege.util.AesUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.equipmanage.common.entity.publics.CommonResponse;
@@ -26,6 +26,8 @@ import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -258,10 +260,14 @@ public class RemoteSecurityService {
 
     }
 
-    public JSONObject loginFromApp(String userName, String password) throws InnerInvokException {
+    public JSONObject loginFromApp(String userName, String password) throws InnerInvokException,  IOException {
         IdPasswordAuthModel dPasswordAuthModel = new IdPasswordAuthModel();
         dPasswordAuthModel.setLoginId(userName);
-        dPasswordAuthModel.setPassword(DesUtil.encode(password, "qaz"));
+        try {
+            dPasswordAuthModel.setPassword(AesUtil.encode(password));
+        } catch (GeneralSecurityException e) {
+            e.printStackTrace();
+        }
         FeignClientResult feignClientResult = new FeignClientResult();
         RequestContext.setProduct(productApp);
         RequestContext.setAppKey(appKeyApp);
@@ -396,10 +402,16 @@ public class RemoteSecurityService {
 //        return toke;
 //    }
 
-    public Token getServerToken() {
+    public Token getServerToken()  {
         IdPasswordAuthModel dPasswordAuthModel = new IdPasswordAuthModel();
         dPasswordAuthModel.setLoginId(amosRequestContext.getUserName());
-        dPasswordAuthModel.setPassword(DesUtil.encode(password, "qaz"));
+        try {
+            dPasswordAuthModel.setPassword(AesUtil.encode(password));
+        } catch (GeneralSecurityException e) {
+            e.printStackTrace();
+        }  catch (IOException e) {
+            e.printStackTrace();
+        }
         Token toke = null;
         try {
             toke = JSON.parseObject(this.redisTemplate.opsForValue().get(buildKey(amosRequestContext.getUserName())), Token.class);

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

@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
+import java.security.GeneralSecurityException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -12,6 +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.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -23,7 +25,6 @@ import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.common.api.service.*;
 import com.yeejoin.amos.boot.module.jcs.api.dto.SignDto;
 import com.yeejoin.amos.feign.privilege.model.GroupUserModel;
-import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.poi.ss.usermodel.Cell;
@@ -1041,8 +1042,13 @@ public class ExcelServiceImpl {
            }
         //密码效验加密,不能为空，并且必须相等
         if(!StringUtils.isEmpty(orgUsrExcelDto.getPassword())){
-            user.setPassword(DesUtil.encode(orgUsrExcelDto.getPassword(), "qaz"));
-            user.setRePassword(DesUtil.encode(orgUsrExcelDto.getPassword(), "qaz"));
+			try {
+				user.setPassword(AesUtil.encode(orgUsrExcelDto.getPassword()));
+				user.setRePassword(AesUtil.encode(orgUsrExcelDto.getPassword()));
+			} catch (GeneralSecurityException e) {
+				e.printStackTrace();
+			}
+
         }else{
             StringBuilder falsest=new  StringBuilder();
             falsest.append("用户:").append(orgUsrExcelDto.getBizOrgName()).append(",两次密码不能为空并且必须相等！");

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.DesUtil;
+import com.yeejoin.amos.feign.privilege.util.AesUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.amos.patrol.business.util.CommonResponse;
@@ -28,6 +28,8 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
+import java.io.IOException;
+import java.security.GeneralSecurityException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -93,7 +95,13 @@ public class RemoteSecurityService {
     public Toke getServerToken() {
         IdPasswordAuthModel dPasswordAuthModel = new IdPasswordAuthModel();
         dPasswordAuthModel.setLoginId(loginId);
-        dPasswordAuthModel.setPassword(DesUtil.encode(password, "qaz"));
+        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(loginId)), Toke.class);
@@ -212,7 +220,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) {
@@ -529,7 +537,7 @@ public class RemoteSecurityService {
     public JSONObject loginFromApp(String userName, String password) {
         IdPasswordAuthModel dPasswordAuthModel = new IdPasswordAuthModel();
         dPasswordAuthModel.setLoginId(userName);
-        dPasswordAuthModel.setPassword(DesUtil.decode(password, "yeejoin"));
+        dPasswordAuthModel.setPassword(AesUtil.decode(password));
         Map map = null;
         FeignClientResult feignClientResult = new FeignClientResult();
         RequestContext.setProduct(productApp);

pom.xml

@@ -221,7 +221,7 @@
 		<dependency>
 			<groupId>com.yeejoin</groupId>
 			<artifactId>amos-feign-privilege</artifactId>
-			<version>${amos.version}</version>
+			<version>1.8.8-DL</version>
 		</dependency>
 	</dependencies>
 	<dependencyManagement>