From 506a3ba2b3c60a40a8dd71e0f19a7ad785e45a77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=B2=BE=E5=8D=8E?= <842761733@qq.com>
Date: Thu, 21 Nov 2019 16:57:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87=E5=A4=96=E7=BD=91?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E6=9C=AC=E5=9C=B0=E4=B8=8B=E8=BD=BD=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8=E5=86=85=E7=BD=91IP=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/config/application.properties            |  1 +
 .../java/cn/keking/filters/ChinesePathFilter.java     | 11 +++++++----
 jodconverter-web/src/main/resources/web/index.ftl     |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/jodconverter-web/src/main/config/application.properties b/jodconverter-web/src/main/config/application.properties
index 04589c76..849e2266 100644
--- a/jodconverter-web/src/main/config/application.properties
+++ b/jodconverter-web/src/main/config/application.properties
@@ -1,5 +1,6 @@
 #######################################不可动态配置，需要重启生效#######################################
 server.port = ${KK_SERVER_PORT:8012}
+server.context-path = ${KK_CONTEXT_PATH:/}
 spring.http.encoding.charset = utf8
 ## Freemarker 配置
 spring.freemarker.template-loader-path = classpath:/web/
diff --git a/jodconverter-web/src/main/java/cn/keking/filters/ChinesePathFilter.java b/jodconverter-web/src/main/java/cn/keking/filters/ChinesePathFilter.java
index f13884cd..23bef8ba 100644
--- a/jodconverter-web/src/main/java/cn/keking/filters/ChinesePathFilter.java
+++ b/jodconverter-web/src/main/java/cn/keking/filters/ChinesePathFilter.java
@@ -23,6 +23,11 @@ public class ChinesePathFilter implements Filter {
         request.setCharacterEncoding("UTF-8");
         response.setCharacterEncoding("UTF-8");
         String baseUrl;
+        String localBaseUrl;
+        StringBuilder pathBuilder = new StringBuilder();
+        pathBuilder.append(request.getScheme()).append("://").append(request.getServerName()).append(":")
+                .append(request.getServerPort()).append(((HttpServletRequest) request).getContextPath()).append("/");
+        localBaseUrl = pathBuilder.toString();
         String baseUrlTmp = ConfigConstants.getBaseUrl();
         if (baseUrlTmp != null && !ConfigRefreshComponent.DEFAULT_BASE_URL.equals(baseUrlTmp.toLowerCase())) {
             if (!baseUrlTmp.endsWith("/")) {
@@ -30,12 +35,10 @@ public class ChinesePathFilter implements Filter {
             }
             baseUrl = baseUrlTmp;
         } else {
-            StringBuilder pathBuilder = new StringBuilder();
-            pathBuilder.append(request.getScheme()).append("://").append(request.getServerName()).append(":")
-                    .append(request.getServerPort()).append(((HttpServletRequest) request).getContextPath()).append("/");
-            baseUrl = pathBuilder.toString();
+            baseUrl = localBaseUrl;
         }
         request.setAttribute("baseUrl", baseUrl);
+        request.setAttribute("localBaseUrl", localBaseUrl);
         chain.doFilter(request, response);
     }
 
diff --git a/jodconverter-web/src/main/resources/web/index.ftl b/jodconverter-web/src/main/resources/web/index.ftl
index 37556649..2ed71896 100644
--- a/jodconverter-web/src/main/resources/web/index.ftl
+++ b/jodconverter-web/src/main/resources/web/index.ftl
@@ -187,7 +187,7 @@ window.open('http://127.0.0.1:8012/picturesPreview?urls='+encodeURIComponent(fil
         }).on('pre-body.bs.table', function (e,data) {
             // 每个data添加一列用来操作
             $(data).each(function (index, item) {
-                item.action = "<a class='btn btn-default' target='_blank' href='${baseUrl}onlinePreview?url="+ encodeURIComponent('${baseUrl}' + item.fileName ) +"'>预览</a>" +
+                item.action = "<a class='btn btn-default' target='_blank' href='${baseUrl}onlinePreview?url="+ encodeURIComponent('${localBaseUrl}' + item.fileName ) +"'>预览</a>" +
                     "<a class='btn btn-default' href='javascript:void(0);' onclick='deleteFile(\""+item.fileName+"\")'>删除</a>";
             });
             return data;