优化：移除localBaseUrl

gitchenjh · klboke · commit b90e326eec83 · 2020-05-18T15:55:26.000+08:00
diff --git a/jodconverter-web/src/main/java/cn/keking/web/filter/ChinesePathFilter.java b/jodconverter-web/src/main/java/cn/keking/web/filter/ChinesePathFilter.java
@@ -35,23 +35,20 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
         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 && !ConfigConstants.DEFAULT_BASE_URL.equals(baseUrlTmp.toLowerCase())) {
             if (!baseUrlTmp.endsWith("/")) {
                 baseUrlTmp = baseUrlTmp.concat("/");
             }
             baseUrl = baseUrlTmp;
         } else {
-            baseUrl = localBaseUrl;
+            baseUrl = pathBuilder.toString();
         }
         BASE_URL = baseUrl;
         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
@@ -189,7 +189,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('${localBaseUrl}' + item.fileName ) +"'>预览</a>" +
+                item.action = "<a class='btn btn-default' target='_blank' href='${baseUrl}onlinePreview?url="+ encodeURIComponent('${baseUrl}' + item.fileName ) +"'>预览</a>" +
                     "<a class='btn btn-default' href='javascript:void(0);' onclick='deleteFile(\""+item.fileName+"\")'>删除</a>";
             });
             return data;
