Merge branch 'dev-hotfix-0826' into 'release'

Dev hotfix 0826



See merge request !45

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

@@ -83,8 +83,9 @@ public class RegisterServiceImpl implements RegisterService {
         //对注册接口做幂等性处理：注册成功，删除缓存，注册失败提示用户
         String nxKey = Constants.REPEAT_REGISTER_PREFIX + mobile;
         Long resultNx = redisClient.setnx(nxKey, mobile);
+        redisClient.expire(nxKey, 2);
         if(resultNx == 1) {
-            try {
+            //try {
                 String mobileEncrypt = AESUtil.encryptV0(mobile);
                 AccountInfoEntity accountInfoEntity = accountInfoDetailMapper.selectByMobile(mobileEncrypt);
                 if (accountInfoEntity == null) {
@@ -161,17 +162,17 @@ public class RegisterServiceImpl implements RegisterService {
 
                     throw new AccountException(AccountExceptionEnum.PICA_ALREADY_REGISTER);
                 }
-            } catch (Exception e) {
+            //} catch (Exception e) {
                 //向上抛出异常，让异常处理框架捕获到
-                logger.error("registerException-" + e.getMessage(), e);
-                intactUtil.sendIntact(batchNo,"register",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"注册失败");
+                //logger.error("registerException-" + e.getMessage(), e);
+                //intactUtil.sendIntact(batchNo,"register",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"注册失败");
 
-                throw new AccountException(AccountExceptionEnum.PICA_REGISTER_FAIL);
-            } finally {
+                //throw new AccountException(AccountExceptionEnum.PICA_REGISTER_FAIL);
+            //} finally {
                 //如果在注册过程中抛出异常，就删除redis中的注册标记
-                logger.info("register-finally-del-nxKey");
-                redisClient.del(nxKey);
-            }
+                //logger.info("register-finally-del-nxKey");
+                //redisClient.del(nxKey);
+            //}
         } else {
             logger.info("register-nxKey is exists");
             intactUtil.sendIntact(batchNo,"register",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"该手机号已注册，请直接登录");