From 8d0b466ef4fe497932e15c186688679e55a26f62 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 22 八月 2025 10:45:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pom.xml | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 109 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index ce728a7..060cc41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,6 @@
<spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>
<alibaba.nacos.version>2.0.4</alibaba.nacos.version>
- <xxl-job-core.version>2.2.0</xxl-job-core.version>
<fastjson.version>1.2.83</fastjson.version>
<pegdown.version>1.6.0</pegdown.version>
<knife4j-spring-boot-starter.version>3.0.3</knife4j-spring-boot-starter.version>
@@ -59,6 +58,8 @@
<!-- Log4j2鐖嗛浄婕忔礊 -->
<log4j2.version>2.17.0</log4j2.version>
<logback.version>1.2.9</logback.version>
+ <!-- webservice -->
+ <cxf.version>3.2.4</cxf.version>
</properties>
<repositories>
@@ -221,17 +222,27 @@
<artifactId>java-jwt</artifactId>
<version>${java-jwt.version}</version>
</dependency>
+ <!-- WebService -->
+ <dependency>
+ <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>3.2.1</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.2.1</version>
+ <version>${cxf.version}</version>
</dependency>
<!--shiro-->
@@ -250,6 +261,14 @@
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>guava</artifactId>
+ <groupId>com.google.guava</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ </exclusion>
</exclusions>
</dependency>
@@ -258,6 +277,12 @@
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>${knife4j-spring-boot-starter.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>guava</artifactId>
+ <groupId>com.google.guava</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- 浠ｇ爜鐢熸垚鍣� -->
@@ -277,6 +302,10 @@
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xercesImpl</artifactId>
+ <groupId>xerces</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -303,6 +332,12 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>asm</artifactId>
+ <groupId>org.ow2.asm</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -325,6 +360,12 @@
<groupId>org.pegdown</groupId>
<artifactId>pegdown</artifactId>
<version>${pegdown.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>asm</artifactId>
+ <groupId>org.ow2.asm</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
@@ -359,6 +400,12 @@
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>${dom4j.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- fileupload -->
<dependency>
@@ -407,6 +454,10 @@
<artifactId>okhttp</artifactId>
<groupId>com.squareup.okhttp3</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>checker-qual</artifactId>
+ <groupId>org.checkerframework</groupId>
+ </exclusion>
</exclusions>
</dependency>
<!-- 浼佷笟寰俊鍜岄拤閽� api -->
@@ -422,6 +473,14 @@
<exclusion>
<artifactId>commons-lang</artifactId>
<groupId>commons-lang</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-collections</artifactId>
+ <groupId>commons-collections</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -473,10 +532,23 @@
<artifactId>xercesImpl</artifactId>
<version>2.12.0</version>
</dependency>
+
+ <!--寮曞叆sap渚濊禆-->
+ <dependency>
+ <groupId>com.sap</groupId>
+ <artifactId>sapjco3</artifactId>
+ <version>3.1.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/src/main/resources/lib/sapjco3.jar</systemPath>
+ </dependency>
</dependencies>
<build>
<plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
<!-- 鎸囧畾JDK缂栬瘧鐗堟湰 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -510,6 +582,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>
@@ -524,6 +622,14 @@
<include>**/*.ftl</include>
</includes>
</resource>
+ <resource>
+ <!--澶栭儴jar瀛樻斁璺緞-->
+ <directory>${project.basedir}/src/main/resources/lib</directory>
+ <targetPath>BOOT-INF/lib/</targetPath>
+ <includes>
+ <include>**/*.jar</include>
+ </includes>
+ </resource>
</resources>
</build>
--
Gitblit v1.9.3