Merge branch 'dev-laowang-20200522' into 'release'

add log

reviewCode赵培军

See merge request !27

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

 package com.pica.cloud.account.account.server.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.pica.cloud.account.account.server.constants.Constants;
 import com.pica.cloud.account.account.server.entity.Account;
 import com.pica.cloud.account.account.server.entity.EncryptEntity;
@@ -110,6 +111,7 @@ public class AccountController extends AccountBaseController {
     @ApiOperation("微信登录")
     @PostMapping("/login/wechat")
     public PicaResponse<String> wechatLogin(@RequestBody AccountReq req) {
+        logger.info("wechatLogin:{}",JSONObject.toJSONString(req));
         //接入新旭事务一致性
         String batchNo = IntactUtils.getUUID();
         intactUtil.sendIntact(batchNo,"wechatLogin",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"req:"+ JSON.toJSONString(req));
@@ -136,6 +138,7 @@ public class AccountController extends AccountBaseController {
     @PostMapping("/login")
     public PicaResponse<String> login(@RequestBody AccountReq req) {
         this.checkMobilePhone(req.getMobilePhone());
+        logger.info("login:{}", JSONObject.toJSONString(req));
         //接入新旭事务一致性
         String batchNo = IntactUtils.getUUID();
         intactUtil.sendIntact(batchNo,"login",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"req:"+ JSON.toJSONString(req));

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

@@ -129,11 +129,11 @@ 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());
+        logger.info("authCode/getAuthCode:{}",JSONObject.toJSONString(request));
 
         AccountUtils.checkMobilePhone(request.getMobile());
 

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

@@ -28,6 +28,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.spring.web.json.Json;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -139,6 +140,7 @@ public class LoginController extends AccountBaseController {
         }
         //added by joy end
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
+        logger.info("login-register:{}",JSONObject.toJSONString(request));
         request.setProductType(super.getProductType());
         Integer sourceType = super.getSourceType();
         request.setSourceType(sourceType == null ? 0 : sourceType);
@@ -173,6 +175,7 @@ public class LoginController extends AccountBaseController {
         request.setSourceType(super.getSourceType());
         request.setLoginIp(super.getIpAddr());
         request.setUserTokenTourist(super.getUserTokenTourist());
+        logger.info("loginByWeChatStep:{}",JSONObject.toJSONString(request));
         LoginResult result = loginService.loginByWeChatStep(request);
         return PicaResponse.toResponse(result);
     }
@@ -188,6 +191,7 @@ public class LoginController extends AccountBaseController {
     @PostMapping("/login/wechat/bind")
     public PicaResponse bindWeChat(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
+        logger.info("bindWeChat:{}",JSONObject.toJSONString(request));
         request.setUserTokenTourist(super.getUserTokenTourist());
         Long result = cacheClient.setnx(cache_prifix + request.getWeChatCode(), request.getWeChatCode());
         if (result == 1) {
@@ -292,6 +296,7 @@ public class LoginController extends AccountBaseController {
 
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
         request.setSourceType(super.getSourceType());
+        logger.info("unifiedVerification:{}",JSONObject.toJSONString(request));
         loginService.preLoginValidate(request);
         return PicaResponse.toResponse();
     }
@@ -304,6 +309,7 @@ public class LoginController extends AccountBaseController {
         request.setSourceType(super.getSourceType());
         request.setLoginIp(super.getIpAddr());
         request.setUserTokenTourist(super.getUserTokenTourist());
+        logger.info("appleAuth:{}", JSONObject.toJSONString(request));
         return PicaResponse.toResponse(loginService.loginByApple(request));
     }
 
@@ -315,6 +321,7 @@ public class LoginController extends AccountBaseController {
         request.setSourceType(super.getSourceType());
         request.setLoginIp(super.getIpAddr());
         request.setUserTokenTourist(super.getUserTokenTourist());
+        logger.info("appleAuthBind:{}",JSONObject.toJSONString(request));
         return PicaResponse.toResponse(loginService.loginByAppleStep(request));
     }
 

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

 package com.pica.cloud.account.account.server.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.pica.cloud.account.account.common.req.OCINRequest;
 import com.pica.cloud.account.account.server.entity.EncryptEntity;
 import com.pica.cloud.account.account.server.entity.LoginResult;
@@ -12,6 +13,8 @@ import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,10 +36,13 @@ public class RegisterController extends AccountBaseController {
     @Autowired
     private ICacheClient redisClient;
 
+    private Logger logger = LoggerFactory.getLogger(RegisterController.class);
+
     @ApiOperation("PC端，移动端注册接口")
     @PostMapping(value = "")
     public PicaResponse<LoginResult> register(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
+        logger.info("register:{}", JSONObject.toJSONString(request));
         String mobile = request.getMobile();
         //接口幂等性处理(redis中没有就进行注册逻辑，如果已经存在，就不处理)
         String authCode = request.getAuthCode();