From 8667a2e3bf710958bf697fb482e01e6b279b0432 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 22 Jan 2024 17:20:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=A9=BA=E6=96=87=E4=BB=B6=E5=B9=B6=E6=98=A0?=
 =?UTF-8?q?=E5=B0=84=E5=A4=96=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jero/config/WebMvcConfiguration.java    | 6 ++++++
 .../src/main/java/com/jero/config/shiro/ShiroConfig.java  | 1 +
 .../onlyoffice/controller/OnlyOfficeController.java       | 1 -
 .../service/impl/BusProcessModelHisServiceImpl.java       | 7 +++----
 .../src/main/resources/application-dev.yml                | 8 ++++----
 .../src/main/resources/application-prod.yml               | 8 ++++----
 6 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/laws-base/laws-base-core/src/main/java/com/jero/config/WebMvcConfiguration.java b/laws-base/laws-base-core/src/main/java/com/jero/config/WebMvcConfiguration.java
index b773aa20..e0ce2ac5 100644
--- a/laws-base/laws-base-core/src/main/java/com/jero/config/WebMvcConfiguration.java
+++ b/laws-base/laws-base-core/src/main/java/com/jero/config/WebMvcConfiguration.java
@@ -38,6 +38,8 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
     private String webAppPath;
     @Value("${spring.resource.static-locations}")
     private String staticLocations;
+    @Value("${file.path}")
+    private String filePath;
 
     /**
      * 静态资源的配置 - 使得可以从磁盘中读取 Html、图片、视频、音频等
@@ -47,6 +49,10 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
         registry.addResourceHandler("/**")
                 .addResourceLocations("file:" + upLoadPath + "//", "file:" + webAppPath + "//")
                 .addResourceLocations(staticLocations.split(","));
+
+        // 映射在线编辑文件存储路径
+        registry.addResourceHandler("/file/**")
+                .addResourceLocations("file:" + filePath);
     }
 
     /**
diff --git a/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
index 6bdf0ddd..6cee39a9 100644
--- a/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
+++ b/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
@@ -144,6 +144,7 @@ public class ShiroConfig {
 
         //onlyoffice排除
         filterChainDefinitionMap.put("/onlyOffice/**", "anon");
+        filterChainDefinitionMap.put("/file/**", "anon");
 
         //对接接口排除
         filterChainDefinitionMap.put("/sync/**", "anon");
diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
index 169ecfc5..fa785439 100644
--- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
+++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
@@ -301,7 +301,6 @@ public class OnlyOfficeController {
     @ApiOperation(value = "|model| 传入 模板文档名称（不带后缀）默认 docx")
     @GetMapping("/saveEditFile")
     public Result<BusProcessModelHis> saveEditFile(String model) {
-
         return Result.OK(busProcessModelHisService.saveEditFile(model));
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java
index 4cd910c2..3c3505a4 100644
--- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java
@@ -57,11 +57,9 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
             String taskId = "task_" + changUuid;
             String topId = "top_" + changUuid;
 
-            StringBuilder builderModel = new StringBuilder();
-            builderModel.append("model").append("/");
-            builderModel.append("model").append("/");
+            String builderModel = "model" + "/";
 
-            File dir = new File(filePath + builderModel.toString());
+            File dir = new File(filePath + builderModel);
             if (!dir.exists()) {
                 dir.mkdirs();
             }
@@ -86,6 +84,7 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
             modelHis.setTaskId(taskId);
             modelHis.setPId(topId);
             modelHis.setEditFilePath(targetPath);
+            modelHis.setDownLoadUrl(downloadUrl + targetPath);
             this.baseMapper.insert(modelHis);
         } catch (Exception e) {
             logger.error(e.getMessage());
diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml
index ca8c3b0b..f7beda03 100644
--- a/laws-single-startup/src/main/resources/application-dev.yml
+++ b/laws-single-startup/src/main/resources/application-dev.yml
@@ -376,11 +376,11 @@ justauth:
     timeout: 1h
 
 file:
-  downloadUrl: a
+  downloadUrl: http://localhost:8184/laws-sinotruk/file/
   split:
-    path: D://opt//onlyoffice//file//splitImage/
-  sourceFilePath: D://opt//onlyoffice//sourceFile//DOCX.docx
-  path: D://opt//onlyoffice//file//
+    path: D://opt//onlyOffice//file//splitImage//
+  sourceFilePath: D://opt//onlyOffice//DOCX.docx
+  path: D:/opt/onlyOffice/file/
 
 iam:
   bimRemoteUser: srmsIam
diff --git a/laws-single-startup/src/main/resources/application-prod.yml b/laws-single-startup/src/main/resources/application-prod.yml
index 9242abe0..962de3a7 100644
--- a/laws-single-startup/src/main/resources/application-prod.yml
+++ b/laws-single-startup/src/main/resources/application-prod.yml
@@ -349,11 +349,11 @@ justauth:
     timeout: 1h
 
 file:
-  downloadUrl: a
+  downloadUrl: http://localhost:8184/laws-sinotruk/file/
   split:
-    path: /opt/onlyoffice/file/splitImage/
-  sourceFilePath: /app/onlyoffice/DOCX.docx
-  path: /app/onlyoffice/file/
+    path: /opt/onlyOffice/file/splitImage/
+  sourceFilePath: /opt/onlyOffice/DOCX.docx
+  path: /opt/onlyOffice/file/
 
 iam:
   bimRemoteUser: srmsIam