From cf702bf141ddfa74dd16df18d47166e695b0ef0b Mon Sep 17 00:00:00 2001 From: yedongfu Date: Sat, 3 Jul 2021 13:06:57 +0800 Subject: [PATCH] change to new prefix --- dtmcli/message.go | 2 +- dtmcli/saga.go | 2 +- dtmcli/tcc.go | 2 +- dtmcli/xa.go | 10 +++++----- dtmsvr/dtmsvr_test.go | 6 +++--- examples/main_msg.go | 2 +- examples/main_saga.go | 2 +- examples/main_saga_barrier.go | 2 +- examples/main_tcc.go | 2 +- examples/main_xa.go | 4 ++-- examples/quick_start.go | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dtmcli/message.go b/dtmcli/message.go index c9f48ca..d1d4aea 100644 --- a/dtmcli/message.go +++ b/dtmcli/message.go @@ -24,7 +24,7 @@ type MsgStep struct { Data string `json:"data"` } -func MsgNew(server string) *Msg { +func NewMsg(server string) *Msg { return &Msg{ MsgData: MsgData{ TransType: "msg", diff --git a/dtmcli/saga.go b/dtmcli/saga.go index d4a34cf..bf615c7 100644 --- a/dtmcli/saga.go +++ b/dtmcli/saga.go @@ -24,7 +24,7 @@ type SagaStep struct { Data string `json:"data"` } -func SagaNew(server string) *Saga { +func NewSaga(server string) *Saga { return &Saga{ SagaData: SagaData{ TransType: "saga", diff --git a/dtmcli/tcc.go b/dtmcli/tcc.go index 5a9c671..0a51afe 100644 --- a/dtmcli/tcc.go +++ b/dtmcli/tcc.go @@ -25,7 +25,7 @@ type TccStep struct { Data string `json:"data"` } -func TccNew(server string) *Tcc { +func NewTcc(server string) *Tcc { return &Tcc{ TccData: TccData{ TransType: "tcc", diff --git a/dtmcli/xa.go b/dtmcli/xa.go index be2dcf4..1625bc7 100644 --- a/dtmcli/xa.go +++ b/dtmcli/xa.go @@ -17,14 +17,14 @@ type XaGlobalFunc func() error type XaLocalFunc func(db *common.DB) error -type XaClient struct { +type Xa struct { Server string Conf map[string]string CallbackUrl string } -func XaClientNew(server string, mysqlConf map[string]string, app *gin.Engine, callbackUrl string) *XaClient { - xa := &XaClient{ +func NewXa(server string, mysqlConf map[string]string, app *gin.Engine, callbackUrl string) *Xa { + xa := &Xa{ Server: server, Conf: mysqlConf, CallbackUrl: callbackUrl, @@ -55,7 +55,7 @@ func XaClientNew(server string, mysqlConf map[string]string, app *gin.Engine, ca return xa } -func (xa *XaClient) XaLocalTransaction(gid string, transFunc XaLocalFunc) (rerr error) { +func (xa *Xa) XaLocalTransaction(gid string, transFunc XaLocalFunc) (rerr error) { defer common.P2E(&rerr) branch := common.GenGid() tx, my := common.DbAlone(xa.Conf) @@ -75,7 +75,7 @@ func (xa *XaClient) XaLocalTransaction(gid string, transFunc XaLocalFunc) (rerr return nil } -func (xa *XaClient) XaGlobalTransaction(gid string, transFunc XaGlobalFunc) (rerr error) { +func (xa *Xa) XaGlobalTransaction(gid string, transFunc XaGlobalFunc) (rerr error) { data := &M{ "gid": gid, "trans_type": "xa", diff --git a/dtmsvr/dtmsvr_test.go b/dtmsvr/dtmsvr_test.go index 9999374..98f1e84 100644 --- a/dtmsvr/dtmsvr_test.go +++ b/dtmsvr/dtmsvr_test.go @@ -209,7 +209,7 @@ func sagaCommittedPending(t *testing.T) { func genMsg(gid string) *dtmcli.Msg { logrus.Printf("beginning a msg test ---------------- %s", gid) - msg := dtmcli.MsgNew(examples.DtmServer) + msg := dtmcli.NewMsg(examples.DtmServer) msg.QueryPrepared = examples.Busi + "/CanSubmit" req := examples.GenTransReq(30, false, false) msg.Add(examples.Busi+"/TransOut", &req) @@ -220,7 +220,7 @@ func genMsg(gid string) *dtmcli.Msg { func genSaga(gid string, outFailed bool, inFailed bool) *dtmcli.Saga { logrus.Printf("beginning a saga test ---------------- %s", gid) - saga := dtmcli.SagaNew(examples.DtmServer) + saga := dtmcli.NewSaga(examples.DtmServer) req := examples.GenTransReq(30, outFailed, inFailed) saga.Add(examples.Busi+"/TransOut", examples.Busi+"/TransOutRevert", &req) saga.Add(examples.Busi+"/TransIn", examples.Busi+"/TransInRevert", &req) @@ -230,7 +230,7 @@ func genSaga(gid string, outFailed bool, inFailed bool) *dtmcli.Saga { func genTcc(gid string, outFailed bool, inFailed bool) *dtmcli.Tcc { logrus.Printf("beginning a tcc test ---------------- %s", gid) - tcc := dtmcli.TccNew(examples.DtmServer) + tcc := dtmcli.NewTcc(examples.DtmServer) req := examples.GenTransReq(30, outFailed, inFailed) tcc.Add(examples.Busi+"/TransOut", examples.Busi+"/TransOutConfirm", examples.Busi+"/TransOutRevert", &req) tcc.Add(examples.Busi+"/TransIn", examples.Busi+"/TransInConfirm", examples.Busi+"/TransInRevert", &req) diff --git a/examples/main_msg.go b/examples/main_msg.go index ce227be..6f9a080 100644 --- a/examples/main_msg.go +++ b/examples/main_msg.go @@ -26,7 +26,7 @@ func MsgFireRequest() { TransInResult: "SUCCESS", TransOutResult: "SUCCESS", } - msg := dtmcli.MsgNew(DtmServer). + msg := dtmcli.NewMsg(DtmServer). Add(Busi+"/TransOut", req). Add(Busi+"/TransIn", req) err := msg.Prepare(Busi + "/TransQuery") diff --git a/examples/main_saga.go b/examples/main_saga.go index 7649b01..efc1e57 100644 --- a/examples/main_saga.go +++ b/examples/main_saga.go @@ -28,7 +28,7 @@ func SagaFireRequest() { TransInResult: "SUCCESS", TransOutResult: "SUCCESS", } - saga := dtmcli.SagaNew(DtmServer). + saga := dtmcli.NewSaga(DtmServer). Add(Busi+"/TransOut", Busi+"/TransOutRevert", req). Add(Busi+"/TransIn", Busi+"/TransInRevert", req) logrus.Printf("saga busi trans submit") diff --git a/examples/main_saga_barrier.go b/examples/main_saga_barrier.go index 43c1a34..6584c04 100644 --- a/examples/main_saga_barrier.go +++ b/examples/main_saga_barrier.go @@ -37,7 +37,7 @@ func SagaBarrierFireRequest() { TransInResult: "SUCCESS", TransOutResult: "SUCCESS", } - saga := dtmcli.SagaNew(DtmServer). + saga := dtmcli.NewSaga(DtmServer). Add(SagaBarrierBusi+"/TransOut", SagaBarrierBusi+"/TransOutCompensate", req). Add(SagaBarrierBusi+"/TransIn", SagaBarrierBusi+"/TransInCompensate", req) logrus.Printf("busi trans submit") diff --git a/examples/main_tcc.go b/examples/main_tcc.go index 6aac55a..908cbb7 100644 --- a/examples/main_tcc.go +++ b/examples/main_tcc.go @@ -28,7 +28,7 @@ func TccFireRequest() { TransInResult: "SUCCESS", TransOutResult: "SUCCESS", } - tcc := dtmcli.TccNew(DtmServer). + tcc := dtmcli.NewTcc(DtmServer). Add(Busi+"/TransOut", Busi+"/TransOutConfirm", Busi+"/TransOutRevert", req). Add(Busi+"/TransIn", Busi+"/TransInConfirm", Busi+"/TransOutRevert", req) logrus.Printf("tcc trans submit") diff --git a/examples/main_xa.go b/examples/main_xa.go index cdf9bb7..ffa3184 100644 --- a/examples/main_xa.go +++ b/examples/main_xa.go @@ -10,7 +10,7 @@ import ( "gorm.io/gorm" ) -var XaClient *dtmcli.XaClient = nil +var XaClient *dtmcli.Xa = nil type UserAccount struct { common.ModelBase @@ -58,7 +58,7 @@ func XaSetup(app *gin.Engine) { app.POST(BusiApi+"/TransInXa", common.WrapHandler(xaTransIn)) app.POST(BusiApi+"/TransOutXa", common.WrapHandler(xaTransOut)) Config.Mysql["database"] = "dtm_busi" - XaClient = dtmcli.XaClientNew(DtmServer, Config.Mysql, app, Busi+"/xa") + XaClient = dtmcli.NewXa(DtmServer, Config.Mysql, app, Busi+"/xa") } func xaTransIn(c *gin.Context) (interface{}, error) { diff --git a/examples/quick_start.go b/examples/quick_start.go index 73b4b82..cfe400d 100644 --- a/examples/quick_start.go +++ b/examples/quick_start.go @@ -31,7 +31,7 @@ func qsStartSvr() { func qsFireRequest() { req := &gin.H{"amount": 30} - saga := dtmcli.SagaNew(DtmServer). + saga := dtmcli.NewSaga(DtmServer). Add(qsBusi+"/TransOut", qsBusi+"/TransOutCompensate", req). Add(qsBusi+"/TransIn", qsBusi+"/TransInCompensate", req) err := saga.Submit()