20200116 完善验证码逻辑

server/src/main/java/com/pica/cloud/account/account/server/controller/AutoCodeController.java

@@ -177,11 +177,8 @@ public class AutoCodeController extends AccountBaseController {
     @ApiOperation("微信获取验证码")
     @PostMapping(value = "/authCode/get")
     public PicaResponse getAuthCode(){
-        String cacheCode = cacheClient.get("authCode-2-j1VrU5MSc1uuZaEa82ZKfQ==");
+        String cacheCode = cacheClient.get("authCode-j1VrU5MSc1uuZaEa82ZKfQ==");
         return PicaResponse.toResponse(cacheCode);
     }
 
-
-
-
 }

server/src/main/java/com/pica/cloud/account/account/server/service/impl/LoginServiceImpl.java

@@ -207,8 +207,8 @@ public class LoginServiceImpl implements LoginService {
         WeChatUserInfoEntity weChatUserInfoEntity = WeChatUtils.mergeWechatUserInfo(weChatUserInfo, weChatEntity.getOpenid());
         String unionId = weChatUserInfoEntity.getUnionid();
         AccountUnionEntity accountUnionEntity = accountUnionMapper.selectByUnionId(unionId);
+        //是否绑定逻辑的判断
         if (accountUnionEntity != null) {
-            //是否绑定逻辑的判断
             Long acctId = accountUnionEntity.getAcctId();
             Long userId = accountUtils.getUserIdByAcctId(request.getProductType(), acctId.intValue());
             Account account = new Account();
@@ -232,6 +232,7 @@ public class LoginServiceImpl implements LoginService {
             return result;
         } else {
             AccountWeChatInfoEntity entity = accountWeChatInfoMapper.selectByUnionId(unionId);
+            //如果微信信息表数据不存在，就把用户信息存储到微信信息表中。
             if (entity == null) {
                 processWeChatInfoUser(weChatUserInfoEntity, request.getWeChatLoginType());
             }
@@ -264,7 +265,7 @@ public class LoginServiceImpl implements LoginService {
         result.setMobile(request.getMobile());
         AccountInfoEntity accountInfo = accountInfoDetailMapper.selectByMobile(AESUtil.encryptV0(request.getMobile()));
         Integer acctId = accountInfo.getId();
-        processAccountUnion(acctId, request.getUnionId());
+        processAccountUnion(acctId, request.getUnionId(),request.getProductType());
         return result;
     }
 
@@ -295,7 +296,7 @@ public class LoginServiceImpl implements LoginService {
             updateWechatInfoUser(entity, weChatUserInfoEntity);
         }
         Integer acctId = doctorInfoMapper.getAcctIdByDoctorId(doctorId);
-        processAccountUnion(acctId, unionId);
+        processAccountUnion(acctId, unionId,request.getProductType());
         return weChatUserInfoEntity.getNickname();
     }
 
@@ -305,7 +306,11 @@ public class LoginServiceImpl implements LoginService {
      * @param acctId
      * @param unionId
      */
-    private void processAccountUnion(Integer acctId, String unionId) {
+    private void processAccountUnion(Integer acctId, String unionId,Integer productType) {
+        //先查询当前产品线是否有记录？
+        //如果有就更新成delete_flag=2;
+        //然后在插入
+
         AccountUnionEntity accountUnionEntity = new AccountUnionEntity();
         accountUnionEntity.setAcctId(acctId.longValue());
         accountUnionEntity.setDeleteFlag(1);

server/src/main/java/com/pica/cloud/account/account/server/util/AESUtil.java

@@ -179,27 +179,27 @@ public class AESUtil {
      * 测试
      */
     public static void main(String[] args) throws Exception {
-//        String KEY="zJJ$c5md3$yuuhWW";
-//        System.out.println("-------------加密---------");
-//        String content = "18621903846";
-//
-//
-//        System.out.println("加密前：" + content);
-//        System.out.println("加密密钥和解密密钥：" + KEY);
-//
-//        System.out.println("-------------解密---------");
-//        String encrypt = aesEncrypt(content, KEY);
-//        System.out.println("加密后：" + encrypt);
-//        String decrypt = aesDecrypt("ieE4wN+GkIxm8S8tSVqTow==", KEY);
-//        System.out.println("解密后：" + decrypt);
+        String KEY="zJJ$c5md3$yuuhWW";
+        System.out.println("-------------加密---------");
+        String content = "13024112500";
+
+
+        System.out.println("加密前：" + content);
+        System.out.println("加密密钥和解密密钥：" + KEY);
+
+        System.out.println("-------------解密---------");
+        String encrypt = aesEncrypt(content, KEY);
+        System.out.println("加密后：" + encrypt);
+        String decrypt = aesDecrypt("ieE4wN+GkIxm8S8tSVqTow==", KEY);
+        System.out.println("解密后：" + decrypt);
 
           //请求参数解密处理
-        String key="am1pnysCRlz80Rl/eTDj/UE/Pe8zkxb2yP73jvrUWEk3x5/lK9hi104MSmsKbl45cPzJfJXBxO+VeItkA63ZqfaUNA0ezdMd7Ord7rGqvWK+4RqAm1T3Qo3lw/5bT0GwgWMWZBrDr30NHCYLmjg6vwVbv3YCEewwQK+rL7bUXu0=";
-        String decrypt = RSAUtil.decrypt(key,privateKey);
-        System.out.println(decrypt);
-        String content="d9eKA7DGhNx7295N0g82rqzaUOeAvBeuR2gXtOX3Y+VV3ei+zW0BQn9moQgN4mRT8XIzq3x2n3qiqCuOzcDvrlGC0kIcUClM0gt8xDaBw+haVpMAw/7R4FgWNPeVRL5k";
-        String result = AESUtil.aesDecrypt(content, decrypt);
-        System.out.println(result);
+//        String key="am1pnysCRlz80Rl/eTDj/UE/Pe8zkxb2yP73jvrUWEk3x5/lK9hi104MSmsKbl45cPzJfJXBxO+VeItkA63ZqfaUNA0ezdMd7Ord7rGqvWK+4RqAm1T3Qo3lw/5bT0GwgWMWZBrDr30NHCYLmjg6vwVbv3YCEewwQK+rL7bUXu0=";
+//        String decrypt = RSAUtil.decrypt(key,privateKey);
+//        System.out.println(decrypt);
+//        String content="d9eKA7DGhNx7295N0g82rqzaUOeAvBeuR2gXtOX3Y+VV3ei+zW0BQn9moQgN4mRT8XIzq3x2n3qiqCuOzcDvrlGC0kIcUClM0gt8xDaBw+haVpMAw/7R4FgWNPeVRL5k";
+//        String result = AESUtil.aesDecrypt(content, decrypt);
+//        System.out.println(result);
 
 
 //        ArrayList<String> list = new ArrayList<>();