change to new prefix
This commit is contained in:
parent
92119b7361
commit
cf702bf141
@ -24,7 +24,7 @@ type MsgStep struct {
|
|||||||
Data string `json:"data"`
|
Data string `json:"data"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func MsgNew(server string) *Msg {
|
func NewMsg(server string) *Msg {
|
||||||
return &Msg{
|
return &Msg{
|
||||||
MsgData: MsgData{
|
MsgData: MsgData{
|
||||||
TransType: "msg",
|
TransType: "msg",
|
||||||
|
|||||||
@ -24,7 +24,7 @@ type SagaStep struct {
|
|||||||
Data string `json:"data"`
|
Data string `json:"data"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func SagaNew(server string) *Saga {
|
func NewSaga(server string) *Saga {
|
||||||
return &Saga{
|
return &Saga{
|
||||||
SagaData: SagaData{
|
SagaData: SagaData{
|
||||||
TransType: "saga",
|
TransType: "saga",
|
||||||
|
|||||||
@ -25,7 +25,7 @@ type TccStep struct {
|
|||||||
Data string `json:"data"`
|
Data string `json:"data"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func TccNew(server string) *Tcc {
|
func NewTcc(server string) *Tcc {
|
||||||
return &Tcc{
|
return &Tcc{
|
||||||
TccData: TccData{
|
TccData: TccData{
|
||||||
TransType: "tcc",
|
TransType: "tcc",
|
||||||
|
|||||||
10
dtmcli/xa.go
10
dtmcli/xa.go
@ -17,14 +17,14 @@ type XaGlobalFunc func() error
|
|||||||
|
|
||||||
type XaLocalFunc func(db *common.DB) error
|
type XaLocalFunc func(db *common.DB) error
|
||||||
|
|
||||||
type XaClient struct {
|
type Xa struct {
|
||||||
Server string
|
Server string
|
||||||
Conf map[string]string
|
Conf map[string]string
|
||||||
CallbackUrl string
|
CallbackUrl string
|
||||||
}
|
}
|
||||||
|
|
||||||
func XaClientNew(server string, mysqlConf map[string]string, app *gin.Engine, callbackUrl string) *XaClient {
|
func NewXa(server string, mysqlConf map[string]string, app *gin.Engine, callbackUrl string) *Xa {
|
||||||
xa := &XaClient{
|
xa := &Xa{
|
||||||
Server: server,
|
Server: server,
|
||||||
Conf: mysqlConf,
|
Conf: mysqlConf,
|
||||||
CallbackUrl: callbackUrl,
|
CallbackUrl: callbackUrl,
|
||||||
@ -55,7 +55,7 @@ func XaClientNew(server string, mysqlConf map[string]string, app *gin.Engine, ca
|
|||||||
return xa
|
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)
|
defer common.P2E(&rerr)
|
||||||
branch := common.GenGid()
|
branch := common.GenGid()
|
||||||
tx, my := common.DbAlone(xa.Conf)
|
tx, my := common.DbAlone(xa.Conf)
|
||||||
@ -75,7 +75,7 @@ func (xa *XaClient) XaLocalTransaction(gid string, transFunc XaLocalFunc) (rerr
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (xa *XaClient) XaGlobalTransaction(gid string, transFunc XaGlobalFunc) (rerr error) {
|
func (xa *Xa) XaGlobalTransaction(gid string, transFunc XaGlobalFunc) (rerr error) {
|
||||||
data := &M{
|
data := &M{
|
||||||
"gid": gid,
|
"gid": gid,
|
||||||
"trans_type": "xa",
|
"trans_type": "xa",
|
||||||
|
|||||||
@ -209,7 +209,7 @@ func sagaCommittedPending(t *testing.T) {
|
|||||||
|
|
||||||
func genMsg(gid string) *dtmcli.Msg {
|
func genMsg(gid string) *dtmcli.Msg {
|
||||||
logrus.Printf("beginning a msg test ---------------- %s", gid)
|
logrus.Printf("beginning a msg test ---------------- %s", gid)
|
||||||
msg := dtmcli.MsgNew(examples.DtmServer)
|
msg := dtmcli.NewMsg(examples.DtmServer)
|
||||||
msg.QueryPrepared = examples.Busi + "/CanSubmit"
|
msg.QueryPrepared = examples.Busi + "/CanSubmit"
|
||||||
req := examples.GenTransReq(30, false, false)
|
req := examples.GenTransReq(30, false, false)
|
||||||
msg.Add(examples.Busi+"/TransOut", &req)
|
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 {
|
func genSaga(gid string, outFailed bool, inFailed bool) *dtmcli.Saga {
|
||||||
logrus.Printf("beginning a saga test ---------------- %s", gid)
|
logrus.Printf("beginning a saga test ---------------- %s", gid)
|
||||||
saga := dtmcli.SagaNew(examples.DtmServer)
|
saga := dtmcli.NewSaga(examples.DtmServer)
|
||||||
req := examples.GenTransReq(30, outFailed, inFailed)
|
req := examples.GenTransReq(30, outFailed, inFailed)
|
||||||
saga.Add(examples.Busi+"/TransOut", examples.Busi+"/TransOutRevert", &req)
|
saga.Add(examples.Busi+"/TransOut", examples.Busi+"/TransOutRevert", &req)
|
||||||
saga.Add(examples.Busi+"/TransIn", examples.Busi+"/TransInRevert", &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 {
|
func genTcc(gid string, outFailed bool, inFailed bool) *dtmcli.Tcc {
|
||||||
logrus.Printf("beginning a tcc test ---------------- %s", gid)
|
logrus.Printf("beginning a tcc test ---------------- %s", gid)
|
||||||
tcc := dtmcli.TccNew(examples.DtmServer)
|
tcc := dtmcli.NewTcc(examples.DtmServer)
|
||||||
req := examples.GenTransReq(30, outFailed, inFailed)
|
req := examples.GenTransReq(30, outFailed, inFailed)
|
||||||
tcc.Add(examples.Busi+"/TransOut", examples.Busi+"/TransOutConfirm", examples.Busi+"/TransOutRevert", &req)
|
tcc.Add(examples.Busi+"/TransOut", examples.Busi+"/TransOutConfirm", examples.Busi+"/TransOutRevert", &req)
|
||||||
tcc.Add(examples.Busi+"/TransIn", examples.Busi+"/TransInConfirm", examples.Busi+"/TransInRevert", &req)
|
tcc.Add(examples.Busi+"/TransIn", examples.Busi+"/TransInConfirm", examples.Busi+"/TransInRevert", &req)
|
||||||
|
|||||||
@ -26,7 +26,7 @@ func MsgFireRequest() {
|
|||||||
TransInResult: "SUCCESS",
|
TransInResult: "SUCCESS",
|
||||||
TransOutResult: "SUCCESS",
|
TransOutResult: "SUCCESS",
|
||||||
}
|
}
|
||||||
msg := dtmcli.MsgNew(DtmServer).
|
msg := dtmcli.NewMsg(DtmServer).
|
||||||
Add(Busi+"/TransOut", req).
|
Add(Busi+"/TransOut", req).
|
||||||
Add(Busi+"/TransIn", req)
|
Add(Busi+"/TransIn", req)
|
||||||
err := msg.Prepare(Busi + "/TransQuery")
|
err := msg.Prepare(Busi + "/TransQuery")
|
||||||
|
|||||||
@ -28,7 +28,7 @@ func SagaFireRequest() {
|
|||||||
TransInResult: "SUCCESS",
|
TransInResult: "SUCCESS",
|
||||||
TransOutResult: "SUCCESS",
|
TransOutResult: "SUCCESS",
|
||||||
}
|
}
|
||||||
saga := dtmcli.SagaNew(DtmServer).
|
saga := dtmcli.NewSaga(DtmServer).
|
||||||
Add(Busi+"/TransOut", Busi+"/TransOutRevert", req).
|
Add(Busi+"/TransOut", Busi+"/TransOutRevert", req).
|
||||||
Add(Busi+"/TransIn", Busi+"/TransInRevert", req)
|
Add(Busi+"/TransIn", Busi+"/TransInRevert", req)
|
||||||
logrus.Printf("saga busi trans submit")
|
logrus.Printf("saga busi trans submit")
|
||||||
|
|||||||
@ -37,7 +37,7 @@ func SagaBarrierFireRequest() {
|
|||||||
TransInResult: "SUCCESS",
|
TransInResult: "SUCCESS",
|
||||||
TransOutResult: "SUCCESS",
|
TransOutResult: "SUCCESS",
|
||||||
}
|
}
|
||||||
saga := dtmcli.SagaNew(DtmServer).
|
saga := dtmcli.NewSaga(DtmServer).
|
||||||
Add(SagaBarrierBusi+"/TransOut", SagaBarrierBusi+"/TransOutCompensate", req).
|
Add(SagaBarrierBusi+"/TransOut", SagaBarrierBusi+"/TransOutCompensate", req).
|
||||||
Add(SagaBarrierBusi+"/TransIn", SagaBarrierBusi+"/TransInCompensate", req)
|
Add(SagaBarrierBusi+"/TransIn", SagaBarrierBusi+"/TransInCompensate", req)
|
||||||
logrus.Printf("busi trans submit")
|
logrus.Printf("busi trans submit")
|
||||||
|
|||||||
@ -28,7 +28,7 @@ func TccFireRequest() {
|
|||||||
TransInResult: "SUCCESS",
|
TransInResult: "SUCCESS",
|
||||||
TransOutResult: "SUCCESS",
|
TransOutResult: "SUCCESS",
|
||||||
}
|
}
|
||||||
tcc := dtmcli.TccNew(DtmServer).
|
tcc := dtmcli.NewTcc(DtmServer).
|
||||||
Add(Busi+"/TransOut", Busi+"/TransOutConfirm", Busi+"/TransOutRevert", req).
|
Add(Busi+"/TransOut", Busi+"/TransOutConfirm", Busi+"/TransOutRevert", req).
|
||||||
Add(Busi+"/TransIn", Busi+"/TransInConfirm", Busi+"/TransOutRevert", req)
|
Add(Busi+"/TransIn", Busi+"/TransInConfirm", Busi+"/TransOutRevert", req)
|
||||||
logrus.Printf("tcc trans submit")
|
logrus.Printf("tcc trans submit")
|
||||||
|
|||||||
@ -10,7 +10,7 @@ import (
|
|||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
)
|
)
|
||||||
|
|
||||||
var XaClient *dtmcli.XaClient = nil
|
var XaClient *dtmcli.Xa = nil
|
||||||
|
|
||||||
type UserAccount struct {
|
type UserAccount struct {
|
||||||
common.ModelBase
|
common.ModelBase
|
||||||
@ -58,7 +58,7 @@ func XaSetup(app *gin.Engine) {
|
|||||||
app.POST(BusiApi+"/TransInXa", common.WrapHandler(xaTransIn))
|
app.POST(BusiApi+"/TransInXa", common.WrapHandler(xaTransIn))
|
||||||
app.POST(BusiApi+"/TransOutXa", common.WrapHandler(xaTransOut))
|
app.POST(BusiApi+"/TransOutXa", common.WrapHandler(xaTransOut))
|
||||||
Config.Mysql["database"] = "dtm_busi"
|
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) {
|
func xaTransIn(c *gin.Context) (interface{}, error) {
|
||||||
|
|||||||
@ -31,7 +31,7 @@ func qsStartSvr() {
|
|||||||
|
|
||||||
func qsFireRequest() {
|
func qsFireRequest() {
|
||||||
req := &gin.H{"amount": 30}
|
req := &gin.H{"amount": 30}
|
||||||
saga := dtmcli.SagaNew(DtmServer).
|
saga := dtmcli.NewSaga(DtmServer).
|
||||||
Add(qsBusi+"/TransOut", qsBusi+"/TransOutCompensate", req).
|
Add(qsBusi+"/TransOut", qsBusi+"/TransOutCompensate", req).
|
||||||
Add(qsBusi+"/TransIn", qsBusi+"/TransInCompensate", req)
|
Add(qsBusi+"/TransIn", qsBusi+"/TransInCompensate", req)
|
||||||
err := saga.Submit()
|
err := saga.Submit()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user