Revert "平台登陆接口替换"

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.PwdUtil;
+import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.equipmanage.common.entity.publics.CommonResponse;
@@ -26,8 +26,6 @@ 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;
 
@@ -260,14 +258,10 @@ public class RemoteSecurityService {
 
     }
 
-    public JSONObject loginFromApp(String userName, String password) throws InnerInvokException,  IOException {
+    public JSONObject loginFromApp(String userName, String password) throws InnerInvokException {
         IdPasswordAuthModel dPasswordAuthModel = new IdPasswordAuthModel();
         dPasswordAuthModel.setLoginId(userName);
-        try {
-            dPasswordAuthModel.setPassword(PwdUtil.encode(password));
-        } catch (GeneralSecurityException e) {
-            e.printStackTrace();
-        }
+        dPasswordAuthModel.setPassword(DesUtil.encode(password, "qaz"));
         FeignClientResult feignClientResult = new FeignClientResult();
         RequestContext.setProduct(productApp);
         RequestContext.setAppKey(appKeyApp);
@@ -402,16 +396,10 @@ public class RemoteSecurityService {
 //        return toke;
 //    }
 
-    public Token getServerToken()  {
+    public Token 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"));
         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,7 +4,6 @@ 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.*;
@@ -13,7 +12,6 @@ import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import com.yeejoin.amos.feign.privilege.util.PwdUtil;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,6 +23,7 @@ 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;
@@ -975,7 +974,7 @@ public class ExcelServiceImpl {
                     token,agencyUser);
             if (!ObjectUtils.isEmpty(amosUser)) {
                 logger.info("添加用户结果"+(amosUser!=null?JSON.toJSONString(amosUser):""));
-                if(amosUser!=null&&amosUser.getStatus()==200){
+                if(amosUser.getStatus()==200){
                     user = (LinkedHashMap<String, Object>) amosUser.getResult();
                 }else{
                     StringBuilder falsest=new  StringBuilder();
@@ -1001,8 +1000,9 @@ public class ExcelServiceImpl {
                     token,
                     group,li);
 
+            logger.info("添加用户组结果"+(amosUser!=null?JSON.toJSONString(amosUser):""));
 
-            if (amosUser!=null&&!ObjectUtils.isEmpty(amosUser)&&amosUser.getStatus()==200) {
+            if (!ObjectUtils.isEmpty(amosUser)&&amosUser.getStatus()==200) {
                 user = (List<Map<String, Object>>) amosUser.getResult();
             }
 
@@ -1041,13 +1041,8 @@ public class ExcelServiceImpl {
            }
         //密码效验加密,不能为空，并且必须相等
         if(!StringUtils.isEmpty(orgUsrExcelDto.getPassword())){
-			try {
-				user.setPassword(PwdUtil.encode(orgUsrExcelDto.getPassword()));
-				user.setRePassword(PwdUtil.encode(orgUsrExcelDto.getPassword()));
-			} catch (GeneralSecurityException e) {
-				e.printStackTrace();
-			}
-
+            user.setPassword(DesUtil.encode(orgUsrExcelDto.getPassword(), "qaz"));
+            user.setRePassword(DesUtil.encode(orgUsrExcelDto.getPassword(), "qaz"));
         }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.PwdUtil;
+import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.amos.patrol.business.util.CommonResponse;
@@ -28,8 +28,6 @@ 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;
@@ -95,13 +93,7 @@ public class RemoteSecurityService {
     public Toke getServerToken() {
         IdPasswordAuthModel dPasswordAuthModel = new IdPasswordAuthModel();
         dPasswordAuthModel.setLoginId(loginId);
-        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(loginId)), Toke.class);
@@ -220,7 +212,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) {
@@ -537,11 +529,7 @@ public class RemoteSecurityService {
     public JSONObject loginFromApp(String userName, String password) {
         IdPasswordAuthModel dPasswordAuthModel = new IdPasswordAuthModel();
         dPasswordAuthModel.setLoginId(userName);
-        try {
-            dPasswordAuthModel.setPassword(PwdUtil.decode(password));
-        } catch (GeneralSecurityException e) {
-            e.printStackTrace();
-        }
+        dPasswordAuthModel.setPassword(DesUtil.decode(password, "yeejoin"));
         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>1.8.8-DL</version>
+			<version>${amos.version}</version>
 		</dependency>
 	</dependencies>
 	<dependencyManagement>