This is an automated email from the ASF dual-hosted git repository. kimmking 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 a98413f Refactor document for spring namespace & governance (#7648) a98413f is described below commit a98413f93d1b7bf3c6a08fa16a632db805e3acb4 Author: Haoran Meng <menghaora...@gmail.com> AuthorDate: Mon Sep 28 18:07:46 2020 +0800 Refactor document for spring namespace & governance (#7648) * Fixes governance shadow examples * Refactor document for spring namespace & governance --- .../configuration/spring-namespace/governance.cn.md | 2 +- .../configuration/spring-namespace/governance.en.md | 2 +- .../usage/governance/spring-namespace.cn.md | 10 +++++++--- .../usage/governance/spring-namespace.en.md | 8 ++++++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-namespace/governance.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-namespace/governance.cn.md index e4c4164..61fd286 100644 --- a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-namespace/governance.cn.md +++ b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-namespace/governance.cn.md @@ -20,7 +20,7 @@ weight = 6 <governance:reg-center id="regCenter" type="ZooKeeper" server-lists="localhost:2181" /> <governance:config-center id="configCenter" type="ZooKeeper" server-lists="localhost:2182" /> - <governance:data-source id="shardingDatabasesTablesDataSource" data-source-ref="realShardingDatabasesTablesDataSource" reg-center-ref="regCenter" config-center-ref="configCenter" overwrite="true" /> + <governance:data-source id="shardingDatabasesTablesDataSource" data-source-names="demo_ds_0, demo_ds_1" reg-center-ref="regCenter" config-center-ref="configCenter" rule-refs="shardingRule" overwrite="true" /> </beans> ``` 命名空间: [http://shardingsphere.apache.org/schema/shardingsphere/governance/governance-5.0.0.xsd](http://shardingsphere.apache.org/schema/shardingsphere/governance/governance-5.0.0.xsd) diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-namespace/governance.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-namespace/governance.en.md index ca060f9..e1b106b 100644 --- a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-namespace/governance.en.md +++ b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-namespace/governance.en.md @@ -19,7 +19,7 @@ weight = 6 "> <governance:reg-center id="regCenter" type="ZooKeeper" server-lists="localhost:2181" /> <governance:config-center id="configCenter" type="ZooKeeper" server-lists="localhost:2182" /> - <governance:data-source id="shardingDatabasesTablesDataSource" data-source-ref="realShardingDatabasesTablesDataSource" reg-center-ref="regCenter" config-center-ref="configCenter" overwrite="true" /> + <governance:data-source id="shardingDatabasesTablesDataSource" data-source-names="demo_ds_0, demo_ds_1" reg-center-ref="regCenter" config-center-ref="configCenter" rule-refs="shardingRule" overwrite="true" /> </beans> ``` diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-namespace.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-namespace.cn.md index 8ee1c17..7a13b6b 100644 --- a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-namespace.cn.md +++ b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-namespace.cn.md @@ -44,9 +44,13 @@ weight = 4 </util:properties> <governance:reg-center id="regCenter" type="Zookeeper" server-lists="localhost:2181" /> <governance:config-center id="configCenter" type="ZooKeeper" server-lists="localhost:2182" /> - <governance:data-source id="shardingDatabasesTablesDataSource" data-source-names="realShardingDatabasesTablesDataSource" reg-center-ref="regCenter" config-center-ref="configCenter" overwrite="true" /> - <governance:data-source id="primaryReplicaReplicationDataSource" data-source-names="realPrimaryReplicaReplicationDataSource" reg-center-ref="regCenter" config-center-ref="configCenter" overwrite="true" /> - <governance:data-source id="encryptDataSource" data-source-names="realEncryptDataSource" reg-center-ref="regCenter" config-center-ref="configCenter" overwrite="true" /> + <governance:data-source id="shardingDatabasesTablesDataSource" data-source-names="demo_ds_0, demo_ds_1" reg-center-ref="regCenter" config-center-ref="configCenter" rule-refs="shardingRule" overwrite="true" /> + <governance:data-source id="primaryReplicaReplicationDataSource" data-source-names="demo_primary_ds, demo_replica_ds_0, demo_replica_ds_1" reg-center-ref="regCenter" config-center-ref="configCenter" rule-refs="primaryReplicaRule" overwrite="true" /> + <governance:data-source id="encryptDataSource" data-source-names="demo_ds" reg-center-ref="regCenter" config-center-ref="configCenter" rule-refs="encryptRule" overwrite="true" > + <props> + <prop key="query-with-cipher-column">true</prop> + </props> + </governance:data-source> </beans> ``` diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-namespace.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-namespace.en.md index e8c3a09..3740c6a 100644 --- a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-namespace.en.md +++ b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-namespace.en.md @@ -44,8 +44,12 @@ weight = 4 </util:properties> <governance:reg-center id="regCenter" type="Zookeeper" server-lists="localhost:2181" /> <governance:config-center id="configCenter" type="ZooKeeper" server-lists="localhost:2182" /> - <governance:data-source id="shardingDatabasesTablesDataSource" data-source-names="realShardingDatabasesTablesDataSource" reg-center-ref="regCenter" config-center-ref="configCenter" overwrite="true" /> - <governance:data-source id="encryptDataSource" data-source-names="realEncryptDataSource" reg-center-ref="regCenter" config-center-ref="configCenter" overwrite="true" /> + <governance:data-source id="shardingDatabasesTablesDataSource" data-source-names="demo_ds_0, demo_ds_1" reg-center-ref="regCenter" config-center-ref="configCenter" rule-refs="shardingRule" overwrite="true" /> + <governance:data-source id="encryptDataSource" data-source-names="demo_ds" reg-center-ref="regCenter" config-center-ref="configCenter" rule-refs="encryptRule" overwrite="true" > + <props> + <prop key="query-with-cipher-column">true</prop> + </props> + </governance:data-source> </beans> ```