4.3.5-2024.07.22

docker-build-push.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+# 这是脚本的第一行，指定解释器
+
+#项目推送 当前版本 4.3.6-2024.07.24
+version="4.3.7-20240724"
+# cd /Users/wangrui/boyuan/beijing_boyuan/bi/file-online-preview
+mvn clean package -Dmaven.test.skip=true
+
+docker build -t docker.platomix.net:10000/module/fileview-app:$version .
+
+docker push docker.platomix.net:10000/module/fileview-app:$version

docker/kkfileview-jdk/docker build.txt

@@ -4,7 +4,7 @@ docker build --tag keking/kkfileview-jdk:4.3.0 .
 # arm64架构执行如下命令
 docker build -f Dockerfile_arm64 --tag keking/kkfileview-jdk:4.3.0 .
 
-#项目推送 当前版本 4.3.5-2024.07.22
+#项目推送 当前版本 4.3.6-2024.07.24
 
 cd /Users/wangrui/boyuan/beijing_boyuan/bi/file-online-preview
 mvn clean package -Dmaven.test.skip=true

server/src/main/java/org/springblade/config/WebConfig.java

@@ -54,7 +54,7 @@ public class WebConfig implements WebMvcConfigurer {
     public FilterRegistrationBean<TrustHostFilter> getTrustHostFilter() {
         Set<String> filterUri = new HashSet<>();
         filterUri.add("/onlinePreview");
-        filterUri.add("/onlinePreview/public");
+        filterUri.add("/onlinePreviewPublic");
         filterUri.add("/picturesPreview");
         filterUri.add("/getCorsFile");
         TrustHostFilter filter = new TrustHostFilter();
@@ -68,7 +68,7 @@ public class WebConfig implements WebMvcConfigurer {
     public FilterRegistrationBean<TrustDirFilter> getTrustDirFilter() {
         Set<String> filterUri = new HashSet<>();
         filterUri.add("/onlinePreview");
-        filterUri.add("/onlinePreview/public");
+        filterUri.add("/onlinePreviewPublic");
         filterUri.add("/picturesPreview");
         filterUri.add("/getCorsFile");
         TrustDirFilter filter = new TrustDirFilter();
@@ -105,7 +105,7 @@ public class WebConfig implements WebMvcConfigurer {
         filterUri.add("/");
         filterUri.add("/onlinePreview");
         filterUri.add("/picturesPreview");
-        filterUri.add("/onlinePreview/public");
+        filterUri.add("/onlinePreviewPublic");
         AttributeSetFilter filter = new AttributeSetFilter();
         FilterRegistrationBean<AttributeSetFilter> registrationBean = new FilterRegistrationBean<>();
         registrationBean.setFilter(filter);

server/src/main/java/org/springblade/controller/OnlinePreviewController.java

@@ -80,6 +80,7 @@ public class OnlinePreviewController {
      */
     @GetMapping("/onlinePreview")
     public String onlinePreview(String url, Model model, String json, HttpServletRequest req) {
+//       return this.onlinePreviewPublic(url,model,req);
         if (StringUtil.isBlank(json)) {
             return otherFilePreview.notSupportedFile(model, "缺少必要参数!");
         }

server/src/main/java/org/springblade/filter/BaseUrlFilter.java

@@ -55,6 +55,7 @@ public class BaseUrlFilter implements Filter {
         if (!baseUrl.endsWith("/")) {
             baseUrl = baseUrl.concat("/");
         }
+        // ${baseUrl}
         baseUrl = baseUrl+"fileview/";
         BASE_URL = baseUrl;
         request.setAttribute("baseUrl", baseUrl);