Merge pull request #964 from jackxu2011/fix-http-protocal-fixed

demonray · web-flow · commit 03a940f58292 · 2022-10-19T11:02:01.000+08:00
fix: fit the https protocal
diff --git a/web/packages/apiServices/module/apiServices/index.js b/web/packages/apiServices/module/apiServices/index.js
@@ -4,7 +4,7 @@ export default {
   dispatchs: {
   },
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
   },
   component: () => import('./index.vue'),
-};
+};
diff --git a/web/packages/apiServices/module/apiServicesExecute/index.js b/web/packages/apiServices/module/apiServicesExecute/index.js
@@ -5,7 +5,7 @@ export default {
     IndexedDB: ['updateResult'],
   },
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
   },
   component: () => import('./index.vue'),
-};
+};
diff --git a/web/packages/apiServices/module/servicesMangement/index.js b/web/packages/apiServices/module/servicesMangement/index.js
@@ -4,7 +4,7 @@ export default {
   dispatchs: {
   },
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
   },
   component: () => import('./index.vue'),
-};
+};
diff --git a/web/packages/dataGovernance/module/dataGovernance/index.js b/web/packages/dataGovernance/module/dataGovernance/index.js
@@ -4,7 +4,7 @@ export default {
   dispatchs: {
   },
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
   },
   component: () => import('./index.vue'),
 };
diff --git a/web/packages/dataService/module/dataManagement/index.js b/web/packages/dataService/module/dataManagement/index.js
@@ -4,7 +4,7 @@ export default {
   dispatchs: {
   },
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
   },
   component: () => import('./index.vue'),
-};
+};
diff --git a/web/packages/dataService/module/dataService/index.js b/web/packages/dataService/module/dataService/index.js
@@ -4,7 +4,7 @@ export default {
   dispatchs: {
   },
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
   },
   component: () => import('./index.vue'),
