From 014341b67183104770c8a172814e5116dc4150b2 Mon Sep 17 00:00:00 2001
From: hanjian <272005125@qq.com>
Date: Mon, 2 Sep 2024 20:53:58 +0800
Subject: [PATCH] update

---
 .env.development                             |  4 ++--
 .env.staging                                 |  6 ++---
 default.conf                                 | 24 ++++++++++++++++++++
 src/components/FileUpload/optimizeUpload.vue |  1 -
 src/views/document/index.vue                 |  5 +++-
 vue.config.js                                |  7 ++++++
 6 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/.env.development b/.env.development
index cd871ae..eb0e48a 100644
--- a/.env.development
+++ b/.env.development
@@ -7,11 +7,11 @@ ENV = 'development'
 VUE_APP_CONTEXT_PATH = '/tool-tech'
 
 # 工具与技术交流管理系统/开发环境
-VUE_APP_BASE_API = 'http://localhost:8080/tool-tech-admin'
+VUE_APP_BASE_API = '/tool-tech-admin'
 VUE_APP_WS_URL = 'ws://localhost:8080/tool-tech-admin/websocket'
 
 # 文档在线预览服务
-VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://localhost:8012/tool-tech-file-view'
+VUE_APP_TOOL_TECH_FILE_VIEW_API = '/tool-tech-file-view'
 
 # 流程管理服务地址
 VUE_APP_WORKFLOW_MANAGE_URL = '/ebpm-process-manage'
diff --git a/.env.staging b/.env.staging
index 43f3fad..628655f 100644
--- a/.env.staging
+++ b/.env.staging
@@ -9,11 +9,11 @@ ENV = 'staging'
 VUE_APP_CONTEXT_PATH = '/tool-tech'
 
 # 工具与技术交流管理系统/测试环境
-VUE_APP_BASE_API = 'https://www.rzdata.net/tool-tech-admin'
-VUE_APP_WS_URL = 'wss://www.rzdata.net/tool-tech-admin/websocket'
+VUE_APP_BASE_API = '/tool-tech-admin'
+VUE_APP_WS_URL = '/tool-tech-admin/websocket'
 
 # 文档在线预览服务
-VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://192.168.1.2:8012/tool-tech-file-view'
+VUE_APP_TOOL_TECH_FILE_VIEW_API = '/tool-tech-file-view'
 
 # 流程管理服务地址
 VUE_APP_WORKFLOW_MANAGE_URL = '/ebpm-process-manage'
diff --git a/default.conf b/default.conf
index 13c1d3a..8494b07 100644
--- a/default.conf
+++ b/default.conf
@@ -15,6 +15,30 @@ server {
         }
     }
 
+    location ^~/tool-tech-admin/ {
+       proxy_pass http://124.223.108.21:8080/tool-tech-admin/;
+       proxy_set_header Host $host;
+       proxy_set_header X-Real-IP $remote_addr;
+       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+       proxy_ssl_verify off;
+    }
+
+    location ^~/tool-tech-file-view/ {
+       proxy_pass http://124.223.108.21:8012/tool-tech-file-view/;
+       proxy_set_header Host $host;
+       proxy_set_header X-Real-IP $remote_addr;
+       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+       proxy_ssl_verify off;
+    }
+
+    location ^~/ebpm-process-manage/ {
+       proxy_pass http://124.223.108.21:9080/ebpm-process-manage/;
+       proxy_set_header Host $host;
+       proxy_set_header X-Real-IP $remote_addr;
+       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+       proxy_ssl_verify off;
+    }
+
     error_page   500 502 503 504  /50x.html;
     location = /50x.html {
         root   /usr/share/nginx/html;
diff --git a/src/components/FileUpload/optimizeUpload.vue b/src/components/FileUpload/optimizeUpload.vue
index 41857ab..1ae5a24 100644
--- a/src/components/FileUpload/optimizeUpload.vue
+++ b/src/components/FileUpload/optimizeUpload.vue
@@ -324,7 +324,6 @@ export default {
         fileNewName: res.data.newFileName,
         suffixType: res.data.suffixType
       }
-      console.info("data===========", data)
       self.$emit("handleSuccess", data)
     },
     /** 清空文件 **/
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index 021c663..35ccd7d 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -453,7 +453,10 @@ export default {
     },
     handlePreview(row){
       this.viewDialogOpen = true;
-      this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(process.env.VUE_APP_BASE_API + row.docUrl));
+      let protocol = window.location.protocol
+      let hostname = window.location.hostname;
+      let getDocUrl = protocol + '//' + hostname + ':8080' + process.env.VUE_APP_BASE_API
+      this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(getDocUrl + row.docUrl));
       this.viewDialogTitle = '文档在线预览'
     },
     // 多选框选中数据
diff --git a/vue.config.js b/vue.config.js
index 876cbf4..1234143 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -41,6 +41,13 @@ module.exports = {
           ['^' + process.env.VUE_APP_BASE_API]: ''
         }
       },
+      [process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API]: {
+        target: `http://localhost:8012/tool-tech-file-view`,
+        changeOrigin: true,
+        pathRewrite: {
+          ['^' + process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API]: ''
+        }
+      },
       [process.env.VUE_APP_WORKFLOW_MANAGE_URL]: {
         target: `http://124.223.108.21:9080/ebpm-process-manage`,
         changeOrigin: true,