Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

code/WebApp/vue/.env.development

@@ -4,7 +4,7 @@ ENV = 'development'
 # base api
 VUE_APP_BASE_API = 'http://dev.ccwin-in.com:10582'
 # authserver api
-VUE_APP_AUTHSERVER_API= 'http://dev.ccwin-in.com:10580'
+VUE_APP_AUTHSERVER_API= 'http://dev.ccwin-in.com:10582'
 
 # app_storage_api
  VUE_APP_STORAGE_API= 'http://localhost:59958'

code/WebApp/vue/.env.production

@@ -2,9 +2,9 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = 'http://microserverappgateway.domain.com'
+VUE_APP_BASE_API = 'http://dev.ccwin-in.com:10582'
 # authserver api
-VUE_APP_AUTHSERVER_API= 'http://microserverauth.domain.com'
+VUE_APP_AUTHSERVER_API= 'http://dev.ccwin-in.com:10582'
 
 # app_storage_api
 VUE_APP_STORAGE_API= 'microserverfilestorage.domain.com'

code/WebApp/vue/src/store/modules/user.js

@@ -55,10 +55,9 @@ const actions = {
     })
   },
 
-  
   userLogin({ commit }, data) { // 用户登录
     return new Promise((resolve, reject) => {
-      axiosMethods.instancePosts('/connect/token', data)
+      axiosMethods.instancePosts('/api/connect-token', data)
         .then(response => {
           commit('SET_TOKEN', response.access_token)
           setToken(response.access_token)
@@ -68,6 +67,18 @@ const actions = {
         })
     })
   },
+  // userLogin({ commit }, data) { // 用户登录
+  //   return new Promise((resolve, reject) => {
+  //     axiosMethods.instancePosts('/connect/token', data)
+  //       .then(response => {
+  //         commit('SET_TOKEN', response.access_token)
+  //         setToken(response.access_token)
+  //         resolve()
+  //       }).catch((error) => {
+  //         reject(error)
+  //       })
+  //   })
+  // },
   // get user info
   getInfo({ commit }) {
     return new Promise((resolve, reject) => {