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 5c0dab7 Modify ShardingSphere-proxy default configuration file
(#11569)
5c0dab7 is described below
commit 5c0dab778efde5230bacc4abf8cc5e75941503ed
Author: zhaojinchao <[email protected]>
AuthorDate: Thu Jul 29 16:37:28 2021 +0800
Modify ShardingSphere-proxy default configuration file (#11569)
* Modify ShardingSphere-proxy default configuration file
* update
---
.../configuration/yaml/encrypt.cn.md | 2 +-
.../configuration/yaml/encrypt.en.md | 2 +-
.../src/main/resources/conf/config-encrypt.yaml | 38 ++++++++++++----------
3 files changed, 22 insertions(+), 20 deletions(-)
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/encrypt.cn.md
b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/encrypt.cn.md
index 26b87eb..f776252 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/encrypt.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/encrypt.cn.md
@@ -6,7 +6,7 @@ weight = 3
## 配置项说明
```yaml
-dataSource: # 省略数据源配置，请参考使用手册
+dataSources: # 省略数据源配置，请参考使用手册
rules:
- !ENCRYPT
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/encrypt.en.md
b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/encrypt.en.md
index c77a0b0..f63a0f3 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/encrypt.en.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/encrypt.en.md
@@ -6,7 +6,7 @@ weight = 3
## Configuration Item Explanation
```yaml
-dataSource: # Omit the data source configuration, please refer to the usage
+dataSources: # Omit the data source configuration, please refer to the usage
rules:
- !ENCRYPT
diff --git
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/resources/conf/config-encrypt.yaml
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/resources/conf/config-encrypt.yaml
index 530b2c8..0598c47 100644
---
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/resources/conf/config-encrypt.yaml
+++
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/resources/conf/config-encrypt.yaml
@@ -24,15 +24,16 @@
#
#schemaName: encrypt_db
#
-#dataSource:
-# url:
jdbc:postgresql://127.0.0.1:5432/demo_ds?serverTimezone=UTC&useSSL=false
-# username: postgres
-# password: postgres
-# connectionTimeoutMilliseconds: 30000
-# idleTimeoutMilliseconds: 60000
-# maxLifetimeMilliseconds: 1800000
-# maxPoolSize: 50
-# minPoolSize: 1
+#dataSources:
+# ds_0:
+# url:
jdbc:postgresql://127.0.0.1:5432/demo_ds?serverTimezone=UTC&useSSL=false
+# username: postgres
+# password: postgres
+# connectionTimeoutMilliseconds: 30000
+# idleTimeoutMilliseconds: 60000
+# maxLifetimeMilliseconds: 1800000
+# maxPoolSize: 50
+# minPoolSize: 1
#
#rules:
#- !ENCRYPT
@@ -62,15 +63,16 @@
#
#schemaName: encrypt_db
#
-#dataSource:
-# url: jdbc:mysql://127.0.0.1:3306/demo_ds?serverTimezone=UTC&useSSL=false
-# username: root
-# password:
-# connectionTimeoutMilliseconds: 30000
-# idleTimeoutMilliseconds: 60000
-# maxLifetimeMilliseconds: 1800000
-# maxPoolSize: 50
-# minPoolSize: 1
+#dataSources:
+# ds_0:
+# url: jdbc:mysql://127.0.0.1:3306/test?serverTimezone=UTC&useSSL=false
+# username: root
+# password: 123456
+# connectionTimeoutMilliseconds: 30000
+# idleTimeoutMilliseconds: 60000
+# maxLifetimeMilliseconds: 1800000
+# maxPoolSize: 50
+# minPoolSize: 1
#
#rules:
#- !ENCRYPT