-};
+};
diff --git a/web/packages/scriptis/module/hdfsSidebar/index.js b/web/packages/scriptis/module/hdfsSidebar/index.js
@@ -26,7 +26,7 @@ export default {
     IndexedDB: ['getTabs', 'getTree', 'appendTree'],
   },
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
   },
   methods: {
     showTree(cb) {
diff --git a/web/packages/scriptis/module/hiveSidebar/index.js b/web/packages/scriptis/module/hiveSidebar/index.js
@@ -22,7 +22,7 @@ export default {
   events: ['showHive', 'getAllDbsAndTables', 'getAllowMap', 'HiveSidebar:getDatabase', 'HiveSidebar:getTables', 'HiveSidebar:getTablePartitions', 'HiveSidebar:deletedAndRefresh'],
   dispatchs: ['Workbench:add', 'Workbench:run', 'Workbench:pasteInEditor', 'HiveSidebar:getTables', 'WorkSidebar:showTree', 'HdfsSidebar:showTree', 'IndexedDB:getTree', 'IndexedDB:appendTree'],
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
     ALLOW_MAP: ['_ind', '_share', '_work', '_qml'],
   },
   methods: {
diff --git a/web/packages/scriptis/module/workSidebar/index.js b/web/packages/scriptis/module/workSidebar/index.js
@@ -32,7 +32,7 @@ export default {
     IndexedDB: ['getTabs', 'appendTree', 'getTree'],
   },
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
   },
   /**
      * methods在js被加载时就会加入监听者队列
diff --git a/web/packages/scriptis/module/workbench/index.js b/web/packages/scriptis/module/workbench/index.js
@@ -40,7 +40,7 @@ export default {
     IDE: ['saveNode'],
   },
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
     BI_API_PATH: 'dws/vg#',
   },
   component: () =>
diff --git a/web/packages/shared/common/service/api.js b/web/packages/shared/common/service/api.js
@@ -61,13 +61,13 @@ instance.interceptors.request.use((config) => {
   config.headers['Content-language'] = localStorage.getItem('locale') || 'zh-CN';
   config.metadata = { startTime: Date.now() }
   if (/\/application\//.test(config.url)) {
-    config.url = `http://${window.location.host}` + config.url
+    config.url = `${location.protocol}//${window.location.host}` + config.url
   }
 
   // 增加token
   if (/dolphinscheduler/.test(config.url)) {
     config.headers['token'] = api.getToken()
-    config.url = `http://${window.location.host}/` + config.url
+    config.url = `${location.protocol}//${window.location.host}/` + config.url
     if (config.useForm) {
       let formData = new FormData()
       Object.keys(config.data).forEach(key => {
diff --git a/web/packages/workflows/module/innerIframe/index.js b/web/packages/workflows/module/innerIframe/index.js
@@ -11,7 +11,7 @@ export default {
   // 规范模块的动作，由外部调用或者自己执行
   methods: {},
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
   },
   component: () => import('./index.vue'),
 };
diff --git a/web/packages/workflows/module/process/index.js b/web/packages/workflows/module/process/index.js
@@ -34,7 +34,7 @@ export default {
   methods: {
   },
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
   },
   component: () => import('./index.vue'),
 };
diff --git a/web/packages/workflows/module/workflow/index.js b/web/packages/workflows/module/workflow/index.js
@@ -18,7 +18,7 @@
 export default {
   name: 'Workflow',
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
   },
   component: () => import('./index.vue'),
 };
diff --git a/web/packages/workflows/module/workflow/index.vue b/web/packages/workflows/module/workflow/index.vue
@@ -562,7 +562,7 @@ export default {
       // 返回结构不一样
       axios
         .get(
-          `http://${window.location.host}/api/rest_j/v1/dss/framework/orchestrator/exportOrchestrator`,
+          `${location.protocol}//${window.location.host}/api/rest_j/v1/dss/framework/orchestrator/exportOrchestrator`,
           {
             params,
             responseType: "arraybuffer"
diff --git a/web/packages/workspace/module/appProcess/index.js b/web/packages/workspace/module/appProcess/index.js
@@ -4,7 +4,7 @@ export default {
   dispatchs: {
   },
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
   },
   component: () => import('./index.vue'),
-};
+};
diff --git a/web/packages/workspace/module/bankHome/index.js b/web/packages/workspace/module/bankHome/index.js
@@ -4,7 +4,7 @@ export default {
   dispatchs: {
   },
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
   },
   component: () => import('./index.vue'),
-};
+};
diff --git a/web/packages/workspace/module/management/index.js b/web/packages/workspace/module/management/index.js
@@ -5,7 +5,7 @@ export default {
     WorkspaceHome: ['updateSidebar']
   },
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
   },
   component: () => import('./index.vue'),
-};
+};
diff --git a/web/packages/workspace/module/managementPlatform/component/guide/index.vue b/web/packages/workspace/module/managementPlatform/component/guide/index.vue
@@ -65,7 +65,7 @@ export default {
       var formdata = new FormData();
       formdata.append("file", $file);
       axios({
-        url: `http://${window.location.host}/api/rest_j/v1/dss/guide/admin/guidecontent/uploadImage`,
+        url: `${location.protocol}//${window.location.host}/api/rest_j/v1/dss/guide/admin/guidecontent/uploadImage`,
         method: "post",
         data: formdata,
         headers: { "Content-Type": "multipart/form-data" },
diff --git a/web/packages/workspace/module/managementPlatform/component/library/index.vue b/web/packages/workspace/module/managementPlatform/component/library/index.vue
@@ -69,7 +69,7 @@ export default {
       var formdata = new FormData();
       formdata.append("file", $file);
       axios({
-        url: `http://${window.location.host}/api/rest_j/v1/dss/guide/admin/guidechapter/uploadImage`,
+        url: `${location.protocol}//${window.location.host}/api/rest_j/v1/dss/guide/admin/guidechapter/uploadImage`,
         method: "post",
         data: formdata,
         headers: { "Content-Type": "multipart/form-data" },
diff --git a/web/packages/workspace/module/managementPlatform/index.js b/web/packages/workspace/module/managementPlatform/index.js
@@ -4,7 +4,7 @@ export default {
   dispatchs: {
   },
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
   },
   component: () => import('./index.vue'),
-};
+};
diff --git a/web/packages/workspace/module/newHome/index.js b/web/packages/workspace/module/newHome/index.js
@@ -4,7 +4,7 @@ export default {
   dispatchs: {
   },
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
   },
   component: () => import('./index.vue'),
-};
+};
diff --git a/web/packages/workspace/module/newProject/index.js b/web/packages/workspace/module/newProject/index.js
@@ -23,7 +23,7 @@ export default {
     workflowIndexedDB: ['addProjectCache', 'clearProjectCache']
   },
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
   },
   component: () => import('./index.vue'),
 };
diff --git a/web/packages/workspace/module/newProject/index.vue b/web/packages/workspace/module/newProject/index.vue
@@ -736,7 +736,7 @@ export default {
                 // 如果是导出成功需要下载文件
                 if (type === 'export' && res.info.msg) {
                   const url =
-                    `http://${window.location.host}/api/rest_j/v1/` +
+                    `${location.protocol}//${window.location.host}/api/rest_j/v1/` +
                     'dss/downloadFile/' +
                     res.info.msg
                   const link = document.createElement('a')
diff --git a/web/packages/workspace/module/permissions/index.js b/web/packages/workspace/module/permissions/index.js
@@ -4,7 +4,7 @@ export default {
   dispatchs: {
   },
   data: {
-    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
   },
   component: () => import('./index.vue'),
-};
+};
