examples setup refactored

app/main.go

@@ -40,38 +40,26 @@ func main() {
 	}
 
 	// 下面是各类的例子
-	app := examples.BaseAppStartup()
+	examples.BaseAppStartup()
 	examples.GrpcStartup()
 	if os.Args[1] == "xa" { // 启动xa示例
-		examples.XaSetup(app)
 		examples.XaFireRequest()
 	} else if os.Args[1] == "saga" { // 启动saga示例
-		examples.SagaSetup(app)
 		examples.SagaFireRequest()
 	} else if os.Args[1] == "tcc" { // 启动tcc示例
-		examples.TccSetup(app)
 		examples.TccFireRequestNested()
 	} else if os.Args[1] == "msg" { // 启动msg示例
-		examples.MsgSetup(app)
 		examples.MsgFireRequest()
 	} else if os.Args[1] == "msg_grpc" { // 启动msg示例
-		examples.MsgGrpcSetup(app)
 		examples.MsgGrpcFireRequest()
 	} else if os.Args[1] == "all" { // 运行所有示例
-		examples.SagaSetup(app)
-		examples.SagaWaitSetup(app)
-		examples.TccSetup(app)
-		examples.XaSetup(app)
-		examples.MsgSetup(app)
 		examples.SagaFireRequest()
 		examples.TccFireRequestNested()
 		examples.XaFireRequest()
 		examples.MsgFireRequest()
 	} else if os.Args[1] == "saga_barrier" {
-		examples.SagaBarrierAddRoute(app)
 		examples.SagaBarrierFireRequest()
 	} else if os.Args[1] == "tcc_barrier" {
-		examples.TccBarrierAddRoute(app)
 		examples.TccBarrierFireRequest()
 	} else {
 		dtmcli.LogRedf("unknown arg: %s", os.Args[1])

dtmsvr/api_grpc.go

@@ -49,6 +49,7 @@ func (s *dtmServer) RegisterXaBranch(ctx context.Context, in *pb.DtmXaBranchRequ
 		BranchID: in.Info.BranchID,
 		Status:   "prepared",
 		Data:     in.BusiData,
+		URL:      in.Notify,
 	})
 	return &emptypb.Empty{}, dtmgrpc.Result2Error(r, err)
 }

dtmsvr/dtmsvr_test.go

