From 61432480c8866ce0af8313dea367b2777e30b644 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 07 三月 2021 11:06:47 +0800
Subject: [PATCH] 删除多余的代码
---
ruoyi-common/src/main/java/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 8108c0c..515cf0b 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 @@
* @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 2c0b1cf..ae0bda2 100644
--- a/ruoyi-ui/src/permission.js
+++ b/ruoyi-ui/src/permission.js
@@ -19,10 +19,8 @@
} 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 91f8253..92bd8f7 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -49,7 +49,7 @@
// 鑾峰彇鐢ㄦ埛淇℃伅
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) { // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
--
Gitblit v1.9.3