Browse Source

Use `determineHttpRequestMethod`

pull/348/head
gdlcf88 4 years ago
parent
commit
c16fb38116
  1. 6
      dtmsvr/trans_status.go
  2. 5
      dtmutil/utils.go

6
dtmsvr/trans_status.go

@ -141,13 +141,17 @@ func (t *TransGlobal) getHTTPResult(uri string, branchID, op string, branchPaylo
SetHeader("Content-type", "application/json"). SetHeader("Content-type", "application/json").
SetHeaders(t.Ext.Headers). SetHeaders(t.Ext.Headers).
SetHeaders(t.TransOptions.BranchHeaders). SetHeaders(t.TransOptions.BranchHeaders).
Execute(dtmimp.If(!dtmutil.IsEmptyBinData(branchPayload) || t.TransType == "xa", "POST", "GET").(string), uri) Execute(t.determineHttpRequestMethod(branchPayload), uri)
if err != nil { if err != nil {
return err return err
} }
return dtmcli.HTTPResp2DtmError(resp) return dtmcli.HTTPResp2DtmError(resp)
} }
func (t *TransGlobal) determineHttpRequestMethod(branchPayload []byte) string {
return dtmimp.If(len(branchPayload) != 0 || t.TransType == "xa", "POST", "GET").(string)
}
func (t *TransGlobal) getJSONRPCResult(uri string, branchID, op string, branchPayload []byte) error { func (t *TransGlobal) getJSONRPCResult(uri string, branchID, op string, branchPayload []byte) error {
var params map[string]interface{} var params map[string]interface{}
dtmimp.MustUnmarshal(branchPayload, &params) dtmimp.MustUnmarshal(branchPayload, &params)

5
dtmutil/utils.go

@ -173,8 +173,3 @@ func RunSQLScript(conf dtmcli.DBConf, script string, skipDrop bool) {
logger.Infof("sql scripts finished: %s", s) logger.Infof("sql scripts finished: %s", s)
} }
} }
// IsEmptyBinData returns true if the bin data is nil or empty
func IsEmptyBinData(binPayload []byte) bool {
return len(binPayload) == 0
}

Loading…
Cancel
Save