From 8c3811eefa65c5301bc5348a2714a48af63856e6 Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Mon, 22 Jun 2026 21:14:38 +0800 Subject: [PATCH] =?UTF-8?q?refactor(build):=20=E5=BC=95=E5=85=A5=20daxpay-?= =?UTF-8?q?parent=20=E7=BB=9F=E4=B8=80=E7=89=88=E6=9C=AC=E4=B8=8E=20compil?= =?UTF-8?q?er=20=E6=B2=BB=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 根 pom 继承 SB parent,集中所有版本属性与 maven-compiler-plugin 配置 - 6 个一级模块改为继承根 pom,删除重复的 properties 与 compiler 声明 - 清理冗余 wxjava/alipay 属性(daxpay-payment/daxpay-plugin/capability-wechat) - mapstruct.version 声明处 6→1,maven-compiler-plugin 声明处 7→1,java.version 声明处 7→1 --- daxpay-channel/pom.xml | 39 ++----------- daxpay-demo/pom.xml | 38 ++----------- daxpay-payment/pom.xml | 46 ++-------------- .../capability-wechat/pom.xml | 4 -- daxpay-platform/pom.xml | 48 ++-------------- daxpay-plugin/pom.xml | 55 ++++--------------- daxpay-start/pom.xml | 44 ++------------- pom.xml | 28 ++++++++-- 8 files changed, 54 insertions(+), 248 deletions(-) diff --git a/daxpay-channel/pom.xml b/daxpay-channel/pom.xml index b49f2a1bb..5ebc699ce 100644 --- a/daxpay-channel/pom.xml +++ b/daxpay-channel/pom.xml @@ -5,15 +5,13 @@ 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 4.1.0 - + cn.daxpay.open + daxpay + 4.0.0-SNAPSHOT + ../pom.xml - cn.daxpay.open daxpay-channel - 4.0.0-SNAPSHOT pom 多商户支付通道功能实现 @@ -25,15 +23,6 @@ daxpay-channel-douyin - - 25 - 25 - 25 - UTF-8 - - 1.6.3 - - org.projectlombok @@ -55,26 +44,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - - - org.projectlombok - lombok - ${lombok.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - - org.apache.maven.plugins maven-resources-plugin diff --git a/daxpay-demo/pom.xml b/daxpay-demo/pom.xml index 3b4686cdd..d54ca80c2 100644 --- a/daxpay-demo/pom.xml +++ b/daxpay-demo/pom.xml @@ -4,25 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 4.1.0 - + cn.daxpay.open + daxpay + 4.0.0-SNAPSHOT + ../pom.xml - cn.daxpay.open daxpay-demo - 4.0.0-SNAPSHOT jar 功能演示模块(可独立装配;默认随 daxpay-start 打包,需隔离时移除 start 中对应依赖即可) - - 25 - 25 - 25 - UTF-8 - - @@ -46,25 +37,4 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - - - - org.projectlombok - lombok - ${lombok.version} - - - - - - - diff --git a/daxpay-payment/pom.xml b/daxpay-payment/pom.xml index 058bc07ae..5b3dc32fa 100644 --- a/daxpay-payment/pom.xml +++ b/daxpay-payment/pom.xml @@ -4,15 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 4.1.0 - + cn.daxpay.open + daxpay + 4.0.0-SNAPSHOT + ../pom.xml - cn.daxpay.open daxpay-payment - 4.0.0-SNAPSHOT pom 多商户支付核心功能实现 @@ -22,40 +20,4 @@ daxpay-payment-admin - - 25 - 25 - 25 - UTF-8 - - 1.6.3 - 4.8.4.B - 4.40.272.ALL - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - - - org.projectlombok - lombok - ${lombok.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - - - - - diff --git a/daxpay-platform/daxpay-platform-capability/capability-wechat/pom.xml b/daxpay-platform/daxpay-platform-capability/capability-wechat/pom.xml index f3c9bd8f6..3f11384be 100644 --- a/daxpay-platform/daxpay-platform-capability/capability-wechat/pom.xml +++ b/daxpay-platform/daxpay-platform-capability/capability-wechat/pom.xml @@ -12,10 +12,6 @@ capability-wechat 微信公众号和小程序管理服务 - - 4.8.4.B - - diff --git a/daxpay-platform/pom.xml b/daxpay-platform/pom.xml index e2e5fa496..b8d7e016b 100644 --- a/daxpay-platform/pom.xml +++ b/daxpay-platform/pom.xml @@ -5,10 +5,10 @@ 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 4.1.0 - + cn.daxpay.open + daxpay + 4.0.0-SNAPSHOT + ../pom.xml cn.daxpay.open @@ -24,48 +24,8 @@ daxpay-platform-service - - 3.0.3 - 5.8.46 - 1.84 - 33.6.0-jre - 3.5.16 - 1.5.7 - 2.2.7 - 2.46.15 - 1.45.0 - 3.2.4 - 1.6.3 - 3.3.7 - - 25 - 25 - 25 - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - - - org.projectlombok - lombok - ${lombok.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - - org.apache.maven.plugins maven-source-plugin diff --git a/daxpay-plugin/pom.xml b/daxpay-plugin/pom.xml index 0fad8fb23..5510aae60 100644 --- a/daxpay-plugin/pom.xml +++ b/daxpay-plugin/pom.xml @@ -2,32 +2,18 @@ - - org.springframework.boot - spring-boot-starter-parent - 4.1.0 - - - cn.daxpay.open - daxpay-plugin - - 4.0.0-SNAPSHOT - pom 4.0.0 + + cn.daxpay.open + daxpay + 4.0.0-SNAPSHOT + ../pom.xml + + + daxpay-plugin + pom 支付插件功能实现 - - 25 - 25 - 25 - UTF-8 - - - 1.6.3 - 4.8.4.B - - - @@ -50,31 +36,10 @@ daxpay-payment-common ${project.version} - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - - - org.projectlombok - lombok - ${lombok.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - - org.apache.maven.plugins @@ -114,4 +79,4 @@ - \ No newline at end of file + diff --git a/daxpay-start/pom.xml b/daxpay-start/pom.xml index 79479ea9b..b462cadd1 100644 --- a/daxpay-start/pom.xml +++ b/daxpay-start/pom.xml @@ -4,29 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 4.1.0 - + cn.daxpay.open + daxpay + 4.0.0-SNAPSHOT + ../pom.xml - cn.daxpay.open daxpay-start - 4.0.0-SNAPSHOT jar 多商户启动终端 - - - 25 - 25 - 25 - UTF-8 - - - 1.6.3 - - @@ -61,8 +48,6 @@ daxpay-payment-merchant ${project.version} - - cn.daxpay.open daxpay-payment-admin @@ -114,32 +99,11 @@ daxpay-channel-douyin ${project.version} - daxpay-union - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - - - org.projectlombok - lombok - ${lombok.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - - org.springframework.boot diff --git a/pom.xml b/pom.xml index 9836918b7..f93da5d0c 100644 --- a/pom.xml +++ b/pom.xml @@ -3,6 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 4.1.0 + + + cn.daxpay.open daxpay 4.0.0-SNAPSHOT @@ -21,11 +28,24 @@ daxpay-demo - 25 - 25 + 25 UTF-8 + + 1.18.46 1.6.3 + 3.0.3 + 5.8.46 + 1.84 + 33.6.0-jre + 3.5.16 + 1.5.7 + 2.2.7 + 2.46.15 + 1.45.0 + 3.2.4 + 3.3.7 + 4.8.4.B @@ -34,8 +54,8 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven.compiler.source} - ${maven.compiler.target} + ${java.version} + ${java.version} org.projectlombok