..

src/main/java/io/renren/modules/admin/entity/MemberEntity.java

@@ -28,7 +28,7 @@ public class MemberEntity implements Serializable {
    /**
     * 
     */
    @TableId(value = "id")
    @TableId
    private Long id;
    /**
     * 名字

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

@@ -9,14 +9,13 @@
package io.renren.modules.app.controller;
import io.renren.common.utils.R;
import io.renren.common.validator.Assert;
import io.renren.common.validator.ValidatorUtils;
import io.renren.modules.app.entity.UserEntity;
import io.renren.modules.app.form.LoginForm;
import io.renren.modules.app.service.SmsCodeService;
import io.renren.modules.app.service.UserService;
import io.renren.modules.app.utils.JwtUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -33,7 +32,6 @@ import java.util.Map;
 */
@RestController
@RequestMapping("/app")
@Api("APP登录接口")
public class AppLoginController {
    @Autowired
    private SmsCodeService smsCodeService;
@@ -45,24 +43,27 @@ public class AppLoginController {
    /**
     * 登录
     */
    // @PostMapping("login")
    // @ApiOperation("登录")
    // public R login(@RequestBody LoginForm form){
    //     //表单校验
    //     ValidatorUtils.validateEntity(form);
    @PostMapping("login")
    public R login(@RequestBody LoginForm form){
        //表单校验
        ValidatorUtils.validateEntity(form);
    //     //用户登录
    //     long userId = userService.login(form);
        smsCodeService.validate(form.getUuid(), form.getCode(), form.getPhone());
    //     //生成token
    //     String token = jwtUtils.generateToken(userId);
        //用户登录
        UserEntity user =  userService.queryByPhone(form.getPhone());
        Assert.isNull(user, "手机号错误");
        long userId = user.getUserId();
    //     Map<String, Object> map = new HashMap<>();
    //     map.put("token", token);
    //     map.put("expire", jwtUtils.getExpire());
        //生成token
        String token = jwtUtils.generateToken(userId);
    //     return R.ok(map);
    // }
        Map<String, Object> map = new HashMap<>();
        map.put("token", token);
        map.put("expire", jwtUtils.getExpire());
        return R.ok(map);
    }
    @PostMapping("mobilecode")
    public R mobileCode(@RequestBody Map<String, Object> params) {

src/main/java/io/renren/modules/app/entity/UserEntity.java

@@ -31,7 +31,7 @@ public class UserEntity implements Serializable {
	/**
	 * 用户ID
	 */
	@TableId
	@TableId(value = "id")
	private Long userId;
	/**
     * 名字

src/main/java/io/renren/modules/app/form/LoginForm.java

@@ -29,8 +29,6 @@ public class LoginForm {
    @NotBlank(message="手机号不能为空")
    private String phone;
    @NotBlank(message="密码不能为空")
    private String password;
    @NotBlank(message="短信验证码不能为空")
    private String code;
    private String uuid;

src/main/java/io/renren/modules/app/service/SmsCodeService.java

@@ -1,6 +1,8 @@
package io.renren.modules.app.service;
import com.baomidou.mybatisplus.extension.service.IService;
import io.renren.common.exception.RRException;
import io.renren.modules.app.entity.SmsCodeEntity;
/**
@@ -22,5 +24,5 @@ public interface SmsCodeService extends IService<SmsCodeEntity> {
     * @param code  验证码
     * @return  true：成功  false：失败
     */
    boolean validate(String uuid, String code, String phone);
    void validate(String uuid, String code, String phone) throws RRException;
}

src/main/java/io/renren/modules/app/service/impl/SmsCodeServiceImpl.java

@@ -45,18 +45,18 @@ public class SmsCodeServiceImpl extends ServiceImpl<SmsCodeDao, SmsCodeEntity> i
    }
    @Override
    public boolean validate(String uuid, String code, String phone) {
    public void validate(String uuid, String code, String phone)  throws RRException{
        SmsCodeEntity smsCodeEntity = this.getOne(new QueryWrapper<SmsCodeEntity>().eq("uuid", uuid));
        if (smsCodeEntity == null) {
            return false;
            throw new RRException("验证码不正确");
        }
        if (smsCodeEntity.getCode().equalsIgnoreCase(code) && smsCodeEntity.getPhone().equalsIgnoreCase(phone)
                && smsCodeEntity.getExpireTime().getTime() >= System.currentTimeMillis()) {
            // 删除验证码
            this.removeById(uuid);
            return true;
        } else {
            throw new RRException("验证码不正确");
        }
        return false;
    }
}