Merge remote-tracking branch 'origin/master'

liding

2025-05-07 0ddea65ff88b3b750ff14d9deb51fa0cda8e52a1

 src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java

@@ -5,10 +5,10 @@
import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.security.core.userdetails.UserDetails;

import org.springframework.security.core.userdetails.UserDetailsService;

import org.springframework.security.core.userdetails.UsernameNotFoundException;

import org.springframework.stereotype.Service;

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.framework.security.LoginUser;

import com.ruoyi.project.system.domain.SysUser;

@@ -26,35 +26,40 @@


    @Autowired

    private ISysUserService userService;

    
    @Autowired

    private SysPasswordService passwordService;



    @Autowired

    private SysPermissionService permissionService;



    @Override

    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException

    public UserDetails loadUserByUsername(String username)

    {

        SysUser user = userService.selectUserByUserName(username);

        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);

    }



    public UserDetails createLoginUser(SysUser user)

    {

        return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));

        return new LoginUser(user.getUserId(), user.getDeptId(), user, user.getTenantId(), permissionService.getMenuPermission(user));

    }

}