From b76d116f68ad270f2a09a41b59ce6afd82b6e686 Mon Sep 17 00:00:00 2001 From: yanghuanglin Date: Tue, 1 Jul 2025 11:55:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=B1=BB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/optima/document/server/config/DocumentConfig.java | 4 ++-- .../pom.xml | 6 +++--- .../optima/document/server/JodConverterDocumentServer.java} | 4 ++-- .../com/optima/document/server/api/DocumentServiceImpl.java | 0 .../com/optima/document/server/config/DocumentConfig.java | 6 +----- .../src/main/resources/application.yml | 2 +- .../src/main/resources/banner.txt | 0 .../document/server/JodConverterDocumentServerTest.java} | 4 ++-- document-server/pom.xml | 2 +- 9 files changed, 12 insertions(+), 16 deletions(-) rename document-server/{jod-document-server => jodconverter-document-server}/pom.xml (86%) rename document-server/{jod-document-server/src/main/java/com/optima/document/server/JodDocumentServer.java => jodconverter-document-server/src/main/java/com/optima/document/server/JodConverterDocumentServer.java} (68%) rename document-server/{jod-document-server => jodconverter-document-server}/src/main/java/com/optima/document/server/api/DocumentServiceImpl.java (100%) rename document-server/{jod-document-server => jodconverter-document-server}/src/main/java/com/optima/document/server/config/DocumentConfig.java (81%) rename document-server/{jod-document-server => jodconverter-document-server}/src/main/resources/application.yml (97%) rename document-server/{jod-document-server => jodconverter-document-server}/src/main/resources/banner.txt (100%) rename document-server/{jod-document-server/src/test/java/com/optima/document/server/JodDocumentServerTest.java => jodconverter-document-server/src/test/java/com/optima/document/server/JodConverterDocumentServerTest.java} (91%) diff --git a/document-server/docto-document-server/src/main/java/com/optima/document/server/config/DocumentConfig.java b/document-server/docto-document-server/src/main/java/com/optima/document/server/config/DocumentConfig.java index 3a9c27e..b0e753b 100644 --- a/document-server/docto-document-server/src/main/java/com/optima/document/server/config/DocumentConfig.java +++ b/document-server/docto-document-server/src/main/java/com/optima/document/server/config/DocumentConfig.java @@ -13,10 +13,9 @@ import org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter; * @author Elias * @since 2021-09-28 16:12 */ -@SuppressWarnings("deprecation") +@Data @Configuration @ConfigurationProperties(prefix = "document") -@Data public class DocumentConfig { private String docToProgram; @@ -26,6 +25,7 @@ public class DocumentConfig { * * @return httpinvoker */ + @SuppressWarnings("deprecation") @Bean(name = "/document-service") HttpInvokerServiceExporter wordService(DocumentService documentService) { HttpInvokerServiceExporter exporter = new HttpInvokerServiceExporter(); diff --git a/document-server/jod-document-server/pom.xml b/document-server/jodconverter-document-server/pom.xml similarity index 86% rename from document-server/jod-document-server/pom.xml rename to document-server/jodconverter-document-server/pom.xml index 5395f6e..a4ee142 100644 --- a/document-server/jod-document-server/pom.xml +++ b/document-server/jodconverter-document-server/pom.xml @@ -7,10 +7,10 @@ document-server 2.0.0 - jod-document-server + jodconverter-document-server 2.0.0 - Jod Document Server - Jod 文档操作服务 + JodConverter Document Server + JodConverter 文档操作服务 4.4.9 diff --git a/document-server/jod-document-server/src/main/java/com/optima/document/server/JodDocumentServer.java b/document-server/jodconverter-document-server/src/main/java/com/optima/document/server/JodConverterDocumentServer.java similarity index 68% rename from document-server/jod-document-server/src/main/java/com/optima/document/server/JodDocumentServer.java rename to document-server/jodconverter-document-server/src/main/java/com/optima/document/server/JodConverterDocumentServer.java index 581fc53..d0e3d26 100644 --- a/document-server/jod-document-server/src/main/java/com/optima/document/server/JodDocumentServer.java +++ b/document-server/jodconverter-document-server/src/main/java/com/optima/document/server/JodConverterDocumentServer.java @@ -4,10 +4,10 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class JodDocumentServer { +public class JodConverterDocumentServer { public static void main(String[] args) { - SpringApplication.run(JodDocumentServer.class, args); + SpringApplication.run(JodConverterDocumentServer.class, args); } } diff --git a/document-server/jod-document-server/src/main/java/com/optima/document/server/api/DocumentServiceImpl.java b/document-server/jodconverter-document-server/src/main/java/com/optima/document/server/api/DocumentServiceImpl.java similarity index 100% rename from document-server/jod-document-server/src/main/java/com/optima/document/server/api/DocumentServiceImpl.java rename to document-server/jodconverter-document-server/src/main/java/com/optima/document/server/api/DocumentServiceImpl.java diff --git a/document-server/jod-document-server/src/main/java/com/optima/document/server/config/DocumentConfig.java b/document-server/jodconverter-document-server/src/main/java/com/optima/document/server/config/DocumentConfig.java similarity index 81% rename from document-server/jod-document-server/src/main/java/com/optima/document/server/config/DocumentConfig.java rename to document-server/jodconverter-document-server/src/main/java/com/optima/document/server/config/DocumentConfig.java index effd536..ca71159 100644 --- a/document-server/jod-document-server/src/main/java/com/optima/document/server/config/DocumentConfig.java +++ b/document-server/jodconverter-document-server/src/main/java/com/optima/document/server/config/DocumentConfig.java @@ -1,8 +1,6 @@ package com.optima.document.server.config; import com.optima.document.api.DocumentService; -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter; @@ -13,16 +11,14 @@ import org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter; * @author Elias * @since 2021-09-28 16:12 */ -@SuppressWarnings("deprecation") @Configuration -@ConfigurationProperties(prefix = "document") -@Data public class DocumentConfig { /** * 文档接口 * * @return httpinvoker */ + @SuppressWarnings("deprecation") @Bean(name = "/document-service") HttpInvokerServiceExporter wordService(DocumentService documentService) { HttpInvokerServiceExporter exporter = new HttpInvokerServiceExporter(); diff --git a/document-server/jod-document-server/src/main/resources/application.yml b/document-server/jodconverter-document-server/src/main/resources/application.yml similarity index 97% rename from document-server/jod-document-server/src/main/resources/application.yml rename to document-server/jodconverter-document-server/src/main/resources/application.yml index a44f16b..ececd65 100644 --- a/document-server/jod-document-server/src/main/resources/application.yml +++ b/document-server/jodconverter-document-server/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 9005 + port: 9004 jodconverter: local: diff --git a/document-server/jod-document-server/src/main/resources/banner.txt b/document-server/jodconverter-document-server/src/main/resources/banner.txt similarity index 100% rename from document-server/jod-document-server/src/main/resources/banner.txt rename to document-server/jodconverter-document-server/src/main/resources/banner.txt diff --git a/document-server/jod-document-server/src/test/java/com/optima/document/server/JodDocumentServerTest.java b/document-server/jodconverter-document-server/src/test/java/com/optima/document/server/JodConverterDocumentServerTest.java similarity index 91% rename from document-server/jod-document-server/src/test/java/com/optima/document/server/JodDocumentServerTest.java rename to document-server/jodconverter-document-server/src/test/java/com/optima/document/server/JodConverterDocumentServerTest.java index 8088311..e8e49d7 100644 --- a/document-server/jod-document-server/src/test/java/com/optima/document/server/JodDocumentServerTest.java +++ b/document-server/jodconverter-document-server/src/test/java/com/optima/document/server/JodConverterDocumentServerTest.java @@ -13,7 +13,7 @@ import java.util.HashMap; import java.util.Map; @Disabled -public class JodDocumentServerTest { +public class JodConverterDocumentServerTest { @Test public void test() throws IOException { @@ -33,7 +33,7 @@ public class JodDocumentServerTest { private static DocumentService buildDocumentService() { // 创建客户端代理 HttpInvokerProxyFactoryBean factoryBean = new HttpInvokerProxyFactoryBean(); - factoryBean.setServiceUrl("http://10.211.55.13:9005/document-service"); + factoryBean.setServiceUrl("http://127.0.0.1:9005/document-service"); factoryBean.setServiceInterface(DocumentService.class); factoryBean.afterPropertiesSet(); diff --git a/document-server/pom.xml b/document-server/pom.xml index e664496..15f17bc 100644 --- a/document-server/pom.xml +++ b/document-server/pom.xml @@ -13,7 +13,7 @@ 文档操作模块 docto-document-server - jod-document-server + jodconverter-document-server