From bbb6c379f24626c3c7ad916ee50d301d994c6489 Mon Sep 17 00:00:00 2001 From: "zhanhua.cheng" Date: Fri, 24 Jun 2022 14:28:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?dtmServer=E6=B3=A8=E5=86=8C=E5=88=B0nacos?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E7=9A=84=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf.sample.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.sample.yml b/conf.sample.yml index a256a2a..f0f2cb6 100644 --- a/conf.sample.yml +++ b/conf.sample.yml @@ -46,7 +46,7 @@ # Driver: 'dtm-driver-http' # name of the driver to handle register/discover # RegistryType: 'nacos' # RegistryAddress: '127.0.0.1:8848,127.0.0.1:8848' -# RegistryOptions: '{"UserName":"nacos","Password":"nacos","NotLoadCacheAtStart":true}' +# RegistryOptions: '{"namespaceId":"a6843d66-cf5b-43ab-b7e7-461200dfe76c","UserName":"nacos","Password":"nacos","NotLoadCacheAtStart":true}' # Target: '{"ServiceName":"dtmService","Enable":true,"Healthy":true,"Weight":10}' # target and options # EndPoint: '127.0.0.1:36789' From cca6675b568002344a014f489201138a300ed084 Mon Sep 17 00:00:00 2001 From: nehcoab Date: Mon, 27 Jun 2022 22:40:55 +0800 Subject: [PATCH 2/2] docs: correct spelling subtraction -> sub-transaction --- README.md | 6 +++--- helper/README-en.md | 6 +++--- test/busi/quick_start.go | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 1c7e181..5ce855d 100644 --- a/README.md +++ b/README.md @@ -59,11 +59,11 @@ go run main.go req := &gin.H{"amount": 30} // micro-service payload // DtmServer is the address of DTM micro-service saga := dtmcli.NewSaga(DtmServer, shortuuid.New()). - // add a TransOut subtraction，forward operation with url: qsBusi+"/TransOut", reverse compensation operation with url: qsBusi+"/TransOutCom" + // add a TransOut sub-transaction，forward operation with url: qsBusi+"/TransOut", reverse compensation operation with url: qsBusi+"/TransOutCom" Add(qsBusi+"/TransOut", qsBusi+"/TransOutCom", req). - // add a TransIn subtraction, forward operation with url: qsBusi+"/TransIn", reverse compensation operation with url: qsBusi+"/TransInCom" + // add a TransIn sub-transaction, forward operation with url: qsBusi+"/TransIn", reverse compensation operation with url: qsBusi+"/TransInCom" Add(qsBusi+"/TransIn", qsBusi+"/TransInCom", req) - // submit the created saga transaction，dtm ensures all subtractions either complete or get revoked + // submit the created saga transaction，dtm ensures all sub-transactions either complete or get revoked err := saga.Submit() ``` diff --git a/helper/README-en.md b/helper/README-en.md index 740ae92..4caed84 100644 --- a/helper/README-en.md +++ b/helper/README-en.md @@ -57,11 +57,11 @@ go run main.go req := &gin.H{"amount": 30} // micro-service payload // DtmServer is the address of DTM micro-service saga := dtmcli.NewSaga(DtmServer, shortuuid.New()). - // add a TransOut subtraction，forward operation with url: qsBusi+"/TransOut", reverse compensation operation with url: qsBusi+"/TransOutCom" + // add a TransOut sub-transaction，forward operation with url: qsBusi+"/TransOut", reverse compensation operation with url: qsBusi+"/TransOutCom" Add(qsBusi+"/TransOut", qsBusi+"/TransOutCom", req). - // add a TransIn subtraction, forward operation with url: qsBusi+"/TransIn", reverse compensation operation with url: qsBusi+"/TransInCom" + // add a TransIn sub-transaction, forward operation with url: qsBusi+"/TransIn", reverse compensation operation with url: qsBusi+"/TransInCom" Add(qsBusi+"/TransIn", qsBusi+"/TransInCom", req) - // submit the created saga transaction，dtm ensures all subtractions either complete or get revoked + // submit the created saga transaction，dtm ensures all sub-transactions either complete or get revoked err := saga.Submit() ``` diff --git a/test/busi/quick_start.go b/test/busi/quick_start.go index 2f33d72..729be30 100644 --- a/test/busi/quick_start.go +++ b/test/busi/quick_start.go @@ -61,11 +61,11 @@ func QsFireRequest() string { req := &gin.H{"amount": 30} // load of micro-service // DtmServer is the url of dtm saga := dtmcli.NewSaga(dtmServer, shortuuid.New()). - // add a TransOut subtraction，forward operation with url: qsBusi+"/TransOut", reverse compensation operation with url: qsBusi+"/TransOutCompensate" + // add a TransOut sub-transaction，forward operation with url: qsBusi+"/TransOut", reverse compensation operation with url: qsBusi+"/TransOutCompensate" Add(qsBusi+"/TransOut", qsBusi+"/TransOutCompensate", req). - // add a TransIn subtraction, forward operation with url: qsBusi+"/TransIn", reverse compensation operation with url: qsBusi+"/TransInCompensate" + // add a TransIn sub-transaction, forward operation with url: qsBusi+"/TransIn", reverse compensation operation with url: qsBusi+"/TransInCompensate" Add(qsBusi+"/TransIn", qsBusi+"/TransInCompensate", req) - // submit the created saga transaction，dtm ensures all subtractions either complete or get revoked + // submit the created saga transaction，dtm ensures all sub-transactions either complete or get revoked err := saga.Submit() if err != nil {