This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch docusaurus
in repository https://gitbox.apache.org/repos/asf/incubator-seata-website.git
The following commit(s) were added to refs/heads/docusaurus by this push:
new 3e59666069 Distinguish between multi-version deployment documents
(#741)
3e59666069 is described below
commit 3e5966606929f2591645e293f04e745340b15d0f
Author: funkye <jian...@apache.org>
AuthorDate: Thu Dec 28 09:37:02 2023 +0800
Distinguish between multi-version deployment documents (#741)
---
.../current/ops/deploy-guide-beginner.md | 21 +---
.../current/ops/deploy-server-raft.md | 4 +
.../current/user/configurations.md | 1 +
.../version-v1.0/ops/deploy-guide-beginner.md | 116 ++-------------------
.../version-v1.1/ops/deploy-guide-beginner.md | 116 ++-------------------
.../version-v1.2/ops/deploy-guide-beginner.md | 116 ++-------------------
.../version-v1.3/ops/deploy-guide-beginner.md | 102 +-----------------
.../version-v1.4/ops/deploy-guide-beginner.md | 102 +-----------------
.../version-v1.5/ops/deploy-guide-beginner.md | 21 +---
.../version-v1.6/ops/deploy-guide-beginner.md | 21 +---
.../version-v1.7/ops/deploy-guide-beginner.md | 21 +---
.../version-v1.8/ops/deploy-guide-beginner.md | 21 +---
.../version-v2.0/ops/deploy-guide-beginner.md | 21 +---
.../version-v2.0/ops/deploy-server-raft.md | 3 +
.../version-v2.0/user/configurations.md | 1 +
.../current/ops/deploy-guide-beginner.md | 32 +-----
.../current/ops/deploy-server-raft.md | 6 +-
.../current/user/configurations.md | 1 +
.../version-v1.0/ops/deploy-guide-beginner.md | 108 +------------------
.../version-v1.1/ops/deploy-guide-beginner.md | 108 +------------------
.../version-v1.2/ops/deploy-guide-beginner.md | 108 +------------------
.../version-v1.3/ops/deploy-guide-beginner.md | 102 +-----------------
.../version-v1.4/ops/deploy-guide-beginner.md | 102 +-----------------
.../version-v1.5/ops/deploy-guide-beginner.md | 32 +-----
.../version-v1.6/ops/deploy-guide-beginner.md | 32 +-----
.../version-v1.7/ops/deploy-guide-beginner.md | 32 +-----
.../version-v1.8/ops/deploy-guide-beginner.md | 32 +-----
.../version-v2.0/ops/deploy-guide-beginner.md | 30 +-----
.../version-v2.0/ops/deploy-server-raft.md | 4 +
.../version-v2.0/user/configurations.md | 1 +
30 files changed, 96 insertions(+), 1321 deletions(-)
diff --git
a/i18n/en/docusaurus-plugin-content-docs/current/ops/deploy-guide-beginner.md
b/i18n/en/docusaurus-plugin-content-docs/current/ops/deploy-guide-beginner.md
index 95fd73024f..d48bc1099e 100644
---
a/i18n/en/docusaurus-plugin-content-docs/current/ops/deploy-guide-beginner.md
+++
b/i18n/en/docusaurus-plugin-content-docs/current/ops/deploy-guide-beginner.md
@@ -39,12 +39,10 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -58,7 +56,7 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
### Start Server
-There are currently three server-side storage modes (store.mode): file, db,
and redis (raft and mongodb will be introduced later). The file mode does not
need to be changed and can be started directly. The following specifically
explains the db and redis startup steps.
+There are currently three server-side storage modes (store.mode): file, db,
redis, raft. The file mode does not need to be changed and can be started
directly. The following specifically explains the db and redis startup steps.
Note: The file mode is a stand-alone mode. The global transaction session
information is read and written in the memory and the local file root.data is
persisted. So the performance is quite well;
@@ -68,7 +66,7 @@ The redis mode is supported by Seata-Server 1.3 and above. It
has high performan
#### Step 1: Startup package
- <a href="https://github.com/seata/seata/releases"; target="_blank">Click to
download</a>.
-- Official DingTalk group (Group Number: 23171167, 1st group is already full,
including 5,000 people, <a href="http://seata.io/zh-cn/community";
target="_blank">2nd group</a>, group 3: 32033786), QQ group (Group Number:
254657148, group 2: 216012363). Please download packages in the group sharing
file.
+- Official DingTalk group (Group Number: 23171167, 1st group is already full,
including 5,000 people, <a href="http://seata.io/zh-cn/community";
target="_blank">2nd group</a>, group 3: 32033786，group 4: 60170003910), QQ
group (Group Number: 254657148, group 2: 216012363). Please download packages
in the group sharing file.
#### Step 2: Create table (db only)
Global transaction session information consists of three pieces of content,
that is global transaction-->branch transaction-->global lock, corresponding to
the tables global_table, branch_table, and lock_table.
@@ -78,31 +76,16 @@ Global transaction session information consists of three
pieces of content, that
Startup package: seata-->conf-->application.yml, modify store.mode="db" or
"redis"
Source code: root directory-->seata-server-->resources-->application.yml,
modify store.mode="db" or "redis"
-For versions below 1.5.0:
-
-Startup package: seata-->conf-->file.conf, modify store.mode="db" or "redis"
-Source code: root directory-->seata-server-->resources-->file.conf, modify
store.mode="db" or "redis"
-
#### Step 4: Modify database connection|redis attribute configuration
Startup package: seata-->conf-->application.example.yml comes with additional
configuration, copy its db|redis related configuration to application.yml, and
modify store.db or store.redis related properties.
Source code: Root
directory-->seata-server-->resources-->application.example.yml comes with
additional configuration, copy its db|redis related configuration to
application.yml, and modify store.db or store.redis related Attributes.
-For versions below 1.5.0:
-
-Startup package: seata-->conf-->file.conf, modify store.db or store.redis
related properties.
-Source code: Root directory-->seata-server-->resources-->file.conf, modify
store.db or store.redis related properties.
-
#### Step 5: Start
- Source code startup: execute the main method in ServerApplication.java
- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-For versions below 1.5.0:
-
-- Source code startup: execute the main method in Server.java
-- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
-
```
-h: IP registered to the registration center
-p: Server rpc listening port
diff --git
a/i18n/en/docusaurus-plugin-content-docs/current/ops/deploy-server-raft.md
b/i18n/en/docusaurus-plugin-content-docs/current/ops/deploy-server-raft.md
index 5897fee13f..09b9e604a3 100644
--- a/i18n/en/docusaurus-plugin-content-docs/current/ops/deploy-server-raft.md
+++ b/i18n/en/docusaurus-plugin-content-docs/current/ops/deploy-server-raft.md
@@ -59,6 +59,10 @@ On Windows
bin\seata-server.bat
```
+4. Volume expansion and contraction
+Assuming the original cluster list is "192.168.0.111:7091, 192.168.0.112:7091,
192.168.0.113:7091", whether it is scaling or shrinking, only need to modify
this string and submit it to the volume expansion and contraction interface of
a member, such as scaling "curl -X POST -i
http://192.168.0.111:7091/metadata/v1/changeCluster?raftClusterStr=192.168.0.111:
7091, 192.168.0.112:7091, 192.168.0.113:7091, 192.168.0.114:7091" ', if it is
scaling, only need to remove the nodes in the cluster [...]
+Note: The seata.server.raft.server-addr configuration is invalid as long as
the cluster is built. Please perform volume expansion and contraction through
the API. The subsequent console will also integrate volume expansion and
contraction and cluster management functions.
+
## Client
1. Change `registry.type`
diff --git
a/i18n/en/docusaurus-plugin-content-docs/current/user/configurations.md
b/i18n/en/docusaurus-plugin-content-docs/current/user/configurations.md
index 8286ab5958..c841c34a43 100644
--- a/i18n/en/docusaurus-plugin-content-docs/current/user/configurations.md
+++ b/i18n/en/docusaurus-plugin-content-docs/current/user/configurations.md
@@ -175,6 +175,7 @@
transport.enable-client-batch-send-request、client.log.exceptionRate
| store.redis.database | redis mode default library | default 0|
| store.redis.password | redis mode password (optional) | null by default|
| store.redis.queryLimit | The maximum number of Redis queries at a time | 100
by default|
+| store.redis.type | Redis operation type: lua, pippline | pippline|
| metrics.enabled | Whether to enable Metrics | False is off by default. In
the false state, all Metrics related components will not be initialized to
minimize the performance loss|
| metrics.registryType | Indicator registrar type | The indicator registrar
type used by Metrics is a built-in compact (simple) implementation by default.
Meters in this implementation only use a limited memory count, and the
performance is high enough to meet most scenarios; Currently, only one
indicator registrar can be set|
| metrics.exporterList | Index result Measurement data outputter list |
default prometheus. Multiple outputters are separated by English commas, such
as "prometheus, jmx". Currently, only the prometheus outputters are connected|
diff --git
a/i18n/en/docusaurus-plugin-content-docs/version-v1.0/ops/deploy-guide-beginner.md
b/i18n/en/docusaurus-plugin-content-docs/version-v1.0/ops/deploy-guide-beginner.md
index 95fd73024f..d4bc573c26 100644
---
a/i18n/en/docusaurus-plugin-content-docs/version-v1.0/ops/deploy-guide-beginner.md
+++
b/i18n/en/docusaurus-plugin-content-docs/version-v1.0/ops/deploy-guide-beginner.md
@@ -39,12 +39,10 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -58,14 +56,12 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
### Start Server
-There are currently three server-side storage modes (store.mode): file, db,
and redis (raft and mongodb will be introduced later). The file mode does not
need to be changed and can be started directly. The following specifically
explains the db and redis startup steps.
+There are currently three server-side storage modes (store.mode): file, db.
The file mode does not need to be changed and can be started directly. The
following specifically explains the db startup steps.
Note: The file mode is a stand-alone mode. The global transaction session
information is read and written in the memory and the local file root.data is
persisted. So the performance is quite well;
The db mode is a high-availability mode. Global transaction session
information is shared through db, but the corresponding performance is poor;
-The redis mode is supported by Seata-Server 1.3 and above. It has high
performance and risks losing transaction information. Please configure the
redis persistence configuration suitable for the current scenario in advance.
-
#### Step 1: Startup package
- <a href="https://github.com/seata/seata/releases"; target="_blank">Click to
download</a>.
- Official DingTalk group (Group Number: 23171167, 1st group is already full,
including 5,000 people, <a href="http://seata.io/zh-cn/community";
target="_blank">2nd group</a>, group 3: 32033786), QQ group (Group Number:
254657148, group 2: 216012363). Please download packages in the group sharing
file.
@@ -75,38 +71,23 @@ Global transaction session information consists of three
pieces of content, that
#### Step 3: Modify store.mode
-Startup package: seata-->conf-->application.yml, modify store.mode="db" or
"redis"
-Source code: root directory-->seata-server-->resources-->application.yml,
modify store.mode="db" or "redis"
-
-For versions below 1.5.0:
-
-Startup package: seata-->conf-->file.conf, modify store.mode="db" or "redis"
-Source code: root directory-->seata-server-->resources-->file.conf, modify
store.mode="db" or "redis"
-
-#### Step 4: Modify database connection|redis attribute configuration
+Startup package: seata-->conf-->file.conf, modify store.mode="db"
+Source code: root directory-->seata-server-->resources-->file.conf, modify
store.mode="db"
-Startup package: seata-->conf-->application.example.yml comes with additional
configuration, copy its db|redis related configuration to application.yml, and
modify store.db or store.redis related properties.
-Source code: Root
directory-->seata-server-->resources-->application.example.yml comes with
additional configuration, copy its db|redis related configuration to
application.yml, and modify store.db or store.redis related Attributes.
+#### Step 4: Modify database connection attribute configuration
-For versions below 1.5.0:
-
-Startup package: seata-->conf-->file.conf, modify store.db or store.redis
related properties.
-Source code: Root directory-->seata-server-->resources-->file.conf, modify
store.db or store.redis related properties.
+Startup package: seata-->conf-->file.conf, modify store.db related properties.
+Source code: Root directory-->seata-server-->resources-->file.conf, modify
store.db related properties.
#### Step 5: Start
-- Source code startup: execute the main method in ServerApplication.java
-- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-
-For versions below 1.5.0:
-
- Source code startup: execute the main method in Server.java
- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
```
-h: IP registered to the registration center
-p: Server rpc listening port
- -m: Global transaction session information storage mode, file, db, redis.
Read startup parameters first (Seata-Server 1.3 and above supports redis)
+ -m: Global transaction session information storage mode, file, db. Read
startup parameters first
-n: Server node. When there are multiple servers, each node needs to be
distinguished to generate transactionIds in different intervals to avoid
conflicts.
-e: Multi-environment configuration please refers to
http://seata.io/en-us/docs/ops/multi-configuration-isolation.html.
```
@@ -192,86 +173,3 @@ You can introduce seata-spring-boot-starter,
spring-cloud-starter-alibaba-seata
Refer to the various rpc implementation modules under the source code
integration folder.
- Automatic <br/>
SpringCloud users can introduce spring-cloud-starter-alibaba-seata, and xid
transfer has been implemented internally.
-
-## Business use
-
-### Annotation interception
-
-#### Global affairs
-
-```java
-@GetMapping(value = "testCommit")
-@GlobalTransactional
-public Object testCommit(@RequestParam(name = "id",defaultValue = "1") Integer
id,
- @RequestParam(name = "sum", defaultValue = "1") Integer sum) {
- Boolean ok = productService.reduceStock(id, sum);
- if (ok) {
- LocalDateTime now = LocalDateTime.now();
- Orders orders = new Orders();
- orders.setCreateTime(now);
- orders.setProductId(id);
- orders.setReplaceTime(now);
- orders.setSum(sum);
- orderService.save(orders);
- return "ok";
- } else {
- return "fail";
- }
-}
-```
-
-#### TCC
-
-```java
-/**
- * Define two-phase commit: name = bean name of the tcc (globally unique),
commitMethod = commit (the two-phase confirmation method) and rollbackMethod =
rollback (the two-phase cancellation method)
- * useTCCFence=true (enable anti-hanging)
- * BusinessActionContextParameter annotation passes parameters to the second
stage
- *
- * @param params - input parameters
- * @return String
- */
-@TwoPhaseBusinessAction(name = "beanName", commitMethod = "commit",
rollbackMethod = "rollback", useTCCFence = true)
-public void insert(@BusinessActionContextParameter(paramName = "params")
Map<String, String> params) {
-
logger.info("此处可以预留资源,或者利用tcc的特点,与AT混用,二阶段时利用一阶段在此处存放的消息,通过二阶段发出,比如redis,mq等操作");
-}
-
-
-/**
- * The confirmation method can be named differently, but it must be consistent
with commitMethod. The context can pass the parameters of the try method.
- *
- * @param context context
- * @return boolean
- */
-public void commit(BusinessActionContext context) {
- logger.info("预留资源真正处理,或者发出mq消息和redis入库");
-}
-
-/**
- * Two-stage cancellation method
- *
- * @param context context
- * @return boolean
- */
-public void rollback(BusinessActionContext context) {
- logger.info("预留资源释放,或清除一阶段准备让二阶段提交时发出的消息缓存");
-}
-```
-
-### Pointcut expression
-
-#### Global affairs
-
-```java
- @Bean
- public AspectTransactionalInterceptor aspectTransactionalInterceptor () {
- return new AspectTransactionalInterceptor();
- }
-
- @Bean
- public Advisor txAdviceAdvisor(AspectTransactionalInterceptor
aspectTransactionalInterceptor ) {
- AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
- pointcut.setExpression("Configure pointcut expression to enable global
transaction interceptor");
- return new DefaultPointcutAdvisor(pointcut,
aspectTransactionalInterceptor);
- }
-```
\ No newline at end of file
diff --git
a/i18n/en/docusaurus-plugin-content-docs/version-v1.1/ops/deploy-guide-beginner.md
b/i18n/en/docusaurus-plugin-content-docs/version-v1.1/ops/deploy-guide-beginner.md
index 95fd73024f..d4bc573c26 100644
---
a/i18n/en/docusaurus-plugin-content-docs/version-v1.1/ops/deploy-guide-beginner.md
+++
b/i18n/en/docusaurus-plugin-content-docs/version-v1.1/ops/deploy-guide-beginner.md
@@ -39,12 +39,10 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -58,14 +56,12 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
### Start Server
-There are currently three server-side storage modes (store.mode): file, db,
and redis (raft and mongodb will be introduced later). The file mode does not
need to be changed and can be started directly. The following specifically
explains the db and redis startup steps.
+There are currently three server-side storage modes (store.mode): file, db.
The file mode does not need to be changed and can be started directly. The
following specifically explains the db startup steps.
Note: The file mode is a stand-alone mode. The global transaction session
information is read and written in the memory and the local file root.data is
persisted. So the performance is quite well;
The db mode is a high-availability mode. Global transaction session
information is shared through db, but the corresponding performance is poor;
-The redis mode is supported by Seata-Server 1.3 and above. It has high
performance and risks losing transaction information. Please configure the
redis persistence configuration suitable for the current scenario in advance.
-
#### Step 1: Startup package
- <a href="https://github.com/seata/seata/releases"; target="_blank">Click to
download</a>.
- Official DingTalk group (Group Number: 23171167, 1st group is already full,
including 5,000 people, <a href="http://seata.io/zh-cn/community";
target="_blank">2nd group</a>, group 3: 32033786), QQ group (Group Number:
254657148, group 2: 216012363). Please download packages in the group sharing
file.
@@ -75,38 +71,23 @@ Global transaction session information consists of three
pieces of content, that
#### Step 3: Modify store.mode
-Startup package: seata-->conf-->application.yml, modify store.mode="db" or
"redis"
-Source code: root directory-->seata-server-->resources-->application.yml,
modify store.mode="db" or "redis"
-
-For versions below 1.5.0:
-
-Startup package: seata-->conf-->file.conf, modify store.mode="db" or "redis"
-Source code: root directory-->seata-server-->resources-->file.conf, modify
store.mode="db" or "redis"
-
-#### Step 4: Modify database connection|redis attribute configuration
+Startup package: seata-->conf-->file.conf, modify store.mode="db"
+Source code: root directory-->seata-server-->resources-->file.conf, modify
store.mode="db"
-Startup package: seata-->conf-->application.example.yml comes with additional
configuration, copy its db|redis related configuration to application.yml, and
modify store.db or store.redis related properties.
-Source code: Root
directory-->seata-server-->resources-->application.example.yml comes with
additional configuration, copy its db|redis related configuration to
application.yml, and modify store.db or store.redis related Attributes.
+#### Step 4: Modify database connection attribute configuration
-For versions below 1.5.0:
-
-Startup package: seata-->conf-->file.conf, modify store.db or store.redis
related properties.
-Source code: Root directory-->seata-server-->resources-->file.conf, modify
store.db or store.redis related properties.
+Startup package: seata-->conf-->file.conf, modify store.db related properties.
+Source code: Root directory-->seata-server-->resources-->file.conf, modify
store.db related properties.
#### Step 5: Start
-- Source code startup: execute the main method in ServerApplication.java
-- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-
-For versions below 1.5.0:
-
- Source code startup: execute the main method in Server.java
- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
```
-h: IP registered to the registration center
-p: Server rpc listening port
- -m: Global transaction session information storage mode, file, db, redis.
Read startup parameters first (Seata-Server 1.3 and above supports redis)
+ -m: Global transaction session information storage mode, file, db. Read
startup parameters first
-n: Server node. When there are multiple servers, each node needs to be
distinguished to generate transactionIds in different intervals to avoid
conflicts.
-e: Multi-environment configuration please refers to
http://seata.io/en-us/docs/ops/multi-configuration-isolation.html.
```
@@ -192,86 +173,3 @@ You can introduce seata-spring-boot-starter,
spring-cloud-starter-alibaba-seata
Refer to the various rpc implementation modules under the source code
integration folder.
- Automatic <br/>
SpringCloud users can introduce spring-cloud-starter-alibaba-seata, and xid
transfer has been implemented internally.
-
-## Business use
-
-### Annotation interception
-
-#### Global affairs
-
-```java
-@GetMapping(value = "testCommit")
-@GlobalTransactional
-public Object testCommit(@RequestParam(name = "id",defaultValue = "1") Integer
id,
- @RequestParam(name = "sum", defaultValue = "1") Integer sum) {
- Boolean ok = productService.reduceStock(id, sum);
- if (ok) {
- LocalDateTime now = LocalDateTime.now();
- Orders orders = new Orders();
- orders.setCreateTime(now);
- orders.setProductId(id);
- orders.setReplaceTime(now);
- orders.setSum(sum);
- orderService.save(orders);
- return "ok";
- } else {
- return "fail";
- }
-}
-```
-
-#### TCC
-
-```java
-/**
- * Define two-phase commit: name = bean name of the tcc (globally unique),
commitMethod = commit (the two-phase confirmation method) and rollbackMethod =
rollback (the two-phase cancellation method)
- * useTCCFence=true (enable anti-hanging)
- * BusinessActionContextParameter annotation passes parameters to the second
stage
- *
- * @param params - input parameters
- * @return String
- */
-@TwoPhaseBusinessAction(name = "beanName", commitMethod = "commit",
rollbackMethod = "rollback", useTCCFence = true)
-public void insert(@BusinessActionContextParameter(paramName = "params")
Map<String, String> params) {
-
logger.info("此处可以预留资源,或者利用tcc的特点,与AT混用,二阶段时利用一阶段在此处存放的消息,通过二阶段发出,比如redis,mq等操作");
-}
-
-
-/**
- * The confirmation method can be named differently, but it must be consistent
with commitMethod. The context can pass the parameters of the try method.
- *
- * @param context context
- * @return boolean
- */
-public void commit(BusinessActionContext context) {
- logger.info("预留资源真正处理,或者发出mq消息和redis入库");
-}
-
-/**
- * Two-stage cancellation method
- *
- * @param context context
- * @return boolean
- */
-public void rollback(BusinessActionContext context) {
- logger.info("预留资源释放,或清除一阶段准备让二阶段提交时发出的消息缓存");
-}
-```
-
-### Pointcut expression
-
-#### Global affairs
-
-```java
- @Bean
- public AspectTransactionalInterceptor aspectTransactionalInterceptor () {
- return new AspectTransactionalInterceptor();
- }
-
- @Bean
- public Advisor txAdviceAdvisor(AspectTransactionalInterceptor
aspectTransactionalInterceptor ) {
- AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
- pointcut.setExpression("Configure pointcut expression to enable global
transaction interceptor");
- return new DefaultPointcutAdvisor(pointcut,
aspectTransactionalInterceptor);
- }
-```
\ No newline at end of file
diff --git
a/i18n/en/docusaurus-plugin-content-docs/version-v1.2/ops/deploy-guide-beginner.md
b/i18n/en/docusaurus-plugin-content-docs/version-v1.2/ops/deploy-guide-beginner.md
index 95fd73024f..d4bc573c26 100644
---
a/i18n/en/docusaurus-plugin-content-docs/version-v1.2/ops/deploy-guide-beginner.md
+++
b/i18n/en/docusaurus-plugin-content-docs/version-v1.2/ops/deploy-guide-beginner.md
@@ -39,12 +39,10 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -58,14 +56,12 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
### Start Server
-There are currently three server-side storage modes (store.mode): file, db,
and redis (raft and mongodb will be introduced later). The file mode does not
need to be changed and can be started directly. The following specifically
explains the db and redis startup steps.
+There are currently three server-side storage modes (store.mode): file, db.
The file mode does not need to be changed and can be started directly. The
following specifically explains the db startup steps.
Note: The file mode is a stand-alone mode. The global transaction session
information is read and written in the memory and the local file root.data is
persisted. So the performance is quite well;
The db mode is a high-availability mode. Global transaction session
information is shared through db, but the corresponding performance is poor;
-The redis mode is supported by Seata-Server 1.3 and above. It has high
performance and risks losing transaction information. Please configure the
redis persistence configuration suitable for the current scenario in advance.
-
#### Step 1: Startup package
- <a href="https://github.com/seata/seata/releases"; target="_blank">Click to
download</a>.
- Official DingTalk group (Group Number: 23171167, 1st group is already full,
including 5,000 people, <a href="http://seata.io/zh-cn/community";
target="_blank">2nd group</a>, group 3: 32033786), QQ group (Group Number:
254657148, group 2: 216012363). Please download packages in the group sharing
file.
@@ -75,38 +71,23 @@ Global transaction session information consists of three
pieces of content, that
#### Step 3: Modify store.mode
-Startup package: seata-->conf-->application.yml, modify store.mode="db" or
"redis"
-Source code: root directory-->seata-server-->resources-->application.yml,
modify store.mode="db" or "redis"
-
-For versions below 1.5.0:
-
-Startup package: seata-->conf-->file.conf, modify store.mode="db" or "redis"
-Source code: root directory-->seata-server-->resources-->file.conf, modify
store.mode="db" or "redis"
-
-#### Step 4: Modify database connection|redis attribute configuration
+Startup package: seata-->conf-->file.conf, modify store.mode="db"
+Source code: root directory-->seata-server-->resources-->file.conf, modify
store.mode="db"
-Startup package: seata-->conf-->application.example.yml comes with additional
configuration, copy its db|redis related configuration to application.yml, and
modify store.db or store.redis related properties.
-Source code: Root
directory-->seata-server-->resources-->application.example.yml comes with
additional configuration, copy its db|redis related configuration to
application.yml, and modify store.db or store.redis related Attributes.
+#### Step 4: Modify database connection attribute configuration
-For versions below 1.5.0:
-
-Startup package: seata-->conf-->file.conf, modify store.db or store.redis
related properties.
-Source code: Root directory-->seata-server-->resources-->file.conf, modify
store.db or store.redis related properties.
+Startup package: seata-->conf-->file.conf, modify store.db related properties.
+Source code: Root directory-->seata-server-->resources-->file.conf, modify
store.db related properties.
#### Step 5: Start
-- Source code startup: execute the main method in ServerApplication.java
-- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-
-For versions below 1.5.0:
-
- Source code startup: execute the main method in Server.java
- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
```
-h: IP registered to the registration center
-p: Server rpc listening port
- -m: Global transaction session information storage mode, file, db, redis.
Read startup parameters first (Seata-Server 1.3 and above supports redis)
+ -m: Global transaction session information storage mode, file, db. Read
startup parameters first
-n: Server node. When there are multiple servers, each node needs to be
distinguished to generate transactionIds in different intervals to avoid
conflicts.
-e: Multi-environment configuration please refers to
http://seata.io/en-us/docs/ops/multi-configuration-isolation.html.
```
@@ -192,86 +173,3 @@ You can introduce seata-spring-boot-starter,
spring-cloud-starter-alibaba-seata
Refer to the various rpc implementation modules under the source code
integration folder.
- Automatic <br/>
SpringCloud users can introduce spring-cloud-starter-alibaba-seata, and xid
transfer has been implemented internally.
-
-## Business use
-
-### Annotation interception
-
-#### Global affairs
-
-```java
-@GetMapping(value = "testCommit")
-@GlobalTransactional
-public Object testCommit(@RequestParam(name = "id",defaultValue = "1") Integer
id,
- @RequestParam(name = "sum", defaultValue = "1") Integer sum) {
- Boolean ok = productService.reduceStock(id, sum);
- if (ok) {
- LocalDateTime now = LocalDateTime.now();
- Orders orders = new Orders();
- orders.setCreateTime(now);
- orders.setProductId(id);
- orders.setReplaceTime(now);
- orders.setSum(sum);
- orderService.save(orders);
- return "ok";
- } else {
- return "fail";
- }
-}
-```
-
-#### TCC
-
-```java
-/**
- * Define two-phase commit: name = bean name of the tcc (globally unique),
commitMethod = commit (the two-phase confirmation method) and rollbackMethod =
rollback (the two-phase cancellation method)
- * useTCCFence=true (enable anti-hanging)
- * BusinessActionContextParameter annotation passes parameters to the second
stage
- *
- * @param params - input parameters
- * @return String
- */
-@TwoPhaseBusinessAction(name = "beanName", commitMethod = "commit",
rollbackMethod = "rollback", useTCCFence = true)
-public void insert(@BusinessActionContextParameter(paramName = "params")
Map<String, String> params) {
-
logger.info("此处可以预留资源,或者利用tcc的特点,与AT混用,二阶段时利用一阶段在此处存放的消息,通过二阶段发出,比如redis,mq等操作");
-}
-
-
-/**
- * The confirmation method can be named differently, but it must be consistent
with commitMethod. The context can pass the parameters of the try method.
- *
- * @param context context
- * @return boolean
- */
-public void commit(BusinessActionContext context) {
- logger.info("预留资源真正处理,或者发出mq消息和redis入库");
-}
-
-/**
- * Two-stage cancellation method
- *
- * @param context context
- * @return boolean
- */
-public void rollback(BusinessActionContext context) {
- logger.info("预留资源释放,或清除一阶段准备让二阶段提交时发出的消息缓存");
-}
-```
-
-### Pointcut expression
-
-#### Global affairs
-
-```java
- @Bean
- public AspectTransactionalInterceptor aspectTransactionalInterceptor () {
- return new AspectTransactionalInterceptor();
- }
-
- @Bean
- public Advisor txAdviceAdvisor(AspectTransactionalInterceptor
aspectTransactionalInterceptor ) {
- AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
- pointcut.setExpression("Configure pointcut expression to enable global
transaction interceptor");
- return new DefaultPointcutAdvisor(pointcut,
aspectTransactionalInterceptor);
- }
-```
\ No newline at end of file
diff --git
a/i18n/en/docusaurus-plugin-content-docs/version-v1.3/ops/deploy-guide-beginner.md
b/i18n/en/docusaurus-plugin-content-docs/version-v1.3/ops/deploy-guide-beginner.md
index 95fd73024f..49447e9dba 100644
---
a/i18n/en/docusaurus-plugin-content-docs/version-v1.3/ops/deploy-guide-beginner.md
+++
b/i18n/en/docusaurus-plugin-content-docs/version-v1.3/ops/deploy-guide-beginner.md
@@ -39,12 +39,10 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -58,7 +56,7 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
### Start Server
-There are currently three server-side storage modes (store.mode): file, db,
and redis (raft and mongodb will be introduced later). The file mode does not
need to be changed and can be started directly. The following specifically
explains the db and redis startup steps.
+There are currently three server-side storage modes (store.mode): file, db,
and redis. The file mode does not need to be changed and can be started
directly. The following specifically explains the db and redis startup steps.
Note: The file mode is a stand-alone mode. The global transaction session
information is read and written in the memory and the local file root.data is
persisted. So the performance is quite well;
@@ -75,31 +73,16 @@ Global transaction session information consists of three
pieces of content, that
#### Step 3: Modify store.mode
-Startup package: seata-->conf-->application.yml, modify store.mode="db" or
"redis"
-Source code: root directory-->seata-server-->resources-->application.yml,
modify store.mode="db" or "redis"
-
-For versions below 1.5.0:
-
Startup package: seata-->conf-->file.conf, modify store.mode="db" or "redis"
Source code: root directory-->seata-server-->resources-->file.conf, modify
store.mode="db" or "redis"
#### Step 4: Modify database connection|redis attribute configuration
-Startup package: seata-->conf-->application.example.yml comes with additional
configuration, copy its db|redis related configuration to application.yml, and
modify store.db or store.redis related properties.
-Source code: Root
directory-->seata-server-->resources-->application.example.yml comes with
additional configuration, copy its db|redis related configuration to
application.yml, and modify store.db or store.redis related Attributes.
-
-For versions below 1.5.0:
-
Startup package: seata-->conf-->file.conf, modify store.db or store.redis
related properties.
Source code: Root directory-->seata-server-->resources-->file.conf, modify
store.db or store.redis related properties.
#### Step 5: Start
-- Source code startup: execute the main method in ServerApplication.java
-- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-
-For versions below 1.5.0:
-
- Source code startup: execute the main method in Server.java
- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
@@ -192,86 +175,3 @@ You can introduce seata-spring-boot-starter,
spring-cloud-starter-alibaba-seata
Refer to the various rpc implementation modules under the source code
integration folder.
- Automatic <br/>
SpringCloud users can introduce spring-cloud-starter-alibaba-seata, and xid
transfer has been implemented internally.
-
-## Business use
-
-### Annotation interception
-
-#### Global affairs
-
-```java
-@GetMapping(value = "testCommit")
-@GlobalTransactional
-public Object testCommit(@RequestParam(name = "id",defaultValue = "1") Integer
id,
- @RequestParam(name = "sum", defaultValue = "1") Integer sum) {
- Boolean ok = productService.reduceStock(id, sum);
- if (ok) {
- LocalDateTime now = LocalDateTime.now();
- Orders orders = new Orders();
- orders.setCreateTime(now);
- orders.setProductId(id);
- orders.setReplaceTime(now);
- orders.setSum(sum);
- orderService.save(orders);
- return "ok";
- } else {
- return "fail";
- }
-}
-```
-
-#### TCC
-
-```java
-/**
- * Define two-phase commit: name = bean name of the tcc (globally unique),
commitMethod = commit (the two-phase confirmation method) and rollbackMethod =
rollback (the two-phase cancellation method)
- * useTCCFence=true (enable anti-hanging)
- * BusinessActionContextParameter annotation passes parameters to the second
stage
- *
- * @param params - input parameters
- * @return String
- */
-@TwoPhaseBusinessAction(name = "beanName", commitMethod = "commit",
rollbackMethod = "rollback", useTCCFence = true)
-public void insert(@BusinessActionContextParameter(paramName = "params")
Map<String, String> params) {
-
logger.info("此处可以预留资源,或者利用tcc的特点,与AT混用,二阶段时利用一阶段在此处存放的消息,通过二阶段发出,比如redis,mq等操作");
-}
-
-
-/**
- * The confirmation method can be named differently, but it must be consistent
with commitMethod. The context can pass the parameters of the try method.
- *
- * @param context context
- * @return boolean
- */
-public void commit(BusinessActionContext context) {
- logger.info("预留资源真正处理,或者发出mq消息和redis入库");
-}
-
-/**
- * Two-stage cancellation method
- *
- * @param context context
- * @return boolean
- */
-public void rollback(BusinessActionContext context) {
- logger.info("预留资源释放,或清除一阶段准备让二阶段提交时发出的消息缓存");
-}
-```
-
-### Pointcut expression
-
-#### Global affairs
-
-```java
- @Bean
- public AspectTransactionalInterceptor aspectTransactionalInterceptor () {
- return new AspectTransactionalInterceptor();
- }
-
- @Bean
- public Advisor txAdviceAdvisor(AspectTransactionalInterceptor
aspectTransactionalInterceptor ) {
- AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
- pointcut.setExpression("Configure pointcut expression to enable global
transaction interceptor");
- return new DefaultPointcutAdvisor(pointcut,
aspectTransactionalInterceptor);
- }
-```
\ No newline at end of file
diff --git
a/i18n/en/docusaurus-plugin-content-docs/version-v1.4/ops/deploy-guide-beginner.md
b/i18n/en/docusaurus-plugin-content-docs/version-v1.4/ops/deploy-guide-beginner.md
index 95fd73024f..49447e9dba 100644
---
a/i18n/en/docusaurus-plugin-content-docs/version-v1.4/ops/deploy-guide-beginner.md
+++
b/i18n/en/docusaurus-plugin-content-docs/version-v1.4/ops/deploy-guide-beginner.md
@@ -39,12 +39,10 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -58,7 +56,7 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
### Start Server
-There are currently three server-side storage modes (store.mode): file, db,
and redis (raft and mongodb will be introduced later). The file mode does not
need to be changed and can be started directly. The following specifically
explains the db and redis startup steps.
+There are currently three server-side storage modes (store.mode): file, db,
and redis. The file mode does not need to be changed and can be started
directly. The following specifically explains the db and redis startup steps.
Note: The file mode is a stand-alone mode. The global transaction session
information is read and written in the memory and the local file root.data is
persisted. So the performance is quite well;
@@ -75,31 +73,16 @@ Global transaction session information consists of three
pieces of content, that
#### Step 3: Modify store.mode
-Startup package: seata-->conf-->application.yml, modify store.mode="db" or
"redis"
-Source code: root directory-->seata-server-->resources-->application.yml,
modify store.mode="db" or "redis"
-
-For versions below 1.5.0:
-
Startup package: seata-->conf-->file.conf, modify store.mode="db" or "redis"
Source code: root directory-->seata-server-->resources-->file.conf, modify
store.mode="db" or "redis"
#### Step 4: Modify database connection|redis attribute configuration
-Startup package: seata-->conf-->application.example.yml comes with additional
configuration, copy its db|redis related configuration to application.yml, and
modify store.db or store.redis related properties.
-Source code: Root
directory-->seata-server-->resources-->application.example.yml comes with
additional configuration, copy its db|redis related configuration to
application.yml, and modify store.db or store.redis related Attributes.
-
-For versions below 1.5.0:
-
Startup package: seata-->conf-->file.conf, modify store.db or store.redis
related properties.
Source code: Root directory-->seata-server-->resources-->file.conf, modify
store.db or store.redis related properties.
#### Step 5: Start
-- Source code startup: execute the main method in ServerApplication.java
-- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-
-For versions below 1.5.0:
-
- Source code startup: execute the main method in Server.java
- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
@@ -192,86 +175,3 @@ You can introduce seata-spring-boot-starter,
spring-cloud-starter-alibaba-seata
Refer to the various rpc implementation modules under the source code
integration folder.
- Automatic <br/>
SpringCloud users can introduce spring-cloud-starter-alibaba-seata, and xid
transfer has been implemented internally.
-
-## Business use
-
-### Annotation interception
-
-#### Global affairs
-
-```java
-@GetMapping(value = "testCommit")
-@GlobalTransactional
-public Object testCommit(@RequestParam(name = "id",defaultValue = "1") Integer
id,
- @RequestParam(name = "sum", defaultValue = "1") Integer sum) {
- Boolean ok = productService.reduceStock(id, sum);
- if (ok) {
- LocalDateTime now = LocalDateTime.now();
- Orders orders = new Orders();
- orders.setCreateTime(now);
- orders.setProductId(id);
- orders.setReplaceTime(now);
- orders.setSum(sum);
- orderService.save(orders);
- return "ok";
- } else {
- return "fail";
- }
-}
-```
-
-#### TCC
-
-```java
-/**
- * Define two-phase commit: name = bean name of the tcc (globally unique),
commitMethod = commit (the two-phase confirmation method) and rollbackMethod =
rollback (the two-phase cancellation method)
- * useTCCFence=true (enable anti-hanging)
- * BusinessActionContextParameter annotation passes parameters to the second
stage
- *
- * @param params - input parameters
- * @return String
- */
-@TwoPhaseBusinessAction(name = "beanName", commitMethod = "commit",
rollbackMethod = "rollback", useTCCFence = true)
-public void insert(@BusinessActionContextParameter(paramName = "params")
Map<String, String> params) {
-
logger.info("此处可以预留资源,或者利用tcc的特点,与AT混用,二阶段时利用一阶段在此处存放的消息,通过二阶段发出,比如redis,mq等操作");
-}
-
-
-/**
- * The confirmation method can be named differently, but it must be consistent
with commitMethod. The context can pass the parameters of the try method.
- *
- * @param context context
- * @return boolean
- */
-public void commit(BusinessActionContext context) {
- logger.info("预留资源真正处理,或者发出mq消息和redis入库");
-}
-
-/**
- * Two-stage cancellation method
- *
- * @param context context
- * @return boolean
- */
-public void rollback(BusinessActionContext context) {
- logger.info("预留资源释放,或清除一阶段准备让二阶段提交时发出的消息缓存");
-}
-```
-
-### Pointcut expression
-
-#### Global affairs
-
-```java
- @Bean
- public AspectTransactionalInterceptor aspectTransactionalInterceptor () {
- return new AspectTransactionalInterceptor();
- }
-
- @Bean
- public Advisor txAdviceAdvisor(AspectTransactionalInterceptor
aspectTransactionalInterceptor ) {
- AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
- pointcut.setExpression("Configure pointcut expression to enable global
transaction interceptor");
- return new DefaultPointcutAdvisor(pointcut,
aspectTransactionalInterceptor);
- }
-```
\ No newline at end of file
diff --git
a/i18n/en/docusaurus-plugin-content-docs/version-v1.5/ops/deploy-guide-beginner.md
b/i18n/en/docusaurus-plugin-content-docs/version-v1.5/ops/deploy-guide-beginner.md
index 95fd73024f..60d78b7ddc 100644
---
a/i18n/en/docusaurus-plugin-content-docs/version-v1.5/ops/deploy-guide-beginner.md
+++
b/i18n/en/docusaurus-plugin-content-docs/version-v1.5/ops/deploy-guide-beginner.md
@@ -39,12 +39,10 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -58,7 +56,7 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
### Start Server
-There are currently three server-side storage modes (store.mode): file, db,
and redis (raft and mongodb will be introduced later). The file mode does not
need to be changed and can be started directly. The following specifically
explains the db and redis startup steps.
+There are currently three server-side storage modes (store.mode): file, db,
and redis. The file mode does not need to be changed and can be started
directly. The following specifically explains the db and redis startup steps.
Note: The file mode is a stand-alone mode. The global transaction session
information is read and written in the memory and the local file root.data is
persisted. So the performance is quite well;
@@ -68,7 +66,7 @@ The redis mode is supported by Seata-Server 1.3 and above. It
has high performan
#### Step 1: Startup package
- <a href="https://github.com/seata/seata/releases"; target="_blank">Click to
download</a>.
-- Official DingTalk group (Group Number: 23171167, 1st group is already full,
including 5,000 people, <a href="http://seata.io/zh-cn/community";
target="_blank">2nd group</a>, group 3: 32033786), QQ group (Group Number:
254657148, group 2: 216012363). Please download packages in the group sharing
file.
+- Official DingTalk group (Group Number: 23171167, 1st group is already full,
including 5,000 people, <a href="http://seata.io/zh-cn/community";
target="_blank">2nd group</a>, group 3: 32033786，group 4: 60170003910), QQ
group (Group Number: 254657148, group 2: 216012363). Please download packages
in the group sharing file.
#### Step 2: Create table (db only)
Global transaction session information consists of three pieces of content,
that is global transaction-->branch transaction-->global lock, corresponding to
the tables global_table, branch_table, and lock_table.
@@ -78,31 +76,16 @@ Global transaction session information consists of three
pieces of content, that
Startup package: seata-->conf-->application.yml, modify store.mode="db" or
"redis"
Source code: root directory-->seata-server-->resources-->application.yml,
modify store.mode="db" or "redis"
-For versions below 1.5.0:
-
-Startup package: seata-->conf-->file.conf, modify store.mode="db" or "redis"
-Source code: root directory-->seata-server-->resources-->file.conf, modify
store.mode="db" or "redis"
-
#### Step 4: Modify database connection|redis attribute configuration
Startup package: seata-->conf-->application.example.yml comes with additional
configuration, copy its db|redis related configuration to application.yml, and
modify store.db or store.redis related properties.
Source code: Root
directory-->seata-server-->resources-->application.example.yml comes with
additional configuration, copy its db|redis related configuration to
application.yml, and modify store.db or store.redis related Attributes.
-For versions below 1.5.0:
-
-Startup package: seata-->conf-->file.conf, modify store.db or store.redis
related properties.
-Source code: Root directory-->seata-server-->resources-->file.conf, modify
store.db or store.redis related properties.
-
#### Step 5: Start
- Source code startup: execute the main method in ServerApplication.java
- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-For versions below 1.5.0:
-
-- Source code startup: execute the main method in Server.java
-- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
-
```
-h: IP registered to the registration center
-p: Server rpc listening port
diff --git
a/i18n/en/docusaurus-plugin-content-docs/version-v1.6/ops/deploy-guide-beginner.md
b/i18n/en/docusaurus-plugin-content-docs/version-v1.6/ops/deploy-guide-beginner.md
index 95fd73024f..60d78b7ddc 100644
---
a/i18n/en/docusaurus-plugin-content-docs/version-v1.6/ops/deploy-guide-beginner.md
+++
b/i18n/en/docusaurus-plugin-content-docs/version-v1.6/ops/deploy-guide-beginner.md
@@ -39,12 +39,10 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -58,7 +56,7 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
### Start Server
-There are currently three server-side storage modes (store.mode): file, db,
and redis (raft and mongodb will be introduced later). The file mode does not
need to be changed and can be started directly. The following specifically
explains the db and redis startup steps.
+There are currently three server-side storage modes (store.mode): file, db,
and redis. The file mode does not need to be changed and can be started
directly. The following specifically explains the db and redis startup steps.
Note: The file mode is a stand-alone mode. The global transaction session
information is read and written in the memory and the local file root.data is
persisted. So the performance is quite well;
@@ -68,7 +66,7 @@ The redis mode is supported by Seata-Server 1.3 and above. It
has high performan
#### Step 1: Startup package
- <a href="https://github.com/seata/seata/releases"; target="_blank">Click to
download</a>.
-- Official DingTalk group (Group Number: 23171167, 1st group is already full,
including 5,000 people, <a href="http://seata.io/zh-cn/community";
target="_blank">2nd group</a>, group 3: 32033786), QQ group (Group Number:
254657148, group 2: 216012363). Please download packages in the group sharing
file.
+- Official DingTalk group (Group Number: 23171167, 1st group is already full,
including 5,000 people, <a href="http://seata.io/zh-cn/community";
target="_blank">2nd group</a>, group 3: 32033786，group 4: 60170003910), QQ
group (Group Number: 254657148, group 2: 216012363). Please download packages
in the group sharing file.
#### Step 2: Create table (db only)
Global transaction session information consists of three pieces of content,
that is global transaction-->branch transaction-->global lock, corresponding to
the tables global_table, branch_table, and lock_table.
@@ -78,31 +76,16 @@ Global transaction session information consists of three
pieces of content, that
Startup package: seata-->conf-->application.yml, modify store.mode="db" or
"redis"
Source code: root directory-->seata-server-->resources-->application.yml,
modify store.mode="db" or "redis"
-For versions below 1.5.0:
-
-Startup package: seata-->conf-->file.conf, modify store.mode="db" or "redis"
-Source code: root directory-->seata-server-->resources-->file.conf, modify
store.mode="db" or "redis"
-
#### Step 4: Modify database connection|redis attribute configuration
Startup package: seata-->conf-->application.example.yml comes with additional
configuration, copy its db|redis related configuration to application.yml, and
modify store.db or store.redis related properties.
Source code: Root
directory-->seata-server-->resources-->application.example.yml comes with
additional configuration, copy its db|redis related configuration to
application.yml, and modify store.db or store.redis related Attributes.
-For versions below 1.5.0:
-
-Startup package: seata-->conf-->file.conf, modify store.db or store.redis
related properties.
-Source code: Root directory-->seata-server-->resources-->file.conf, modify
store.db or store.redis related properties.
-
#### Step 5: Start
- Source code startup: execute the main method in ServerApplication.java
- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-For versions below 1.5.0:
-
-- Source code startup: execute the main method in Server.java
-- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
-
```
-h: IP registered to the registration center
-p: Server rpc listening port
diff --git
a/i18n/en/docusaurus-plugin-content-docs/version-v1.7/ops/deploy-guide-beginner.md
b/i18n/en/docusaurus-plugin-content-docs/version-v1.7/ops/deploy-guide-beginner.md
index 95fd73024f..60d78b7ddc 100644
---
a/i18n/en/docusaurus-plugin-content-docs/version-v1.7/ops/deploy-guide-beginner.md
+++
b/i18n/en/docusaurus-plugin-content-docs/version-v1.7/ops/deploy-guide-beginner.md
@@ -39,12 +39,10 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -58,7 +56,7 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
### Start Server
-There are currently three server-side storage modes (store.mode): file, db,
and redis (raft and mongodb will be introduced later). The file mode does not
need to be changed and can be started directly. The following specifically
explains the db and redis startup steps.
+There are currently three server-side storage modes (store.mode): file, db,
and redis. The file mode does not need to be changed and can be started
directly. The following specifically explains the db and redis startup steps.
Note: The file mode is a stand-alone mode. The global transaction session
information is read and written in the memory and the local file root.data is
persisted. So the performance is quite well;
@@ -68,7 +66,7 @@ The redis mode is supported by Seata-Server 1.3 and above. It
has high performan
#### Step 1: Startup package
- <a href="https://github.com/seata/seata/releases"; target="_blank">Click to
download</a>.
-- Official DingTalk group (Group Number: 23171167, 1st group is already full,
including 5,000 people, <a href="http://seata.io/zh-cn/community";
target="_blank">2nd group</a>, group 3: 32033786), QQ group (Group Number:
254657148, group 2: 216012363). Please download packages in the group sharing
file.
+- Official DingTalk group (Group Number: 23171167, 1st group is already full,
including 5,000 people, <a href="http://seata.io/zh-cn/community";
target="_blank">2nd group</a>, group 3: 32033786，group 4: 60170003910), QQ
group (Group Number: 254657148, group 2: 216012363). Please download packages
in the group sharing file.
#### Step 2: Create table (db only)
Global transaction session information consists of three pieces of content,
that is global transaction-->branch transaction-->global lock, corresponding to
the tables global_table, branch_table, and lock_table.
@@ -78,31 +76,16 @@ Global transaction session information consists of three
pieces of content, that
Startup package: seata-->conf-->application.yml, modify store.mode="db" or
"redis"
Source code: root directory-->seata-server-->resources-->application.yml,
modify store.mode="db" or "redis"
-For versions below 1.5.0:
-
-Startup package: seata-->conf-->file.conf, modify store.mode="db" or "redis"
-Source code: root directory-->seata-server-->resources-->file.conf, modify
store.mode="db" or "redis"
-
#### Step 4: Modify database connection|redis attribute configuration
Startup package: seata-->conf-->application.example.yml comes with additional
configuration, copy its db|redis related configuration to application.yml, and
modify store.db or store.redis related properties.
Source code: Root
directory-->seata-server-->resources-->application.example.yml comes with
additional configuration, copy its db|redis related configuration to
application.yml, and modify store.db or store.redis related Attributes.
-For versions below 1.5.0:
-
-Startup package: seata-->conf-->file.conf, modify store.db or store.redis
related properties.
-Source code: Root directory-->seata-server-->resources-->file.conf, modify
store.db or store.redis related properties.
-
#### Step 5: Start
- Source code startup: execute the main method in ServerApplication.java
- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-For versions below 1.5.0:
-
-- Source code startup: execute the main method in Server.java
-- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
-
```
-h: IP registered to the registration center
-p: Server rpc listening port
diff --git
a/i18n/en/docusaurus-plugin-content-docs/version-v1.8/ops/deploy-guide-beginner.md
b/i18n/en/docusaurus-plugin-content-docs/version-v1.8/ops/deploy-guide-beginner.md
index 95fd73024f..60d78b7ddc 100644
---
a/i18n/en/docusaurus-plugin-content-docs/version-v1.8/ops/deploy-guide-beginner.md
+++
b/i18n/en/docusaurus-plugin-content-docs/version-v1.8/ops/deploy-guide-beginner.md
@@ -39,12 +39,10 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -58,7 +56,7 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
### Start Server
-There are currently three server-side storage modes (store.mode): file, db,
and redis (raft and mongodb will be introduced later). The file mode does not
need to be changed and can be started directly. The following specifically
explains the db and redis startup steps.
+There are currently three server-side storage modes (store.mode): file, db,
and redis. The file mode does not need to be changed and can be started
directly. The following specifically explains the db and redis startup steps.
Note: The file mode is a stand-alone mode. The global transaction session
information is read and written in the memory and the local file root.data is
persisted. So the performance is quite well;
@@ -68,7 +66,7 @@ The redis mode is supported by Seata-Server 1.3 and above. It
has high performan
#### Step 1: Startup package
- <a href="https://github.com/seata/seata/releases"; target="_blank">Click to
download</a>.
-- Official DingTalk group (Group Number: 23171167, 1st group is already full,
including 5,000 people, <a href="http://seata.io/zh-cn/community";
target="_blank">2nd group</a>, group 3: 32033786), QQ group (Group Number:
254657148, group 2: 216012363). Please download packages in the group sharing
file.
+- Official DingTalk group (Group Number: 23171167, 1st group is already full,
including 5,000 people, <a href="http://seata.io/zh-cn/community";
target="_blank">2nd group</a>, group 3: 32033786，group 4: 60170003910), QQ
group (Group Number: 254657148, group 2: 216012363). Please download packages
in the group sharing file.
#### Step 2: Create table (db only)
Global transaction session information consists of three pieces of content,
that is global transaction-->branch transaction-->global lock, corresponding to
the tables global_table, branch_table, and lock_table.
@@ -78,31 +76,16 @@ Global transaction session information consists of three
pieces of content, that
Startup package: seata-->conf-->application.yml, modify store.mode="db" or
"redis"
Source code: root directory-->seata-server-->resources-->application.yml,
modify store.mode="db" or "redis"
-For versions below 1.5.0:
-
-Startup package: seata-->conf-->file.conf, modify store.mode="db" or "redis"
-Source code: root directory-->seata-server-->resources-->file.conf, modify
store.mode="db" or "redis"
-
#### Step 4: Modify database connection|redis attribute configuration
Startup package: seata-->conf-->application.example.yml comes with additional
configuration, copy its db|redis related configuration to application.yml, and
modify store.db or store.redis related properties.
Source code: Root
directory-->seata-server-->resources-->application.example.yml comes with
additional configuration, copy its db|redis related configuration to
application.yml, and modify store.db or store.redis related Attributes.
-For versions below 1.5.0:
-
-Startup package: seata-->conf-->file.conf, modify store.db or store.redis
related properties.
-Source code: Root directory-->seata-server-->resources-->file.conf, modify
store.db or store.redis related properties.
-
#### Step 5: Start
- Source code startup: execute the main method in ServerApplication.java
- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-For versions below 1.5.0:
-
-- Source code startup: execute the main method in Server.java
-- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
-
```
-h: IP registered to the registration center
-p: Server rpc listening port
diff --git
a/i18n/en/docusaurus-plugin-content-docs/version-v2.0/ops/deploy-guide-beginner.md
b/i18n/en/docusaurus-plugin-content-docs/version-v2.0/ops/deploy-guide-beginner.md
index 95fd73024f..d48bc1099e 100644
---
a/i18n/en/docusaurus-plugin-content-docs/version-v2.0/ops/deploy-guide-beginner.md
+++
b/i18n/en/docusaurus-plugin-content-docs/version-v2.0/ops/deploy-guide-beginner.md
@@ -39,12 +39,10 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -58,7 +56,7 @@ In the @SpringBootApplication annotation, exclude
com.alibaba.cloud.seata.Global
### Start Server
-There are currently three server-side storage modes (store.mode): file, db,
and redis (raft and mongodb will be introduced later). The file mode does not
need to be changed and can be started directly. The following specifically
explains the db and redis startup steps.
+There are currently three server-side storage modes (store.mode): file, db,
redis, raft. The file mode does not need to be changed and can be started
directly. The following specifically explains the db and redis startup steps.
Note: The file mode is a stand-alone mode. The global transaction session
information is read and written in the memory and the local file root.data is
persisted. So the performance is quite well;
@@ -68,7 +66,7 @@ The redis mode is supported by Seata-Server 1.3 and above. It
has high performan
#### Step 1: Startup package
- <a href="https://github.com/seata/seata/releases"; target="_blank">Click to
download</a>.
-- Official DingTalk group (Group Number: 23171167, 1st group is already full,
including 5,000 people, <a href="http://seata.io/zh-cn/community";
target="_blank">2nd group</a>, group 3: 32033786), QQ group (Group Number:
254657148, group 2: 216012363). Please download packages in the group sharing
file.
+- Official DingTalk group (Group Number: 23171167, 1st group is already full,
including 5,000 people, <a href="http://seata.io/zh-cn/community";
target="_blank">2nd group</a>, group 3: 32033786，group 4: 60170003910), QQ
group (Group Number: 254657148, group 2: 216012363). Please download packages
in the group sharing file.
#### Step 2: Create table (db only)
Global transaction session information consists of three pieces of content,
that is global transaction-->branch transaction-->global lock, corresponding to
the tables global_table, branch_table, and lock_table.
@@ -78,31 +76,16 @@ Global transaction session information consists of three
pieces of content, that
Startup package: seata-->conf-->application.yml, modify store.mode="db" or
"redis"
Source code: root directory-->seata-server-->resources-->application.yml,
modify store.mode="db" or "redis"
-For versions below 1.5.0:
-
-Startup package: seata-->conf-->file.conf, modify store.mode="db" or "redis"
-Source code: root directory-->seata-server-->resources-->file.conf, modify
store.mode="db" or "redis"
-
#### Step 4: Modify database connection|redis attribute configuration
Startup package: seata-->conf-->application.example.yml comes with additional
configuration, copy its db|redis related configuration to application.yml, and
modify store.db or store.redis related properties.
Source code: Root
directory-->seata-server-->resources-->application.example.yml comes with
additional configuration, copy its db|redis related configuration to
application.yml, and modify store.db or store.redis related Attributes.
-For versions below 1.5.0:
-
-Startup package: seata-->conf-->file.conf, modify store.db or store.redis
related properties.
-Source code: Root directory-->seata-server-->resources-->file.conf, modify
store.db or store.redis related properties.
-
#### Step 5: Start
- Source code startup: execute the main method in ServerApplication.java
- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-For versions below 1.5.0:
-
-- Source code startup: execute the main method in Server.java
-- Command to start: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
-
```
-h: IP registered to the registration center
-p: Server rpc listening port
diff --git
a/i18n/en/docusaurus-plugin-content-docs/version-v2.0/ops/deploy-server-raft.md
b/i18n/en/docusaurus-plugin-content-docs/version-v2.0/ops/deploy-server-raft.md
index 5897fee13f..24aac6cc2d 100644
---
a/i18n/en/docusaurus-plugin-content-docs/version-v2.0/ops/deploy-server-raft.md
+++
b/i18n/en/docusaurus-plugin-content-docs/version-v2.0/ops/deploy-server-raft.md
@@ -58,6 +58,9 @@ On Windows
```cmd
bin\seata-server.bat
```
+4. Volume expansion and contraction
+Assuming the original cluster list is "192.168.0.111:7091, 192.168.0.112:7091,
192.168.0.113:7091", whether it is scaling or shrinking, only need to modify
this string and submit it to the volume expansion and contraction interface of
a member, such as scaling "curl -X POST -i
http://192.168.0.111:7091/metadata/v1/changeCluster?raftClusterStr=192.168.0.111:
7091, 192.168.0.112:7091, 192.168.0.113:7091, 192.168.0.114:7091" ', if it is
scaling, only need to remove the nodes in the cluster [...]
+Note: The seata.server.raft.server-addr configuration is invalid as long as
the cluster is built. Please perform volume expansion and contraction through
the API. The subsequent console will also integrate volume expansion and
contraction and cluster management functions.
## Client
diff --git
a/i18n/en/docusaurus-plugin-content-docs/version-v2.0/user/configurations.md
b/i18n/en/docusaurus-plugin-content-docs/version-v2.0/user/configurations.md
index 904781cac2..c4a55cdb7a 100644
--- a/i18n/en/docusaurus-plugin-content-docs/version-v2.0/user/configurations.md
+++ b/i18n/en/docusaurus-plugin-content-docs/version-v2.0/user/configurations.md
@@ -128,6 +128,7 @@ description: Seata parameter configuration.
| store.redis.database | redis mode default library | default 0|
| store.redis.password | redis mode password (optional) | null by default|
| store.redis.queryLimit | The maximum number of Redis queries at a time | 100
by default|
+| store.redis.type | Redis operation type: lua, pippline | pippline|
| metrics.enabled | Whether to enable Metrics | False is off by default. In
the false state, all Metrics related components will not be initialized to
minimize the performance loss|
| metrics.registryType | Indicator registrar type | The indicator registrar
type used by Metrics is a built-in compact (simple) implementation by default.
Meters in this implementation only use a limited memory count, and the
performance is high enough to meet most scenarios; Currently, only one
indicator registrar can be set|
| metrics.exporterList | Index result Measurement data outputter list |
default prometheus. Multiple outputters are separated by English commas, such
as "prometheus, jmx". Currently, only the prometheus outputters are connected|
diff --git
a/i18n/zh-cn/docusaurus-plugin-content-docs/current/ops/deploy-guide-beginner.md
b/i18n/zh-cn/docusaurus-plugin-content-docs/current/ops/deploy-guide-beginner.md
index eeb6459350..85e9315a6d 100644
---
a/i18n/zh-cn/docusaurus-plugin-content-docs/current/ops/deploy-guide-beginner.md
+++
b/i18n/zh-cn/docusaurus-plugin-content-docs/current/ops/deploy-guide-beginner.md
@@ -57,8 +57,8 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
### 启动Server
-Server端存储模式（store.mode）现有file、db、redis三种（后续将引入raft,mongodb），file模式无需改动，直接启动即可，下面专门讲下db和redis启动步骤。
-注： file模式为单机模式，全局事务会话信息内存中读写并持久化本地文件root.data，性能较高;
+Server端存储模式（store.mode）现有file、db、redis、raft，file模式无需改动，直接启动即可,raft部署方式请访问[专门部署文档](https://seata.io/zh-cn/docs/ops/deploy-server-raft)，下面专门讲下db和redis启动步骤。
+注： file模式为单机模式，全局事务会话信息内存中读写并异步(默认)持久化本地文件root.data，性能较高;
db模式为高可用模式，全局事务会话信息通过db共享，相应性能差些;
@@ -66,7 +66,7 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
#### 步骤一：启动包
- <a href="https://github.com/seata/seata/releases"; target="_blank">点击下载</a>
-- 官方钉钉群（群号：23171167，1群5000人已满，<a href="http://seata.io/zh-cn/community";
target="_blank">2群</a>, 3群: 32033786），qq群（群号: 254657148,2群: 216012363）群文件共享下载
+- 官方钉钉群（群号：23171167，1群5000人已满，<a href="http://seata.io/zh-cn/community";
target="_blank">2群</a>, 3群: 32033786，4群：60170003910），qq群（群号: 254657148,2群:
216012363）群文件共享下载
#### 步骤二：建表(仅db)
全局事务会话信息由3块内容构成，全局事务-->分支事务-->全局锁，对应表global_table、branch_table、lock_table
@@ -76,46 +76,24 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
启动包: seata-->conf-->application.yml，修改store.mode="db或者redis"
源码: 根目录-->seata-server-->resources-->application.yml，修改store.mode="db或者redis"
-1.5.0以下版本:
-
-启动包: seata-->conf-->file.conf，修改store.mode="db或者redis"
-源码: 根目录-->seata-server-->resources-->file.conf，修改store.mode="db或者redis"
-
#### 步骤四：修改数据库连接|redis属性配置
启动包:
seata-->conf-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-源码:
根目录-->seata-server-->resources-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
+源码:
根目录-->seata-server-->resources-->application.example.yml中附带额外配置，将其db/redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-1.5.0以下版本:
-
-启动包: seata-->conf-->file.conf，修改store.db或store.redis相关属性。
-源码: 根目录-->seata-server-->resources-->file.conf，修改store.db或store.redis相关属性。
#### 步骤五：启动
- 源码启动: 执行ServerApplication.java的main方法
- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-1.5.0以下版本:
-
-- 源码启动: 执行Server.java的main方法
-- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
-```
- -h: 注册到注册中心的ip
- -p: Server rpc 监听端口
- -m: 全局事务会话信息存储模式，file、db、redis，优先读取启动参数 (Seata-Server 1.3及以上版本支持redis)
- -n: Server node，当有多个Server时，需区分各自节点，用于生成不同区间的transactionId，以免冲突
- -e: 多环境配置参考
http://seata.io/en-us/docs/ops/multi-configuration-isolation.html
-```
-- <a href="https://seata.io/zh-cn/docs/ops/deploy-by-docker.html";
target="_blank">点击查看docker部署</a>
-
注: 堆内存建议分配2G，堆外内存1G
### 业务系统集成Client
#### 步骤一：添加seata依赖（建议单选）
- 依赖seata-all
- 依赖seata-spring-boot-starter，支持yml、properties配置(.conf可删除)，内部已依赖seata-all
-- 依赖spring-cloud-alibaba-seata，内部集成了seata，并实现了xid传递
+- 依赖spring-cloud-starter-alibaba-seata，内部集成了seata，并实现了xid传递
#### 步骤二：undo_log建表、配置参数(仅AT模式)
- <a href="https://seata.io/zh-cn/docs/user/configurations.html";
target="_blank">查看参数配置介绍</a>
diff --git
a/i18n/zh-cn/docusaurus-plugin-content-docs/current/ops/deploy-server-raft.md
b/i18n/zh-cn/docusaurus-plugin-content-docs/current/ops/deploy-server-raft.md
index 8e120ed72e..9577b6efcf 100644
---
a/i18n/zh-cn/docusaurus-plugin-content-docs/current/ops/deploy-server-raft.md
+++
b/i18n/zh-cn/docusaurus-plugin-content-docs/current/ops/deploy-server-raft.md
@@ -58,6 +58,10 @@ $ sh ./bin/seata-server.sh
bin\seata-server.bat
```
+4. 扩缩容方式
+假设原集群列表为`192.168.0.111:7091,192.168.0.112:7091,192.168.0.113:7091`，无论是扩容还是缩容，只需要对这个字符串进行修改，并提交到一个所在成员的扩缩容接口即可，比如扩容`curl
-X POST -i
http://192.168.0.111:7091/metadata/v1/changeCluster?raftClusterStr=192.168.0.111:7091,192.168.0.112:7091,192.168.0.113:7091,192.168.0.114:7091"`，如果是缩容，只需要将集群连接串中需要下线的节点进行去除，并调用扩缩容接口即可.
+注：seata.server.raft.server-addr配置只要集群构建完成后，修改该配置就无效了，请统一通过api方式进行扩缩容，后续控制台中也会集成扩缩容和集群管理功能。
+
## Client
1. 修改`registry.type`
@@ -65,7 +69,7 @@ bin\seata-server.bat
registry:
type: raft
raft:
- server-addr: 192.168.0.111:7091, 192.168.0.112:7091,
192.168.0.113:7091
+ server-addr: 192.168.0.111:7091,192.168.0.112:7091,192.168.0.113:7091
```
2. 将事务分组对应的tc集群改为server的raft group
```
diff --git
a/i18n/zh-cn/docusaurus-plugin-content-docs/current/user/configurations.md
b/i18n/zh-cn/docusaurus-plugin-content-docs/current/user/configurations.md
index 4ac1a5d35d..b291c01586 100644
--- a/i18n/zh-cn/docusaurus-plugin-content-docs/current/user/configurations.md
+++ b/i18n/zh-cn/docusaurus-plugin-content-docs/current/user/configurations.md
@@ -119,6 +119,7 @@ description: Seata 参数配置。
| store.redis.database | redis模式默认库 | 默认0 |
| store.redis.password | redis模式密码(无可不填) | 默认null |
| store.redis.queryLimit | redis模式一次查询最大条数 | 默认100 |
+| store.redis.type | redis模式主要使用的方式: lua, pippline | pippline|
| metrics.enabled | 是否启用Metrics |
默认false关闭，在False状态下，所有与Metrics相关的组件将不会被初始化，使得性能损耗最低 |
| metrics.registryType | 指标注册器类型 |
Metrics使用的指标注册器类型，默认为内置的compact（简易）实现，这个实现中的Meter仅使用有限内存计数，性能高足够满足大多数场景；目前只能设置一个指标注册器实现
|
| metrics.exporterList | 指标结果Measurement数据输出器列表 |
默认prometheus，多个输出器使用英文逗号分割，例如"prometheus,jmx"，目前仅实现了对接prometheus的输出器 |
diff --git
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.0/ops/deploy-guide-beginner.md
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.0/ops/deploy-guide-beginner.md
index eeb6459350..2f7c628eb1 100644
---
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.0/ops/deploy-guide-beginner.md
+++
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.0/ops/deploy-guide-beginner.md
@@ -38,12 +38,10 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -57,13 +55,11 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
### 启动Server
-Server端存储模式（store.mode）现有file、db、redis三种（后续将引入raft,mongodb），file模式无需改动，直接启动即可，下面专门讲下db和redis启动步骤。
+Server端存储模式（store.mode）现有file、db，file模式无需改动，直接启动即可，下面专门讲下db启动步骤。
注： file模式为单机模式，全局事务会话信息内存中读写并持久化本地文件root.data，性能较高;
db模式为高可用模式，全局事务会话信息通过db共享，相应性能差些;
-redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息丢失风险,请提前配置合适当前场景的redis持久化配置.
-
#### 步骤一：启动包
- <a href="https://github.com/seata/seata/releases"; target="_blank">点击下载</a>
- 官方钉钉群（群号：23171167，1群5000人已满，<a href="http://seata.io/zh-cn/community";
target="_blank">2群</a>, 3群: 32033786），qq群（群号: 254657148,2群: 216012363）群文件共享下载
@@ -73,31 +69,16 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
#### 步骤三：修改store.mode
-启动包: seata-->conf-->application.yml，修改store.mode="db或者redis"
-源码: 根目录-->seata-server-->resources-->application.yml，修改store.mode="db或者redis"
-
-1.5.0以下版本:
-
-启动包: seata-->conf-->file.conf，修改store.mode="db或者redis"
-源码: 根目录-->seata-server-->resources-->file.conf，修改store.mode="db或者redis"
+启动包: seata-->conf-->file.conf，修改store.mode="db"
+源码: 根目录-->seata-server-->resources-->file.conf，修改store.mode="db"
#### 步骤四：修改数据库连接|redis属性配置
-启动包:
seata-->conf-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-源码:
根目录-->seata-server-->resources-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-
-1.5.0以下版本:
-
启动包: seata-->conf-->file.conf，修改store.db或store.redis相关属性。
源码: 根目录-->seata-server-->resources-->file.conf，修改store.db或store.redis相关属性。
#### 步骤五：启动
-- 源码启动: 执行ServerApplication.java的main方法
-- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-
-1.5.0以下版本:
-
- 源码启动: 执行Server.java的main方法
- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
```
@@ -105,7 +86,7 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
-p: Server rpc 监听端口
-m: 全局事务会话信息存储模式，file、db、redis，优先读取启动参数 (Seata-Server 1.3及以上版本支持redis)
-n: Server node，当有多个Server时，需区分各自节点，用于生成不同区间的transactionId，以免冲突
- -e: 多环境配置参考
http://seata.io/en-us/docs/ops/multi-configuration-isolation.html
+ -e: 多环境配置参考
https://seata.io/zh-cn/docs/v1.3/ops/multi-configuration-isolation
```
- <a href="https://seata.io/zh-cn/docs/ops/deploy-by-docker.html";
target="_blank">点击查看docker部署</a>
@@ -189,85 +170,4 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
- 自动
springCloud用户可以引入spring-cloud-starter-alibaba-seata，内部已经实现xid传递
-## 业务使用
-
-### 注解拦截
-
-#### 全局事务
-
-```java
-@GetMapping(value = "testCommit")
-@GlobalTransactional
-public Object testCommit(@RequestParam(name = "id",defaultValue = "1") Integer
id,
- @RequestParam(name = "sum", defaultValue = "1") Integer sum) {
- Boolean ok = productService.reduceStock(id, sum);
- if (ok) {
- LocalDateTime now = LocalDateTime.now();
- Orders orders = new Orders();
- orders.setCreateTime(now);
- orders.setProductId(id);
- orders.setReplaceTime(now);
- orders.setSum(sum);
- orderService.save(orders);
- return "ok";
- } else {
- return "fail";
- }
-}
-```
-
-#### TCC
-
-```java
-/**
- * 定义两阶段提交 name = 该tcc的bean名称,全局唯一 commitMethod = commit 为二阶段确认方法
rollbackMethod = rollback 为二阶段取消方法
- * useTCCFence=true 为开启防悬挂
- * BusinessActionContextParameter注解 传递参数到二阶段中
- *
- * @param params -入参
- * @return String
- */
-@TwoPhaseBusinessAction(name = "beanName", commitMethod = "commit",
rollbackMethod = "rollback", useTCCFence = true)
-public void insert(@BusinessActionContextParameter(paramName = "params")
Map<String, String> params) {
-
logger.info("此处可以预留资源,或者利用tcc的特点,与AT混用,二阶段时利用一阶段在此处存放的消息,通过二阶段发出,比如redis,mq等操作");
-}
-
-/**
- * 确认方法、可以另命名，但要保证与commitMethod一致 context可以传递try方法的参数
- *
- * @param context 上下文
- * @return boolean
- */
-public void commit(BusinessActionContext context) {
- logger.info("预留资源真正处理,或者发出mq消息和redis入库");
-}
-
-/**
- * 二阶段取消方法
- *
- * @param context 上下文
- * @return boolean
- */
-public void rollback(BusinessActionContext context) {
- logger.info("预留资源释放,或清除一阶段准备让二阶段提交时发出的消息缓存");
-}
-```
-
-### 切点表达式
-
-#### 全局事务
-
-```java
- @Bean
- public AspectTransactionalInterceptor aspectTransactionalInterceptor () {
- return new AspectTransactionalInterceptor();
- }
-
- @Bean
- public Advisor txAdviceAdvisor(AspectTransactionalInterceptor
aspectTransactionalInterceptor ) {
- AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
- pointcut.setExpression("配置切点表达式使全局事务拦截器生效");
- return new DefaultPointcutAdvisor(pointcut,
aspectTransactionalInterceptor);
- }
-```
diff --git
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.1/ops/deploy-guide-beginner.md
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.1/ops/deploy-guide-beginner.md
index eeb6459350..2f7c628eb1 100644
---
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.1/ops/deploy-guide-beginner.md
+++
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.1/ops/deploy-guide-beginner.md
@@ -38,12 +38,10 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -57,13 +55,11 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
### 启动Server
-Server端存储模式（store.mode）现有file、db、redis三种（后续将引入raft,mongodb），file模式无需改动，直接启动即可，下面专门讲下db和redis启动步骤。
+Server端存储模式（store.mode）现有file、db，file模式无需改动，直接启动即可，下面专门讲下db启动步骤。
注： file模式为单机模式，全局事务会话信息内存中读写并持久化本地文件root.data，性能较高;
db模式为高可用模式，全局事务会话信息通过db共享，相应性能差些;
-redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息丢失风险,请提前配置合适当前场景的redis持久化配置.
-
#### 步骤一：启动包
- <a href="https://github.com/seata/seata/releases"; target="_blank">点击下载</a>
- 官方钉钉群（群号：23171167，1群5000人已满，<a href="http://seata.io/zh-cn/community";
target="_blank">2群</a>, 3群: 32033786），qq群（群号: 254657148,2群: 216012363）群文件共享下载
@@ -73,31 +69,16 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
#### 步骤三：修改store.mode
-启动包: seata-->conf-->application.yml，修改store.mode="db或者redis"
-源码: 根目录-->seata-server-->resources-->application.yml，修改store.mode="db或者redis"
-
-1.5.0以下版本:
-
-启动包: seata-->conf-->file.conf，修改store.mode="db或者redis"
-源码: 根目录-->seata-server-->resources-->file.conf，修改store.mode="db或者redis"
+启动包: seata-->conf-->file.conf，修改store.mode="db"
+源码: 根目录-->seata-server-->resources-->file.conf，修改store.mode="db"
#### 步骤四：修改数据库连接|redis属性配置
-启动包:
seata-->conf-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-源码:
根目录-->seata-server-->resources-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-
-1.5.0以下版本:
-
启动包: seata-->conf-->file.conf，修改store.db或store.redis相关属性。
源码: 根目录-->seata-server-->resources-->file.conf，修改store.db或store.redis相关属性。
#### 步骤五：启动
-- 源码启动: 执行ServerApplication.java的main方法
-- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-
-1.5.0以下版本:
-
- 源码启动: 执行Server.java的main方法
- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
```
@@ -105,7 +86,7 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
-p: Server rpc 监听端口
-m: 全局事务会话信息存储模式，file、db、redis，优先读取启动参数 (Seata-Server 1.3及以上版本支持redis)
-n: Server node，当有多个Server时，需区分各自节点，用于生成不同区间的transactionId，以免冲突
- -e: 多环境配置参考
http://seata.io/en-us/docs/ops/multi-configuration-isolation.html
+ -e: 多环境配置参考
https://seata.io/zh-cn/docs/v1.3/ops/multi-configuration-isolation
```
- <a href="https://seata.io/zh-cn/docs/ops/deploy-by-docker.html";
target="_blank">点击查看docker部署</a>
@@ -189,85 +170,4 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
- 自动
springCloud用户可以引入spring-cloud-starter-alibaba-seata，内部已经实现xid传递
-## 业务使用
-
-### 注解拦截
-
-#### 全局事务
-
-```java
-@GetMapping(value = "testCommit")
-@GlobalTransactional
-public Object testCommit(@RequestParam(name = "id",defaultValue = "1") Integer
id,
- @RequestParam(name = "sum", defaultValue = "1") Integer sum) {
- Boolean ok = productService.reduceStock(id, sum);
- if (ok) {
- LocalDateTime now = LocalDateTime.now();
- Orders orders = new Orders();
- orders.setCreateTime(now);
- orders.setProductId(id);
- orders.setReplaceTime(now);
- orders.setSum(sum);
- orderService.save(orders);
- return "ok";
- } else {
- return "fail";
- }
-}
-```
-
-#### TCC
-
-```java
-/**
- * 定义两阶段提交 name = 该tcc的bean名称,全局唯一 commitMethod = commit 为二阶段确认方法
rollbackMethod = rollback 为二阶段取消方法
- * useTCCFence=true 为开启防悬挂
- * BusinessActionContextParameter注解 传递参数到二阶段中
- *
- * @param params -入参
- * @return String
- */
-@TwoPhaseBusinessAction(name = "beanName", commitMethod = "commit",
rollbackMethod = "rollback", useTCCFence = true)
-public void insert(@BusinessActionContextParameter(paramName = "params")
Map<String, String> params) {
-
logger.info("此处可以预留资源,或者利用tcc的特点,与AT混用,二阶段时利用一阶段在此处存放的消息,通过二阶段发出,比如redis,mq等操作");
-}
-
-/**
- * 确认方法、可以另命名，但要保证与commitMethod一致 context可以传递try方法的参数
- *
- * @param context 上下文
- * @return boolean
- */
-public void commit(BusinessActionContext context) {
- logger.info("预留资源真正处理,或者发出mq消息和redis入库");
-}
-
-/**
- * 二阶段取消方法
- *
- * @param context 上下文
- * @return boolean
- */
-public void rollback(BusinessActionContext context) {
- logger.info("预留资源释放,或清除一阶段准备让二阶段提交时发出的消息缓存");
-}
-```
-
-### 切点表达式
-
-#### 全局事务
-
-```java
- @Bean
- public AspectTransactionalInterceptor aspectTransactionalInterceptor () {
- return new AspectTransactionalInterceptor();
- }
-
- @Bean
- public Advisor txAdviceAdvisor(AspectTransactionalInterceptor
aspectTransactionalInterceptor ) {
- AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
- pointcut.setExpression("配置切点表达式使全局事务拦截器生效");
- return new DefaultPointcutAdvisor(pointcut,
aspectTransactionalInterceptor);
- }
-```
diff --git
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.2/ops/deploy-guide-beginner.md
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.2/ops/deploy-guide-beginner.md
index eeb6459350..2f7c628eb1 100644
---
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.2/ops/deploy-guide-beginner.md
+++
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.2/ops/deploy-guide-beginner.md
@@ -38,12 +38,10 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -57,13 +55,11 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
### 启动Server
-Server端存储模式（store.mode）现有file、db、redis三种（后续将引入raft,mongodb），file模式无需改动，直接启动即可，下面专门讲下db和redis启动步骤。
+Server端存储模式（store.mode）现有file、db，file模式无需改动，直接启动即可，下面专门讲下db启动步骤。
注： file模式为单机模式，全局事务会话信息内存中读写并持久化本地文件root.data，性能较高;
db模式为高可用模式，全局事务会话信息通过db共享，相应性能差些;
-redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息丢失风险,请提前配置合适当前场景的redis持久化配置.
-
#### 步骤一：启动包
- <a href="https://github.com/seata/seata/releases"; target="_blank">点击下载</a>
- 官方钉钉群（群号：23171167，1群5000人已满，<a href="http://seata.io/zh-cn/community";
target="_blank">2群</a>, 3群: 32033786），qq群（群号: 254657148,2群: 216012363）群文件共享下载
@@ -73,31 +69,16 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
#### 步骤三：修改store.mode
-启动包: seata-->conf-->application.yml，修改store.mode="db或者redis"
-源码: 根目录-->seata-server-->resources-->application.yml，修改store.mode="db或者redis"
-
-1.5.0以下版本:
-
-启动包: seata-->conf-->file.conf，修改store.mode="db或者redis"
-源码: 根目录-->seata-server-->resources-->file.conf，修改store.mode="db或者redis"
+启动包: seata-->conf-->file.conf，修改store.mode="db"
+源码: 根目录-->seata-server-->resources-->file.conf，修改store.mode="db"
#### 步骤四：修改数据库连接|redis属性配置
-启动包:
seata-->conf-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-源码:
根目录-->seata-server-->resources-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-
-1.5.0以下版本:
-
启动包: seata-->conf-->file.conf，修改store.db或store.redis相关属性。
源码: 根目录-->seata-server-->resources-->file.conf，修改store.db或store.redis相关属性。
#### 步骤五：启动
-- 源码启动: 执行ServerApplication.java的main方法
-- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-
-1.5.0以下版本:
-
- 源码启动: 执行Server.java的main方法
- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
```
@@ -105,7 +86,7 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
-p: Server rpc 监听端口
-m: 全局事务会话信息存储模式，file、db、redis，优先读取启动参数 (Seata-Server 1.3及以上版本支持redis)
-n: Server node，当有多个Server时，需区分各自节点，用于生成不同区间的transactionId，以免冲突
- -e: 多环境配置参考
http://seata.io/en-us/docs/ops/multi-configuration-isolation.html
+ -e: 多环境配置参考
https://seata.io/zh-cn/docs/v1.3/ops/multi-configuration-isolation
```
- <a href="https://seata.io/zh-cn/docs/ops/deploy-by-docker.html";
target="_blank">点击查看docker部署</a>
@@ -189,85 +170,4 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
- 自动
springCloud用户可以引入spring-cloud-starter-alibaba-seata，内部已经实现xid传递
-## 业务使用
-
-### 注解拦截
-
-#### 全局事务
-
-```java
-@GetMapping(value = "testCommit")
-@GlobalTransactional
-public Object testCommit(@RequestParam(name = "id",defaultValue = "1") Integer
id,
- @RequestParam(name = "sum", defaultValue = "1") Integer sum) {
- Boolean ok = productService.reduceStock(id, sum);
- if (ok) {
- LocalDateTime now = LocalDateTime.now();
- Orders orders = new Orders();
- orders.setCreateTime(now);
- orders.setProductId(id);
- orders.setReplaceTime(now);
- orders.setSum(sum);
- orderService.save(orders);
- return "ok";
- } else {
- return "fail";
- }
-}
-```
-
-#### TCC
-
-```java
-/**
- * 定义两阶段提交 name = 该tcc的bean名称,全局唯一 commitMethod = commit 为二阶段确认方法
rollbackMethod = rollback 为二阶段取消方法
- * useTCCFence=true 为开启防悬挂
- * BusinessActionContextParameter注解 传递参数到二阶段中
- *
- * @param params -入参
- * @return String
- */
-@TwoPhaseBusinessAction(name = "beanName", commitMethod = "commit",
rollbackMethod = "rollback", useTCCFence = true)
-public void insert(@BusinessActionContextParameter(paramName = "params")
Map<String, String> params) {
-
logger.info("此处可以预留资源,或者利用tcc的特点,与AT混用,二阶段时利用一阶段在此处存放的消息,通过二阶段发出,比如redis,mq等操作");
-}
-
-/**
- * 确认方法、可以另命名，但要保证与commitMethod一致 context可以传递try方法的参数
- *
- * @param context 上下文
- * @return boolean
- */
-public void commit(BusinessActionContext context) {
- logger.info("预留资源真正处理,或者发出mq消息和redis入库");
-}
-
-/**
- * 二阶段取消方法
- *
- * @param context 上下文
- * @return boolean
- */
-public void rollback(BusinessActionContext context) {
- logger.info("预留资源释放,或清除一阶段准备让二阶段提交时发出的消息缓存");
-}
-```
-
-### 切点表达式
-
-#### 全局事务
-
-```java
- @Bean
- public AspectTransactionalInterceptor aspectTransactionalInterceptor () {
- return new AspectTransactionalInterceptor();
- }
-
- @Bean
- public Advisor txAdviceAdvisor(AspectTransactionalInterceptor
aspectTransactionalInterceptor ) {
- AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
- pointcut.setExpression("配置切点表达式使全局事务拦截器生效");
- return new DefaultPointcutAdvisor(pointcut,
aspectTransactionalInterceptor);
- }
-```
diff --git
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3/ops/deploy-guide-beginner.md
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3/ops/deploy-guide-beginner.md
index eeb6459350..3eb48eafaf 100644
---
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3/ops/deploy-guide-beginner.md
+++
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3/ops/deploy-guide-beginner.md
@@ -38,12 +38,10 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -57,7 +55,7 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
### 启动Server
-Server端存储模式（store.mode）现有file、db、redis三种（后续将引入raft,mongodb），file模式无需改动，直接启动即可，下面专门讲下db和redis启动步骤。
+Server端存储模式（store.mode）现有file、db、redis三种，file模式无需改动，直接启动即可，下面专门讲下db和redis启动步骤。
注： file模式为单机模式，全局事务会话信息内存中读写并持久化本地文件root.data，性能较高;
db模式为高可用模式，全局事务会话信息通过db共享，相应性能差些;
@@ -73,31 +71,16 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
#### 步骤三：修改store.mode
-启动包: seata-->conf-->application.yml，修改store.mode="db或者redis"
-源码: 根目录-->seata-server-->resources-->application.yml，修改store.mode="db或者redis"
-
-1.5.0以下版本:
-
启动包: seata-->conf-->file.conf，修改store.mode="db或者redis"
源码: 根目录-->seata-server-->resources-->file.conf，修改store.mode="db或者redis"
#### 步骤四：修改数据库连接|redis属性配置
-启动包:
seata-->conf-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-源码:
根目录-->seata-server-->resources-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-
-1.5.0以下版本:
-
启动包: seata-->conf-->file.conf，修改store.db或store.redis相关属性。
源码: 根目录-->seata-server-->resources-->file.conf，修改store.db或store.redis相关属性。
#### 步骤五：启动
-- 源码启动: 执行ServerApplication.java的main方法
-- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-
-1.5.0以下版本:
-
- 源码启动: 执行Server.java的main方法
- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
```
@@ -105,7 +88,7 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
-p: Server rpc 监听端口
-m: 全局事务会话信息存储模式，file、db、redis，优先读取启动参数 (Seata-Server 1.3及以上版本支持redis)
-n: Server node，当有多个Server时，需区分各自节点，用于生成不同区间的transactionId，以免冲突
- -e: 多环境配置参考
http://seata.io/en-us/docs/ops/multi-configuration-isolation.html
+ -e: 多环境配置参考
https://seata.io/zh-cn/docs/v1.3/ops/multi-configuration-isolation
```
- <a href="https://seata.io/zh-cn/docs/ops/deploy-by-docker.html";
target="_blank">点击查看docker部署</a>
@@ -189,85 +172,4 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
- 自动
springCloud用户可以引入spring-cloud-starter-alibaba-seata，内部已经实现xid传递
-## 业务使用
-
-### 注解拦截
-
-#### 全局事务
-
-```java
-@GetMapping(value = "testCommit")
-@GlobalTransactional
-public Object testCommit(@RequestParam(name = "id",defaultValue = "1") Integer
id,
- @RequestParam(name = "sum", defaultValue = "1") Integer sum) {
- Boolean ok = productService.reduceStock(id, sum);
- if (ok) {
- LocalDateTime now = LocalDateTime.now();
- Orders orders = new Orders();
- orders.setCreateTime(now);
- orders.setProductId(id);
- orders.setReplaceTime(now);
- orders.setSum(sum);
- orderService.save(orders);
- return "ok";
- } else {
- return "fail";
- }
-}
-```
-
-#### TCC
-
-```java
-/**
- * 定义两阶段提交 name = 该tcc的bean名称,全局唯一 commitMethod = commit 为二阶段确认方法
rollbackMethod = rollback 为二阶段取消方法
- * useTCCFence=true 为开启防悬挂
- * BusinessActionContextParameter注解 传递参数到二阶段中
- *
- * @param params -入参
- * @return String
- */
-@TwoPhaseBusinessAction(name = "beanName", commitMethod = "commit",
rollbackMethod = "rollback", useTCCFence = true)
-public void insert(@BusinessActionContextParameter(paramName = "params")
Map<String, String> params) {
-
logger.info("此处可以预留资源,或者利用tcc的特点,与AT混用,二阶段时利用一阶段在此处存放的消息,通过二阶段发出,比如redis,mq等操作");
-}
-
-/**
- * 确认方法、可以另命名，但要保证与commitMethod一致 context可以传递try方法的参数
- *
- * @param context 上下文
- * @return boolean
- */
-public void commit(BusinessActionContext context) {
- logger.info("预留资源真正处理,或者发出mq消息和redis入库");
-}
-
-/**
- * 二阶段取消方法
- *
- * @param context 上下文
- * @return boolean
- */
-public void rollback(BusinessActionContext context) {
- logger.info("预留资源释放,或清除一阶段准备让二阶段提交时发出的消息缓存");
-}
-```
-
-### 切点表达式
-
-#### 全局事务
-
-```java
- @Bean
- public AspectTransactionalInterceptor aspectTransactionalInterceptor () {
- return new AspectTransactionalInterceptor();
- }
-
- @Bean
- public Advisor txAdviceAdvisor(AspectTransactionalInterceptor
aspectTransactionalInterceptor ) {
- AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
- pointcut.setExpression("配置切点表达式使全局事务拦截器生效");
- return new DefaultPointcutAdvisor(pointcut,
aspectTransactionalInterceptor);
- }
-```
diff --git
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4/ops/deploy-guide-beginner.md
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4/ops/deploy-guide-beginner.md
index eeb6459350..e4827af803 100644
---
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4/ops/deploy-guide-beginner.md
+++
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4/ops/deploy-guide-beginner.md
@@ -38,12 +38,10 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -57,7 +55,7 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
### 启动Server
-Server端存储模式（store.mode）现有file、db、redis三种（后续将引入raft,mongodb），file模式无需改动，直接启动即可，下面专门讲下db和redis启动步骤。
+Server端存储模式（store.mode）现有file、db、redis三种，file模式无需改动，直接启动即可，下面专门讲下db和redis启动步骤。
注： file模式为单机模式，全局事务会话信息内存中读写并持久化本地文件root.data，性能较高;
db模式为高可用模式，全局事务会话信息通过db共享，相应性能差些;
@@ -73,31 +71,16 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
#### 步骤三：修改store.mode
-启动包: seata-->conf-->application.yml，修改store.mode="db或者redis"
-源码: 根目录-->seata-server-->resources-->application.yml，修改store.mode="db或者redis"
-
-1.5.0以下版本:
-
启动包: seata-->conf-->file.conf，修改store.mode="db或者redis"
源码: 根目录-->seata-server-->resources-->file.conf，修改store.mode="db或者redis"
#### 步骤四：修改数据库连接|redis属性配置
-启动包:
seata-->conf-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-源码:
根目录-->seata-server-->resources-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-
-1.5.0以下版本:
-
启动包: seata-->conf-->file.conf，修改store.db或store.redis相关属性。
源码: 根目录-->seata-server-->resources-->file.conf，修改store.db或store.redis相关属性。
#### 步骤五：启动
-- 源码启动: 执行ServerApplication.java的main方法
-- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-
-1.5.0以下版本:
-
- 源码启动: 执行Server.java的main方法
- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
```
@@ -105,7 +88,7 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
-p: Server rpc 监听端口
-m: 全局事务会话信息存储模式，file、db、redis，优先读取启动参数 (Seata-Server 1.3及以上版本支持redis)
-n: Server node，当有多个Server时，需区分各自节点，用于生成不同区间的transactionId，以免冲突
- -e: 多环境配置参考
http://seata.io/en-us/docs/ops/multi-configuration-isolation.html
+ -e: 多环境配置参考
https://seata.io/zh-cn/docs/v1.4/ops/multi-configuration-isolation
```
- <a href="https://seata.io/zh-cn/docs/ops/deploy-by-docker.html";
target="_blank">点击查看docker部署</a>
@@ -189,85 +172,4 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
- 自动
springCloud用户可以引入spring-cloud-starter-alibaba-seata，内部已经实现xid传递
-## 业务使用
-
-### 注解拦截
-
-#### 全局事务
-
-```java
-@GetMapping(value = "testCommit")
-@GlobalTransactional
-public Object testCommit(@RequestParam(name = "id",defaultValue = "1") Integer
id,
- @RequestParam(name = "sum", defaultValue = "1") Integer sum) {
- Boolean ok = productService.reduceStock(id, sum);
- if (ok) {
- LocalDateTime now = LocalDateTime.now();
- Orders orders = new Orders();
- orders.setCreateTime(now);
- orders.setProductId(id);
- orders.setReplaceTime(now);
- orders.setSum(sum);
- orderService.save(orders);
- return "ok";
- } else {
- return "fail";
- }
-}
-```
-
-#### TCC
-
-```java
-/**
- * 定义两阶段提交 name = 该tcc的bean名称,全局唯一 commitMethod = commit 为二阶段确认方法
rollbackMethod = rollback 为二阶段取消方法
- * useTCCFence=true 为开启防悬挂
- * BusinessActionContextParameter注解 传递参数到二阶段中
- *
- * @param params -入参
- * @return String
- */
-@TwoPhaseBusinessAction(name = "beanName", commitMethod = "commit",
rollbackMethod = "rollback", useTCCFence = true)
-public void insert(@BusinessActionContextParameter(paramName = "params")
Map<String, String> params) {
-
logger.info("此处可以预留资源,或者利用tcc的特点,与AT混用,二阶段时利用一阶段在此处存放的消息,通过二阶段发出,比如redis,mq等操作");
-}
-
-/**
- * 确认方法、可以另命名，但要保证与commitMethod一致 context可以传递try方法的参数
- *
- * @param context 上下文
- * @return boolean
- */
-public void commit(BusinessActionContext context) {
- logger.info("预留资源真正处理,或者发出mq消息和redis入库");
-}
-
-/**
- * 二阶段取消方法
- *
- * @param context 上下文
- * @return boolean
- */
-public void rollback(BusinessActionContext context) {
- logger.info("预留资源释放,或清除一阶段准备让二阶段提交时发出的消息缓存");
-}
-```
-
-### 切点表达式
-
-#### 全局事务
-
-```java
- @Bean
- public AspectTransactionalInterceptor aspectTransactionalInterceptor () {
- return new AspectTransactionalInterceptor();
- }
-
- @Bean
- public Advisor txAdviceAdvisor(AspectTransactionalInterceptor
aspectTransactionalInterceptor ) {
- AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
- pointcut.setExpression("配置切点表达式使全局事务拦截器生效");
- return new DefaultPointcutAdvisor(pointcut,
aspectTransactionalInterceptor);
- }
-```
diff --git
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.5/ops/deploy-guide-beginner.md
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.5/ops/deploy-guide-beginner.md
index eeb6459350..f416537af8 100644
---
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.5/ops/deploy-guide-beginner.md
+++
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.5/ops/deploy-guide-beginner.md
@@ -38,12 +38,10 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -57,8 +55,8 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
### 启动Server
-Server端存储模式（store.mode）现有file、db、redis三种（后续将引入raft,mongodb），file模式无需改动，直接启动即可，下面专门讲下db和redis启动步骤。
-注： file模式为单机模式，全局事务会话信息内存中读写并持久化本地文件root.data，性能较高;
+Server端存储模式（store.mode）现有file、db、redis，file模式无需改动，直接启动即可,下面专门讲下db和redis启动步骤。
+注： file模式为单机模式，全局事务会话信息内存中读写并异步(默认)持久化本地文件root.data，性能较高;
db模式为高可用模式，全局事务会话信息通过db共享，相应性能差些;
@@ -76,46 +74,24 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
启动包: seata-->conf-->application.yml，修改store.mode="db或者redis"
源码: 根目录-->seata-server-->resources-->application.yml，修改store.mode="db或者redis"
-1.5.0以下版本:
-
-启动包: seata-->conf-->file.conf，修改store.mode="db或者redis"
-源码: 根目录-->seata-server-->resources-->file.conf，修改store.mode="db或者redis"
-
#### 步骤四：修改数据库连接|redis属性配置
启动包:
seata-->conf-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-源码:
根目录-->seata-server-->resources-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
+源码:
根目录-->seata-server-->resources-->application.example.yml中附带额外配置，将其db/redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-1.5.0以下版本:
-
-启动包: seata-->conf-->file.conf，修改store.db或store.redis相关属性。
-源码: 根目录-->seata-server-->resources-->file.conf，修改store.db或store.redis相关属性。
#### 步骤五：启动
- 源码启动: 执行ServerApplication.java的main方法
- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-1.5.0以下版本:
-
-- 源码启动: 执行Server.java的main方法
-- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
-```
- -h: 注册到注册中心的ip
- -p: Server rpc 监听端口
- -m: 全局事务会话信息存储模式，file、db、redis，优先读取启动参数 (Seata-Server 1.3及以上版本支持redis)
- -n: Server node，当有多个Server时，需区分各自节点，用于生成不同区间的transactionId，以免冲突
- -e: 多环境配置参考
http://seata.io/en-us/docs/ops/multi-configuration-isolation.html
-```
-- <a href="https://seata.io/zh-cn/docs/ops/deploy-by-docker.html";
target="_blank">点击查看docker部署</a>
-
注: 堆内存建议分配2G，堆外内存1G
### 业务系统集成Client
#### 步骤一：添加seata依赖（建议单选）
- 依赖seata-all
- 依赖seata-spring-boot-starter，支持yml、properties配置(.conf可删除)，内部已依赖seata-all
-- 依赖spring-cloud-alibaba-seata，内部集成了seata，并实现了xid传递
+- 依赖spring-cloud-starter-alibaba-seata，内部集成了seata，并实现了xid传递
#### 步骤二：undo_log建表、配置参数(仅AT模式)
- <a href="https://seata.io/zh-cn/docs/user/configurations.html";
target="_blank">查看参数配置介绍</a>
diff --git
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.6/ops/deploy-guide-beginner.md
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.6/ops/deploy-guide-beginner.md
index eeb6459350..f416537af8 100644
---
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.6/ops/deploy-guide-beginner.md
+++
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.6/ops/deploy-guide-beginner.md
@@ -38,12 +38,10 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -57,8 +55,8 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
### 启动Server
-Server端存储模式（store.mode）现有file、db、redis三种（后续将引入raft,mongodb），file模式无需改动，直接启动即可，下面专门讲下db和redis启动步骤。
-注： file模式为单机模式，全局事务会话信息内存中读写并持久化本地文件root.data，性能较高;
+Server端存储模式（store.mode）现有file、db、redis，file模式无需改动，直接启动即可,下面专门讲下db和redis启动步骤。
+注： file模式为单机模式，全局事务会话信息内存中读写并异步(默认)持久化本地文件root.data，性能较高;
db模式为高可用模式，全局事务会话信息通过db共享，相应性能差些;
@@ -76,46 +74,24 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
启动包: seata-->conf-->application.yml，修改store.mode="db或者redis"
源码: 根目录-->seata-server-->resources-->application.yml，修改store.mode="db或者redis"
-1.5.0以下版本:
-
-启动包: seata-->conf-->file.conf，修改store.mode="db或者redis"
-源码: 根目录-->seata-server-->resources-->file.conf，修改store.mode="db或者redis"
-
#### 步骤四：修改数据库连接|redis属性配置
启动包:
seata-->conf-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-源码:
根目录-->seata-server-->resources-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
+源码:
根目录-->seata-server-->resources-->application.example.yml中附带额外配置，将其db/redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-1.5.0以下版本:
-
-启动包: seata-->conf-->file.conf，修改store.db或store.redis相关属性。
-源码: 根目录-->seata-server-->resources-->file.conf，修改store.db或store.redis相关属性。
#### 步骤五：启动
- 源码启动: 执行ServerApplication.java的main方法
- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-1.5.0以下版本:
-
-- 源码启动: 执行Server.java的main方法
-- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
-```
- -h: 注册到注册中心的ip
- -p: Server rpc 监听端口
- -m: 全局事务会话信息存储模式，file、db、redis，优先读取启动参数 (Seata-Server 1.3及以上版本支持redis)
- -n: Server node，当有多个Server时，需区分各自节点，用于生成不同区间的transactionId，以免冲突
- -e: 多环境配置参考
http://seata.io/en-us/docs/ops/multi-configuration-isolation.html
-```
-- <a href="https://seata.io/zh-cn/docs/ops/deploy-by-docker.html";
target="_blank">点击查看docker部署</a>
-
注: 堆内存建议分配2G，堆外内存1G
### 业务系统集成Client
#### 步骤一：添加seata依赖（建议单选）
- 依赖seata-all
- 依赖seata-spring-boot-starter，支持yml、properties配置(.conf可删除)，内部已依赖seata-all
-- 依赖spring-cloud-alibaba-seata，内部集成了seata，并实现了xid传递
+- 依赖spring-cloud-starter-alibaba-seata，内部集成了seata，并实现了xid传递
#### 步骤二：undo_log建表、配置参数(仅AT模式)
- <a href="https://seata.io/zh-cn/docs/user/configurations.html";
target="_blank">查看参数配置介绍</a>
diff --git
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.7/ops/deploy-guide-beginner.md
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.7/ops/deploy-guide-beginner.md
index eeb6459350..f416537af8 100644
---
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.7/ops/deploy-guide-beginner.md
+++
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.7/ops/deploy-guide-beginner.md
@@ -38,12 +38,10 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -57,8 +55,8 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
### 启动Server
-Server端存储模式（store.mode）现有file、db、redis三种（后续将引入raft,mongodb），file模式无需改动，直接启动即可，下面专门讲下db和redis启动步骤。
-注： file模式为单机模式，全局事务会话信息内存中读写并持久化本地文件root.data，性能较高;
+Server端存储模式（store.mode）现有file、db、redis，file模式无需改动，直接启动即可,下面专门讲下db和redis启动步骤。
+注： file模式为单机模式，全局事务会话信息内存中读写并异步(默认)持久化本地文件root.data，性能较高;
db模式为高可用模式，全局事务会话信息通过db共享，相应性能差些;
@@ -76,46 +74,24 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
启动包: seata-->conf-->application.yml，修改store.mode="db或者redis"
源码: 根目录-->seata-server-->resources-->application.yml，修改store.mode="db或者redis"
-1.5.0以下版本:
-
-启动包: seata-->conf-->file.conf，修改store.mode="db或者redis"
-源码: 根目录-->seata-server-->resources-->file.conf，修改store.mode="db或者redis"
-
#### 步骤四：修改数据库连接|redis属性配置
启动包:
seata-->conf-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-源码:
根目录-->seata-server-->resources-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
+源码:
根目录-->seata-server-->resources-->application.example.yml中附带额外配置，将其db/redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-1.5.0以下版本:
-
-启动包: seata-->conf-->file.conf，修改store.db或store.redis相关属性。
-源码: 根目录-->seata-server-->resources-->file.conf，修改store.db或store.redis相关属性。
#### 步骤五：启动
- 源码启动: 执行ServerApplication.java的main方法
- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-1.5.0以下版本:
-
-- 源码启动: 执行Server.java的main方法
-- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
-```
- -h: 注册到注册中心的ip
- -p: Server rpc 监听端口
- -m: 全局事务会话信息存储模式，file、db、redis，优先读取启动参数 (Seata-Server 1.3及以上版本支持redis)
- -n: Server node，当有多个Server时，需区分各自节点，用于生成不同区间的transactionId，以免冲突
- -e: 多环境配置参考
http://seata.io/en-us/docs/ops/multi-configuration-isolation.html
-```
-- <a href="https://seata.io/zh-cn/docs/ops/deploy-by-docker.html";
target="_blank">点击查看docker部署</a>
-
注: 堆内存建议分配2G，堆外内存1G
### 业务系统集成Client
#### 步骤一：添加seata依赖（建议单选）
- 依赖seata-all
- 依赖seata-spring-boot-starter，支持yml、properties配置(.conf可删除)，内部已依赖seata-all
-- 依赖spring-cloud-alibaba-seata，内部集成了seata，并实现了xid传递
+- 依赖spring-cloud-starter-alibaba-seata，内部集成了seata，并实现了xid传递
#### 步骤二：undo_log建表、配置参数(仅AT模式)
- <a href="https://seata.io/zh-cn/docs/user/configurations.html";
target="_blank">查看参数配置介绍</a>
diff --git
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.8/ops/deploy-guide-beginner.md
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.8/ops/deploy-guide-beginner.md
index eeb6459350..f416537af8 100644
---
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.8/ops/deploy-guide-beginner.md
+++
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.8/ops/deploy-guide-beginner.md
@@ -38,12 +38,10 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
- <version>最新版</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- <version>最新版本</version>
<exclusions>
<exclusion>
<groupId>io.seata</groupId>
@@ -57,8 +55,8 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
### 启动Server
-Server端存储模式（store.mode）现有file、db、redis三种（后续将引入raft,mongodb），file模式无需改动，直接启动即可，下面专门讲下db和redis启动步骤。
-注： file模式为单机模式，全局事务会话信息内存中读写并持久化本地文件root.data，性能较高;
+Server端存储模式（store.mode）现有file、db、redis，file模式无需改动，直接启动即可,下面专门讲下db和redis启动步骤。
+注： file模式为单机模式，全局事务会话信息内存中读写并异步(默认)持久化本地文件root.data，性能较高;
db模式为高可用模式，全局事务会话信息通过db共享，相应性能差些;
@@ -76,46 +74,24 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
启动包: seata-->conf-->application.yml，修改store.mode="db或者redis"
源码: 根目录-->seata-server-->resources-->application.yml，修改store.mode="db或者redis"
-1.5.0以下版本:
-
-启动包: seata-->conf-->file.conf，修改store.mode="db或者redis"
-源码: 根目录-->seata-server-->resources-->file.conf，修改store.mode="db或者redis"
-
#### 步骤四：修改数据库连接|redis属性配置
启动包:
seata-->conf-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-源码:
根目录-->seata-server-->resources-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
+源码:
根目录-->seata-server-->resources-->application.example.yml中附带额外配置，将其db/redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-1.5.0以下版本:
-
-启动包: seata-->conf-->file.conf，修改store.db或store.redis相关属性。
-源码: 根目录-->seata-server-->resources-->file.conf，修改store.db或store.redis相关属性。
#### 步骤五：启动
- 源码启动: 执行ServerApplication.java的main方法
- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-1.5.0以下版本:
-
-- 源码启动: 执行Server.java的main方法
-- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
-```
- -h: 注册到注册中心的ip
- -p: Server rpc 监听端口
- -m: 全局事务会话信息存储模式，file、db、redis，优先读取启动参数 (Seata-Server 1.3及以上版本支持redis)
- -n: Server node，当有多个Server时，需区分各自节点，用于生成不同区间的transactionId，以免冲突
- -e: 多环境配置参考
http://seata.io/en-us/docs/ops/multi-configuration-isolation.html
-```
-- <a href="https://seata.io/zh-cn/docs/ops/deploy-by-docker.html";
target="_blank">点击查看docker部署</a>
-
注: 堆内存建议分配2G，堆外内存1G
### 业务系统集成Client
#### 步骤一：添加seata依赖（建议单选）
- 依赖seata-all
- 依赖seata-spring-boot-starter，支持yml、properties配置(.conf可删除)，内部已依赖seata-all
-- 依赖spring-cloud-alibaba-seata，内部集成了seata，并实现了xid传递
+- 依赖spring-cloud-starter-alibaba-seata，内部集成了seata，并实现了xid传递
#### 步骤二：undo_log建表、配置参数(仅AT模式)
- <a href="https://seata.io/zh-cn/docs/user/configurations.html";
target="_blank">查看参数配置介绍</a>
diff --git
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v2.0/ops/deploy-guide-beginner.md
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v2.0/ops/deploy-guide-beginner.md
index eeb6459350..7b6b4dd0af 100644
---
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v2.0/ops/deploy-guide-beginner.md
+++
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v2.0/ops/deploy-guide-beginner.md
@@ -57,8 +57,8 @@ Seata分TC、TM和RM三个角色，TC（Server端）为单独服务端部署，T
### 启动Server
-Server端存储模式（store.mode）现有file、db、redis三种（后续将引入raft,mongodb），file模式无需改动，直接启动即可，下面专门讲下db和redis启动步骤。
-注： file模式为单机模式，全局事务会话信息内存中读写并持久化本地文件root.data，性能较高;
+Server端存储模式（store.mode）现有file、db、redis、raft，file模式无需改动，直接启动即可,raft部署方式请访问[专门部署文档](https://seata.io/zh-cn/docs/ops/deploy-server-raft)，下面专门讲下db和redis启动步骤。
+注： file模式为单机模式，全局事务会话信息内存中读写并异步(默认)持久化本地文件root.data，性能较高;
db模式为高可用模式，全局事务会话信息通过db共享，相应性能差些;
@@ -76,46 +76,24 @@ redis模式Seata-Server 1.3及以上版本支持,性能较高,存在事务信息
启动包: seata-->conf-->application.yml，修改store.mode="db或者redis"
源码: 根目录-->seata-server-->resources-->application.yml，修改store.mode="db或者redis"
-1.5.0以下版本:
-
-启动包: seata-->conf-->file.conf，修改store.mode="db或者redis"
-源码: 根目录-->seata-server-->resources-->file.conf，修改store.mode="db或者redis"
-
#### 步骤四：修改数据库连接|redis属性配置
启动包:
seata-->conf-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-源码:
根目录-->seata-server-->resources-->application.example.yml中附带额外配置，将其db|redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
+源码:
根目录-->seata-server-->resources-->application.example.yml中附带额外配置，将其db/redis相关配置复制至application.yml,进行修改store.db或store.redis相关属性。
-1.5.0以下版本:
-
-启动包: seata-->conf-->file.conf，修改store.db或store.redis相关属性。
-源码: 根目录-->seata-server-->resources-->file.conf，修改store.db或store.redis相关属性。
#### 步骤五：启动
- 源码启动: 执行ServerApplication.java的main方法
- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db
-1.5.0以下版本:
-
-- 源码启动: 执行Server.java的main方法
-- 命令启动: seata-server.sh -h 127.0.0.1 -p 8091 -m db -n 1 -e test
-```
- -h: 注册到注册中心的ip
- -p: Server rpc 监听端口
- -m: 全局事务会话信息存储模式，file、db、redis，优先读取启动参数 (Seata-Server 1.3及以上版本支持redis)
- -n: Server node，当有多个Server时，需区分各自节点，用于生成不同区间的transactionId，以免冲突
- -e: 多环境配置参考
http://seata.io/en-us/docs/ops/multi-configuration-isolation.html
-```
-- <a href="https://seata.io/zh-cn/docs/ops/deploy-by-docker.html";
target="_blank">点击查看docker部署</a>
-
注: 堆内存建议分配2G，堆外内存1G
### 业务系统集成Client
#### 步骤一：添加seata依赖（建议单选）
- 依赖seata-all
- 依赖seata-spring-boot-starter，支持yml、properties配置(.conf可删除)，内部已依赖seata-all
-- 依赖spring-cloud-alibaba-seata，内部集成了seata，并实现了xid传递
+- 依赖spring-cloud-starter-alibaba-seata，内部集成了seata，并实现了xid传递
#### 步骤二：undo_log建表、配置参数(仅AT模式)
- <a href="https://seata.io/zh-cn/docs/user/configurations.html";
target="_blank">查看参数配置介绍</a>
diff --git
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v2.0/ops/deploy-server-raft.md
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v2.0/ops/deploy-server-raft.md
index 8e120ed72e..bc6fbf080e 100644
---
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v2.0/ops/deploy-server-raft.md
+++
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v2.0/ops/deploy-server-raft.md
@@ -58,6 +58,10 @@ $ sh ./bin/seata-server.sh
bin\seata-server.bat
```
+4. 扩缩容方式
+假设原集群列表为`192.168.0.111:7091,192.168.0.112:7091,192.168.0.113:7091`，无论是扩容还是缩容，只需要对这个字符串进行修改，并提交到一个所在成员的扩缩容接口即可，比如扩容`curl
-X POST -i
http://192.168.0.111:7091/metadata/v1/changeCluster?raftClusterStr=192.168.0.111:7091,192.168.0.112:7091,192.168.0.113:7091,192.168.0.114:7091"`，如果是缩容，只需要将集群连接串中需要下线的节点进行去除，并调用扩缩容接口即可.
+注：seata.server.raft.server-addr配置只要集群构建完成后，修改该配置就无效了，请统一通过api方式进行扩缩容，后续控制台中也会集成扩缩容和集群管理功能。
+
## Client
1. 修改`registry.type`
diff --git
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v2.0/user/configurations.md
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v2.0/user/configurations.md
index a8f1ec1c3d..b5013a3d7a 100644
---
a/i18n/zh-cn/docusaurus-plugin-content-docs/version-v2.0/user/configurations.md
+++
b/i18n/zh-cn/docusaurus-plugin-content-docs/version-v2.0/user/configurations.md
@@ -117,6 +117,7 @@ description: Seata 参数配置。
| store.redis.database | redis模式默认库 | 默认0 |
| store.redis.password | redis模式密码(无可不填) | 默认null |
| store.redis.queryLimit | redis模式一次查询最大条数 | 默认100 |
+| store.redis.type | redis模式主要使用的方式: lua, pippline | pippline|
| metrics.enabled | 是否启用Metrics |
默认false关闭，在False状态下，所有与Metrics相关的组件将不会被初始化，使得性能损耗最低 |
| metrics.registryType | 指标注册器类型 |
Metrics使用的指标注册器类型，默认为内置的compact（简易）实现，这个实现中的Meter仅使用有限内存计数，性能高足够满足大多数场景；目前只能设置一个指标注册器实现
|
| metrics.exporterList | 指标结果Measurement数据输出器列表 |
默认prometheus，多个输出器使用英文逗号分割，例如"prometheus,jmx"，目前仅实现了对接prometheus的输出器 |
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For additional commands, e-mail: notifications-h...@seata.apache.org
