|
@@ -1,12 +1,12 @@
|
|
-import { removeToken, setToken } from '@/util/auth'
|
|
|
|
-import { getStore, setStore } from '@/util/store'
|
|
|
|
-import { isURL } from '@/util/validate'
|
|
|
|
-import { getUserInfo, loginByMobile, loginBySocial, loginByUsername, logout } from '@/api/login'
|
|
|
|
-import { deepClone, encryption } from '@/util/util'
|
|
|
|
|
|
+import {removeToken, setToken} from '@/util/auth'
|
|
|
|
+import {getStore, setStore} from '@/util/store'
|
|
|
|
+import {isURL} from '@/util/validate'
|
|
|
|
+import {getUserInfo, loginByMobile, loginBySocial, loginByUsername, logout, refeshToken} from '@/api/login'
|
|
|
|
+import {deepClone, encryption} from '@/util/util'
|
|
import webiste from '@/const/website'
|
|
import webiste from '@/const/website'
|
|
-import { GetMenu } from '@/api/admin/menu'
|
|
|
|
|
|
+import {GetMenu} from '@/api/admin/menu'
|
|
|
|
|
|
-function addPath (ele, first) {
|
|
|
|
|
|
+function addPath(ele, first) {
|
|
const propsConfig = webiste.menu.props
|
|
const propsConfig = webiste.menu.props
|
|
const propsDefault = {
|
|
const propsDefault = {
|
|
label: propsConfig.label || 'label',
|
|
label: propsConfig.label || 'label',
|
|
@@ -36,6 +36,9 @@ const user = {
|
|
name: 'menu'
|
|
name: 'menu'
|
|
}) || [],
|
|
}) || [],
|
|
menuAll: [],
|
|
menuAll: [],
|
|
|
|
+ expires_in: getStore({
|
|
|
|
+ name: 'expires_in'
|
|
|
|
+ }) || '',
|
|
access_token: getStore({
|
|
access_token: getStore({
|
|
name: 'access_token'
|
|
name: 'access_token'
|
|
}) || '',
|
|
}) || '',
|
|
@@ -45,7 +48,7 @@ const user = {
|
|
},
|
|
},
|
|
actions: {
|
|
actions: {
|
|
// 根据用户名登录
|
|
// 根据用户名登录
|
|
- LoginByUsername ({ commit }, userInfo) {
|
|
|
|
|
|
+ LoginByUsername({commit}, userInfo) {
|
|
const user = encryption({
|
|
const user = encryption({
|
|
data: userInfo,
|
|
data: userInfo,
|
|
key: 'pigxpigxpigxpigx',
|
|
key: 'pigxpigxpigxpigx',
|
|
@@ -57,6 +60,7 @@ const user = {
|
|
setToken(data.access_token)
|
|
setToken(data.access_token)
|
|
commit('SET_ACCESS_TOKEN', data.access_token)
|
|
commit('SET_ACCESS_TOKEN', data.access_token)
|
|
commit('SET_REFRESH_TOKEN', data.refresh_token)
|
|
commit('SET_REFRESH_TOKEN', data.refresh_token)
|
|
|
|
+ commit('SET_EXPIRES_IN', data.expires_in)
|
|
commit('CLEAR_LOCK')
|
|
commit('CLEAR_LOCK')
|
|
resolve()
|
|
resolve()
|
|
}).catch(error => {
|
|
}).catch(error => {
|
|
@@ -65,13 +69,14 @@ const user = {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 根据手机号登录
|
|
// 根据手机号登录
|
|
- LoginByPhone ({ commit }, userInfo) {
|
|
|
|
|
|
+ LoginByPhone({commit}, userInfo) {
|
|
return new Promise((resolve, reject) => {
|
|
return new Promise((resolve, reject) => {
|
|
loginByMobile(userInfo.mobile, userInfo.code).then(response => {
|
|
loginByMobile(userInfo.mobile, userInfo.code).then(response => {
|
|
const data = response.data
|
|
const data = response.data
|
|
setToken(data.access_token)
|
|
setToken(data.access_token)
|
|
commit('SET_ACCESS_TOKEN', data.access_token)
|
|
commit('SET_ACCESS_TOKEN', data.access_token)
|
|
commit('SET_REFRESH_TOKEN', data.refresh_token)
|
|
commit('SET_REFRESH_TOKEN', data.refresh_token)
|
|
|
|
+ commit('SET_EXPIRES_IN', data.expires_in)
|
|
commit('CLEAR_LOCK')
|
|
commit('CLEAR_LOCK')
|
|
resolve()
|
|
resolve()
|
|
}).catch(error => {
|
|
}).catch(error => {
|
|
@@ -80,13 +85,14 @@ const user = {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 根据OpenId登录
|
|
// 根据OpenId登录
|
|
- LoginBySocial ({ commit }, param) {
|
|
|
|
|
|
+ LoginBySocial({commit}, param) {
|
|
return new Promise((resolve, reject) => {
|
|
return new Promise((resolve, reject) => {
|
|
loginBySocial(param.state, param.code).then(response => {
|
|
loginBySocial(param.state, param.code).then(response => {
|
|
const data = response.data
|
|
const data = response.data
|
|
setToken(data.access_token)
|
|
setToken(data.access_token)
|
|
commit('SET_ACCESS_TOKEN', data.access_token)
|
|
commit('SET_ACCESS_TOKEN', data.access_token)
|
|
commit('SET_REFRESH_TOKEN', data.refresh_token)
|
|
commit('SET_REFRESH_TOKEN', data.refresh_token)
|
|
|
|
+ commit('SET_EXPIRES_IN', data.expires_in)
|
|
commit('CLEAR_LOCK')
|
|
commit('CLEAR_LOCK')
|
|
resolve()
|
|
resolve()
|
|
}).catch(error => {
|
|
}).catch(error => {
|
|
@@ -94,7 +100,7 @@ const user = {
|
|
})
|
|
})
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- GetUserInfo ({ commit }) {
|
|
|
|
|
|
+ GetUserInfo({commit}) {
|
|
return new Promise((resolve, reject) => {
|
|
return new Promise((resolve, reject) => {
|
|
getUserInfo().then((res) => {
|
|
getUserInfo().then((res) => {
|
|
const data = res.data.data || {}
|
|
const data = res.data.data || {}
|
|
@@ -108,11 +114,15 @@ const user = {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 刷新token
|
|
// 刷新token
|
|
- RefeshToken ({ commit }) {
|
|
|
|
|
|
+ RefeshToken({commit, state}) {
|
|
return new Promise((resolve, reject) => {
|
|
return new Promise((resolve, reject) => {
|
|
- logout().then(() => {
|
|
|
|
- commit('SET_TOKEN', new Date().getTime())
|
|
|
|
- setToken()
|
|
|
|
|
|
+ refeshToken(state.refresh_token).then(response => {
|
|
|
|
+ const data = response.data
|
|
|
|
+ setToken(data.access_token)
|
|
|
|
+ commit('SET_ACCESS_TOKEN', data.access_token)
|
|
|
|
+ commit('SET_REFRESH_TOKEN', data.refresh_token)
|
|
|
|
+ commit('SET_EXPIRES_IN', data.expires_in)
|
|
|
|
+ commit('CLEAR_LOCK')
|
|
resolve()
|
|
resolve()
|
|
}).catch(error => {
|
|
}).catch(error => {
|
|
reject(error)
|
|
reject(error)
|
|
@@ -120,7 +130,7 @@ const user = {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 登出
|
|
// 登出
|
|
- LogOut ({ commit }) {
|
|
|
|
|
|
+ LogOut({commit}) {
|
|
return new Promise((resolve, reject) => {
|
|
return new Promise((resolve, reject) => {
|
|
logout().then(() => {
|
|
logout().then(() => {
|
|
commit('SET_MENU', [])
|
|
commit('SET_MENU', [])
|
|
@@ -128,6 +138,7 @@ const user = {
|
|
commit('SET_USER_INFO', {})
|
|
commit('SET_USER_INFO', {})
|
|
commit('SET_ACCESS_TOKEN', '')
|
|
commit('SET_ACCESS_TOKEN', '')
|
|
commit('SET_REFRESH_TOKEN', '')
|
|
commit('SET_REFRESH_TOKEN', '')
|
|
|
|
+ commit('SET_EXPIRES_IN', '')
|
|
commit('SET_ROLES', [])
|
|
commit('SET_ROLES', [])
|
|
commit('DEL_ALL_TAG')
|
|
commit('DEL_ALL_TAG')
|
|
commit('CLEAR_LOCK')
|
|
commit('CLEAR_LOCK')
|
|
@@ -139,7 +150,7 @@ const user = {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 注销session
|
|
// 注销session
|
|
- FedLogOut ({ commit }) {
|
|
|
|
|
|
+ FedLogOut({commit}) {
|
|
return new Promise(resolve => {
|
|
return new Promise(resolve => {
|
|
commit('SET_MENU', [])
|
|
commit('SET_MENU', [])
|
|
commit('SET_PERMISSIONS', [])
|
|
commit('SET_PERMISSIONS', [])
|
|
@@ -154,9 +165,9 @@ const user = {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 获取系统菜单
|
|
// 获取系统菜单
|
|
- GetMenu ({
|
|
|
|
- commit
|
|
|
|
- }) {
|
|
|
|
|
|
+ GetMenu({
|
|
|
|
+ commit
|
|
|
|
+ }) {
|
|
return new Promise(resolve => {
|
|
return new Promise(resolve => {
|
|
GetMenu().then((res) => {
|
|
GetMenu().then((res) => {
|
|
const data = res.data.data
|
|
const data = res.data.data
|
|
@@ -180,6 +191,14 @@ const user = {
|
|
type: 'session'
|
|
type: 'session'
|
|
})
|
|
})
|
|
},
|
|
},
|
|
|
|
+ SET_EXPIRES_IN: (state, expires_in) => {
|
|
|
|
+ state.expires_in = expires_in
|
|
|
|
+ setStore({
|
|
|
|
+ name: 'expires_in',
|
|
|
|
+ content: state.expires_in,
|
|
|
|
+ type: 'session'
|
|
|
|
+ })
|
|
|
|
+ },
|
|
SET_REFRESH_TOKEN: (state, rfToken) => {
|
|
SET_REFRESH_TOKEN: (state, rfToken) => {
|
|
state.refresh_token = rfToken
|
|
state.refresh_token = rfToken
|
|
setStore({
|
|
setStore({
|