diff --git a/pigx-app-server/pigx-app-server-biz/src/main/resources/logback-spring.xml b/pigx-app-server/pigx-app-server-biz/src/main/resources/logback-spring.xml
index 964ca8735..90d1d7a70 100644
--- a/pigx-app-server/pigx-app-server-biz/src/main/resources/logback-spring.xml
+++ b/pigx-app-server/pigx-app-server-biz/src/main/resources/logback-spring.xml
@@ -13,11 +13,11 @@
-
+
+ class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+ class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
diff --git a/pigx-auth/src/main/resources/logback-spring.xml b/pigx-auth/src/main/resources/logback-spring.xml
index 13d4db2e5..faa788879 100644
--- a/pigx-auth/src/main/resources/logback-spring.xml
+++ b/pigx-auth/src/main/resources/logback-spring.xml
@@ -30,11 +30,11 @@
-
+
+ class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+ class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
diff --git a/pigx-boot/src/main/resources/application.yml b/pigx-boot/src/main/resources/application.yml
index 770d47059..fd19285bd 100644
--- a/pigx-boot/src/main/resources/application.yml
+++ b/pigx-boot/src/main/resources/application.yml
@@ -19,8 +19,9 @@ spring:
config.enabled: false
discovery.enabled: false
gateway:
- enabled: false
- redis.enabled: false
+ server.webflux:
+ enabled: false
+ redis.enabled: false
sentinel.enabled: false
openfeign.okhttp.enabled: true
freemarker: # freemarker 配置,授权码模式页面渲染使用
diff --git a/pigx-boot/src/main/resources/logback-spring.xml b/pigx-boot/src/main/resources/logback-spring.xml
index 13d4db2e5..53c3fc1e3 100644
--- a/pigx-boot/src/main/resources/logback-spring.xml
+++ b/pigx-boot/src/main/resources/logback-spring.xml
@@ -30,11 +30,11 @@
-
+
+ class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+ class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index e109491f4..98f6ab32d 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -48,6 +48,7 @@
7.1
0.21.0
2.17.1
+ 1.59.1
0.33.0
1.0.0
1.8.4
@@ -486,6 +487,14 @@
pom
import
+
+
+ io.grpc
+ grpc-bom
+ ${grpc.version}
+ pom
+ import
+
cn.hutool
diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/AsyncConfiguration.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/AsyncConfiguration.java
deleted file mode 100644
index 721629097..000000000
--- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/AsyncConfiguration.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.pig4cloud.pigx.common.core.config;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.AsyncConfigurer;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-
-import java.util.concurrent.Executor;
-
-/**
- * 明确异步线程池配置,避免和 @EnableScheduling 造成的线程池冲突
- *
- * @author lengleng
- * @date 2024/4/20
- */
-@Configuration(proxyBeanMethods = false)
-@RequiredArgsConstructor
-public class AsyncConfiguration implements AsyncConfigurer {
-
- private final ThreadPoolTaskExecutor applicationTaskExecutor;
-
- @Override
- public Executor getAsyncExecutor() {
- return applicationTaskExecutor;
- }
-}
diff --git a/pigx-common/pigx-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pigx-common/pigx-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 3ed6f3b40..cf6cbbac6 100644
--- a/pigx-common/pigx-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/pigx-common/pigx-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,4 +1,3 @@
-com.pig4cloud.pigx.common.core.config.AsyncConfiguration
com.pig4cloud.pigx.common.core.config.JacksonConfiguration
com.pig4cloud.pigx.common.core.config.MessageSourceConfiguration
com.pig4cloud.pigx.common.core.config.WebCommonConfiguration
diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerConfiguration.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerConfiguration.java
index 57d70a2cd..0ce1e1d03 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerConfiguration.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerConfiguration.java
@@ -31,7 +31,7 @@ import org.springframework.security.config.annotation.web.configurers.HeadersCon
import org.springframework.security.core.annotation.AnnotationTemplateExpressionDefaults;
import org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenIntrospector;
import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+import org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher;
/**
* @author lengleng
@@ -55,13 +55,13 @@ public class PigxResourceServerConfiguration {
@Bean
@Order(Ordered.HIGHEST_PRECEDENCE)
SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
- AntPathRequestMatcher[] requestMatchers = permitAllUrl.getIgnoreUrls()
+ PathPatternRequestMatcher[] permitMatchers = permitAllUrl.getIgnoreUrls()
.stream()
- .map(AntPathRequestMatcher::new)
+ .map(url -> PathPatternRequestMatcher.withDefaults().matcher(url))
.toList()
- .toArray(new AntPathRequestMatcher[]{});
+ .toArray(new PathPatternRequestMatcher[]{});
- http.authorizeHttpRequests(authorizeRequests -> authorizeRequests.requestMatchers(requestMatchers)
+ http.authorizeHttpRequests(authorizeRequests -> authorizeRequests.requestMatchers(permitMatchers)
.permitAll()
.anyRequest()
.authenticated())
@@ -75,9 +75,9 @@ public class PigxResourceServerConfiguration {
}
/**
- * 支持自定义权限表达式
+ * 创建并返回一个支持自定义权限表达式的默认模板实例
*
- * @return {@link PrePostTemplateDefaults }
+ * @return {@link PrePostTemplateDefaults} 权限表达式默认模板实例
*/
@Bean
AnnotationTemplateExpressionDefaults prePostTemplateDefaults() {
diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/resources/logback-spring.xml b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/resources/logback-spring.xml
index 0cd6c2983..1a5d10343 100644
--- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/resources/logback-spring.xml
+++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/resources/logback-spring.xml
@@ -13,11 +13,11 @@
-
+
+ class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+ class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/resources/logback-spring.xml b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/resources/logback-spring.xml
index 0cd6c2983..1a5d10343 100644
--- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/resources/logback-spring.xml
+++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/resources/logback-spring.xml
@@ -13,11 +13,11 @@
-
+
+ class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+ class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml
index 132fb851f..7a0fa6191 100644
--- a/pigx-gateway/pom.xml
+++ b/pigx-gateway/pom.xml
@@ -36,7 +36,7 @@
org.springframework.cloud
- spring-cloud-starter-gateway
+ spring-cloud-starter-gateway-server-webflux
org.springframework.boot
diff --git a/pigx-gateway/src/main/resources/logback-spring.xml b/pigx-gateway/src/main/resources/logback-spring.xml
index 232d13ee7..4e0059ebc 100644
--- a/pigx-gateway/src/main/resources/logback-spring.xml
+++ b/pigx-gateway/src/main/resources/logback-spring.xml
@@ -30,11 +30,11 @@
-
+
+ class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+ class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/logback-spring.xml b/pigx-upms/pigx-upms-biz/src/main/resources/logback-spring.xml
index 3e292157f..255758dc4 100644
--- a/pigx-upms/pigx-upms-biz/src/main/resources/logback-spring.xml
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/logback-spring.xml
@@ -13,11 +13,11 @@
-
+
+ class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+ class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
diff --git a/pigx-visual/pigx-codegen/src/main/resources/logback-spring.xml b/pigx-visual/pigx-codegen/src/main/resources/logback-spring.xml
index c109e7843..6879ae21a 100644
--- a/pigx-visual/pigx-codegen/src/main/resources/logback-spring.xml
+++ b/pigx-visual/pigx-codegen/src/main/resources/logback-spring.xml
@@ -30,11 +30,11 @@
-
+
+ class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+ class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/logback-spring.xml b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/logback-spring.xml
index ef137181c..f9663e651 100644
--- a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/logback-spring.xml
+++ b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/logback-spring.xml
@@ -30,11 +30,11 @@
-
+
+ class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+ class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
diff --git a/pigx-visual/pigx-daemon-quartz/src/main/resources/logback-spring.xml b/pigx-visual/pigx-daemon-quartz/src/main/resources/logback-spring.xml
index daf3fa0bd..a96b00255 100644
--- a/pigx-visual/pigx-daemon-quartz/src/main/resources/logback-spring.xml
+++ b/pigx-visual/pigx-daemon-quartz/src/main/resources/logback-spring.xml
@@ -13,11 +13,11 @@
-
+
+ class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+ class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/logback-spring.xml b/pigx-visual/pigx-jimu-platform/src/main/resources/logback-spring.xml
index cb1ff1c12..73877b781 100644
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/logback-spring.xml
+++ b/pigx-visual/pigx-jimu-platform/src/main/resources/logback-spring.xml
@@ -30,11 +30,11 @@
-
+
+ class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+ class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
diff --git a/pigx-visual/pigx-monitor/src/main/resources/logback-spring.xml b/pigx-visual/pigx-monitor/src/main/resources/logback-spring.xml
index ef137181c..f9663e651 100644
--- a/pigx-visual/pigx-monitor/src/main/resources/logback-spring.xml
+++ b/pigx-visual/pigx-monitor/src/main/resources/logback-spring.xml
@@ -30,11 +30,11 @@
-
+
+ class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+ class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
diff --git a/pigx-visual/pigx-mp-platform/src/main/resources/logback-spring.xml b/pigx-visual/pigx-mp-platform/src/main/resources/logback-spring.xml
index ef137181c..f9663e651 100644
--- a/pigx-visual/pigx-mp-platform/src/main/resources/logback-spring.xml
+++ b/pigx-visual/pigx-mp-platform/src/main/resources/logback-spring.xml
@@ -30,11 +30,11 @@
-
+
+ class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+ class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
diff --git a/pigx-visual/pigx-pay-platform/src/main/resources/logback-spring.xml b/pigx-visual/pigx-pay-platform/src/main/resources/logback-spring.xml
index 721909512..3f405bf46 100644
--- a/pigx-visual/pigx-pay-platform/src/main/resources/logback-spring.xml
+++ b/pigx-visual/pigx-pay-platform/src/main/resources/logback-spring.xml
@@ -13,11 +13,11 @@
-
+
+ class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+ class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
diff --git a/pigx-visual/pigx-report-platform/src/main/resources/logback-spring.xml b/pigx-visual/pigx-report-platform/src/main/resources/logback-spring.xml
index e0c81dc15..5f9a207d5 100644
--- a/pigx-visual/pigx-report-platform/src/main/resources/logback-spring.xml
+++ b/pigx-visual/pigx-report-platform/src/main/resources/logback-spring.xml
@@ -13,11 +13,11 @@
-
+
+ class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+ class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/logback-spring.xml b/pigx-visual/pigx-xxl-job-admin/src/main/resources/logback-spring.xml
index 8fde520d4..a1f9b59a6 100755
--- a/pigx-visual/pigx-xxl-job-admin/src/main/resources/logback-spring.xml
+++ b/pigx-visual/pigx-xxl-job-admin/src/main/resources/logback-spring.xml
@@ -22,11 +22,11 @@
-
+
+ class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+ class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
diff --git a/pom.xml b/pom.xml
index 32182c338..97e7cd66c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,9 +33,9 @@
- 3.4.5
- 2024.0.0
- 2023.0.3.2
+ 3.5.0
+ 2025.0.0
+ 2023.0.3.3
UTF-8
17
17
@@ -119,7 +119,6 @@
pigx-flow
pigx-visual
pigx-app-server
- pigx-knowledge
@@ -156,6 +155,18 @@
pom
import
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+ ${spring-cloud-alibaba.version}
+
+
+ logback-adapter
+ com.alibaba.nacos
+
+
+
org.springframework.boot