huwhois 4 years ago
parent
commit
8cc395ef73

+ 14 - 14
src/main/java/io/renren/modules/app/controller/AppLoginController.java

45
    /**
45
    /**
46
     * 登录
46
     * 登录
47
     */
47
     */
48
    @PostMapping("login")
48
    // @PostMapping("login")
49
    @ApiOperation("登录")
49
    // @ApiOperation("登录")
50
    public R login(@RequestBody LoginForm form){
50
    // public R login(@RequestBody LoginForm form){
51
        //表单校验
51
    //     //表单校验
52
        ValidatorUtils.validateEntity(form);
52
    //     ValidatorUtils.validateEntity(form);
53
53
54
        //用户登录
54
    //     //用户登录
55
        long userId = userService.login(form);
55
    //     long userId = userService.login(form);
56
56
57
        //生成token
57
    //     //生成token
58
        String token = jwtUtils.generateToken(userId);
58
    //     String token = jwtUtils.generateToken(userId);
59
59
60
        Map<String, Object> map = new HashMap<>();
60
    //     Map<String, Object> map = new HashMap<>();
61
        map.put("token", token);
61
    //     map.put("token", token);
62
        map.put("expire", jwtUtils.getExpire());
62
    //     map.put("expire", jwtUtils.getExpire());
63
63
64
        return R.ok(map);
64
    //     return R.ok(map);
65
    }
65
    // }
66
66
67
    @PostMapping("mobilecode")
67
    @PostMapping("mobilecode")
68
    public R mobileCode(@RequestBody Map<String, Object> params) {
68
    public R mobileCode(@RequestBody Map<String, Object> params) {

+ 13 - 13
src/main/java/io/renren/modules/app/controller/AppRegisterController.java

40
40
41
    // @PostMapping("register")
41
    // @PostMapping("register")
42
    // @ApiOperation("注册")
42
    // @ApiOperation("注册")
43
    public R register(@RequestBody RegisterForm form){
43
    // public R register(@RequestBody RegisterForm form){
44
        //表单校验
44
    //     //表单校验
45
        ValidatorUtils.validateEntity(form);
45
    //     ValidatorUtils.validateEntity(form);
46
47
    //     UserEntity user = new UserEntity();
47
        UserEntity user = new UserEntity();
48
    //     user.setMobile(form.getMobile());
48
        user.setMobile(form.getMobile());
49
    //     user.setUsername(form.getMobile());
49
        user.setUsername(form.getMobile());
50
    //     user.setPassword(DigestUtils.sha256Hex(form.getPassword()));
50
        user.setPassword(DigestUtils.sha256Hex(form.getPassword()));
51
    //     user.setCreateTime(new Date());
51
        user.setCreateTime(new Date());
52
    //     userService.save(user);
52
        userService.save(user);
54
    //     return R.ok();
53
55
    // }
54
        return R.ok();
55
    }
56
}
56
}