diff --git a/.env.prod b/.env.prod index 6fd6f89..f4092ba 100644 --- a/.env.prod +++ b/.env.prod @@ -1,5 +1,6 @@ # backend service base url, prod environment -VITE_SERVICE_BASE_URL=http://154.219.110.17:8080/api +# VITE_SERVICE_BASE_URL=http://154.219.110.17:8080/api +VITE_SERVICE_BASE_URL=https://test.tju.edu.kg/api # other backend service base url, prod environment # VITE_OTHER_SERVICE_BASE_URL= `{ diff --git a/.env.test b/.env.test index b121306..478dc1b 100644 --- a/.env.test +++ b/.env.test @@ -1,6 +1,6 @@ # backend service base url, test environment -VITE_SERVICE_BASE_URL=http://localhost:8080/api -#VITE_SERVICE_BASE_URL=http://154.219.110.17:8080/api +#VITE_SERVICE_BASE_URL=http://localhost:8080/api +VITE_SERVICE_BASE_URL=http://154.219.110.17:8080/api # # other backend service base url, test environment # VITE_OTHER_SERVICE_BASE_URL= `{ diff --git a/packages/axios/src/index.ts b/packages/axios/src/index.ts index c29d9d2..1eccd49 100644 --- a/packages/axios/src/index.ts +++ b/packages/axios/src/index.ts @@ -52,7 +52,9 @@ function createCommonRequest( async response => { const responseType: ResponseType = (response.config?.responseType as ResponseType) || 'json'; + response.data.errorMsg = "success"; if (responseType !== 'json' || opts.isBackendSuccess(response)) { + console.log("true") return Promise.resolve(response); } @@ -60,9 +62,14 @@ function createCommonRequest( if (fail) { return fail; } + + // console.log('...Response Data:', response.data); + // const isSuccess = opts.isBackendSuccess(response); + // console.log('...Is Backend Success:', isSuccess); + const backendErrorMessage = response.data?.message || 'the backend request error.'; const backendError = new AxiosError( - 'the backend request error', + backendErrorMessage, BACKEND_ERROR_CODE, response.config, response.request, @@ -72,10 +79,11 @@ function createCommonRequest( await opts.onError(backendError); return Promise.reject(backendError); + }, async (error: AxiosError) => { await opts.onError(error); - + return Promise.reject(error); } ); diff --git a/src/store/modules/auth/index.ts b/src/store/modules/auth/index.ts index a8b4da3..2b9ea29 100644 --- a/src/store/modules/auth/index.ts +++ b/src/store/modules/auth/index.ts @@ -107,12 +107,8 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => { async function getUserInfo() { const { response, error } = await fetchGetUserInfo(); let data:any = response.data.data - - //console.log(data.name) - //console.log(error?.status == 200) if (error?.status == 200) { - console.log("200") let info: Api.Auth.UserInfo = { userId: data.employeeId.toString(), userName: data.name, @@ -121,10 +117,11 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => { }; Object.assign(userInfo, info); - console.log("getUserInfo") + console.log("getUserInfo true") return true; } + console.log("getUserInfo false") return false; } diff --git a/src/views/_builtin/login/modules/pwd-login.vue b/src/views/_builtin/login/modules/pwd-login.vue index a45d62e..54ab090 100644 --- a/src/views/_builtin/login/modules/pwd-login.vue +++ b/src/views/_builtin/login/modules/pwd-login.vue @@ -57,15 +57,18 @@ async function handleSubmit() { /> + {{ $t('common.confirm') }} + diff --git a/src/views/plan/index.vue b/src/views/plan/index.vue index b35005d..3086148 100644 --- a/src/views/plan/index.vue +++ b/src/views/plan/index.vue @@ -1,6 +1,6 @@ -