This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit d5419ce0cd1526a5b4e33f66ce6c5edc8147b040
Author: Lei Zhang <zhang...@apache.org>
AuthorDate: Tue Mar 8 14:10:50 2022 +0800
SCB-2421 Update documents
---
docs/fsm/fsm_manual.md | 13 +++++--------
docs/fsm/fsm_manual_zh.md | 13 +++++--------
docs/fsm/persistence_zh.md | 15 +++++++--------
docs/user_guide.md | 32 ++++++++++++++++++--------------
docs/user_guide_zh.md | 28 ++++++++++++++++------------
5 files changed, 51 insertions(+), 50 deletions(-)
diff --git a/docs/fsm/fsm_manual.md b/docs/fsm/fsm_manual.md
index e3e0e68..da8327c 100755
--- a/docs/fsm/fsm_manual.md
+++ b/docs/fsm/fsm_manual.md
@@ -30,7 +30,7 @@ ServiceComb Pack 0.5.0 开始支持 Saga 状态机模式，你只需要在启动
* 启动 Elasticsearch
```bash
- docker run --name elasticsearch -p 9200:9200 -p 9300:9300 -e
"discovery.type=single-node" elasticsearch:6.6.2
+ docker run --name elasticsearch -p 9200:9200 -p 9300:9300 -e
"discovery.type=single-node" elasticsearch:7.17.1
```
* 启动 Alpha
@@ -42,8 +42,7 @@ ServiceComb Pack 0.5.0 开始支持 Saga 状态机模式，你只需要在启动
--spring.datasource.password=password \
--alpha.feature.akka.enabled=true \
--alpha.feature.akka.transaction.repository.type=elasticsearch \
- --spring.data.elasticsearch.cluster-name=docker-cluster \
- --spring.data.elasticsearch.cluster-nodes=localhost:9300 \
+ --spring.elasticsearch.rest.uris=http://127.0.0.1:9200 \
--spring.profiles.active=prd
```
@@ -165,7 +164,7 @@ services:
- POSTGRES_PASSWORD=password
elasticsearch:
- image: elasticsearch:6.6.2
+ image: elasticsearch:7.17.1
hostname: elasticsearch
container_name: elasticsearch
environment:
@@ -246,8 +245,7 @@ services:
--spring.datasource.username=saga \
--spring.datasource.password=password \
--spring.kafka.bootstrap-servers=127.0.0.1:9092 \
- --spring.data.elasticsearch.cluster-name=docker-cluster \
- --spring.data.elasticsearch.cluster-nodes=127.0.0.1:9300 \
+ --spring.elasticsearch.rest.uris=http://127.0.0.1:9200 \
--akkaConfig.akka.remote.artery.canonical.port=8070 \
--akkaConfig.akka.cluster.seed-nodes[0]="akka://alpha-cluster@127.0.0.1:8070" \
--akkaConfig.akka-persistence-redis.redis.host=127.0.0.1 \
@@ -267,8 +265,7 @@ services:
--spring.datasource.username=saga \
--spring.datasource.password=password \
--spring.kafka.bootstrap-servers=127.0.0.1:9092 \
- --spring.data.elasticsearch.cluster-name=docker-cluster \
- --spring.data.elasticsearch.cluster-nodes=127.0.0.1:9300 \
+ --spring.elasticsearch.rest.uris=http://127.0.0.1:9200 \
--akkaConfig.akka.remote.artery.canonical.port=8071 \
--akkaConfig.akka.cluster.seed-nodes[0]="akka://alpha-cluster@127.0.0.1:8070" \
--akkaConfig.akka-persistence-redis.redis.host=127.0.0.1 \
diff --git a/docs/fsm/fsm_manual_zh.md b/docs/fsm/fsm_manual_zh.md
index 1acd53b..31a0367 100755
--- a/docs/fsm/fsm_manual_zh.md
+++ b/docs/fsm/fsm_manual_zh.md
@@ -30,7 +30,7 @@ ServiceComb Pack 0.5.0 开始支持 Saga 状态机模式，你只需要在启动
* 启动 Elasticsearch
```bash
- docker run --name elasticsearch -p 9200:9200 -p 9300:9300 -e
"discovery.type=single-node" elasticsearch:6.6.2
+ docker run -d --name elasticsearch -p 9200:9200 -p 9300:9300 -e
"discovery.type=single-node" elasticsearch:7.17.1
```
* 启动 Alpha
@@ -42,8 +42,7 @@ ServiceComb Pack 0.5.0 开始支持 Saga 状态机模式，你只需要在启动
--spring.datasource.password=password \
--alpha.feature.akka.enabled=true \
--alpha.feature.akka.transaction.repository.type=elasticsearch \
- --spring.data.elasticsearch.cluster-name=docker-cluster \
- --spring.data.elasticsearch.cluster-nodes=localhost:9300 \
+ --spring.elasticsearch.rest.uris=http://127.0.0.1:9200 \
--spring.profiles.active=prd
```
@@ -165,7 +164,7 @@ services:
- POSTGRES_PASSWORD=password
elasticsearch:
- image: elasticsearch:6.6.2
+ image: elasticsearch:7.17.1
hostname: elasticsearch
container_name: elasticsearch
environment:
@@ -246,8 +245,7 @@ services:
--spring.datasource.username=saga \
--spring.datasource.password=password \
--spring.kafka.bootstrap-servers=127.0.0.1:9092 \
- --spring.data.elasticsearch.cluster-name=docker-cluster \
- --spring.data.elasticsearch.cluster-nodes=127.0.0.1:9300 \
+ --spring.elasticsearch.rest.uris=http://127.0.0.1:9200 \
--akkaConfig.akka.remote.artery.canonical.port=8070 \
--akkaConfig.akka.cluster.seed-nodes[0]="akka://alpha-cluster@127.0.0.1:8070" \
--akkaConfig.akka-persistence-redis.redis.host=127.0.0.1 \
@@ -267,8 +265,7 @@ services:
--spring.datasource.username=saga \
--spring.datasource.password=password \
--spring.kafka.bootstrap-servers=127.0.0.1:9092 \
- --spring.data.elasticsearch.cluster-name=docker-cluster \
- --spring.data.elasticsearch.cluster-nodes=127.0.0.1:9300 \
+ --spring.elasticsearch.rest.uris=http://127.0.0.1:9200 \
--akkaConfig.akka.remote.artery.canonical.port=8071 \
--akkaConfig.akka.cluster.seed-nodes[0]="akka://alpha-cluster@127.0.0.1:8070" \
--akkaConfig.akka-persistence-redis.redis.host=127.0.0.1 \
diff --git a/docs/fsm/persistence_zh.md b/docs/fsm/persistence_zh.md
index 9a0065a..c49eed9 100644
--- a/docs/fsm/persistence_zh.md
+++ b/docs/fsm/persistence_zh.md
@@ -15,13 +15,12 @@
### 持久化参数
-| 参数名 | 默认值 | 说明
|
-| ------------------------------------------------------------ | ------ |
------------------------------------------------------------ |
-| alpha.feature.akka.transaction.repository.type | |
持久化类型，目前可选值 elasticsearch，如果不设置则不存储 |
-| alpha.feature.akka.transaction.repository.elasticsearch.batchSize | 100 |
elasticsearch 批量入库数量 |
-| alpha.feature.akka.transaction.repository.elasticsearch.refreshTime | 5000
| elasticsearch 定时同步到ES时间 |
-| spring.data.elasticsearch.cluster-name | |
ES集群名称 |
-| spring.data.elasticsearch.cluster-nodes | |
ES节点地址，格式：localhost:9300，多个地址逗号分隔 |
+| 参数名 | 默认值 | 说明
|
+| ------------------------------------------------------------ | ------
|------------------------------------------|
+| alpha.feature.akka.transaction.repository.type | |
持久化类型，目前可选值 elasticsearch，如果不设置则不存储 |
+| alpha.feature.akka.transaction.repository.elasticsearch.batchSize | 100 |
elasticsearch 批量入库数量 |
+| alpha.feature.akka.transaction.repository.elasticsearch.refreshTime | 5000
| elasticsearch 定时同步到ES时间 |
+| spring.elasticsearch.rest.uris | |
ES节点地址，格式：http://localhost:9200，多个地址逗号分隔 |
### Elasticsearch 索引
@@ -232,4 +231,4 @@ Alpha 会在 Elasticsearch 中创建一个名为 `alpha_global_transaction` 的
}
```
- 更多用法参考 [Elasticsearch
APIs](https://www.elastic.co/guide/en/elasticsearch/reference/6.6/docs.html)
\ No newline at end of file
+ 更多用法参考 [Elasticsearch 7.X
APIs](https://www.elastic.co/guide/en/elasticsearch/reference/7.17/docs.html)
\ No newline at end of file
diff --git a/docs/user_guide.md b/docs/user_guide.md
index 2b98727..bfca281 100644
--- a/docs/user_guide.md
+++ b/docs/user_guide.md
@@ -421,10 +421,11 @@ Alpha instance can register to the discovery service,
Omega obtains Alpha's inst
- spring boot version compatible
- If your project is not using spring boot 2.1.1, please refer to this list
to add a compatible spring-cloud-starter-consul-discovery version
+ If your project is not using spring boot 2.3.X, please refer to this list
to add a compatible spring-cloud-starter-consul-discovery version
| spring boot | spring-cloud-starter-consul-discovery |
| ------------- | ------------------------------------- |
+ | 2.3.12.RELEASE | 2.2.8.RELEASE |
| 2.1.x.RELEASE | 2.1.1.RELEASE |
| 2.0.x.RELEASE | 2.0.2.RELEASE |
@@ -434,7 +435,7 @@ Alpha instance can register to the discovery service, Omega
obtains Alpha's inst
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-consul-discovery</artifactId>
- <version>2.0.2.RELEASE</version>
+ <version>2.2.8.RELEASE</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -533,10 +534,11 @@ Alpha instance can register to the discovery service,
Omega obtains Alpha's inst
* spring boot version compatible
- If your project is not using spring boot 2.1.1, please refer to this list
to add a compatible spring-cloud-starter-netflix-eureka-client version
+ If your project is not using spring boot 2.3.X, please refer to this list
to add a compatible spring-cloud-starter-netflix-eureka-client version
| spring boot | spring-cloud-starter-netflix-eureka-client |
- | ------------- | ------------------------------------------ |
+ |--------------------------------------------|
------------------------------------------ |
+ | 2.3.12.RELEASE | 2.2.10.RELEASE |
| 2.1.x.RELEASE | 2.1.1.RELEASE |
| 2.0.x.RELEASE | 2.0.3.RELEASE |
@@ -546,7 +548,7 @@ Alpha instance can register to the discovery service, Omega
obtains Alpha's inst
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
- <version>2.0.3.RELEASE</version>
+ <version>2.2.10.RELEASE</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -660,12 +662,13 @@ Alpha instance can register to the discovery service,
Omega obtains Alpha's inst
- spring boot version compatible
- If your project is not using spring boot 2.1.1, please refer to this list
to add a compatible spring-cloud-starter-zookeeper-discovery version
+ If your project is not using spring boot 2.3.X, please refer to this list
to add a compatible spring-cloud-starter-zookeeper-discovery version
| spring boot | spring-cloud-starter-zookeeper-discovery |
- | ------------- | ------------------------------------- |
- | 2.1.x.RELEASE | 2.1.1.RELEASE |
- | 1.5.17.RELEASE | 1.2.2.RELEASE |
+ |------------------------------------------|
------------------------------------- |
+ | 2.3.12.RELEASE | 2.2.5.RELEASE |
+ | 2.1.x.RELEASE | 2.1.1.RELEASE |
+ | 1.5.17.RELEASE | 1.2.2.RELEASE |
```xml
<dependencyManagement>
@@ -673,7 +676,7 @@ Alpha instance can register to the discovery service, Omega
obtains Alpha's inst
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-zookeeper-discovery</artifactId>
- <version>2.1.1.RELEASE</version>
+ <version>2.2.5.RELEASE</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -782,10 +785,11 @@ Alpha instance can register to the discovery service,
Omega obtains Alpha's inst
- spring boot version compatible
- If your project is not using spring boot 2.1.1, please refer to this list
to add a compatible spring-cloud-starter-alibaba-nacos-discovery version
+ If your project is not using spring boot 2.3.X, please refer to this list
to add a compatible spring-cloud-starter-alibaba-nacos-discovery version
| spring boot | spring-cloud-starter-alibaba-nacos-discovery |
- | ------------- | ------------------------------------- |
+----------------| ------------- | ------------------------------------- |
+ | 2.3.12.RELEASE | 2.2.6.RELEASE |
| 2.1.x.RELEASE | 0.2.2.RELEASE |
| 1.5.17.RELEASE | 0.1.2.RELEASE |
@@ -793,9 +797,9 @@ Alpha instance can register to the discovery service, Omega
obtains Alpha's inst
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.springframework.cloud</groupId>
+ <groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
- <version>0.2.2.RELEASE</version>
+ <version>2.2.6.RELEASE</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/docs/user_guide_zh.md b/docs/user_guide_zh.md
index 235ff39..a8265df 100644
--- a/docs/user_guide_zh.md
+++ b/docs/user_guide_zh.md
@@ -423,10 +423,11 @@ public void bar() {
- spring boot 版本兼容
- 如果你的项目使用的不是spring boot
2.1.1版本，那么请参照此列表增加兼容的spring-cloud-starter-consul-discovery版本
+ 如果你的项目使用的不是 spring boot 2.3.X
版本，那么请参照此列表增加兼容的spring-cloud-starter-consul-discovery版本
| spring boot | spring-cloud-starter-consul-discovery |
| ------------- | ------------------------------------- |
+ | 2.3.12.RELEASE | 2.2.8.RELEASE |
| 2.1.x.RELEASE | 2.1.1.RELEASE |
| 2.0.x.RELEASE | 2.0.2.RELEASE |
@@ -436,7 +437,7 @@ public void bar() {
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-consul-discovery</artifactId>
- <version>2.0.2.RELEASE</version>
+ <version>2.2.8.RELEASE</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -532,10 +533,11 @@ public void bar() {
* spring boot 版本兼容
- 如果你的项目使用的不是spring boot
2.1.1版本，那么请参照此列表增加兼容的spring-cloud-starter-consul-discovery版本
+ 如果你的项目使用的不是 spring boot 2.3.X
版本，那么请参照此列表增加兼容的spring-cloud-starter-consul-discovery版本
| spring boot | spring-cloud-starter-netflix-eureka-client |
- | ------------- | ------------------------------------------ |
+ |--------------------------------------------|
------------------------------------------ |
+ | 2.3.12.RELEASE | 2.2.10.RELEASE |
| 2.1.x.RELEASE | 2.1.1.RELEASE |
| 2.0.x.RELEASE | 2.0.3.RELEASE |
@@ -545,7 +547,7 @@ public void bar() {
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
- <version>2.0.3.RELEASE</version>
+ <version>2.2.10.RELEASE</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -656,10 +658,11 @@ public void bar() {
- spring boot 版本兼容
- 如果你的项目使用的不是spring boot
2.1.1版本，那么请参照此列表增加兼容的spring-cloud-starter-zookeeper-discovery版本
+ 如果你的项目使用的不是 spring boot 2.3.X
版本，那么请参照此列表增加兼容的spring-cloud-starter-zookeeper-discovery版本
| spring boot | spring-cloud-starter-zookeeper-discovery |
- | ------------- | ------------------------------------- |
+ |------------------------------------------|
------------------------------------- |
+ | 2.3.12.RELEASE | 2.2.5.RELEASE |
| 2.1.x.RELEASE | 2.1.1.RELEASE |
| 1.5.17.RELEASE | 1.2.2.RELEASE |
@@ -669,7 +672,7 @@ public void bar() {
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-zookeeper-discovery</artifactId>
- <version>2.1.1.RELEASE</version>
+ <version>2.2.5.RELEASE</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -772,10 +775,11 @@ public void bar() {
- spring boot 版本兼容
- 如果你的项目使用的不是spring boot
2.1.1版本，那么请参照此列表增加兼容的spring-cloud-starter-alibaba-nacos-discovery版本
+ 如果你的项目使用的不是 spring boot 2.3.X
版本，那么请参照此列表增加兼容的spring-cloud-starter-alibaba-nacos-discovery版本
| spring boot | spring-cloud-starter-alibaba-nacos-discovery |
- | ------------- | ------------------------------------- |
+----------------| ------------- | ------------------------------------- |
+ | 2.3.12.RELEASE | 2.2.6.RELEASE |
| 2.1.x.RELEASE | 0.2.2.RELEASE |
| 1.5.17.RELEASE | 0.1.2.RELEASE |
@@ -783,9 +787,9 @@ public void bar() {
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.springframework.cloud</groupId>
+ <groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
- <version>0.2.2.RELEASE</version>
+ <version>2.2.6.RELEASE</version>
</dependency>
</dependencies>
</dependencyManagement>
