Merge branch 'master' of http://gitabc.xyqb.com/head_group/xyqb-user2

pom.xml

@@ -279,7 +279,7 @@
             <dependency>
                 <groupId>cn.quantgroup</groupId>
                 <artifactId>quantgroup-sms-sdk</artifactId>
-                <version>1.0.5</version>
+                <version>1.0.5-SNAPSHOT</version>
             </dependency>
         </dependencies>
         <build>

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java

@@ -216,7 +216,7 @@ public class UserController implements IBaseController {
     public JsonResult register(@RequestParam String phoneNo, @RequestParam String password,
                                @RequestParam String verificationCode, @RequestParam(required = false) Long channelId,
                                @RequestParam(required = false) Long registerFrom) {
-        LOGGER.info("用户注册, phoneNo:{}, verificationCode:{}, channelId:{}, registerFrom:{},appChannel:{}", phoneNo, verificationCode, channelId, registerFrom, getAppChannel());
+        LOGGER.info("用户注册, phoneNo:{}, verificationCode:{}, channelId:{}, registerFrom:{}", phoneNo, verificationCode, channelId, registerFrom);
         if (!ValidationUtil.validatePhoneNo(phoneNo)) {
             LOGGER.info("用户注册失败，手机号错误, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
             return JsonResult.buildErrorStateResult("手机号错误", null);
@@ -245,7 +245,7 @@ public class UserController implements IBaseController {
             return JsonResult.buildErrorStateResult("注册失败，请稍后重试", null);
         }
 
-        LOGGER.info("用户注册成功, registerFrom:{}, phoneNo:{}, appChannel:{}", registerFrom, phoneNo, getAppChannel());
+        LOGGER.info("用户注册成功, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
 
         return JsonResult.buildSuccessResult(null, null);
     }
@@ -454,6 +454,5 @@ public class UserController implements IBaseController {
             return JsonResult.buildErrorStateResult("登录失败", null);
         }
     }
-    
 
 }