This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 5f8a98426ac Rename sharding to shardingsphere in seata.conf (#30741)
5f8a98426ac is described below
commit 5f8a98426ac4838b05471460d4d1161dbb536d6e
Author: LotusMoon <[email protected]>
AuthorDate: Tue Apr 2 14:07:59 2024 +0800
Rename sharding to shardingsphere in seata.conf (#30741)
* Support encrypt rewriter with custom databaseName config
* Rename sharding to shardingsphere in seata.conf
* convert ShardingSphere to lowercase
---
.../shardingsphere-jdbc/special-api/transaction/seata.cn.md | 8 ++++----
.../shardingsphere-jdbc/special-api/transaction/seata.en.md | 8 ++++----
.../src/main/resources/template/resources/seata.ftl | 2 +-
.../base/seata/at/SeataATShardingSphereTransactionManager.java | 4 ++--
.../transaction/type/base/seata-at/src/test/resources/seata.conf | 4 ++--
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.cn.md
b/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.cn.md
index 6a66f116c50..5ec66e76433 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.cn.md
@@ -80,16 +80,16 @@ ALTER TABLE `undo_log` ADD INDEX `ix_log_created`
(`log_created`);
`seata.conf` 存在四个属性，
-1. `sharding.transaction.seata.at.enable`，当此值为`true`时，开启 ShardingSphere 的
Seata AT 集成，存在默认值为 `true`
-2. `sharding.transaction.seata.tx.timeout`，全局事务超时（秒），存在默认值为 `60`
+1. `shardingsphere.transaction.seata.at.enable`，当此值为`true`时，开启 ShardingSphere
的 Seata AT 集成，存在默认值为 `true`
+2. `shardingsphere.transaction.seata.tx.timeout`，全局事务超时（秒），存在默认值为 `60`
3. `client.application.id`，应用唯一主键
4. `client.transaction.service.group`，所属事务组，存在默认值为 `default`
一个完全配置的 `seata.conf` 如下，
```conf
-sharding.transaction.seata.at.enable = true
-sharding.transaction.seata.tx.timeout = 60
+shardingsphere.transaction.seata.at.enable = true
+shardingsphere.transaction.seata.tx.timeout = 60
client {
application.id = example
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.en.md
b/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.en.md
index e2ef1b63fe5..360074868f6 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.en.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.en.md
@@ -81,16 +81,16 @@ The configuration file format refers to the
[JavaDoc](https://github.com/apache/
There are four properties in `seata.conf`,
-1. `sharding.transaction.seata.at.enable`, when this value is `true`,
ShardingSphere's Seata AT integration is enabled, there is a default value of
`true`
-2. `sharding.transaction.seata.tx.timeout`, global transaction timeout in
SECONDS, there is a default value of `60`
+1. `shardingsphere.transaction.seata.at.enable`, when this value is `true`,
ShardingSphere's Seata AT integration is enabled, there is a default value of
`true`
+2. `shardingsphere.transaction.seata.tx.timeout`, global transaction timeout
in SECONDS, there is a default value of `60`
3. `client.application.id`, apply the only primary key
4. `client.transaction.service.group`, the transaction group it belongs to,
there is a default value of `default`
A fully configured `seata.conf` is as follows,
```conf
-sharding.transaction.seata.at.enable = true
-sharding.transaction.seata.tx.timeout = 60
+shardingsphere.transaction.seata.at.enable = true
+shardingsphere.transaction.seata.tx.timeout = 60
client {
application.id = example
diff --git
a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/resources/seata.ftl
b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/resources/seata.ftl
index 919da72e8da..d235996daee 100644
---
a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/resources/seata.ftl
+++
b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/resources/seata.ftl
@@ -15,7 +15,7 @@
# limitations under the License.
#
-sharding.transaction.seata.at.enable = true
+shardingsphere.transaction.seata.at.enable = true
client {
application.id = jdbc-test
diff --git
a/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManager.java
b/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManager.java
index 6cf19e41095..de7592f46e9 100644
---
a/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManager.java
+++
b/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManager.java
@@ -59,10 +59,10 @@ public final class SeataATShardingSphereTransactionManager
implements ShardingSp
public SeataATShardingSphereTransactionManager() {
FileConfiguration config = new FileConfiguration("seata.conf");
- enableSeataAT =
config.getBoolean("sharding.transaction.seata.at.enable", true);
+ enableSeataAT =
config.getBoolean("shardingsphere.transaction.seata.at.enable", true);
applicationId = config.getConfig("client.application.id");
transactionServiceGroup =
config.getConfig("client.transaction.service.group", "default");
- globalTXTimeout =
config.getInt("sharding.transaction.seata.tx.timeout", 60);
+ globalTXTimeout =
config.getInt("shardingsphere.transaction.seata.tx.timeout", 60);
}
@Override
diff --git
a/kernel/transaction/type/base/seata-at/src/test/resources/seata.conf
b/kernel/transaction/type/base/seata-at/src/test/resources/seata.conf
index dd4a2160541..ad22c09b203 100644
--- a/kernel/transaction/type/base/seata-at/src/test/resources/seata.conf
+++ b/kernel/transaction/type/base/seata-at/src/test/resources/seata.conf
@@ -15,8 +15,8 @@
# limitations under the License.
#
-sharding.transaction.seata.at.enable = true
-sharding.transaction.seata.tx.timeout = 30
+shardingsphere.transaction.seata.at.enable = true
+shardingsphere.transaction.seata.tx.timeout = 30
client {
application.id = jdbc-test
