Merge branch 'dev-addComment-20200609' into 'release'

add comment

reviewCode赵培军

See merge request !29

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

@@ -148,10 +148,12 @@ public class AccountController extends AccountBaseController {
             return PicaResponse.toResponse(null, PicaResultCode.RESULE_DATA_NONE.code(), "未注册，请验证码登录");
         }
 
-        if (StringUtils.isBlank(req.getPassword())) {  //验证码登录
+        if (StringUtils.isBlank(req.getPassword())) {
+            //验证码登录
             req.setFlag("0");
             intactUtil.sendIntact(batchNo,"login",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"校验验证码前的返回，因为验证码可能校验不通过，就直接返回了");
-            this.checkAuthCode(req);  //校验验证码
+            //校验验证码
+            this.checkAuthCode(req);
         } else {  //密码登录
             if (!StringUtils.equals(req.getPassword(), account.getPassword())) {
                 intactUtil.sendIntact(batchNo,"login",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"请输入正确的密码");
@@ -213,7 +215,7 @@ public class AccountController extends AccountBaseController {
         return PicaResponse.toResponse(result);
     }
 
-    @ApiOperation("H5端一键登录功能,无需完善信息")
+    @ApiOperation("H5端验证码登录,无需完善信息")
     @PostMapping("/login-register/v1")
 //    @RepeatForbidden(uniqueKey = "content")
     //当前版本存在性能问题 luo优化后上

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

@@ -109,7 +109,6 @@ public class AutoCodeController extends AccountBaseController {
         //  验证码类型 0默认 1注册 2微信登录绑定手机 3修改手机
         //  4重置密码 5忘记密码 7患者招募提交问卷(效验) 8Appe登录绑定手机
 
-        //added by joy begin
         EncryptEntity entity = new EncryptEntity();
         if(StringUtils.isEmpty(authCodeReq.getKey()) && StringUtils.isEmpty(authCodeReq.getContent())){
             //明文时处理
@@ -129,7 +128,6 @@ public class AutoCodeController extends AccountBaseController {
             entity.setKey(authCodeReq.getKey());
             entity.setContent(authCodeReq.getContent());
         }
-        //added by joy end
 
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
         request.setSourceType(super.getSourceType());
@@ -137,25 +135,18 @@ public class AutoCodeController extends AccountBaseController {
 
         AccountUtils.checkMobilePhone(request.getMobile());
 
-        //接入新旭事务一致性
-        String batchNo = IntactUtils.getUUID();
-        intactUtil.sendIntact(batchNo,"getAuthCode",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"authCodeReq:"+ JSONObject.toJSONString(authCodeReq));
-
         if (request.getBizType() != null && request.getBizType().equals(1)) {
             logger.info("app-rcValidate-start");
             //  调用风控接口
             authCodeService.rcValidate(req, request, super.getDeviceInfo(), super.getSourceType());
             //  发送短信验证码
-            processSysCode(request.getMobile(), request.getFlag(),batchNo);
-            //接入新旭事务一致性
-            intactUtil.sendIntact(batchNo,"getAuthCode",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"authCodeReq:"+ JSONObject.toJSONString(authCodeReq));
+            processSysCode(request.getMobile(), request.getFlag());
             return PicaResponse.toResponse();
         } else {
             //  老版本业务(发送短信验证码)
-            processSysCode(request.getMobile(), request.getFlag(),batchNo);
+            processSysCode(request.getMobile(), request.getFlag());
             //  记录风控数据
             authCodeService.recordRcData(req, request, super.getDeviceInfo("device_ip"));
-            intactUtil.sendIntact(batchNo,"getAuthCode",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"authCodeReq:"+ JSONObject.toJSONString(authCodeReq));
             return PicaResponse.toResponse();
         }
     }
@@ -171,22 +162,16 @@ public class AutoCodeController extends AccountBaseController {
         }
         AccountUtils.checkMobilePhone(request.getMobile());
 
-        //接入新旭事务一致性
-        String batchNo = IntactUtils.getUUID();
-        intactUtil.sendIntact(batchNo,"getH5AuthCode",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"entity:"+ JSON.toJSONString(entity));
-
         //  拼图验证
         int recordData = authCodeService.validateJigsawCode(req, request);
 
         //  发送短信验证码
-        processSysCode(request.getMobile(), request.getFlag(),batchNo);
+        processSysCode(request.getMobile(), request.getFlag());
 
         if (recordData != -1) {
             //  记录风控数据（记录是h5端）
             authCodeService.recordRcData(req, request, super.getDeviceInfo("device_ip"));
         }
-        intactUtil.sendIntact(batchNo,"getH5AuthCode",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"entity:"+ JSON.toJSONString(entity));
-
 
         return PicaResponse.toResponse();
     }
@@ -216,9 +201,6 @@ public class AutoCodeController extends AccountBaseController {
             return PicaResponse.toResponse(null, PicaResultCode.PARAM_IS_INVALID.code(), "图形验证码错误");
         }
         this.checkMobilePhone(mobilePhone);
-        //接入新旭事务一致性
-        String batchNo = IntactUtils.getUUID();
-        intactUtil.sendIntact(batchNo,"getAuthCodeWithCaptcha",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"entity:"+ JSON.toJSONString(entity));
         String authCode = CommonUtil.createValidateCode();  //随机生成验证码
         String message = "您的验证码是" + authCode + ",在10分钟内有效。如非本人操作，请忽略本短信！";
         //判断账号是否已经存在
@@ -235,9 +217,6 @@ public class AutoCodeController extends AccountBaseController {
         //  记录风控数据
         authCodeService.recordRcData(req, request, super.getDeviceInfo("device_ip"));
 
-        intactUtil.sendIntact(batchNo,"getAuthCodeWithCaptcha",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"entity:"+ JSON.toJSONString(entity));
-
-
         return PicaResponse.toResponse(StringUtils.EMPTY);
     }
 
@@ -255,16 +234,11 @@ public class AutoCodeController extends AccountBaseController {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
         request.setFlag(AccountTypeEnum.SYSCODE_TYPE_WE_CHAT.getCode());
         AccountUtils.checkMobilePhone(request.getMobile());
-        //接入新旭事务一致性
-        String batchNo = IntactUtils.getUUID();
-        intactUtil.sendIntact(batchNo,"getWChatSysCode",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"entity:"+ JSON.toJSONString(entity));
         AccountUnionEntity accountUnionEntity = accountUnionService.selectInfoByUnionId(request.getUnionId());
         if (accountUnionEntity != null) {
-            processSysCode(request.getMobile(), request.getFlag(),batchNo);
-            intactUtil.sendIntact(batchNo,"getWChatSysCode",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"entity:"+ JSON.toJSONString(entity));
+            processSysCode(request.getMobile(), request.getFlag());
             return PicaResponse.toResponse();
         }
-        intactUtil.sendIntact(batchNo,"getWChatSysCode",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"entity:"+ JSON.toJSONString(entity));
 
         throw new AccountException(AccountExceptionEnum.PICA_UNBIND_MOBILE);
     }
@@ -279,7 +253,7 @@ public class AutoCodeController extends AccountBaseController {
      * @param mobilePhone
      * @param flag
      */
-    private void processSysCode(String mobilePhone, Integer flag,String batchNo) {
+    private void processSysCode(String mobilePhone, Integer flag) {
         String authCodeKey = this.getAuthCodeKey(mobilePhone, flag.toString());
         String authCodeKeySecure = authCodeKey + "-secure";
         //如果存在，说明刚刚发送过验证码
@@ -290,7 +264,6 @@ public class AutoCodeController extends AccountBaseController {
             } else {
                 int remainTime = 59 - (int) (System.currentTimeMillis() - time) / 1000;
                 if (remainTime > 0) {
-                    intactUtil.sendIntact(batchNo,"processSysCode",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"请X秒后重试");
                     throw new AccountException(AccountExceptionEnum.PICA_SYSCODE_RETRY.getCode(),
                             AccountExceptionEnum.PICA_SYSCODE_RETRY.getMessage().replace("X", String.valueOf(remainTime)));
                 } else {

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

@@ -59,7 +59,7 @@ public class LoginController extends AccountBaseController {
     private String cache_prifix = "cache-";
 
     /**
-     * 密码登录接口
+     * 密码登录接口（app、H5）
      *
      * @param authCodeReq
      * @return