From 6704db81085a526c783b5ce0c28c03429aaa88a7 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 01 Sep 2020 13:31:00 +0800
Subject: [PATCH] 移除 OAuth2 改为 Redis
---
ruoyi-ui/src/store/modules/user.js | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index c097710..7b5ceaf 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)
@@ -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