From 352bbbc132960ad6a1fd5c59e2adfbae3e670c11 Mon Sep 17 00:00:00 2001
From: fangdawei <44673626@qq.com>
Date: Wed, 28 Jun 2023 11:47:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=EF=BC=8C=E7=BB=9F=E4=B8=80=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E8=B0=83=E7=94=A8=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=8D=B3=EF=BC=9Ahttp://dev.ccwin-in.com:10582=20=E4=BA=8C?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=86ids4=E7=9A=84token=E6=8E=A5=E5=8F=A3=E6=94=B9?=
 =?UTF-8?q?=E6=88=90/api/connect-token=E5=BD=A2=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/WebApp/vue/.env.development          |  2 +-
 code/WebApp/vue/.env.production           |  4 ++--
 code/WebApp/vue/src/store/modules/user.js | 15 +++++++++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/code/WebApp/vue/.env.development b/code/WebApp/vue/.env.development
index 9e566165..e36ca0f2 100644
--- a/code/WebApp/vue/.env.development
+++ b/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'
diff --git a/code/WebApp/vue/.env.production b/code/WebApp/vue/.env.production
index c85e34ab..5302f2d4 100644
--- a/code/WebApp/vue/.env.production
+++ b/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'
diff --git a/code/WebApp/vue/src/store/modules/user.js b/code/WebApp/vue/src/store/modules/user.js
index c53db7f3..a5373afc 100644
--- a/code/WebApp/vue/src/store/modules/user.js
+++ b/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) => {