From 61432480c8866ce0af8313dea367b2777e30b644 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 7 Mar 2021 11:06:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/common/core/text/Convert.java   | 21 +++++++++++++------
 ruoyi-ui/src/permission.js                    |  6 ++----
 ruoyi-ui/src/store/modules/user.js            |  2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
index 8108c0ca..515cf0bc 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
@@ -785,19 +785,28 @@ public class Convert
      * @param charset 字符集
      * @return 字符串
      */
-    public static String str(Object obj, Charset charset) {
-        if (null == obj) {
+    public static String str(Object obj, Charset charset)
+    {
+        if (null == obj)
+        {
             return null;
         }
 
-        if (obj instanceof String) {
+        if (obj instanceof String)
+        {
             return (String) obj;
-        } else if (obj instanceof byte[]) {
+        }
+        else if (obj instanceof byte[])
+        {
             return str((byte[]) obj, charset);
-        } else if (obj instanceof Byte[]) {
+        }
+        else if (obj instanceof Byte[])
+        {
             byte[] bytes = ArrayUtils.toPrimitive((Byte[]) obj);
             return str(bytes, charset);
-        } else if (obj instanceof ByteBuffer) {
+        }
+        else if (obj instanceof ByteBuffer)
+        {
             return str((ByteBuffer) obj, charset);
         }
         return obj.toString();
diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js
index 2c0b1cfb..ae0bda25 100644
--- a/ruoyi-ui/src/permission.js
+++ b/ruoyi-ui/src/permission.js
@@ -19,10 +19,8 @@ router.beforeEach((to, from, next) => {
     } else {
       if (store.getters.roles.length === 0) {
         // 判断当前用户是否已拉取完user_info信息
-        store.dispatch('GetInfo').then(res => {
-          // 拉取user_info
-          const roles = res.roles
-          store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => {
+        store.dispatch('GetInfo').then(() => {
+          store.dispatch('GenerateRoutes').then(accessRoutes => {
             // 根据roles权限生成可访问的路由表
             router.addRoutes(accessRoutes) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index 91f82530..92bd8f76 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -49,7 +49,7 @@ const user = {
     // 获取用户信息
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
-        getInfo(state.token).then(res => {
+        getInfo().then(res => {
           const user = res.user
           const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组