zc

src/store/modules/user.js

@@ -1,5 +1,7 @@
 import { login, logout, getInfo, refreshToken } from '@/api/login'
 import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth'
+import store from '@/store'
+import router from '@/router'
 
 const user = {
   state: {
@@ -70,23 +72,24 @@ const user = {
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
-          const user = res.user
-          const avatar = user.avatar == "" ? require("@/assets/ZDimages/tx_cion.png") : 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_ROLES', ['placeholder'])
-          commit('SET_PERMISSIONS', res.permissions)
-
-          commit('SET_NAME', user.userName)
-          commit('SET_AVATAR', avatar)
-          localStorage.setItem('user',JSON.stringify(user));
-          resolve(res)
+          if(res){
+            let user = res.user
+            let avatar = user.avatar == "" ? require("@/assets/ZDimages/tx_cion.png") : user.avatar;
+            commit('SET_ROLES', ['placeholder'])
+            commit('SET_PERMISSIONS', res.permissions)
+            commit('SET_NAME', user.userName)
+            commit('SET_AVATAR', avatar)
+            localStorage.setItem('user',JSON.stringify(user));
+            resolve(res)
+          }else{
+            store.dispatch('LogOut').then(() => {
+              localStorage.removeItem('serviceType');
+              router.replace({
+                path: '/login'
+              })
+            })
+            return
+          }
         }).catch(error => {
           reject(error)
         })