Merge branch 'dtm-labs:main' into main

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()
 ```
 

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'
 

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()
 ```
 

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 {