This is an automated email from the ASF dual-hosted git repository.
panjuan 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 0938abd fix cfg typo (#6379)
0938abd is described below
commit 0938abd198d306f3b750f990440250b978357853
Author: sandynz <[email protected]>
AuthorDate: Mon Jul 20 12:07:29 2020 +0800
fix cfg typo (#6379)
---
.../src/main/resources/conf/config-master_slave.yaml | 6 +++---
.../src/main/resources/conf/config-sharding.yaml | 6 ++++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git
a/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/config-master_slave.yaml
b/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/config-master_slave.yaml
index 1920bad..422ceae 100644
---
a/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/config-master_slave.yaml
+++
b/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/config-master_slave.yaml
@@ -39,11 +39,11 @@ dataSourceCommon:
dataSources:
master_ds:
- jdbcUrl:
jdbc:mysql://127.0.0.1:3306/master_ds?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://127.0.0.1:3306/master_ds?serverTimezone=UTC&useSSL=false
slave_ds_0:
- jdbcUrl:
jdbc:mysql://127.0.0.1:3306/slave_ds_0?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://127.0.0.1:3306/slave_ds_0?serverTimezone=UTC&useSSL=false
slave_ds_1:
- jdbcUrl:
jdbc:mysql://127.0.0.1:3306/slave_ds_1?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://127.0.0.1:3306/slave_ds_1?serverTimezone=UTC&useSSL=false
rules:
- !MASTER_SLAVE
diff --git
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/resources/conf/config-sharding.yaml
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/resources/conf/config-sharding.yaml
index e778454..8b5f709 100644
---
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/resources/conf/config-sharding.yaml
+++
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/resources/conf/config-sharding.yaml
@@ -90,7 +90,8 @@
# keyGenerators:
# snowflake:
# type: SNOWFLAKE
-# worker.id: 123
+# props:
+# worker.id: 123
######################################################################################################
#
@@ -163,4 +164,5 @@
# keyGenerators:
# snowflake:
# type: SNOWFLAKE
-# worker.id: 123
+# props:
+# worker.id: 123
