update 同步 ruoyi 适配改动

疯狂的狮子li

2021-08-17 52d0d62c35d01ee73d9dba7b1be99a29adc35ef2

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

@@ -1,60 +1,60 @@
package com.ruoyi.framework.web.service;



import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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.core.domain.entity.SysUser;

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

import com.ruoyi.common.enums.UserStatus;

import com.ruoyi.common.exception.ServiceException;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.system.service.ISysUserService;



/**

 * 用户验证处理

 *

 * @author ruoyi

 */

@Service

public class UserDetailsServiceImpl implements UserDetailsService

{

    private static final Logger log = LoggerFactory.getLogger(UserDetailsServiceImpl.class);



    @Autowired

    private ISysUserService userService;



    @Autowired

    private SysPermissionService permissionService;



    @Override

    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException

    {

        SysUser user = userService.selectUserByUserName(username);

        if (StringUtils.isNull(user))

        {

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

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

        }

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

        {

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

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

        }

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

        {

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

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

        }



        return createLoginUser(user);

    }



    public UserDetails createLoginUser(SysUser user)

    {

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

    }

}

package com.ruoyi.framework.web.service;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.UserStatus;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysUserService;

/**
 * 用户验证处理
 *
 * @author ruoyi
 */
@Service
public class UserDetailsServiceImpl implements UserDetailsService
{
    private static final Logger log = LoggerFactory.getLogger(UserDetailsServiceImpl.class);

    @Autowired
    private ISysUserService userService;

    @Autowired
    private SysPermissionService permissionService;

    @Override
    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
    {
        SysUser user = userService.selectUserByUserName(username);
        if (StringUtils.isNull(user))
        {
            log.info("登录用户：{} 不存在.", username);
            throw new ServiceException("登录用户：" + username + " 不存在");
        }
        else if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
        {
            log.info("登录用户：{} 已被删除.", username);
            throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
        }
        else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
        {
            log.info("登录用户：{} 已被停用.", username);
            throw new ServiceException("对不起，您的账号：" + username + " 已停用");
        }

        return createLoginUser(user);
    }

    public UserDetails createLoginUser(SysUser user)
    {
        return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
    }
}