|
@@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
|
/**
|
|
|
* 权限获取工具类
|
|
|
- *
|
|
|
+ *
|
|
|
* @author ruoyi
|
|
|
*/
|
|
|
public class SecurityUtils
|
|
@@ -72,9 +72,17 @@ public class SecurityUtils
|
|
|
{
|
|
|
// 从header获取token标识
|
|
|
String token = request.getHeader(TokenConstants.AUTHENTICATION);
|
|
|
+ token = getTokenOne(request,token);
|
|
|
return replaceTokenPrefix(token);
|
|
|
}
|
|
|
|
|
|
+ public static String getTokenOne(HttpServletRequest request,String token){
|
|
|
+ if (StringUtils.isNotBlank(token)){
|
|
|
+ token = request.getHeader("token");
|
|
|
+ }
|
|
|
+ return token;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 裁剪token前缀
|
|
|
*/
|
|
@@ -90,7 +98,7 @@ public class SecurityUtils
|
|
|
|
|
|
/**
|
|
|
* 是否为管理员
|
|
|
- *
|
|
|
+ *
|
|
|
* @param userId 用户ID
|
|
|
* @return 结果
|
|
|
*/
|