From 7a35c474d6153189957422264b57df7ce1daed77 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 29 Jul 2021 14:51:27 +0800
Subject: [PATCH] 统一网关错误码响应
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecurityUtils.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecurityUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecurityUtils.java
index 36eb90c..b7b7b66 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecurityUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecurityUtils.java
@@ -1,14 +1,9 @@
package com.ruoyi.common.core.utils;
import javax.servlet.http.HttpServletRequest;
-
-import com.ruoyi.common.core.exception.BaseException;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.text.Convert;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
/**
* 权限获取工具类
@@ -22,13 +17,8 @@
*/
public static String getUsername()
{
- String username = "";
- try {
- username = URLDecoder.decode(ServletUtils.getRequest().getHeader(CacheConstants.DETAILS_USERNAME), "UTF-8");
- } catch (UnsupportedEncodingException e) {
- throw new BaseException("获取username失败");
- }
- return username;
+ String username = ServletUtils.getRequest().getHeader(CacheConstants.DETAILS_USERNAME);
+ return ServletUtils.urlDecode(username);
}
/**
@@ -52,7 +42,15 @@
*/
public static String getToken(HttpServletRequest request)
{
- String token = ServletUtils.getRequest().getHeader(CacheConstants.HEADER);
+ String token = request.getHeader(CacheConstants.TOKEN_AUTHENTICATION);
+ return replaceTokenPrefix(token);
+ }
+
+ /**
+ * 替换token前缀
+ */
+ public static String replaceTokenPrefix(String token)
+ {
if (StringUtils.isNotEmpty(token) && token.startsWith(CacheConstants.TOKEN_PREFIX))
{
token = token.replace(CacheConstants.TOKEN_PREFIX, "");
--
Gitblit v1.9.3