fixed base url issue in docker

crawlab-team · Nov 5, 2021 · e2bea31 · e2bea31
1 parent 8a89eac
commit e2bea31
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "crawlab-ui",
-  "version": "0.6.0-beta.202111032108",
+  "version": "0.6.0-beta.202111052136",
   "private": false,
   "author": {
     "name": "Marvin Zhang",

diff --git a/src/components/index.ts b/src/components/index.ts
@@ -33,6 +33,8 @@ import FormItem from './form/FormItem.vue';
 import FormReadonlyValue from './form/FormReadonlyValue.vue';
 import FormTable from './form/FormTable.vue';
 import FormTableField from './form/FormTableField.vue';
+import GitFileStatus from './git/GitFileStatus.vue';
+import GitForm from './git/GitForm.vue';
 import AtomMaterialIcon from './icon/AtomMaterialIcon.vue';
 import Icon from './icon/Icon.vue';
 import MenuItemIcon from './icon/MenuItemIcon.vue';
@@ -141,6 +143,8 @@ export {
   FormReadonlyValue as ClFormReadonlyValue,
   FormTable as ClFormTable,
   FormTableField as ClFormTableField,
+  GitFileStatus as ClGitFileStatus,
+  GitForm as ClGitForm,
   AtomMaterialIcon as ClAtomMaterialIcon,
   Icon as ClIcon,
   MenuItemIcon as ClMenuItemIcon,

diff --git a/src/interfaces/global.d.ts b/src/interfaces/global.d.ts
@@ -1,4 +1,5 @@
 interface Window {
+  VUE_APP_API_BASE_URL?: string;
   initCanvas?: Function;
   resetCanvas?: Function;
   _hmt?: Array;

diff --git a/src/services/request.ts b/src/services/request.ts
@@ -26,11 +26,9 @@ export const initRequest = (router?: Router) => {
       console.error(err);
     }
   });
-}
+};
 
 const useRequest = () => {
-  const baseUrl = getRequestBaseUrl();
-
   const getHeaders = (): any => {
     // headers
     const headers = {} as any;
@@ -46,7 +44,7 @@ const useRequest = () => {
 
   const request = async <R = any>(opts: AxiosRequestConfig): Promise<R> => {
     // base url
-    const baseURL = baseUrl;
+    const baseURL = getRequestBaseUrl();
 
     // headers
     const headers = getHeaders();
@@ -145,7 +143,7 @@ const useRequest = () => {
 
   const requestRaw = async <R = any>(opts: AxiosRequestConfig): Promise<AxiosResponse> => {
     // base url
-    const baseURL = baseUrl;
+    const baseURL = getRequestBaseUrl();
 
     // headers
     const headers = getHeaders();
@@ -170,7 +168,6 @@ const useRequest = () => {
 
   return {
     // public variables and methods
-    baseUrl,
     request,
     get,
     post,

diff --git a/src/utils/request.ts b/src/utils/request.ts
@@ -1,5 +1,5 @@
 export const getRequestBaseUrl = (): string => {
-  return process.env.VUE_APP_API_BASE_URL || 'http://localhost:8000';
+  return window.VUE_APP_API_BASE_URL || process.env.VUE_APP_API_BASE_URL || 'http://localhost:8000';
 };
 
 export const getEmptyResponseWithListData = <T = any>(): ResponseWithListData<T> => {