mirror of
				https://github.com/continew-org/continew-admin.git
				synced 2025-11-04 09:01:37 +08:00 
			
		
		
		
	优化:使用枚举存储性别、状态等信息(采用 MyBatis Plus#通用枚举扩展),常量类则专注于存储全局变量,例如:缓存键、默认值等
This commit is contained in:
		@@ -24,7 +24,7 @@ import cn.dev33.satoken.stp.StpUtil;
 | 
			
		||||
import cn.hutool.core.bean.BeanUtil;
 | 
			
		||||
 | 
			
		||||
import top.charles7c.cnadmin.auth.service.LoginService;
 | 
			
		||||
import top.charles7c.cnadmin.common.consts.CommonConstants;
 | 
			
		||||
import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
 | 
			
		||||
import top.charles7c.cnadmin.common.model.dto.LoginUser;
 | 
			
		||||
import top.charles7c.cnadmin.common.util.CheckUtils;
 | 
			
		||||
import top.charles7c.cnadmin.common.util.SecureUtils;
 | 
			
		||||
@@ -53,7 +53,7 @@ public class LoginServiceImpl implements LoginService {
 | 
			
		||||
        CheckUtils.exIfNull(sysUser, "用户名或密码错误");
 | 
			
		||||
        Long userId = sysUser.getUserId();
 | 
			
		||||
        CheckUtils.exIfNotEqual(sysUser.getPassword(), SecureUtils.md5Salt(password, userId.toString()), "用户名或密码错误");
 | 
			
		||||
        CheckUtils.exIfEqual(CommonConstants.STATUS_DISABLE, sysUser.getStatus(), "此账号已被禁用,如有疑问,请联系管理员");
 | 
			
		||||
        CheckUtils.exIfEqual(DisEnableStatusEnum.DISABLE, sysUser.getStatus(), "此账号已被禁用,如有疑问,请联系管理员");
 | 
			
		||||
 | 
			
		||||
        // 登录
 | 
			
		||||
        LoginUser loginUser = BeanUtil.copyProperties(sysUser, LoginUser.class);
 | 
			
		||||
 
 | 
			
		||||
@@ -23,6 +23,8 @@ import lombok.Data;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableId;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableName;
 | 
			
		||||
 | 
			
		||||
import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
 | 
			
		||||
import top.charles7c.cnadmin.common.enums.GenderEnum;
 | 
			
		||||
import top.charles7c.cnadmin.common.model.entity.BaseEntity;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
@@ -61,7 +63,7 @@ public class SysUser extends BaseEntity {
 | 
			
		||||
    /**
 | 
			
		||||
     * 性别(0未知 1男 2女)
 | 
			
		||||
     */
 | 
			
		||||
    private Integer gender;
 | 
			
		||||
    private GenderEnum gender;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 手机号码
 | 
			
		||||
@@ -86,7 +88,7 @@ public class SysUser extends BaseEntity {
 | 
			
		||||
    /**
 | 
			
		||||
     * 状态(1启用 2禁用)
 | 
			
		||||
     */
 | 
			
		||||
    private Integer status;
 | 
			
		||||
    private DisEnableStatusEnum status;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 最后一次修改密码的时间
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user