Merge remote-tracking branch 'upstream/master' into dev_lcw

# Conflicts:
#	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
This commit is contained in:
hsdllcw
2024-11-07 11:59:30 +08:00
7 changed files with 18 additions and 14 deletions

View File

@@ -20,7 +20,7 @@ public class SecurityConstants
/**
* 授权信息字段
*/
public static final String AUTHORIZATION_HEADER = "authorization";
public static final String AUTHORIZATION_HEADER = "Authorization";
/**
* 请求来源

View File

@@ -7,11 +7,6 @@ package com.ruoyi.common.core.constant;
*/
public class TokenConstants
{
/**
* 令牌自定义标识
*/
public static final String AUTHENTICATION = "Authorization";
/**
* 令牌前缀
*/

View File

@@ -62,7 +62,7 @@ public class SecurityUtils
public static String getToken(HttpServletRequest request)
{
// 从header获取token标识
String token = request.getHeader(TokenConstants.AUTHENTICATION);
String token = request.getHeader(SecurityConstants.AUTHORIZATION_HEADER);
return replaceTokenPrefix(token);
}