This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new 81504c09b7 optimize: change the getProperty call to
resolvePlaceholders in SpringBootConfigurationProvider (#7955)
81504c09b7 is described below
commit 81504c09b7b20d8a73b5fe26a8840706c6f643ac
Author: lokidundun <[email protected]>
AuthorDate: Tue Jan 27 10:29:11 2026 +0800
optimize: change the getProperty call to resolvePlaceholders in
SpringBootConfigurationProvider (#7955)
---
changes/en-us/2.x.md | 1 +
changes/zh-cn/2.x.md | 1 +
.../boot/autoconfigure/provider/SpringBootConfigurationProvider.java | 4 ++++
3 files changed, 6 insertions(+)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index f97944d6e8..7a66ffb544 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -37,6 +37,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7943](https://github.com/apache/incubator-seata/pull/7943)] update
jib-maven-plugin version and increase parallel test execution limits
- [[#7934](https://github.com/apache/incubator-seata/pull/7934)] add OkHttp
and MockWebServer dependencies to resolve version conflicts
- [[#7951](https://github.com/apache/incubator-seata/pull/7951)] upgrade qs
dependency version to 6.14.1
+- [[#7955](https://github.com/apache/incubator-seata/pull/7955)] change the
getProperty call to resolvePlaceholders
### security:
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 2b843db31b..8261615af5 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -36,6 +36,7 @@
- [[#7943](https://github.com/apache/incubator-seata/pull/7943)]
升级jib-maven-plugin版本和提高ci并行度
- [[#7934](https://github.com/apache/incubator-seata/pull/7934)] 添加 OkHttp 和
MockWebServer 依赖来解决版本冲突
- [[#7951](https://github.com/apache/incubator-seata/pull/7951)]
升级qs依赖版本至6.14.1
+- [[#7955](https://github.com/apache/incubator-seata/pull/7955)] 将 getProperty
调用改为 resolvePlaceholders
### security:
diff --git
a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/org/apache/seata/spring/boot/autoconfigure/provider/SpringBootConfigurationProvider.java
b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/org/apache/seata/spring/boot/autoconfigure/provider/SpringBootConfigurationProvider.java
index fc1159364d..349da18540 100644
---
a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/org/apache/seata/spring/boot/autoconfigure/provider/SpringBootConfigurationProvider.java
+++
b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/org/apache/seata/spring/boot/autoconfigure/provider/SpringBootConfigurationProvider.java
@@ -239,6 +239,10 @@ public class SpringBootConfigurationProvider implements
ExtConfigurationProvider
return getConfigFromEnvironment(oldGrouplistDataId, dataType);
}
}
+ // ensures that values are converted to their actual values
+ if (value instanceof String) {
+ value = environment.resolvePlaceholders((String) value);
+ }
return value;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]