多元融合

src/main/java/com/fdkankan/fusion/service/impl/TmUserServiceImpl.java

@@ -25,6 +25,7 @@ import com.fdkankan.fusion.response.UserAddRequest;
 import com.fdkankan.fusion.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.redis.util.RedisUtil;
+import com.fdkankan.sign.AesUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -128,7 +129,14 @@ public class TmUserServiceImpl extends ServiceImpl<ITmUserMapper, TmUser> implem
         if(tmDepartment == null){
             throw new BusinessException(ResultCode.NOT_DEPT);
         }
-        FdkkLoginRequest request = new FdkkLoginRequest(param.getUserName(),param.getPassword(),param.getPassword());
+       String password = Base64Converter.decode(Base64Converter.subText(param.getPassword()));
+
+        FdkkLoginRequest request = null;
+        try {
+            request = new FdkkLoginRequest(param.getUserName(), AesUtil.encrypt(password),AesUtil.encrypt(password));
+        } catch (Exception e) {
+            throw new BusinessException(ResultCode.PASSWORD_ERROR);
+        }
         FdkkResponse fdkkResponse = fdKKClient.fdkkRegister(request);
         if(fdkkResponse.getCode() == 0 ){
             this.addNewUser(param,role);

src/main/resources/application-prod.yaml

@@ -63,4 +63,4 @@ laser:
 fusion:
   sign:
     appid: 051de32597041e41f73b97d61c67a13b
-    publickey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCUXIPwcWay3Rct4xfD/JEZoOExhO+5HIGgKbdgjNFvx3gAPD79gfPPZxM8vuZNc+dCDj2SiY93bMxYjI4PjavqgwSUcbtr4wNjt3tXHrJWOqYrQg4nVFJK0AmF7ARwHztId2v5URLZ6pdpHFOl1BOxUQ2lFD9br1csB+mo9YZIAwIDAQAB
+    publicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCUXIPwcWay3Rct4xfD/JEZoOExhO+5HIGgKbdgjNFvx3gAPD79gfPPZxM8vuZNc+dCDj2SiY93bMxYjI4PjavqgwSUcbtr4wNjt3tXHrJWOqYrQg4nVFJK0AmF7ARwHztId2v5URLZ6pdpHFOl1BOxUQ2lFD9br1csB+mo9YZIAwIDAQAB

src/main/resources/application-test.yaml

@@ -64,4 +64,4 @@ laser:
 fusion:
   sign:
     appid: 051de32597041e41f73b97d61c67a13b
-    publickey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9/sgajow5p92r8pubsD0GS8Mcp3m999zWd3Ozlut2lZn6WixukwKHLquGbtW5ZKPdUoHC5czO9508neOgex7f4tacXUDs2Yh+c5GmxN4IRCLN7QC5U/LszJcQimS0Eo0ZBySU6+Rrt7DujIrn6cnMIjhLBFxjBUUI5yqlQDC38wIDAQAB
+    publicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9/sgajow5p92r8pubsD0GS8Mcp3m999zWd3Ozlut2lZn6WixukwKHLquGbtW5ZKPdUoHC5czO9508neOgex7f4tacXUDs2Yh+c5GmxN4IRCLN7QC5U/LszJcQimS0Eo0ZBySU6+Rrt7DujIrn6cnMIjhLBFxjBUUI5yqlQDC38wIDAQAB