From d3b5e93952a24a42d3942d2245c32336f4f73b39 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 21 Mar 2026 20:51:34 +0800
Subject: [PATCH] 优化RightToolbar搜索栏切换动画
---
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
index 78a5393..b50f4b1 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
@@ -1,13 +1,14 @@
package com.ruoyi.common.security.utils;
-import javax.servlet.http.HttpServletRequest;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.TokenConstants;
+import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.context.SecurityContextHolder;
import com.ruoyi.common.core.utils.ServletUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.system.api.model.LoginUser;
+import jakarta.servlet.http.HttpServletRequest;
/**
* 权限获取工具类
@@ -62,7 +63,7 @@
public static String getToken(HttpServletRequest request)
{
// 从header获取token标识
- String token = request.getHeader(TokenConstants.AUTHENTICATION);
+ String token = request.getHeader(SecurityConstants.AUTHORIZATION_HEADER);
return replaceTokenPrefix(token);
}
@@ -82,12 +83,22 @@
/**
* 是否为管理员
*
+ * @return 结果
+ */
+ public static boolean isAdmin()
+ {
+ return isAdmin(getUserId());
+ }
+
+ /**
+ * 是否为管理员
+ *
* @param userId 用户ID
* @return 结果
*/
public static boolean isAdmin(Long userId)
{
- return userId != null && 1L == userId;
+ return UserConstants.isAdmin(userId);
}
/**
--
Gitblit v1.9.3