Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-12-27 dd37247e65374dd4ef7e8e8b9212d8f29023e301

 ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java

@@ -2,9 +2,13 @@

import cn.hutool.http.HttpStatus;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.service.IUserService;
import com.ruoyi.common.core.service.UserService;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.spring.SpringUtils;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;

/**
@@ -12,42 +16,15 @@
 *
 * @author Long Li
 */
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class SecurityUtils {
    /**
     * 用户ID
     **/
    public static Long getUserId() {
        return LoginUtils.getUserId();
    }

    /**
     * 获取部门ID
     **/
    public static Long getDeptId() {
        try {
            return getUser().getDeptId();
        } catch (Exception e) {
            throw new ServiceException("获取部门ID异常", HttpStatus.HTTP_UNAUTHORIZED);
        }
    }

    /**
     * 获取用户账户
     **/
    public static String getUsername() {
        try {
            return getUser().getUserName();
        } catch (Exception e) {
            throw new ServiceException("获取用户账户异常", HttpStatus.HTTP_UNAUTHORIZED);
        }
    }

    /**
     * 获取用户
     **/
    public static SysUser getUser() {
        try {
            return SpringUtils.getBean(IUserService.class).selectUserById(getUserId());
            return SpringUtils.getBean(UserService.class).selectUserById(LoginUtils.getUserId());
        } catch (Exception e) {
            throw new ServiceException("获取用户信息异常", HttpStatus.HTTP_UNAUTHORIZED);
        }