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
index c5338eb1..87c5d038 100644
--- 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,11 +35,9 @@ 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 && !ConfigConstants.DEFAULT_BASE_URL.equals(baseUrlTmp.toLowerCase())) {
if (!baseUrlTmp.endsWith("/")) {
@@ -47,11 +45,10 @@ public class ChinesePathFilter implements Filter {
}
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
index 5dd94a9e..cf8b07c3 100644
--- 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 = "预览" +
+ item.action = "预览" +
"删除";
});
return data;