..

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

@@ -8,6 +8,7 @@
package io.renren.modules.app.controller;
import io.renren.common.utils.MyUtils;
import io.renren.common.utils.R;
import io.renren.common.validator.Assert;
import io.renren.common.validator.ValidatorUtils;
@@ -51,7 +52,8 @@ public class AppLoginController {
        smsCodeService.validate(form.getUuid(), form.getCode(), form.getPhone());
        //用户登录
        UserEntity user =  userService.queryByPhone(form.getPhone());
        String symbol = MyUtils.md5(form.getTurename() + form.getPhone());
        UserEntity user =  userService.queryBySymbol(symbol);
        Assert.isNull(user, "手机号错误");
        long userId = user.getUserId();

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

@@ -22,13 +22,14 @@ public class LoginForm {
    // @ApiModelProperty(value = "手机号")
    // @NotBlank(message="手机号不能为空")
    // private String mobile;
    // @ApiModelProperty(value = "密码")
    // @NotBlank(message="密码不能为空")
    // private String password;
    @NotBlank(message="手机号不能为空")
    private String phone;
    @NotBlank(message="姓名不能为空")
    private String turename;
    @NotBlank(message="短信验证码不能为空")
    private String code;
    private String uuid;

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

@@ -22,6 +22,8 @@ public interface UserService extends IService<UserEntity> {
	UserEntity queryByPhone(String phone);
	UserEntity queryBySymbol(String symbol);
	/**
	 * 用户登录
	 * @param form    登录表单

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

@@ -48,7 +48,7 @@ public class SmsCodeServiceImpl extends ServiceImpl<SmsCodeDao, SmsCodeEntity> i
    public void validate(String uuid, String code, String phone)  throws RRException{
        SmsCodeEntity smsCodeEntity = this.getOne(new QueryWrapper<SmsCodeEntity>().eq("uuid", uuid));
        if (smsCodeEntity == null) {
            throw new RRException("验证码不正确");
            throw new RRException("验证码不正确1");
        }
        if (smsCodeEntity.getCode().equalsIgnoreCase(code) && smsCodeEntity.getPhone().equalsIgnoreCase(phone)
@@ -56,7 +56,7 @@ public class SmsCodeServiceImpl extends ServiceImpl<SmsCodeDao, SmsCodeEntity> i
            // 删除验证码
            this.removeById(uuid);
        } else {
            throw new RRException("验证码不正确");
            throw new RRException("验证码不正确2");
        }
    }
}

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

@@ -29,6 +29,11 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
		return baseMapper.selectOne(new QueryWrapper<UserEntity>().eq("phone", phone));
	}
	@Override
	public UserEntity queryBySymbol(String symbol) {
		return this.getOne(new QueryWrapper<UserEntity>().eq("symbol", symbol));
	}
	// @Override
	// public long login(LoginForm form) {
	// 	UserEntity user = queryByPhone(form.getMobile());