@@ -46,13 +46,8 @@ func TestMain(m *testing.M) {
 	examples.PopulateDB(false)
 	// 启动组件
 	go StartSvr()
-	app = examples.BaseAppStartup()
 	examples.GrpcStartup()
-	examples.XaGrpcSetup()
+	app = examples.BaseAppStartup()
-	examples.TccSetup(app)
-	examples.XaSetup(app)
-	examples.TccBarrierAddRoute(app)
-	examples.SagaBarrierAddRoute(app)
 
 	resetXaData()
 	m.Run()

examples/main_grpc_xa.go

@@ -3,6 +3,7 @@ package examples
 import (
 	context "context"
 
+	"github.com/gin-gonic/gin"
 	"github.com/yedf/dtm/dtmcli"
 	"github.com/yedf/dtm/dtmgrpc"
 	emptypb "google.golang.org/protobuf/types/known/emptypb"
@@ -11,9 +12,10 @@ import (
 // XaGrpcClient XA client connection
 var XaGrpcClient *dtmgrpc.XaGrpcClient = nil
 
-// XaGrpcSetup 挂载http的api，创建XaClient
+func init() {
-func XaGrpcSetup() {
+	setupFuncs["XaGrpcSetup"] = func(app *gin.Engine) {
-	XaGrpcClient = dtmgrpc.NewXaGrpcClient(DtmGrpcServer, config.DB, BusiGrpc+"/examples.Busi/XaNotify")
+		XaGrpcClient = dtmgrpc.NewXaGrpcClient(DtmGrpcServer, config.DB, BusiGrpc+"/examples.Busi/XaNotify")
+	}
 }
 
 func (s *busiServer) XaNotify(ctx context.Context, in *dtmgrpc.BusiRequest) (*emptypb.Empty, error) {

examples/main_saga_barrier.go

@@ -21,13 +21,14 @@ func SagaBarrierFireRequest() string {
 	return saga.Gid
 }
 
-// SagaBarrierAddRoute 1
+func init() {
-func SagaBarrierAddRoute(app *gin.Engine) {
+	setupFuncs["SagaBarrierSetup"] = func(app *gin.Engine) {
-	app.POST(BusiAPI+"/SagaBTransIn", common.WrapHandler(sagaBarrierTransIn))
+		app.POST(BusiAPI+"/SagaBTransIn", common.WrapHandler(sagaBarrierTransIn))
-	app.POST(BusiAPI+"/SagaBTransInCompensate", common.WrapHandler(sagaBarrierTransInCompensate))
+		app.POST(BusiAPI+"/SagaBTransInCompensate", common.WrapHandler(sagaBarrierTransInCompensate))
-	app.POST(BusiAPI+"/SagaBTransOut", common.WrapHandler(sagaBarrierTransOut))
+		app.POST(BusiAPI+"/SagaBTransOut", common.WrapHandler(sagaBarrierTransOut))
-	app.POST(BusiAPI+"/SagaBTransOutCompensate", common.WrapHandler(sagaBarrierTransOutCompensate))
+		app.POST(BusiAPI+"/SagaBTransOutCompensate", common.WrapHandler(sagaBarrierTransOutCompensate))
-	dtmcli.Logf("examples listening at %d", BusiPort)
+		dtmcli.Logf("examples listening at %d", BusiPort)
+	}
 }
 
 func sagaBarrierAdjustBalance(sdb *sql.Tx, uid int, amount int) (interface{}, error) {

examples/main_tcc.go

@@ -7,14 +7,15 @@ import (
 	"github.com/yedf/dtm/dtmcli"
 )
 
-// TccSetup 1
+func init() {
-func TccSetup(app *gin.Engine) {
+	setupFuncs["TccSetupSetup"] = func(app *gin.Engine) {
-	app.POST(BusiAPI+"/TransInTccParent", common.WrapHandler(func(c *gin.Context) (interface{}, error) {
+		app.POST(BusiAPI+"/TransInTccParent", common.WrapHandler(func(c *gin.Context) (interface{}, error) {
-		tcc, err := dtmcli.TccFromQuery(c.Request.URL.Query())
+			tcc, err := dtmcli.TccFromQuery(c.Request.URL.Query())
-		e2p(err)
+			e2p(err)
-		dtmcli.Logf("TransInTccParent ")
+			dtmcli.Logf("TransInTccParent ")
-		return tcc.CallBranch(&TransReq{Amount: reqFrom(c).Amount}, Busi+"/TransIn", Busi+"/TransInConfirm", Busi+"/TransInRevert")
+			return tcc.CallBranch(&TransReq{Amount: reqFrom(c).Amount}, Busi+"/TransIn", Busi+"/TransInConfirm", Busi+"/TransInRevert")
-	}))
+		}))
+	}
 }
 
 // TccFireRequestNested 1

examples/main_tcc_barrier.go

@@ -25,15 +25,16 @@ func TccBarrierFireRequest() string {
 	return gid
 }
 
-// TccBarrierAddRoute 1
+func init() {
-func TccBarrierAddRoute(app *gin.Engine) {
+	setupFuncs["TccBarrierSetup"] = func(app *gin.Engine) {
-	app.POST(BusiAPI+"/TccBTransInTry", common.WrapHandler(tccBarrierTransInTry))
+		app.POST(BusiAPI+"/TccBTransInTry", common.WrapHandler(tccBarrierTransInTry))
-	app.POST(BusiAPI+"/TccBTransInConfirm", common.WrapHandler(tccBarrierTransInConfirm))
+		app.POST(BusiAPI+"/TccBTransInConfirm", common.WrapHandler(tccBarrierTransInConfirm))
-	app.POST(BusiAPI+"/TccBTransInCancel", common.WrapHandler(tccBarrierTransInCancel))
+		app.POST(BusiAPI+"/TccBTransInCancel", common.WrapHandler(tccBarrierTransInCancel))
-	app.POST(BusiAPI+"/TccBTransOutTry", common.WrapHandler(tccBarrierTransOutTry))
+		app.POST(BusiAPI+"/TccBTransOutTry", common.WrapHandler(tccBarrierTransOutTry))
-	app.POST(BusiAPI+"/TccBTransOutConfirm", common.WrapHandler(tccBarrierTransOutConfirm))
+		app.POST(BusiAPI+"/TccBTransOutConfirm", common.WrapHandler(tccBarrierTransOutConfirm))
-	app.POST(BusiAPI+"/TccBTransOutCancel", common.WrapHandler(TccBarrierTransOutCancel))
+		app.POST(BusiAPI+"/TccBTransOutCancel", common.WrapHandler(TccBarrierTransOutCancel))
-	dtmcli.Logf("examples listening at %d", BusiPort)
+		dtmcli.Logf("examples listening at %d", BusiPort)
+	}
 }
 
 const transInUID = 1

examples/main_xa.go

@@ -10,15 +10,16 @@ import (
 // XaClient XA client connection
 var XaClient *dtmcli.XaClient = nil
 
-// XaSetup 挂载http的api，创建XaClient
+func init() {
-func XaSetup(app *gin.Engine) {
+	setupFuncs["XaSetup"] = func(app *gin.Engine) {
-	var err error
+		var err error
-	XaClient, err = dtmcli.NewXaClient(DtmServer, config.DB, Busi+"/xa", func(path string, xa *dtmcli.XaClient) {
+		XaClient, err = dtmcli.NewXaClient(DtmServer, config.DB, Busi+"/xa", func(path string, xa *dtmcli.XaClient) {
-		app.POST(path, common.WrapHandler(func(c *gin.Context) (interface{}, error) {
+			app.POST(path, common.WrapHandler(func(c *gin.Context) (interface{}, error) {
-			return xa.HandleCallback(c.Query("gid"), c.Query("branch_id"), c.Query("branch_type"))
+				return xa.HandleCallback(c.Query("gid"), c.Query("branch_id"), c.Query("branch_type"))
-		}))
+			}))
-	})
+		})
-	e2p(err)
+		e2p(err)
+	}
 }
 
 // XaFireRequest 注册全局XA事务，调用XA的分支