From c16fb38116bac5c17ee79d3bcfac116bf2e1b956 Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Sat, 17 Sep 2022 16:34:12 +0800 Subject: [PATCH] Use `determineHttpRequestMethod` --- dtmsvr/trans_status.go | 6 +++++- dtmutil/utils.go | 5 ----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dtmsvr/trans_status.go b/dtmsvr/trans_status.go index d9541d1..38b5cce 100644 --- a/dtmsvr/trans_status.go +++ b/dtmsvr/trans_status.go @@ -141,13 +141,17 @@ func (t *TransGlobal) getHTTPResult(uri string, branchID, op string, branchPaylo SetHeader("Content-type", "application/json"). SetHeaders(t.Ext.Headers). 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 { return err } 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 { var params map[string]interface{} dtmimp.MustUnmarshal(branchPayload, ¶ms) diff --git a/dtmutil/utils.go b/dtmutil/utils.go index 21e8a82..eec4265 100644 --- a/dtmutil/utils.go +++ b/dtmutil/utils.go @@ -173,8 +173,3 @@ func RunSQLScript(conf dtmcli.DBConf, script string, skipDrop bool) { 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 -}