From 80a890549dd8361a0aa199188283f8941652c7ee Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 03 Sep 2021 16:52:14 +0800
Subject: [PATCH] 修复保存配置主题颜色失效问题
---
ruoyi-ui/src/store/modules/user.js | 33 ++++++++++++---------------------
1 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index c097710..103706d 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -1,10 +1,9 @@
import { login, logout, getInfo, refreshToken } from '@/api/login'
-import { getToken, getRefreshToken, setToken, setRefreshToken, setExpiresIn, removeToken } from '@/utils/auth'
+import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth'
const user = {
state: {
token: getToken(),
- refresh_token: getRefreshToken(),
name: '',
avatar: '',
roles: [],
@@ -17,9 +16,6 @@
},
SET_EXPIRES_IN: (state, time) => {
state.expires_in = time
- },
- SET_REFRESH_TOKEN: (state, token) => {
- state.refresh_token = token
},
SET_NAME: (state, name) => {
state.name = name
@@ -44,12 +40,11 @@
const uuid = userInfo.uuid
return new Promise((resolve, reject) => {
login(username, password, code, uuid).then(res => {
- setToken(res.access_token)
- commit('SET_TOKEN', res.access_token)
- setRefreshToken(res.refresh_token)
- commit('SET_REFRESH_TOKEN', res.refresh_token)
- setExpiresIn(res.expires_in)
- commit('SET_EXPIRES_IN', res.expires_in)
+ let data = res.data
+ setToken(data.access_token)
+ commit('SET_TOKEN', data.access_token)
+ setExpiresIn(data.expires_in)
+ commit('SET_EXPIRES_IN', data.expires_in)
resolve()
}).catch(error => {
reject(error)
@@ -60,9 +55,9 @@
// 获取用户信息
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/image/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+ const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : user.avatar;
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions)
@@ -77,17 +72,13 @@
})
})
},
-
+
// 刷新token
RefreshToken({commit, state}) {
return new Promise((resolve, reject) => {
- refreshToken(state.refresh_token).then(res => {
- setToken(res.access_token)
- commit('SET_TOKEN', res.access_token)
- setRefreshToken(res.refresh_token)
- commit('SET_REFRESH_TOKEN', res.refresh_token)
- setExpiresIn(res.expires_in)
- commit('SET_EXPIRES_IN', res.expires_in)
+ refreshToken(state.token).then(res => {
+ setExpiresIn(res.data)
+ commit('SET_EXPIRES_IN', res.data)
resolve()
}).catch(error => {
reject(error)
--
Gitblit v1.9.3