后端服务登录添加密码加密

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.fas.business.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.fas.business.feign.OutTokenLoginFeign;
 import com.yeejoin.amos.fas.business.feign.PrivilegeFeign;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
@@ -11,9 +12,13 @@ import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.business.vo.RoleBo;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.ApplicationModel;
 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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -76,18 +81,17 @@ public class LoginController {
         reginParams = JSON.parseObject(redisTemplate.opsForValue().get(buildKey(userId, token)), ReginParams.class);
         if(reginParams == null){
             reginParams = new ReginParams();
-            Map<String, String> param = new HashMap<>();
-            param.put("loginId", userId);
-            param.put("password", password);
-            Object result = privilegeFeign.login(appKey, product, param).getResult();
-            if (ObjectUtils.isEmpty(result)){
+            IdPasswordAuthModel  dPasswordAuthModel = new IdPasswordAuthModel();
+            dPasswordAuthModel.setLoginId(userId);
+            dPasswordAuthModel.setPassword(DesUtil.encode(password, "qaz"));
+            RequestContext.setProduct(product);
+    		FeignClientResult feignClientResult = Privilege.authClient.idpassword(dPasswordAuthModel);
+            if (ObjectUtils.isEmpty(feignClientResult.getResult())){
                 throw new Exception("缺失登录信息");
             }
-
-            Map<String ,String > re = (Map<String ,String >) result;
+            Map<String ,String > re = (Map<String, String>) feignClientResult.getResult();
             String amosToken = re.get("token");
             privilegeFeign.warrant(appKey, product, amosToken);
-
             RequestContext.setToken(amosToken);
             RequestContext.setProduct(product);
             RequestContext.setAppKey(appKey);

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_p_point.xml

@@ -35,6 +35,7 @@
         FROM
         `p_point` p
         <where>
+        	is_delete = 0
             <if test="list != null and list.length > 0">
                 AND
                 <foreach collection="list" item="item" index="index" open="(" close=")" separator="OR">