Merge branch 'mp-server-test' into 'master'

Mp server test

See merge request quanshu/mp-server!489

mp-admin/src/main/java/com/qs/mp/web/controller/api/common/UserController.java

@@ -249,6 +249,7 @@ public class UserController extends BaseApiController {
       sysUser = new SysUser();
       sysUser.setUserName(phoneNumber);
       sysUser.setNickName(phoneNumber);
+      sysUser.setPhonenumber(phoneNumber);
       sysUserService.registerUser(sysUser);
     }
     Map<String, String> result = sysLoginService.wxAuthLogin(phoneNumber, wxLoginParams.getIdentity());

mp-admin/src/main/java/com/qs/mp/web/controller/system/SysLoginController.java

@@ -101,6 +101,7 @@ public class SysLoginController
             sysUser = new SysUser();
             sysUser.setUserName(smsCode.getMobile());
             sysUser.setNickName(smsCode.getMobile());
+            sysUser.setPhonenumber(smsCode.getMobile());
             sysUserService.registerUser(sysUser);
         }
 

mp-framework/src/main/java/com/qs/mp/framework/web/service/SysRegisterService.java

@@ -19,7 +19,7 @@ import com.qs.mp.system.service.ISysUserService;
 
 /**
  * 注册校验方法
- * 
+ *
  * @author ygp
  */
 @Component
@@ -75,6 +75,7 @@ public class SysRegisterService
             SysUser sysUser = new SysUser();
             sysUser.setUserName(username);
             sysUser.setNickName(username);
+            sysUser.setPhonenumber(username);
             sysUser.setPassword(SecurityUtils.encryptPassword(registerBody.getPassword()));
             boolean regFlag = userService.registerUser(sysUser);
             if (!regFlag)
@@ -92,7 +93,7 @@ public class SysRegisterService
 
     /**
      * 校验验证码
-     * 
+     *
      * @param username 用户名
      * @param code 验证码
      * @param uuid 唯一标识