Merge branch 'dev_wanke' of git.sagacloud.cn:sagacloud/sagacloud-cwc-pages into dev_wanke

package.json

@@ -13,9 +13,7 @@
     "axios": "^0.19.0",
     "echarts": "^4.2.1",
     "element-ui": "^2.9.1",
-    "mkdirp": "^1.0.3",
     "moment": "^2.24.0",
-    "node-releases": "^1.1.52",
     "vue": "^2.5.2",
     "vue-router": "^3.0.1"
   },

src/router/index.js

@@ -94,7 +94,7 @@ router.beforeEach(async (to, from, next) => {
       query: to.query
     }
     store.commit('setLastRoute', lastRoute)
-    let ssoServer = 'http://sso.sagacloud.cn'
+    let ssoServer = 'http://10.199.143.85:7003'
     let redirectUrl = window.location.protocol + '//' + window.location.host + '/auth'
     window.location.href = `${ssoServer}/login?redirectUrl=${redirectUrl}`
   }

src/store/index.js

@@ -10,8 +10,7 @@ const store = new Vuex.Store({
   modules: {},
   state: {
     name: '这里是全局的',
-    projects: [
-    ],
+    projects: [],
     projectId: 'Pj4419000005',
     comeUrl: '',
     flag: 'wanke',
@@ -49,20 +48,32 @@ const store = new Vuex.Store({
       state.lastRoute = val
       storage.set(KEY_LAST_ROUTE, val)
     },
-    setUserInfo(state, { userInfo }) {
+    setUserInfo(state, {
+      userInfo
+    }) {
       state.userInfo = userInfo
     }
   },
   actions: {
-    async loadUserInfo(context, { token }) {
-      let res = await axios.get('/server/userInfo', { params: { token: token } })
+    async loadUserInfo(context, {
+      token
+    }) {
+      let res = await axios.get('/server/userInfo', {
+        params: {
+          token: token
+        }
+      })
       if (res.data.result == 'success') {
         // commit 到vuex， 供全局使用
-        context.commit('setUserInfo', { userInfo: res.data })
-        context.commit('setProjects', { projects: res.data.projects })
+        context.commit('setUserInfo', {
+          userInfo: res.data
+        })
+        context.commit('setProjects', {
+          projects: res.data.projects
+        })
         localStorage.setItem('token', token)
       } else {
-        let ssoServer = 'http://sso.sagacloud.cn'
+        let ssoServer = 'http://10.199.143.85:7003'
         let redirectUrl = window.location.protocol + '//' + window.location.host + '/auth'
         window.location.href = `${ssoServer}/login?redirectUrl=${redirectUrl}`
       }