From a95be9d41827d970a26d0c89b92780fab1f52e62 Mon Sep 17 00:00:00 2001
From: DokiYolo <857815116@qq.com>
Date: Wed, 06 Jan 2021 10:06:57 +0800
Subject: [PATCH] 解决header获取username中文情况下乱码

---
 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecurityUtils.java |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 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 dbba358..36eb90c 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,8 +1,14 @@
 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;
 
 /**
  * 权限获取工具类
@@ -16,7 +22,13 @@
      */
     public static String getUsername()
     {
-        return ServletUtils.getRequest().getHeader(CacheConstants.DETAILS_USERNAME);
+        String username = "";
+        try {
+            username = URLDecoder.decode(ServletUtils.getRequest().getHeader(CacheConstants.DETAILS_USERNAME), "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new BaseException("获取username失败");
+        }
+        return username;
     }
 
     /**
@@ -28,6 +40,27 @@
     }
 
     /**
+     * 获取请求token
+     */
+    public static String getToken()
+    {
+        return getToken(ServletUtils.getRequest());
+    }
+
+    /**
+     * 根据request获取请求token
+     */
+    public static String getToken(HttpServletRequest request)
+    {
+        String token = ServletUtils.getRequest().getHeader(CacheConstants.HEADER);
+        if (StringUtils.isNotEmpty(token) && token.startsWith(CacheConstants.TOKEN_PREFIX))
+        {
+            token = token.replace(CacheConstants.TOKEN_PREFIX, "");
+        }
+        return token;
+    }
+
+    /**
      * 是否为管理员
      * 
      * @param userId 用户ID

--
Gitblit v1.9.3