From 5837fcc2f017a44fe8af57dcbc6da96c4abcd2af Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Fri, 13 Sep 2024 08:41:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/onlyoffice/Crosconfig.java | 29 +++++++++++++++ .../admin/onlyoffice/MvcConfiguration.java | 35 +++++++++++++++++++ .../admin/only/onlyofController.java | 4 +-- 3 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/onlyoffice/Crosconfig.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/onlyoffice/MvcConfiguration.java diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/onlyoffice/Crosconfig.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/onlyoffice/Crosconfig.java new file mode 100644 index 0000000..60943b8 --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/onlyoffice/Crosconfig.java @@ -0,0 +1,29 @@ +package cn.iocoder.yudao.module.bpm.controller.admin.onlyoffice; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class Crosconfig implements WebMvcConfigurer { + + + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOrigins("*") +// .allowCredentials(true) + .allowedMethods("GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS") + .maxAge(3600); + } + + /** + * 配置restTemplate工具类 + * @return + */ + @Bean + public RestTemplate restTemplate(){ + return new RestTemplate(); + } +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/onlyoffice/MvcConfiguration.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/onlyoffice/MvcConfiguration.java new file mode 100644 index 0000000..73a7a38 --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/onlyoffice/MvcConfiguration.java @@ -0,0 +1,35 @@ +package cn.iocoder.yudao.module.bpm.controller.admin.onlyoffice; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.ViewResolverRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.thymeleaf.spring5.view.ThymeleafViewResolver; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; + +@Configuration +public class MvcConfiguration implements WebMvcConfigurer { + +// @Resource(name="thymeleafViewResolver") +// @Autowired + @Resource + private ThymeleafViewResolver thymeleafViewResolver; + @Value("${files.docservice.url.site}") + private String documentServerHost; + @Value("${files.docservice.url.api}") + private String documentServerApiJs; + @Override + public void configureViewResolvers(ViewResolverRegistry registry) { + if (thymeleafViewResolver != null) { + Map vars = new HashMap<>(8); + vars.put("documentServerApiJs", documentServerHost+documentServerApiJs); + System.out.println("documentServerApiJs"+ String.format(documentServerApiJs, documentServerHost)); +// System.out.println( String.format(documentServerApiJs, documentServerHost)); + // 静态参数,只取一次值 + thymeleafViewResolver.setStaticVariables(vars); + } + } +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/only/controller/admin/only/onlyofController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/only/controller/admin/only/onlyofController.java index aa7e676..624d9c6 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/only/controller/admin/only/onlyofController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/only/controller/admin/only/onlyofController.java @@ -10,8 +10,8 @@ import cn.iocoder.yudao.module.bpm.controller.admin.onlyoffice.utils.DocumentCon import cn.iocoder.yudao.module.bpm.controller.admin.onlyoffice.utils.FileUtil; import cn.iocoder.yudao.module.bpm.controller.admin.onlyoffice.utils.Md5Utils; import cn.iocoder.yudao.module.bpm.controller.admin.onlyoffice.vo.Document; -import cn.iocoder.yudao.module.bpm.service.document.DocumentService; -import cn.iocoder.yudao.module.bpm.service.fileupload.FileUploadService; +import cn.iocoder.yudao.module.bpm.service.onlyoffice.document.DocumentService; +import cn.iocoder.yudao.module.bpm.service.onlyoffice.fileupload.FileUploadService; import cn.iocoder.yudao.module.only.controller.admin.only.vo.onlyofPageReqVO; import cn.iocoder.yudao.module.only.controller.admin.only.vo.onlyofRespVO; import cn.iocoder.yudao.module.only.controller.admin.only.vo.onlyofSaveReqVO;