优化代码

RuoYi

2023-08-14 ab99a72b65184035f48ccd0bb4f5465a0cd6b1ae

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java

@@ -10,7 +10,8 @@
import com.ruoyi.common.core.domain.entity.SysUser;

import com.ruoyi.common.core.domain.model.LoginUser;

import com.ruoyi.common.enums.UserStatus;

import com.ruoyi.common.exception.BaseException;

import com.ruoyi.common.exception.ServiceException;

import com.ruoyi.common.utils.MessageUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.system.service.ISysUserService;



@@ -26,6 +27,9 @@


    @Autowired

    private ISysUserService userService;

    
    @Autowired

    private SysPasswordService passwordService;



    @Autowired

    private SysPermissionService permissionService;

@@ -37,19 +41,21 @@
        if (StringUtils.isNull(user))

        {

            log.info("登录用户：{} 不存在.", username);

            throw new UsernameNotFoundException("登录用户：" + username + " 不存在");

            throw new ServiceException(MessageUtils.message("user.not.exists"));

        }

        else if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))

        {

            log.info("登录用户：{} 已被删除.", username);

            throw new BaseException("对不起，您的账号：" + username + " 已被删除");

            throw new ServiceException(MessageUtils.message("user.password.delete"));

        }

        else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))

        {

            log.info("登录用户：{} 已被停用.", username);

            throw new BaseException("对不起，您的账号：" + username + " 已停用");

            throw new ServiceException(MessageUtils.message("user.blocked"));

        }



        passwordService.validate(user);



        return createLoginUser(user);

    }