|
@@ -7,7 +7,8 @@ const user = {
|
|
|
name: '',
|
|
|
avatar: '',
|
|
|
roles: [],
|
|
|
- permissions: []
|
|
|
+ permissions: [],
|
|
|
+ user_id: ''
|
|
|
},
|
|
|
|
|
|
mutations: {
|
|
@@ -17,6 +18,9 @@ const user = {
|
|
|
SET_NAME: (state, name) => {
|
|
|
state.name = name
|
|
|
},
|
|
|
+ SET_USER_ID: (state, user_id) => {
|
|
|
+ state.user_id = user_id
|
|
|
+ },
|
|
|
SET_AVATAR: (state, avatar) => {
|
|
|
state.avatar = avatar
|
|
|
},
|
|
@@ -36,49 +40,60 @@ const user = {
|
|
|
const code = userInfo.code
|
|
|
const uuid = userInfo.uuid
|
|
|
return new Promise((resolve, reject) => {
|
|
|
- login(username, password, code, uuid).then(res => {
|
|
|
- setToken(res.token)
|
|
|
- commit('SET_TOKEN', res.token)
|
|
|
- resolve()
|
|
|
- }).catch(error => {
|
|
|
- reject(error)
|
|
|
- })
|
|
|
+ login(username, password, code, uuid)
|
|
|
+ .then(res => {
|
|
|
+ setToken(res.token)
|
|
|
+ commit('SET_TOKEN', res.token)
|
|
|
+ resolve()
|
|
|
+ })
|
|
|
+ .catch(error => {
|
|
|
+ reject(error)
|
|
|
+ })
|
|
|
})
|
|
|
},
|
|
|
|
|
|
// 获取用户信息
|
|
|
GetInfo({ commit, state }) {
|
|
|
return new Promise((resolve, reject) => {
|
|
|
- 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是否是一个非空数组
|
|
|
- commit('SET_ROLES', res.roles)
|
|
|
- commit('SET_PERMISSIONS', res.permissions)
|
|
|
- } else {
|
|
|
- commit('SET_ROLES', ['ROLE_DEFAULT'])
|
|
|
- }
|
|
|
- commit('SET_NAME', user.userName)
|
|
|
- commit('SET_AVATAR', avatar)
|
|
|
- resolve(res)
|
|
|
- }).catch(error => {
|
|
|
- reject(error)
|
|
|
- })
|
|
|
+ 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是否是一个非空数组
|
|
|
+ commit('SET_ROLES', res.roles)
|
|
|
+ commit('SET_PERMISSIONS', res.permissions)
|
|
|
+ } else {
|
|
|
+ commit('SET_ROLES', ['ROLE_DEFAULT'])
|
|
|
+ }
|
|
|
+ commit('SET_NAME', user.userName)
|
|
|
+ commit('SET_AVATAR', avatar)
|
|
|
+ commit('SET_USER_ID', user.userId)
|
|
|
+ resolve(res)
|
|
|
+ })
|
|
|
+ .catch(error => {
|
|
|
+ reject(error)
|
|
|
+ })
|
|
|
})
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
// 退出系统
|
|
|
LogOut({ commit, state }) {
|
|
|
return new Promise((resolve, reject) => {
|
|
|
- logout(state.token).then(() => {
|
|
|
- commit('SET_TOKEN', '')
|
|
|
- commit('SET_ROLES', [])
|
|
|
- commit('SET_PERMISSIONS', [])
|
|
|
- removeToken()
|
|
|
- resolve()
|
|
|
- }).catch(error => {
|
|
|
- reject(error)
|
|
|
- })
|
|
|
+ logout(state.token)
|
|
|
+ .then(() => {
|
|
|
+ commit('SET_TOKEN', '')
|
|
|
+ commit('SET_ROLES', [])
|
|
|
+ commit('SET_PERMISSIONS', [])
|
|
|
+ removeToken()
|
|
|
+ resolve()
|
|
|
+ })
|
|
|
+ .catch(error => {
|
|
|
+ reject(error)
|
|
|
+ })
|
|
|
})
|
|
|
},
|
|
|
|