diff --git a/pigx-app-server/pigx-app-server-api/pom.xml b/pigx-app-server/pigx-app-server-api/pom.xml index d73bf41ae..767591c1d 100644 --- a/pigx-app-server/pigx-app-server-api/pom.xml +++ b/pigx-app-server/pigx-app-server-api/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx-app-server - 5.12.0 + 6.0.0-SNAPSHOT pigx-app-server-api diff --git a/pigx-app-server/pigx-app-server-biz/pom.xml b/pigx-app-server/pigx-app-server-biz/pom.xml index 0ca3823e3..81e5f7787 100644 --- a/pigx-app-server/pigx-app-server-biz/pom.xml +++ b/pigx-app-server/pigx-app-server-biz/pom.xml @@ -7,21 +7,16 @@ com.pig4cloud pigx-app-server - 5.12.0 + 6.0.0-SNAPSHOT pigx-app-server-biz - - - org.springframework.boot - spring-boot-starter-undertow - org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc @@ -64,6 +59,10 @@ pigx-app-server-api ${project.version} + + com.pig4cloud + pigx-upms-api + com.pig4cloud @@ -77,12 +76,12 @@ com.baomidou - mybatis-plus-spring-boot3-starter + mybatis-plus-spring-boot4-starter com.alibaba - druid-spring-boot-3-starter + druid-spring-boot-4-starter diff --git a/pigx-app-server/pom.xml b/pigx-app-server/pom.xml index 2430d7b55..bbd39699d 100644 --- a/pigx-app-server/pom.xml +++ b/pigx-app-server/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx - 5.12.0 + 6.0.0-SNAPSHOT pigx-app-server diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml index 5766f4161..dded515dc 100644 --- a/pigx-auth/pom.xml +++ b/pigx-auth/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.12.0 + 6.0.0-SNAPSHOT pigx-auth @@ -88,27 +88,20 @@ com.pig4cloud pigx-common-encrypt-api - + io.springboot.plugin captcha-core - ${captcha.image.version} - + io.github.pig-mesh.plugin captcha-spring-boot-starter - ${captcha.version} org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-undertow + spring-boot-starter-webmvc diff --git a/pigx-boot/pom.xml b/pigx-boot/pom.xml index bb453e849..4e310428e 100755 --- a/pigx-boot/pom.xml +++ b/pigx-boot/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pigx - 5.12.0 + 6.0.0-SNAPSHOT pigx-boot @@ -42,7 +42,7 @@ pigx-upms-biz ${project.version} - + com.pig4cloud pigx-codegen @@ -97,11 +97,6 @@ com.pig4cloud pigx-common-swagger - - - org.springframework.boot - spring-boot-starter-undertow - diff --git a/pigx-common/pigx-common-audit/pom.xml b/pigx-common/pigx-common-audit/pom.xml index 9a6a76aed..6b938b1fa 100644 --- a/pigx-common/pigx-common-audit/pom.xml +++ b/pigx-common/pigx-common-audit/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT pigx-common-audit @@ -22,13 +22,18 @@ org.springframework.boot - spring-boot-starter-aop + spring-boot-starter-aspectj com.pig4cloud pigx-upms-api + + + com.baomidou + mybatis-plus-core + org.springframework.security diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index c1eb5488b..bd280c48d 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -11,54 +11,61 @@ pigx 公共版本控制,在此pom定义的依赖,全局业务微服务不需要指定版本。 - 5.12.0 + 6.0.0-SNAPSHOT 3.5.16 - 1.5.5 + 1.5.7 4.5.0 - 3.1.0 - 1.2.23 - 5.8.42 + 3.1.2 + 1.2.28 + 5.8.44 9.5.0 21.3.0.0 - 12.10.0.jre8 + 12.10.2.jre8 8.1.3.140 - 6.2.0 + 6.2.5 3.0.5 - 2.8.5 - 2.2.28 - 4.7.8-20251028.120007 + 3.0.3 + 2.2.50 + 4.7.9-20260103.233048 2.9.12.1-17 - 3.0.3 - 4.0.1 - 1.15.3 + 3.0.25 + 1.15.4 5.4.3 - 7.2.0 - 2.5.2.RELEASE + 8.0.0 1.2.83 - 2.4.2 + 3.4.0 3.0.52.ALL - 1.12.261 - 7.8.0 - 1.7.0 + 2.44.12 + 7.8.6 + 2.5.0 7.1 0.21.0 - 2.25.2 + 2.25.4 1.59.1 0.33.0 1.0.0 - 1.8.4 - 8.7.2-jdk17-20250109 - 3.3.4 - 1.4.7 - 2.0.1 - 2.20.1 + 1.8.10 + 8.7.3-jdk17-20260319 + 3.3.5 + 2.0.2 + 2.22.18 2.4.1 2.16.1 3.1 + 1.4.0 + 2.2.3 + + + software.amazon.awssdk + bom + ${aws.sdk.version} + pom + import + com.pig4cloud pigx-common-core @@ -186,13 +193,23 @@ pigx-flow-api ${pigx.version} - + - io.github.pig-mesh.ai - deepseek-spring-boot-starter - ${deepseek.version} + io.springboot.plugin + captcha-core + ${captcha.image.version} + + + + io.github.pig-mesh.plugin + captcha-spring-boot-starter + ${captcha.version} + + + com.anji-plus + captcha + ${captcha.version} - org.ow2.asm asm @@ -206,7 +223,7 @@ com.baomidou - dynamic-datasource-spring-boot3-starter + dynamic-datasource-spring-boot4-starter ${dynamic-ds.version} @@ -224,7 +241,7 @@ com.alibaba - druid-spring-boot-3-starter + druid-spring-boot-4-starter ${druid.version} @@ -393,17 +410,6 @@ groovy ${groovy.version} - - javax.servlet - javax.servlet-api - ${javax.version} - - - - org.springframework.security.oauth - spring-security-oauth2 - ${security.oauth.version} - org.jsoup @@ -416,6 +422,11 @@ flowable-spring-boot-starter-process ${flowable.version} + + org.flowable + flowable-bpmn-layout + ${flowable.version} + org.dromara.sms4j diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml index a9c0cb7b5..8f3400aa7 100644 --- a/pigx-common/pigx-common-core/pom.xml +++ b/pigx-common/pigx-common-core/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT pigx-common-core @@ -55,10 +55,22 @@ org.springframework.boot spring-boot-starter-validation - + org.springframework.boot - spring-boot-starter-json + spring-boot-jackson2 + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + org.springframework.boot + spring-boot-servlet diff --git a/pigx-common/pigx-common-data/pom.xml b/pigx-common/pigx-common-data/pom.xml index e7c6d6f9f..0434414d5 100644 --- a/pigx-common/pigx-common-data/pom.xml +++ b/pigx-common/pigx-common-data/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT pigx-common-data @@ -60,12 +60,6 @@ druid true - - - com.pig4cloud - pigx-common-security - true - com.pig4cloud @@ -76,5 +70,17 @@ org.springframework.boot spring-boot-starter-data-redis + + org.springframework.boot + spring-boot-cache + + + org.springframework.boot + spring-boot-jdbc + + + org.springframework.boot + spring-boot-jackson2 + diff --git a/pigx-common/pigx-common-datasource/pom.xml b/pigx-common/pigx-common-datasource/pom.xml index d8a567c2d..522f060dc 100644 --- a/pigx-common/pigx-common-datasource/pom.xml +++ b/pigx-common/pigx-common-datasource/pom.xml @@ -5,7 +5,7 @@ pigx-common com.pig4cloud - 5.12.0 + 6.0.0-SNAPSHOT 4.0.0 @@ -24,12 +24,12 @@ com.baomidou - dynamic-datasource-spring-boot3-starter + dynamic-datasource-spring-boot4-starter com.alibaba - druid-spring-boot-3-starter + druid-spring-boot-4-starter provided @@ -37,5 +37,9 @@ org.springframework spring-webmvc + + org.springframework.boot + spring-boot-jdbc + diff --git a/pigx-common/pigx-common-encrypt-api/pom.xml b/pigx-common/pigx-common-encrypt-api/pom.xml index dfd969eeb..8a775d677 100644 --- a/pigx-common/pigx-common-encrypt-api/pom.xml +++ b/pigx-common/pigx-common-encrypt-api/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT pigx-common-encrypt-api @@ -43,7 +43,11 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc + + + org.springframework.boot + spring-boot-jackson2 diff --git a/pigx-common/pigx-common-excel/pom.xml b/pigx-common/pigx-common-excel/pom.xml index ce150138d..674455a19 100644 --- a/pigx-common/pigx-common-excel/pom.xml +++ b/pigx-common/pigx-common-excel/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT pigx-common-excel @@ -33,15 +33,15 @@ pigx excel 操作 - 1.2.0 + 2.0.1-incubating - + - cn.idev.excel - fastexcel - ${fastexcel.version} + org.apache.fesod + fesod-sheet + ${fesod.version} @@ -51,7 +51,7 @@ org.springframework.boot - spring-boot-starter-aop + spring-boot-starter-aspectj @@ -63,5 +63,10 @@ jakarta.servlet jakarta.servlet-api + + + cn.hutool + hutool-core + diff --git a/pigx-common/pigx-common-feign/pom.xml b/pigx-common/pigx-common-feign/pom.xml index b218c866f..61eade0b5 100755 --- a/pigx-common/pigx-common-feign/pom.xml +++ b/pigx-common/pigx-common-feign/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT 4.0.0 @@ -18,6 +18,10 @@ org.springframework.cloud spring-cloud-starter-openfeign + + org.springframework.boot + spring-boot-jackson2 + io.github.openfeign diff --git a/pigx-common/pigx-common-gateway/pom.xml b/pigx-common/pigx-common-gateway/pom.xml index f80d118a3..f4fa35c9b 100644 --- a/pigx-common/pigx-common-gateway/pom.xml +++ b/pigx-common/pigx-common-gateway/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT pigx-common-gateway @@ -44,7 +44,7 @@ org.springframework.cloud - spring-cloud-gateway-server + spring-cloud-gateway-server-webflux org.springframework.boot @@ -64,5 +64,17 @@ spring-webflux true + + org.springframework.boot + spring-boot-jackson2 + + + org.springframework.boot + spring-boot-health + + + org.springframework.boot + spring-boot-webflux + diff --git a/pigx-common/pigx-common-gray/pom.xml b/pigx-common/pigx-common-gray/pom.xml index 21f44d2e2..53bf39c33 100644 --- a/pigx-common/pigx-common-gray/pom.xml +++ b/pigx-common/pigx-common-gray/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT pigx-common-gray diff --git a/pigx-common/pigx-common-idempotent/pom.xml b/pigx-common/pigx-common-idempotent/pom.xml index 7ba880101..b9ccaefac 100644 --- a/pigx-common/pigx-common-idempotent/pom.xml +++ b/pigx-common/pigx-common-idempotent/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT pigx-common-idempotent @@ -21,14 +21,14 @@ org.springframework.boot - spring-boot-starter-aop + spring-boot-starter-aspectj provided org.redisson - redisson-spring-boot-starter + redisson ${redisson.version} @@ -37,5 +37,9 @@ jakarta.servlet jakarta.servlet-api + + org.springframework.boot + spring-boot-data-redis + diff --git a/pigx-common/pigx-common-job/pom.xml b/pigx-common/pigx-common-job/pom.xml index d50d5c15d..cf557122f 100644 --- a/pigx-common/pigx-common-job/pom.xml +++ b/pigx-common/pigx-common-job/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT pigx-common-job diff --git a/pigx-common/pigx-common-log/pom.xml b/pigx-common/pigx-common-log/pom.xml index 893bb186c..28b06321a 100644 --- a/pigx-common/pigx-common-log/pom.xml +++ b/pigx-common/pigx-common-log/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT pigx-common-log @@ -62,5 +62,9 @@ org.springframework.security spring-security-oauth2-core + + org.springframework.boot + spring-boot-jackson2 + diff --git a/pigx-common/pigx-common-oss/pom.xml b/pigx-common/pigx-common-oss/pom.xml index aa5f905c7..85754dbcb 100755 --- a/pigx-common/pigx-common-oss/pom.xml +++ b/pigx-common/pigx-common-oss/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT pigx-common-oss @@ -16,9 +16,8 @@ - com.amazonaws - aws-java-sdk-s3 - ${aws.version} + software.amazon.awssdk + s3 cn.hutool diff --git a/pigx-common/pigx-common-seata/pom.xml b/pigx-common/pigx-common-seata/pom.xml index 009a95eaf..940471def 100644 --- a/pigx-common/pigx-common-seata/pom.xml +++ b/pigx-common/pigx-common-seata/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT pigx-common-seata diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml index 109ad9751..298fd4698 100644 --- a/pigx-common/pigx-common-security/pom.xml +++ b/pigx-common/pigx-common-security/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT pigx-common-security @@ -53,8 +53,18 @@ spring-security-oauth2-jose - org.springframework.security - spring-security-oauth2-authorization-server + org.springframework.boot + spring-boot-starter-security-oauth2-authorization-server + + + org.springframework.boot + spring-boot-jackson2 + + + + com.anji-plus + captcha + true @@ -77,10 +87,6 @@ pigx-upms-api - - com.pig4cloud - pigx-app-server-api - org.springframework spring-webmvc diff --git a/pigx-common/pigx-common-sensitive/pom.xml b/pigx-common/pigx-common-sensitive/pom.xml index 8ae935f73..232aad47c 100644 --- a/pigx-common/pigx-common-sensitive/pom.xml +++ b/pigx-common/pigx-common-sensitive/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT pigx-common-sensitive @@ -61,5 +61,9 @@ org.springframework.data spring-data-redis + + org.springframework.boot + spring-boot-jackson2 + diff --git a/pigx-common/pigx-common-sentinel/pom.xml b/pigx-common/pigx-common-sentinel/pom.xml index 6cc9e1013..82f343a17 100755 --- a/pigx-common/pigx-common-sentinel/pom.xml +++ b/pigx-common/pigx-common-sentinel/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT 4.0.0 @@ -51,5 +51,9 @@ spring-webflux true + + org.springframework.boot + spring-boot-jackson2 + diff --git a/pigx-common/pigx-common-sequence/pom.xml b/pigx-common/pigx-common-sequence/pom.xml index 7022d3963..65db22da1 100755 --- a/pigx-common/pigx-common-sequence/pom.xml +++ b/pigx-common/pigx-common-sequence/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT pigx-common-sequence diff --git a/pigx-common/pigx-common-sse/pom.xml b/pigx-common/pigx-common-sse/pom.xml index 0cc7405e1..2ebcd18d9 100755 --- a/pigx-common/pigx-common-sse/pom.xml +++ b/pigx-common/pigx-common-sse/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT pigx-common-sse diff --git a/pigx-common/pigx-common-swagger/pom.xml b/pigx-common/pigx-common-swagger/pom.xml index 583f18d91..ed4a83337 100644 --- a/pigx-common/pigx-common-swagger/pom.xml +++ b/pigx-common/pigx-common-swagger/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT pigx-common-swagger @@ -48,7 +48,7 @@ org.springframework.cloud - spring-cloud-gateway-server + spring-cloud-gateway-server-webflux provided diff --git a/pigx-common/pigx-common-websocket/pom.xml b/pigx-common/pigx-common-websocket/pom.xml index 5c1836c44..69cc5b7f0 100755 --- a/pigx-common/pigx-common-websocket/pom.xml +++ b/pigx-common/pigx-common-websocket/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT pigx-common-websocket @@ -34,5 +34,9 @@ com.pig4cloud pigx-common-security + + org.springframework.boot + spring-boot-jackson2 + diff --git a/pigx-common/pigx-common-xss/pom.xml b/pigx-common/pigx-common-xss/pom.xml index b17e9d66b..937cadb47 100755 --- a/pigx-common/pigx-common-xss/pom.xml +++ b/pigx-common/pigx-common-xss/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 5.12.0 + 6.0.0-SNAPSHOT pigx-common-xss @@ -31,8 +31,8 @@ - com.fasterxml.jackson.core - jackson-databind + org.springframework.boot + spring-boot-jackson2 diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml index c4b370688..cea902d74 100644 --- a/pigx-common/pom.xml +++ b/pigx-common/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.12.0 + 6.0.0-SNAPSHOT pigx-common diff --git a/pigx-flow/pigx-flow-api/pom.xml b/pigx-flow/pigx-flow-api/pom.xml index a730ebb01..68b5fd5da 100644 --- a/pigx-flow/pigx-flow-api/pom.xml +++ b/pigx-flow/pigx-flow-api/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx-flow - 5.12.0 + 6.0.0-SNAPSHOT pigx-flow-api diff --git a/pigx-flow/pigx-flow-biz/pom.xml b/pigx-flow/pigx-flow-biz/pom.xml index 53cf2b7c2..eebf85527 100644 --- a/pigx-flow/pigx-flow-biz/pom.xml +++ b/pigx-flow/pigx-flow-biz/pom.xml @@ -7,21 +7,16 @@ com.pig4cloud pigx-flow - 5.12.0 + 6.0.0-SNAPSHOT pigx-flow-biz - - - org.springframework.boot - spring-boot-starter-undertow - org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc @@ -47,12 +42,10 @@ org.flowable flowable-bpmn-layout - ${flowable.version} org.flowable flowable-spring-boot-starter-process - ${flowable.version} mybatis @@ -107,12 +100,12 @@ com.baomidou - mybatis-plus-spring-boot3-starter + mybatis-plus-spring-boot4-starter com.alibaba - druid-spring-boot-3-starter + druid-spring-boot-4-starter diff --git a/pigx-flow/pom.xml b/pigx-flow/pom.xml index 99a12c70c..acad54796 100644 --- a/pigx-flow/pom.xml +++ b/pigx-flow/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.12.0 + 6.0.0-SNAPSHOT pigx-flow diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index bc9a018fb..dc9b2125d 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.12.0 + 6.0.0-SNAPSHOT pigx-gateway diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml index 2ebe4e6bc..349d4e006 100644 --- a/pigx-register/pom.xml +++ b/pigx-register/pom.xml @@ -18,7 +18,7 @@ com.pig4cloud pigx - 5.12.0 + 6.0.0-SNAPSHOT pigx-register @@ -27,19 +27,37 @@ nacos 注册配置中心 - 3.1.0-bugfix + 3.2.1 + 1.4.0 io.github.pig-mesh.nacos - nacos-console + nacos-server ${nacos.version} + + io.github.pig-mesh.sofa + jraft-core + ${jraft.version} + + + hessian + com.alipay.sofa + + + io.github.pig-mesh.nacos - nacos-server + nacos-console ${nacos.version} + + + jraft-core + com.alipay.sofa + + diff --git a/pigx-upms/pigx-upms-api/pom.xml b/pigx-upms/pigx-upms-api/pom.xml index 0d3bd1a40..88b1fa4a8 100644 --- a/pigx-upms/pigx-upms-api/pom.xml +++ b/pigx-upms/pigx-upms-api/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-upms - 5.12.0 + 6.0.0-SNAPSHOT pigx-upms-api diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index c9ea22de4..ee49fb9ce 100644 --- a/pigx-upms/pigx-upms-biz/pom.xml +++ b/pigx-upms/pigx-upms-biz/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-upms - 5.12.0 + 6.0.0-SNAPSHOT pigx-upms-biz @@ -127,15 +127,24 @@ com.pig4cloud pigx-common-encrypt-api + + + com.anji-plus + captcha + + + io.github.pig-mesh.plugin + captcha-spring-boot-starter + com.baomidou - mybatis-plus-spring-boot3-starter + mybatis-plus-spring-boot4-starter com.alibaba - druid-spring-boot-3-starter + druid-spring-boot-4-starter @@ -180,11 +189,6 @@ org.dromara.sms4j sms4j-oa-core - - - io.github.pig-mesh.ai - deepseek-spring-boot-starter - com.pig4cloud pigx-common-sse @@ -197,12 +201,7 @@ org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-undertow + spring-boot-starter-webmvc diff --git a/pigx-upms/pom.xml b/pigx-upms/pom.xml index a9ad833ce..1d81cc357 100644 --- a/pigx-upms/pom.xml +++ b/pigx-upms/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.12.0 + 6.0.0-SNAPSHOT pigx-upms diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml old mode 100755 new mode 100644 index 4cc48397c..12143bc0f --- a/pigx-visual/pigx-codegen/pom.xml +++ b/pigx-visual/pigx-codegen/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 5.12.0 + 6.0.0-SNAPSHOT pigx-codegen @@ -17,7 +17,7 @@ 2.0.2 0.1.0 - 11.5.0.0 + 11.5.9.0 1.10 @@ -45,7 +45,7 @@ com.baomidou - mybatis-plus-spring-boot3-starter + mybatis-plus-spring-boot4-starter com.mysql @@ -85,7 +85,7 @@ com.alibaba - druid-spring-boot-3-starter + druid-spring-boot-4-starter @@ -96,18 +96,6 @@ org.anyline anyline-data-jdbc-mysql - - org.anyline - anyline-data-jdbc-postgresql - - - org.anyline - anyline-data-jdbc-oracle - - - org.anyline - anyline-data-jdbc-dm - com.pig4cloud @@ -174,12 +162,7 @@ org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-undertow + spring-boot-starter-webmvc diff --git a/pigx-visual/pigx-daemon-elastic-job/pom.xml b/pigx-visual/pigx-daemon-elastic-job/pom.xml index df7366dfc..460904099 100644 --- a/pigx-visual/pigx-daemon-elastic-job/pom.xml +++ b/pigx-visual/pigx-daemon-elastic-job/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-visual - 5.12.0 + 6.0.0-SNAPSHOT pigx-daemon-elastic-job @@ -55,7 +55,7 @@ com.baomidou - mybatis-plus-spring-boot3-starter + mybatis-plus-spring-boot4-starter com.mysql @@ -64,7 +64,7 @@ com.alibaba - druid-spring-boot-3-starter + druid-spring-boot-4-starter @@ -84,12 +84,7 @@ org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-undertow + spring-boot-starter-webmvc diff --git a/pigx-visual/pigx-daemon-quartz/pom.xml b/pigx-visual/pigx-daemon-quartz/pom.xml index e7ef3f389..a7b179f6c 100644 --- a/pigx-visual/pigx-daemon-quartz/pom.xml +++ b/pigx-visual/pigx-daemon-quartz/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 5.12.0 + 6.0.0-SNAPSHOT 4.0.0 @@ -37,7 +37,7 @@ com.baomidou - mybatis-plus-spring-boot3-starter + mybatis-plus-spring-boot4-starter @@ -62,7 +62,7 @@ com.alibaba - druid-spring-boot-3-starter + druid-spring-boot-4-starter @@ -92,12 +92,7 @@ org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-undertow + spring-boot-starter-webmvc diff --git a/pigx-visual/pigx-jimu-platform/pom.xml b/pigx-visual/pigx-jimu-platform/pom.xml index 098a7ba70..6926dfcfe 100755 --- a/pigx-visual/pigx-jimu-platform/pom.xml +++ b/pigx-visual/pigx-jimu-platform/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 5.12.0 + 6.0.0-SNAPSHOT pigx-jimu-platform @@ -31,6 +31,10 @@ com.pig4cloud pigx-common-feign + + com.pig4cloud + pigx-common-sentinel + com.pig4cloud @@ -49,17 +53,12 @@ org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-undertow + spring-boot-starter-webmvc org.jeecgframework.jimureport - jimureport-spring-boot3-starter-fastjson2 + jimureport-spring-boot3-starter ${jimu.version} @@ -78,10 +77,14 @@ TinyPinyin ${tinyPinyin.version} + + org.springframework.boot + spring-boot-data-commons + com.alibaba - druid-spring-boot-3-starter + druid-spring-boot-4-starter diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml index 8fcf62c41..f0b274f7d 100644 --- a/pigx-visual/pigx-monitor/pom.xml +++ b/pigx-visual/pigx-monitor/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-visual - 5.12.0 + 6.0.0-SNAPSHOT pigx-monitor @@ -64,12 +64,7 @@ org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-undertow + spring-boot-starter-webmvc diff --git a/pigx-visual/pigx-mp-platform/pom.xml b/pigx-visual/pigx-mp-platform/pom.xml old mode 100755 new mode 100644 index fcd7b3db5..ff8fb1efd --- a/pigx-visual/pigx-mp-platform/pom.xml +++ b/pigx-visual/pigx-mp-platform/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 5.12.0 + 6.0.0-SNAPSHOT pigx-mp-platform @@ -14,7 +14,7 @@ 微信公众号管理模块 - 1.1.2 + 1.1.2-20250513.122102 @@ -36,7 +36,7 @@ com.baomidou - mybatis-plus-spring-boot3-starter + mybatis-plus-spring-boot4-starter @@ -56,7 +56,7 @@ com.alibaba - druid-spring-boot-3-starter + druid-spring-boot-4-starter @@ -116,12 +116,7 @@ org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-undertow + spring-boot-starter-webmvc diff --git a/pigx-visual/pigx-pay-platform/pom.xml b/pigx-visual/pigx-pay-platform/pom.xml index 872dfdbe7..a79d383b1 100755 --- a/pigx-visual/pigx-pay-platform/pom.xml +++ b/pigx-visual/pigx-pay-platform/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 5.12.0 + 6.0.0-SNAPSHOT pigx-pay-platform @@ -31,7 +31,7 @@ com.baomidou - mybatis-plus-spring-boot3-starter + mybatis-plus-spring-boot4-starter com.mysql @@ -40,7 +40,7 @@ com.alibaba - druid-spring-boot-3-starter + druid-spring-boot-4-starter @@ -124,12 +124,7 @@ org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-undertow + spring-boot-starter-webmvc org.springframework.boot diff --git a/pigx-visual/pigx-report-platform/pom.xml b/pigx-visual/pigx-report-platform/pom.xml index b34ee1321..b45076a75 100644 --- a/pigx-visual/pigx-report-platform/pom.xml +++ b/pigx-visual/pigx-report-platform/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 5.12.0 + 6.0.0-SNAPSHOT pigx-report-platform @@ -15,7 +15,7 @@ 基于 GoView 的大屏设计系统 - 1.0.3 + 1.0.4 @@ -34,7 +34,7 @@ io.github.pig-mesh - goview-spring-boot3-starter + goview-spring-boot4-starter ${goview.version} @@ -58,13 +58,13 @@ com.alibaba - druid-spring-boot-3-starter + druid-spring-boot-4-starter org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc @@ -72,12 +72,6 @@ com.pig4cloud pigx-upms-api - - - - org.springframework.boot - spring-boot-starter-undertow - diff --git a/pigx-visual/pigx-xxl-job-admin/pom.xml b/pigx-visual/pigx-xxl-job-admin/pom.xml index c28f90548..b37d34167 100644 --- a/pigx-visual/pigx-xxl-job-admin/pom.xml +++ b/pigx-visual/pigx-xxl-job-admin/pom.xml @@ -4,19 +4,18 @@ com.pig4cloud pigx-visual - 5.12.0 + 6.0.0-SNAPSHOT pigx-xxl-job-admin xxl job admin 控制台内置方便开发 jar + - 3.0.4 + 2.4.0 - - com.alibaba.cloud @@ -29,44 +28,31 @@ spring-cloud-starter-alibaba-nacos-config - - - org.springframework.boot - spring-boot-starter-validation - - - - + org.springframework.boot spring-boot-starter-web - org.springframework.boot spring-boot-starter-freemarker - org.springframework.boot spring-boot-starter-mail - org.springframework.boot spring-boot-starter-actuator - - + org.mybatis.spring.boot mybatis-spring-boot-starter - ${mybatis-spring-boot-starter.version} - com.mysql @@ -75,7 +61,7 @@ com.alibaba - druid-spring-boot-3-starter + druid-spring-boot-4-starter @@ -83,24 +69,14 @@ com.xuxueli xxl-job-core ${xxl.job.version} + - + - org.springframework.boot - spring-boot-starter-undertow - - - - jakarta.annotation - jakarta.annotation-api - compile - - - - jakarta.servlet - jakarta.servlet-api - compile + com.xuxueli + xxl-sso-core + ${xxl-sso.version} @@ -121,6 +97,9 @@ io.fabric8 docker-maven-plugin + + false + @@ -133,8 +112,6 @@ **/*.ttf **/*.otf **/*.eot - **/*.js - **/*.css @@ -146,11 +123,8 @@ **/*.ttf **/*.otf **/*.eot - **/*.js - **/*.css - diff --git a/pigx-visual/pom.xml b/pigx-visual/pom.xml index 25bd1af74..0b7a9068a 100644 --- a/pigx-visual/pom.xml +++ b/pigx-visual/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.12.0 + 6.0.0-SNAPSHOT pigx-visual diff --git a/pom.xml b/pom.xml index 965fab2e7..38c1fca23 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.12.0 + 6.0.0-SNAPSHOT ${project.artifactId} pom @@ -33,31 +33,26 @@ - 3.5.11 - 2025.0.1 - 2025.0.0.0 + 4.0.6 + 2025.1.1 + 2025.1.0.0 UTF-8 17 17 - 1.12.1 - 1.12.1-beta21 - 1.1.2 - 3.5.8 - 3.14.0 - 0.0.39 - 4.9.9 - 1.4.0 - 2.2.3 + 4.0.4 + 3.14.1 + 0.0.47 + 9.0.1 3.6.4 - 7.2.0 + 8.0.0 2.0.0 3.0.0 3.0.5 3.0.5 2.12.6 - 2.0.0 - 1.12.792 - 3.1.1 + 2.3.4 + 2.44.12 + 3.4.0 registry.cn-hangzhou.aliyuncs.com http://127.0.0.1:2375 pigcloudx @@ -127,6 +122,14 @@ pom import + + + software.amazon.awssdk + bom + ${aws.sdk.version} + pom + import + org.springframework.boot @@ -166,15 +169,8 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc ${spring-boot.version} - - - - spring-boot-starter-tomcat - org.springframework.boot - -