新增测试用手机号登录

src/main/java/com/gxwebsoft/common/system/controller/UserController.java

@@ -8,11 +8,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.config.ConfigProperties;
+import com.gxwebsoft.common.core.security.JwtSubject;
+import com.gxwebsoft.common.core.security.JwtUtil;
 import com.gxwebsoft.common.core.utils.CommonUtil;
 import com.gxwebsoft.common.core.web.*;
 import com.gxwebsoft.common.system.entity.*;
 import com.gxwebsoft.common.system.param.UserImportParam;
 import com.gxwebsoft.common.system.param.UserParam;
+import com.gxwebsoft.common.system.result.LoginResult;
 import com.gxwebsoft.common.system.service.DictionaryDataService;
 import com.gxwebsoft.common.system.service.OrganizationService;
 import com.gxwebsoft.common.system.service.RoleService;
@@ -51,6 +55,8 @@ public class UserController extends BaseController {
     private OrganizationService organizationService;
     @Resource
     private DictionaryDataService dictionaryDataService;
+    @Resource
+    private ConfigProperties configProperties;
 
     @PreAuthorize("hasAuthority('sys:auth:user')")
     @ApiOperation("分页查询用户")
@@ -80,6 +86,16 @@ public class UserController extends BaseController {
         return success(userService.getByPhone(phone));
     }
 
+    @ApiOperation("手机号登录(测试用)")
+    @PostMapping("/loginByPhoneForTest")
+    public ApiResult<?> loginByPhoneForTest(@RequestBody User user) {
+        User getLoginUser = userService.getByPhone(user.getPhone());
+        if (!user.getPhoneLoginCode().equals("1700083")) return fail("验证码错误");
+        String access_token = JwtUtil.buildToken(new JwtSubject(getLoginUser.getUsername(), getLoginUser.getTenantId()),
+                configProperties.getTokenExpireTime(), configProperties.getTokenKey());
+        return success("登录成功", new LoginResult(access_token, user));
+    }
+
     @PreAuthorize("hasAuthority('sys:user:save')")
     @ApiOperation("添加用户")
     @PostMapping()
@@ -88,11 +104,11 @@ public class UserController extends BaseController {
         user.setPassword(userService.encodePassword(user.getPassword()));
         // 排重
         final User byPhone = userService.getByPhone(user.getPhone());
-        if(ObjectUtil.isNotEmpty(byPhone)){
+        if (ObjectUtil.isNotEmpty(byPhone)) {
             return fail("该手机号码已存在");
         }
         if (userService.saveUser(user)) {
-            return success("添加成功",user.getUserId());
+            return success("添加成功", user.getUserId());
         }
         return fail("添加失败");
     }
@@ -137,12 +153,12 @@ public class UserController extends BaseController {
             userParam.setLimit(500L);
             final PageResult<User> result = userService.pageRel(userParam);
             final Set<Integer> collect = result.getList().stream().map(User::getUserId).collect(Collectors.toSet());
-        return success("添加成功",collect);
+            return success("添加成功", collect);
         }
         return fail("添加失败");
     }
 
-//    @PreAuthorize("hasAuthority('sys:user:update')")
+    //    @PreAuthorize("hasAuthority('sys:user:update')")
     @OperationLog
     @ApiOperation("修改用户")
     @PutMapping()
@@ -364,7 +380,7 @@ public class UserController extends BaseController {
     @PreAuthorize("hasAuthority('sys:auth:user')")
     @PostMapping("/getAvatarByMpWx")
     @ApiOperation("更新微信头像")
-    public ApiResult<?> getAvatarByMpWx(@RequestBody User user){
+    public ApiResult<?> getAvatarByMpWx(@RequestBody User user) {
         user.setAvatar("https://oa.gxwebsoft.com/assets/logo.7ccfefb9.svg");
         if (userService.updateUser(user)) {
             return success("更新成功");
@@ -374,7 +390,7 @@ public class UserController extends BaseController {
 
     @PostMapping("/updatePointsBySign")
     @ApiOperation("签到成功累加积分")
-    public ApiResult<?> updatePointsBySign(){
+    public ApiResult<?> updatePointsBySign() {
         final User loginUser = getLoginUser();
         loginUser.setPoints(loginUser.getPoints() + 1);
         if (userService.updateUser(loginUser)) {
@@ -386,7 +402,7 @@ public class UserController extends BaseController {
     @PreAuthorize("hasAuthority('sys:auth:user')")
     @PutMapping("/updateUserBalance")
     @ApiOperation("更新用户余额")
-    public ApiResult<?> updateUserBalance(@RequestBody User user){
+    public ApiResult<?> updateUserBalance(@RequestBody User user) {
         if (getLoginUser() == null) {
             return fail("请先登录");
         }
@@ -404,17 +420,17 @@ public class UserController extends BaseController {
         final LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
         wrapper.gt(User::getBalance, 0);
         if (!param.getOrganizationId().equals(0)) {
-        wrapper.eq(User::getOrganizationId,param.getOrganizationId());
+            wrapper.eq(User::getOrganizationId, param.getOrganizationId());
         }
         final List<User> list = userService.list(wrapper);
         final BigDecimal totalBalance = list.stream().map(User::getBalance).reduce(BigDecimal.ZERO, BigDecimal::add);
         //      System.out.println("统计用户余额 = " + totalBalance);
-      return success("统计成功",totalBalance);
+        return success("统计成功", totalBalance);
     }
 
     @ApiOperation("更新商户ID")
     @PutMapping("/updateUserMerchantId")
-    public ApiResult<?> updateUserMerchantId(@RequestBody User user){
+    public ApiResult<?> updateUserMerchantId(@RequestBody User user) {
         if (userService.updateUser(user)) {
             return success("更新成功");
         }

src/main/java/com/gxwebsoft/common/system/entity/User.java

@@ -305,6 +305,10 @@ public class User implements UserDetails {
     @TableField(exist = false)
     private User referee;
 
+    @ApiModelProperty("手机号登录校验码")
+    @TableField(exist = false)
+    private String phoneLoginCode;
+
 //    @ApiModelProperty("企业信息")
 //    @TableField(exist = false)
 //    private Company companyInfo;