login

pom.xml

@@ -77,11 +77,11 @@
			<artifactId>spring-boot-configuration-processor</artifactId>
			<optional>true</optional>
		</dependency>
		<!--<dependency>-->
			<!--<groupId>org.springframework.boot</groupId>-->
			<!--<artifactId>spring-boot-devtools</artifactId>-->
			<!--<optional>true</optional>-->
		<!--</dependency>-->
		<dependency>
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-devtools</artifactId>
			<optional>true</optional>
		</dependency>
		<dependency>
			<groupId>com.baomidou</groupId>
			<artifactId>mybatis-plus-boot-starter</artifactId>

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

@@ -39,7 +39,7 @@ public class MemberEntity implements Serializable {
	 * 密码
	 */
	@NotBlank(message="密码不能为空", groups = AddGroup.class)
	@JsonIgnore
	// @JsonIgnore
	private String password;
	/**
	 * 盐

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

@@ -41,13 +41,14 @@ public class AppRegisterController {
    // @ApiOperation("注册")
    // public R register(@RequestBody RegisterForm form){
    //     //表单校验
    //     ValidatorUtils.validateEntity(form);
        //  ValidatorUtils.validateEntity(form);
    //     UserEntity user = new UserEntity();
    //     user.setPhone(form.getPhone());
    //     user.setUsername(form.getPhone());
    //     user.setTruename(form.getTruename());
    //     userService.saveMember(user);
        //  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();
    // }

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

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

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

@@ -22,9 +22,9 @@ import javax.validation.constraints.NotBlank;
@Data
@ApiModel(value = "登录表单")
public class LoginForm {
    @ApiModelProperty(value = "手机号")
    @NotBlank(message="手机号不能为空")
    private String mobile;
    @ApiModelProperty(value = "账号")
    @NotBlank(message="账号(手机号)不能为空")
    private String username;
    @ApiModelProperty(value = "密码")
    @NotBlank(message="密码不能为空")

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

@@ -20,7 +20,7 @@ import io.renren.modules.app.form.LoginForm;
 */
public interface UserService extends IService<UserEntity> {
	UserEntity queryByMobile(String mobile);
	UserEntity queryByUsername(String username);
	/**
	 * 用户登录

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

@@ -29,18 +29,18 @@ import org.springframework.transaction.annotation.Transactional;
public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements UserService {
	@Override
	public UserEntity queryByMobile(String mobile) {
		return baseMapper.selectOne(new QueryWrapper<UserEntity>().eq("mobile", mobile));
	public UserEntity queryByUsername(String username) {
		return baseMapper.selectOne(new QueryWrapper<UserEntity>().eq("username", username));
	}
	@Override
	public long login(LoginForm form) {
		UserEntity user = queryByMobile(form.getMobile());
		Assert.isNull(user, "手机号或密码错误");
		UserEntity user = queryByUsername(form.getUsername());
		Assert.isNull(user, "账号或密码错误");
		//密码错误
		if(!user.getPassword().equals(DigestUtils.sha256Hex(form.getPassword()))){
			throw new RRException("手机号或密码错误");
		// if(!user.getPassword().equals(DigestUtils.sha256Hex(form.getPassword()))){
		if(!user.getPassword().equals(new Sha256Hash(form.getPassword(), user.getSalt()).toHex())){
			throw new RRException("账号或密码错误1");
		}
		return user.getUserId();