From 659c74e7aaf751cc10ac47b7e0939f235a17d873 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 06 九月 2025 10:12:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pom.xml | 52 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 559fb4f..5715852 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
<log4j2.version>2.17.0</log4j2.version>
<logback.version>1.2.9</logback.version>
<!-- webservice -->
- <cxf.version>3.2.4</cxf.version>
+ <cxf.version>3.5.2</cxf.version>
</properties>
<repositories>
@@ -227,21 +227,11 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web-services</artifactId>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.apache.cxf</groupId>-->
-<!-- <artifactId>cxf-spring-boot-starter-jaxws</artifactId>-->
-<!-- <version>${cxf.version}</version>-->
-<!-- </dependency>-->
<!-- CXF webservice -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-spring-boot-starter-jaxws</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
</dependency>
@@ -268,6 +258,10 @@
<exclusion>
<artifactId>commons-beanutils</artifactId>
<groupId>commons-beanutils</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>Saxon-HE</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -527,11 +521,11 @@
<version>0.8</version>
</dependency>
<!--xml瑙ｆ瀽鍖咃細濡傛灉椤圭洰涓凡鏈夛紝寮曡捣鍐茬獊锛屽彲娉ㄩ噴-->
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.12.0</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>xerces</groupId>-->
+<!-- <artifactId>xercesImpl</artifactId>-->
+<!-- <version>2.12.0</version>-->
+<!-- </dependency>-->
<!--寮曞叆sap渚濊禆-->
<dependency>
@@ -582,6 +576,32 @@
</nonFilteredFileExtensions>
</configuration>
</plugin>
+ <!-- CXF Codegen Plugin锛氭牴鎹� WSDL 鐢熸垚 Java 瀹㈡埛绔唬鐮� -->
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <version>3.5.5</version> <!-- 浣犲彲浠ヤ娇鐢ㄦ渶鏂扮殑绋冲畾鐗堟湰锛屾瘮濡� 3.5.6 / 4.x -->
+ <executions>
+ <execution>
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>wsdl2java</goal>
+ </goals>
+ <configuration>
+ <!-- 鎸囧畾鐢熸垚鐨� Java 绫� 鏀惧湪鍝釜鐩綍涓嬶紙閫氬父鏄� target/generated-sources/cxf锛� -->
+ <sourceRoot>${project.basedir}/target/generated-sources/cxf</sourceRoot>
+ <wsdlOptions>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/WebService.asmx.wsdl</wsdl>
+ <!-- 鎴栬�呯洿鎺ヤ娇鐢� WSDL 鐨勭綉缁滃湴鍧� -->
+ <!-- <wsdl>http://10.101.0.182:8002/MesWebService/WebService.asmx?wsdl</wsdl> -->
+ </wsdlOption>
+ </wsdlOptions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<resources>
<resource>
--
Gitblit v1.9.3