..

src/main/java/io/renren/modules/app/controller/AppLoginController.java

@@ -45,24 +45,24 @@ public class AppLoginController {
    /**
     * 登录
     */
    @PostMapping("login")
    @ApiOperation("登录")
    public R login(@RequestBody LoginForm form){
        //表单校验
        ValidatorUtils.validateEntity(form);
    // @PostMapping("login")
    // @ApiOperation("登录")
    // public R login(@RequestBody LoginForm form){
    //     //表单校验
    //     ValidatorUtils.validateEntity(form);
        //用户登录
        long userId = userService.login(form);
    //     //用户登录
    //     long userId = userService.login(form);
        //生成token
        String token = jwtUtils.generateToken(userId);
    //     //生成token
    //     String token = jwtUtils.generateToken(userId);
        Map<String, Object> map = new HashMap<>();
        map.put("token", token);
        map.put("expire", jwtUtils.getExpire());
    //     Map<String, Object> map = new HashMap<>();
    //     map.put("token", token);
    //     map.put("expire", jwtUtils.getExpire());
        return R.ok(map);
    }
    //     return R.ok(map);
    // }
    @PostMapping("mobilecode")
    public R mobileCode(@RequestBody Map<String, Object> params) {

src/main/java/io/renren/modules/app/controller/AppRegisterController.java

@@ -40,17 +40,17 @@ public class AppRegisterController {
    // @PostMapping("register")
    // @ApiOperation("注册")
    public R register(@RequestBody RegisterForm form){
        //表单校验
        ValidatorUtils.validateEntity(form);
        UserEntity user = new UserEntity();
        user.setMobile(form.getMobile());
        user.setUsername(form.getMobile());
        user.setPassword(DigestUtils.sha256Hex(form.getPassword()));
        user.setCreateTime(new Date());
        userService.save(user);
        return R.ok();
    }
    // public R register(@RequestBody RegisterForm form){
    //     //表单校验
    //     ValidatorUtils.validateEntity(form);
    //     UserEntity user = new UserEntity();
    //     user.setMobile(form.getMobile());
    //     user.setUsername(form.getMobile());
    //     user.setPassword(DigestUtils.sha256Hex(form.getPassword()));
    //     user.setCreateTime(new Date());
    //     userService.save(user);
    //     return R.ok();
    // }
}