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 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