Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0

nezha-fronted/src/components/common/login.vue

@@ -167,15 +167,6 @@ export default {
             // 登录成功，记录用户名、token和lang
             this.authToken = res.data.authToken
             sessionStorage.setItem('nz-token', res.data.authToken)
-            this.$get('/sys/user/profile').then(response => {
-              if (response.code === 200) {
-                const userList = response.user
-                console.log(userList)
-                // 保存当前用户的 userId
-                localStorage.setItem('nz-user-id', userList.id)
-                localStorage.setItem('nz-user-name', userList.name)
-              }
-            })
             if (res.data.authFlag === 1) {
               if (res.data.authBind === 0) {
                 this.verifyShow = true

nezha-fronted/src/store/user.js

@@ -1,4 +1,4 @@
-import { post } from '../http'
+import { post, get } from '../http'
 import router from '../router'
 import bus from '../libs/bus'
 import { sortByOrderNum } from '../permission'
@@ -65,6 +65,15 @@ const user = {
           }
         })
       })
+      get('/sys/user/profile').then(response => {
+        if (response.code === 200) {
+          const userList = response.user
+          console.log(userList)
+          // 保存当前用户的 userId
+          localStorage.setItem('nz-user-id', userList.id)
+          localStorage.setItem('nz-user-name', userList.name)
+        }
+      })
     },
     logoutSuccess (store, res) {
       sessionStorage.removeItem('nz-username')