You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by xi...@apache.org on 2020/07/29 13:39:00 UTC
[shardingsphere] branch master updated: revise docs for
orchestration
This is an automated email from the ASF dual-hosted git repository.
xiaoyu 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 0e6904b revise docs for orchestration
new e5d4d1a Merge pull request #6517 from kimmking/reviseDoc1
0e6904b is described below
commit 0e6904b5c2c0561213de7133dd203a4fb687b483
Author: kimmking <ki...@apache.org>
AuthorDate: Wed Jul 29 21:36:41 2020 +0800
revise docs for orchestration
---
docs/document/content/dev-manual/governance.cn.md | 20 ++++++++++----------
docs/document/content/dev-manual/governance.en.md | 20 ++++++++++----------
.../configuration/java-api/governance.cn.md | 14 +++++++++-----
.../configuration/java-api/governance.en.md | 14 +++++++++-----
.../spring-boot-starter/governance.cn.md | 2 +-
.../spring-boot-starter/governance.en.md | 2 +-
.../configuration/spring-namespace/governance.en.md | 2 +-
.../configuration/yaml/governance.cn.md | 16 +++++++++-------
.../configuration/yaml/governance.en.md | 12 +++++++-----
.../usage/governance/java-api.cn.md | 20 +++++++++-----------
.../usage/governance/java-api.en.md | 20 +++++++++-----------
.../usage/governance/spring-boot-starter.cn.md | 6 +++---
.../usage/governance/spring-boot-starter.en.md | 6 +++---
.../usage/governance/spring-namespace.cn.md | 6 +++---
.../usage/governance/spring-namespace.en.md | 6 +++---
.../shardingsphere-jdbc/usage/governance/yaml.cn.md | 12 +++++-------
.../shardingsphere-jdbc/usage/governance/yaml.en.md | 14 ++++++--------
.../shardingsphere-proxy/usage/governance.en.md | 2 +-
18 files changed, 99 insertions(+), 95 deletions(-)
diff --git a/docs/document/content/dev-manual/governance.cn.md b/docs/document/content/dev-manual/governance.cn.md
index 50c501c..787092a 100644
--- a/docs/document/content/dev-manual/governance.cn.md
+++ b/docs/document/content/dev-manual/governance.cn.md
@@ -5,29 +5,29 @@ weight = 8
chapter = true
+++
-## ConfigCenterRepository
+## ConfigurationRepository
| *SPI 名称* | *详细说明* |
| -------------------------------- | ----------------------- |
-| ConfigCenterRepository | 配置中心 |
+| ConfigurationRepository | 配置中心 |
| *已知实现类* | *详细说明* |
| -------------------------------- | ----------------------- |
-| CuratorZookeeperCenterRepository | 基于 ZooKeeper 的配置中心 |
-| EtcdCenterRepository | 基于 Etcd 的配置中心 |
-| NacosCenterRepository | 基于 Nacos 的配置中心 |
-| ApolloCenterRepository | 基于 Apollo 的配置中心 |
+| CuratorZookeeperRepository | 基于 ZooKeeper 的配置中心 |
+| EtcdRepository | 基于 etcd 的配置中心 |
+| NacosRepository | 基于 Nacos 的配置中心 |
+| ApolloRepository | 基于 Apollo 的配置中心 |
-## RegistryCenterRepository
+## RegistryRepository
| *SPI 名称* | *详细说明* |
| -------------------------------- | ----------------------- |
-| RegistryCenterRepository | 注册中心 |
+| RegistryRepository | 注册中心 |
| *已知实现类* | *详细说明* |
| -------------------------------- | ----------------------- |
-| CuratorZookeeperCenterRepository | 基于 ZooKeeper 的注册中心 |
-| EtcdCenterRepository | 基于 Etcd 的注册中心 |
+| CuratorZookeeperRepository | 基于 ZooKeeper 的注册中心 |
+| EtcdRepository | 基于 etcd 的注册中心 |
## RootInvokeHook
diff --git a/docs/document/content/dev-manual/governance.en.md b/docs/document/content/dev-manual/governance.en.md
index ba314b7..27755e6 100644
--- a/docs/document/content/dev-manual/governance.en.md
+++ b/docs/document/content/dev-manual/governance.en.md
@@ -5,29 +5,29 @@ weight = 8
chapter = true
+++
-## ConfigCenterRepository
+## ConfigurationRepository
| *SPI Name* | *Description* |
| -------------------------------- | ----------------------- |
-| ConfigCenterRepository | Config center |
+| ConfigurationRepository | Config repository |
| *Implementation Class* | *Description* |
| -------------------------------- | ----------------------- |
-| CuratorZookeeperCenterRepository | ZooKeeper config center |
-| EtcdCenterRepository | Etcd config center |
-| NacosCenterRepository | Nacos config center |
-| ApolloCenterRepository | Apollo config center |
+| CuratorZookeeperRepository | ZooKeeper config repository |
+| EtcdRepository | etcd config repository |
+| NacosRepository | Nacos config repository |
+| ApolloRepository | Apollo config repository |
-## RegistryCenterRepository
+## RegistryRepository
| *SPI Name* | *Description* |
| -------------------------------- | ------------------------- |
-| RegistryCenterRepository | Registry center |
+| RegistryRepository | Registry repository |
| *Implementation Class* | *Description* |
| -------------------------------- | ------------------------- |
-| CuratorZookeeperCenterRepository | ZooKeeper registry center |
-| EtcdCenterRepository | Etcd registry center |
+| CuratorZookeeperRepository | ZooKeeper registry repository |
+| EtcdRepository | etcd registry repository |
## RootInvokeHook
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/java-api/governance.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/java-api/governance.cn.md
index 52d3d12..880c974 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/java-api/governance.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/java-api/governance.cn.md
@@ -13,19 +13,23 @@ weight = 6
可配置属性：
-| *名称* | *数据类型* | *说明* |
-| ------------------------ | ----------------------------------- | ----------------------------------------------------------------- |
-| instanceConfigurationMap | Map\<String, CenterConfiguration\> | 治理实例的配置 map，key 为名称，value 为治理实例 |
+| *名称* | *数据类型* | *说明* |
+| ----------------------------------- | ----------------------------------- | ----------------------------------------------------------------- |
+| registryCenterConfiguration | Map\<String, CenterConfiguration\> | 注册中心实例的配置 map，key 为名称，value 为治理实例 |
+| additionalConfigCenterConfiguration | Map\<String, CenterConfiguration\> | 可选的配置中心实例的配置 map，key 为名称，value 为治理实例 |
+
+注册中心的类型可以为Zookeeper或etcd。
+配置中心的类型可以为Zookeeper或etcd、Apollo、Nacos。
*治理实例配置*
-类名称：org.apache.shardingsphere.orchestration.repository.api.config.CenterConfiguration
+类名称：org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration
可配置属性：
| *名称* | *数据类型* | *说明* |
| ------------- | ---------- | -------------------------------------------------------------------------- |
-| type | String | 治理实例类型，如：zookeeper, etcd, apollo, nacos |
+| type | String | 治理实例类型，如：Zookeeper, etcd, Apollo, Nacos |
| serverLists | String | 治理服务列表，包括 IP 地址和端口号，多个地址用逗号分隔，如: host1:2181,host2:2181 |
| namespace (?) | String | 治理命名空间 |
| props | Properties | 配置本实例需要的其他参数，例如 ZooKeeper 的连接参数等 |
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/java-api/governance.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/java-api/governance.en.md
index 4a0b4e7..2e21d14 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/java-api/governance.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/java-api/governance.en.md
@@ -13,19 +13,23 @@ Class name: org.apache.shardingsphere.orchestration.repository.api.config.Orches
Attributes:
-| *Name* | *Data Type* | *Description* |
-| ------------------------ | ----------------------------------- | ------------------------------------------------------------------------------------------------------------------- |
-| instanceConfigurationMap | Map\<String, CenterConfiguration\> | Config map of config-center®istry-center, the key is orchestration name, the value is the orchestration instance |
+| *Name* | *Data Type* | *Description* |
+| ----------------------------------- | ----------------------------------- | ------------------------------------------------------------------------------------------------------------------- |
+| registryCenterConfiguration | Map\<String, CenterConfiguration\> | Config map of registry-center, the key is orchestration name, the value is the orchestration instance |
+| additionalConfigCenterConfiguration | Map\<String, CenterConfiguration\> | Config additional map of config-center, the key is orchestration name, the value is the orchestration instance |
+
+The type of registryCenter could be Zookeeper or etcd.
+The type of additional ConfigCenter could be Zookeeper or etcd, Apollo, Nacos.
*Orchestration Instance Configuration*
-Class name: org.apache.shardingsphere.orchestration.repository.api.config.CenterConfiguration
+Class name: org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration
Attributes:
| *Name* | *Data Type* | *Description* |
| ------------- | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
-| type | String | Orchestration instance type, such as: zookeeper, etcd, apollo, nacos |
+| type | String | Orchestration instance type, such as: Zookeeper, etcd, Apollo, Nacos |
| serverLists | String | The list of servers that connect to orchestration instance, including IP and port number, use commas to separate, such as: host1:2181,host2:2181 |
| namespace (?) | String | Orchestration namespace |
| props | Properties | Properties for center instance config, such as options of zookeeper |
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-boot-starter/governance.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-boot-starter/governance.cn.md
index 8f6fabf..5c3f7d6 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-boot-starter/governance.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-boot-starter/governance.cn.md
@@ -8,7 +8,7 @@ weight = 6
### 治理
```properties
-spring.shardingsphere.orchestration.spring_boot_ds_sharding.type= # 治理持久化类型。如：zookeeper, etcd, apollo, nacos
+spring.shardingsphere.orchestration.spring_boot_ds_sharding.type= # 治理持久化类型。如：Zookeeper, etcd, Apollo, Nacos
spring.shardingsphere.orchestration.spring_boot_ds_sharding.server-lists= # 治理服务列表。包括 IP 地址和端口号。多个地址用逗号分隔。如: host1:2181,host2:2181
spring.shardingsphere.orchestration.spring_boot_ds_sharding.namespace= # 治理命名空间
spring.shardingsphere.orchestration.spring_boot_ds_sharding.props.overwrite= # 本地配置是否覆盖配置中心配置。如果可覆盖，每次启动都以本地配置为准
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-boot-starter/governance.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-boot-starter/governance.en.md
index 8a3df3a..1171d39 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-boot-starter/governance.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-boot-starter/governance.en.md
@@ -8,7 +8,7 @@ weight = 6
### Management
```properties
-spring.shardingsphere.orchestration.spring_boot_ds_sharding.type= #Orchestration instance type. Example:zookeeper, etcd, apollo, nacos
+spring.shardingsphere.orchestration.spring_boot_ds_sharding.type= #Orchestration instance type. Example:Zookeeper, etcd, Apollo, Nacos
spring.shardingsphere.orchestration.spring_boot_ds_sharding.server-lists= #The list of servers that connect to orchestration instance, including IP and port number; use commas to separate
spring.shardingsphere.orchestration.spring_boot_ds_sharding.namespace= #Orchestration namespace
spring.shardingsphere.orchestration.spring_boot_ds_sharding.properties.overwrite= #Whether to overwrite local configurations with config center configurations; if it can, each initialization should refer to local configurations
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 1a6360e..99218e8 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
@@ -17,7 +17,7 @@ weight = 6
http://shardingsphere.apache.org/schema/shardingsphere/orchestration
http://shardingsphere.apache.org/schema/shardingsphere/orchestration/orchestration.xsd
">
- <orchestration:reg-center id="regCenter" type="zookeeper" server-lists="localhost:2181">
+ <orchestration:reg-center id="regCenter" type="Zookeeper" server-lists="localhost:2181">
<props>
<prop key="overwrite">true</prop>
</props>
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/governance.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/governance.cn.md
index e4d7e1d..6a8608c 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/governance.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/governance.cn.md
@@ -8,13 +8,15 @@ weight = 6
### 治理
```yaml
-orchestration:
- demo_yaml_ds_sharding: # 治理实例名称
- type: # 治理持久化类型。如：zookeeper, etcd, apollo, nacos
- serverLists: # 治理服务列表。包括 IP 地址和端口号。多个地址用逗号分隔。如: host1:2181,host2:2181
- namespace: # 治理命名空间
- props: # 配置本实例需要的其他参数，例如 ZooKeeper 的连接参数等
- overwrite: # 本地配置是否覆盖配置中心配置。如果可覆盖，每次启动都以本地配置为准
+orchestration:
+ namespace: # 治理命名空间
+ registryCenter: # 配置中心
+ type: # 治理持久化类型。如：Zookeeper, etcd
+ serverLists: # 治理服务列表。包括 IP 地址和端口号。多个地址用逗号分隔。如: host1:2181,host2:2181
+ additionalConfigCenter:
+ type: # 治理持久化类型。如：Zookeeper, etcd, Nacos, Apollo
+ serverLists: # 治理服务列表。包括 IP 地址和端口号。多个地址用逗号分隔。如: host1:2181,host2:2181
+ overwrite: # 本地配置是否覆盖配置中心配置。如果可覆盖，每次启动都以本地配置为准
```
### 集群管理
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/governance.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/governance.en.md
index 46e5421..6f4b213 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/governance.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/governance.en.md
@@ -9,12 +9,14 @@ weight = 6
```yaml
orchestration:
- demo_yaml_ds_sharding: #Orchestration instance name
- type: #Orchestration instance type. Example:zookeeper, etcd, apollo, nacos
+ namespace: #Orchestration namespace
+ registryCenter: # Registry Center
+ type: #Orchestration instance type. Example:Zookeeper, etcd
serverLists: #The list of servers that connect to orchestration instance, including IP and port number; use commas to separate
- namespace: #Orchestration namespace
- props: #Properties for center instance config, such as options of zookeeper
- overwrite: #Whether to overwrite local configurations with config center configurations; if it can, each initialization should refer to local configurations
+ additionalConfigCenter:
+ type: #Orchestration instance type. Example:Zookeeper, etcd, Apollo, Nacos
+ serverLists: #The list of servers that connect to orchestration instance, including IP and port number; use commas to separate
+ overwrite: #Whether to overwrite local configurations with config center configurations; if it can, each initialization should refer to local configurations
```
### Cluster
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/java-api.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/java-api.cn.md
index 0eabba1..49797ca 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/java-api.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/java-api.cn.md
@@ -15,14 +15,14 @@ weight = 1
<!-- 使用 ZooKeeper 时，需要引入此模块 -->
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-orchestration-center-zookeeper-curator</artifactId>
+ <artifactId>shardingsphere-orchestration-repository-zookeeper-curator</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
<!-- 使用 Etcd 时，需要引入此模块 -->
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-orchestration-center-etcd</artifactId>
+ <artifactId>shardingsphere-orchestration-repository-etcd</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
```
@@ -36,19 +36,16 @@ weight = 1
// ...
// 配置配置/注册/元数据中心
-Properties props = new Properties();
-props.setProperty("overwrite", overwrite);
-CenterConfiguration centerConfiguration = new CenterConfiguration("zookeeper", props);
-centerConfiguration.setServerLists("localhost:2181");
-centerConfiguration.setNamespace("shardingsphere-orchestration");
+OrchestrationCenterConfiguration configuration = new OrchestrationCenterConfiguration("Zookeeper", "localhost:2181", new Properties());
// 配置治理
-Map<String, CenterConfiguration> instanceConfigurationMap = new HashMap<String, CenterConfiguration>();
-instanceConfigurationMap.put("orchestration-shardingsphere-data-source", centerConfiguration);
+Map<String, CenterConfiguration> configurationMap = new HashMap<String, CenterConfiguration>();
+configurationMap.put("orchestration-shardingsphere-data-source", configuration);
// 创建 OrchestrationShardingSphereDataSource
DataSource dataSource = OrchestrationShardingSphereDataSourceFactory.createDataSource(
- createDataSourceMap(), createShardingRuleConfig(), new HashMap<String, Object>(), new Properties(), new OrchestrationConfiguration(instanceConfigurationMap));
+ createDataSourceMap(), createShardingRuleConfig(), new HashMap<String, Object>(), new Properties(),
+ new OrchestrationConfiguration("shardingsphere-orchestration", configurationMap, true));
```
## 使用 OrchestrationShardingSphereDataSource
@@ -60,7 +57,8 @@ DataSource dataSource = OrchestrationShardingSphereDataSourceFactory.createDataS
```java
DataSource dataSource = OrchestrationShardingSphereDataSourceFactory.createDataSource(
- createDataSourceMap(), createShardingRuleConfig(), new HashMap<String, Object>(), new Properties(), new OrchestrationConfiguration(instanceConfigurationMap));
+ createDataSourceMap(), createShardingRuleConfig(), new HashMap<String, Object>(), new Properties(),
+ new OrchestrationConfiguration("shardingsphere-orchestration", configurationMap, true));
String sql = "SELECT i.* FROM t_order o JOIN t_order_item i ON o.order_id=i.order_id WHERE o.user_id=? AND o.order_id=?";
try (
Connection conn = dataSource.getConnection();
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/java-api.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/java-api.en.md
index 880fa45..67fb975 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/java-api.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/java-api.en.md
@@ -15,14 +15,14 @@ weight = 1
<!-- import if using ZooKeeper -->
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-orchestration-center-zookeeper-curator</artifactId>
+ <artifactId>shardingsphere-orchestration-repository-zookeeper-curator</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
<!-- import if using Etcd -->
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-orchestration-center-etcd</artifactId>
+ <artifactId>shardingsphere-orchestration-repository-etcd</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
```
@@ -36,19 +36,16 @@ Using ZooKeeper as config center and registry center for example.
// ...
// Configure config/registry/metadata center
-Properties props = new Properties();
-props.setProperty("overwrite", overwrite);
-CenterConfiguration centerConfiguration = new CenterConfiguration("zookeeper", props);
-centerConfiguration.setServerLists("localhost:2181");
-centerConfiguration.setNamespace("shardingsphere-orchestration");
+OrchestrationCenterConfiguration configuration = new OrchestrationCenterConfiguration("Zookeeper", "localhost:2181", new Properties());
// Configure orchestration
-Map<String, CenterConfiguration> instanceConfigurationMap = new HashMap<String, CenterConfiguration>();
-instanceConfigurationMap.put("orchestration-shardingsphere-data-source", centerConfiguration);
+Map<String, CenterConfiguration> configurationMap = new HashMap<String, CenterConfiguration>();
+configurationMap.put("orchestration-shardingsphere-data-source", configuration);
// Create OrchestrationShardingSphereDataSource
DataSource dataSource = OrchestrationShardingSphereDataSourceFactory.createDataSource(
- createDataSourceMap(), createShardingRuleConfig(), new HashMap<String, Object>(), new Properties(), new OrchestrationConfiguration(instanceConfigurationMap));
+ createDataSourceMap(), createShardingRuleConfig(), new HashMap<String, Object>(), new Properties(),
+ new OrchestrationConfiguration("shardingsphere-orchestration", configurationMap, true));
```
## Use OrchestrationShardingSphereDataSource
@@ -60,7 +57,8 @@ Take native JDBC usage as an example:
```java
DataSource dataSource = OrchestrationShardingSphereDataSourceFactory.createDataSource(
- createDataSourceMap(), createShardingRuleConfig(), new HashMap<String, Object>(), new Properties(), new OrchestrationConfiguration(instanceConfigurationMap));
+ createDataSourceMap(), createShardingRuleConfig(), new HashMap<String, Object>(), new Properties(),
+ new OrchestrationConfiguration("shardingsphere-orchestration", configurationMap, true));
String sql = "SELECT i.* FROM t_order o JOIN t_order_item i ON o.order_id=i.order_id WHERE o.user_id=? AND o.order_id=?";
try (
Connection conn = dataSource.getConnection();
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-boot-starter.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-boot-starter.cn.md
index e2d1e3f..0f26323 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-boot-starter.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-boot-starter.cn.md
@@ -15,14 +15,14 @@ weight = 3
<!-- 使用 ZooKeeper 时，需要引入此模块 -->
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-orchestration-center-zookeeper-curator</artifactId>
+ <artifactId>shardingsphere-orchestration-repository-zookeeper-curator</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
<!-- 使用 Etcd 时，需要引入此模块 -->
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-orchestration-center-etcd</artifactId>
+ <artifactId>shardingsphere-orchestration-repository-etcd</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
```
@@ -30,7 +30,7 @@ weight = 3
## 规则配置
```properties
-spring.shardingsphere.orchestration.spring_boot_ds.type=zookeeper
+spring.shardingsphere.orchestration.spring_boot_ds.type=Zookeeper
spring.shardingsphere.orchestration.spring_boot_ds.server-lists=localhost:2181
spring.shardingsphere.orchestration.spring_boot_ds.namespace=orchestration-spring-boot-shardingsphere-test
spring.shardingsphere.orchestration.spring_boot_ds.properties.overwrite=true
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-boot-starter.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-boot-starter.en.md
index 83a40c2..d504187 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-boot-starter.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-boot-starter.en.md
@@ -15,14 +15,14 @@ weight = 3
<!-- import if using ZooKeeper -->
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-orchestration-center-zookeeper-curator</artifactId>
+ <artifactId>shardingsphere-orchestration-repository-zookeeper-curator</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
<!-- import if using Etcd -->
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-orchestration-center-etcd</artifactId>
+ <artifactId>shardingsphere-orchestration-repository-etcd</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
```
@@ -30,7 +30,7 @@ weight = 3
## Configure Rule
```properties
-spring.shardingsphere.orchestration.spring_boot_ds.type=zookeeper
+spring.shardingsphere.orchestration.spring_boot_ds.type=Zookeeper
spring.shardingsphere.orchestration.spring_boot_ds.server-lists=localhost:2181
spring.shardingsphere.orchestration.spring_boot_ds.namespace=orchestration-spring-boot-shardingsphere-test
spring.shardingsphere.orchestration.spring_boot_ds.properties.overwrite=true
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 656bb1b..a64489a 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
@@ -15,14 +15,14 @@ weight = 4
<!-- 使用 ZooKeeper 时，需要引入此模块 -->
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-orchestration-center-zookeeper-curator</artifactId>
+ <artifactId>shardingsphere-orchestration-repository-zookeeper-curator</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
<!-- 使用 Etcd 时，需要引入此模块 -->
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-orchestration-center-etcd</artifactId>
+ <artifactId>shardingsphere-orchestration-repository-etcd</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
```
@@ -42,7 +42,7 @@ weight = 4
<prop key="max-retries">3</prop>
<prop key="operation-timeout-milliseconds">3000</prop>
</util:properties>
- <orchestration:reg-center id="regCenter" type="zookeeper" server-lists="localhost:2181" />
+ <orchestration:reg-center id="regCenter" type="Zookeeper" server-lists="localhost:2181" />
<orchestration:data-source id="shardingDatabasesTablesDataSource" data-source-ref="realShardingDatabasesTablesDataSource" reg-center-ref="regCenter" overwrite="true" />
<orchestration:slave-data-source id="masterSlaveDataSource" data-source-ref="realMasterSlaveDataSource" reg-center-ref="regCenter" overwrite="true" />
<orchestration:data-source id="encryptDataSource" data-source-ref="realEncryptDataSource" reg-center-ref="regCenter" overwrite="true" />
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 c2f1c9f..12bc4f6 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
@@ -15,14 +15,14 @@ weight = 4
<!-- import if using ZooKeeper -->
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-orchestration-center-zookeeper-curator</artifactId>
+ <artifactId>shardingsphere-orchestration-repository-zookeeper-curator</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
<!-- import if using Etcd -->
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-orchestration-center-etcd</artifactId>
+ <artifactId>shardingsphere-orchestration-repository-etcd</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
```
@@ -42,7 +42,7 @@ weight = 4
<prop key="max-retries">3</prop>
<prop key="operation-timeout-milliseconds">3000</prop>
</util:properties>
- <orchestration:reg-center id="regCenter" type="zookeeper" server-lists="localhost:2181" />
+ <orchestration:reg-center id="regCenter" type="Zookeeper" server-lists="localhost:2181" />
<orchestration:data-source id="shardingDatabasesTablesDataSource" data-source-ref="realShardingDatabasesTablesDataSource" reg-center-ref="regCenter" overwrite="true" />
<orchestration:slave-data-source id="masterSlaveDataSource" data-source-ref="realMasterSlaveDataSource" reg-center-ref="regCenter" overwrite="true" />
<orchestration:data-source id="encryptDataSource" data-source-ref="realEncryptDataSource" reg-center-ref="regCenter" overwrite="true" />
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/yaml.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/yaml.cn.md
index fc067a6..31e3a62 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/yaml.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/yaml.cn.md
@@ -15,14 +15,14 @@ weight = 2
<!-- 使用 ZooKeeper 时，需要引入此模块 -->
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-orchestration-center-zookeeper-curator</artifactId>
+ <artifactId>shardingsphere-orchestration-repository-zookeeper-curator</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
<!-- 使用 Etcd 时，需要引入此模块 -->
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-orchestration-center-etcd</artifactId>
+ <artifactId>shardingsphere-orchestration-repository-etcd</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
```
@@ -33,13 +33,11 @@ weight = 2
```yaml
orchestration:
- name: orchestration_ds
+ namespace: orchestration_ds
registryCenter:
- type: zookeeper
+ type: Zookeeper
serverLists: localhost:2181
- namespace: orchestration
- props:
- overwrite: true
+ overwrite: true
```
```java
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/yaml.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/yaml.en.md
index a1bc0f7..ea7f45c 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/yaml.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/yaml.en.md
@@ -15,14 +15,14 @@ weight = 2
<!-- import if using ZooKeeper -->
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-orchestration-center-zookeeper-curator</artifactId>
+ <artifactId>shardingsphere-orchestration-repository-zookeeper-curator</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
<!-- import if using Etcd -->
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-orchestration-center-etcd</artifactId>
+ <artifactId>shardingsphere-orchestration-repository-etcd</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
```
@@ -33,13 +33,11 @@ Using ZooKeeper as config center and registry center for example.
```yaml
orchestration:
- name: orchestration_ds
+ namespace: orchestration_ds
registryCenter:
- type: zookeeper
- serverLists: localhost:2181
- namespace: orchestration
- props:
- overwrite: true
+ type: Zookeeper
+ serverLists: localhost:2181
+ overwrite: true
```
```java
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/usage/governance.en.md b/docs/document/content/user-manual/shardingsphere-proxy/usage/governance.en.md
index 4aed4d7..baeb30f 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/usage/governance.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/usage/governance.en.md
@@ -11,7 +11,7 @@ ShardingSphere-Proxy has provided the solution of Zookeeper in default, which im
[Configuration Rules](/en/user-manual/shardingsphere-jdbc/configuration/yaml/governance/) consistent with ShardingSphere-JDBC YAML.
## Other Third Party Components
-Refer to [Supported Third Party Components](/cn/features/governance/management/dependency/) for details.
+Refer to [Supported Third Party Components](/en/features/governance/management/dependency/) for details.
1. Use SPI methods in logic coding and put the generated jar package to the lib folder of ShardingSphere-Proxy.
1. Follow [Configuration Rules](/en/user-manual/shardingsphere-jdbc/configuration/yaml/governance/) to configure and use it.