From c93afa39728cd2191eb50795db9ebfadd112de27 Mon Sep 17 00:00:00 2001 From: yedf2 <120050102@qq.com> Date: Sun, 17 Apr 2022 13:23:45 +0800 Subject: [PATCH 1/2] update dtmdriver-http --- dtmcli/dtmimp/vars.go | 3 +-- dtmsvr/trans_status.go | 2 +- go.mod | 4 ++-- go.sum | 2 ++ 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dtmcli/dtmimp/vars.go b/dtmcli/dtmimp/vars.go index e9d265b..ad688d0 100644 --- a/dtmcli/dtmimp/vars.go +++ b/dtmcli/dtmimp/vars.go @@ -46,9 +46,8 @@ func init() { RestyClient.OnBeforeRequest(func(c *resty.Client, r *resty.Request) error { r.URL = MayReplaceLocalhost(r.URL) u, err := dtmdriver.GetHTTPDriver().ResolveURL(r.URL) - logger.Debugf("requesting: %s %s %s", r.Method, r.URL, MustMarshalString(r.Body)) + logger.Debugf("requesting: %s %s %s resolved: %s", r.Method, r.URL, MustMarshalString(r.Body), u) r.URL = u - logger.Debugf("resolved: %s err: %v", r.URL, err) return err }) RestyClient.OnAfterResponse(func(c *resty.Client, resp *resty.Response) error { diff --git a/dtmsvr/trans_status.go b/dtmsvr/trans_status.go index 67552db..2d78241 100644 --- a/dtmsvr/trans_status.go +++ b/dtmsvr/trans_status.go @@ -89,7 +89,7 @@ func (t *TransGlobal) getURLResult(uri string, branchID, op string, branchPayloa if uri == "" { // empty url is success return nil } - if strings.HasPrefix(uri, "http://") || strings.HasPrefix(uri, "https://") { + if t.Protocol == "http" || strings.HasPrefix(uri, "http://") || strings.HasPrefix(uri, "https://") { if t.RequestTimeout != 0 { dtmimp.RestyClient.SetTimeout(time.Duration(t.RequestTimeout) * time.Second) } diff --git a/go.mod b/go.mod index c1d8531..68c812a 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/BurntSushi/toml v0.4.1 // indirect github.com/dtm-labs/dtmdriver v0.0.3 github.com/dtm-labs/dtmdriver-gozero v0.0.2 - github.com/dtm-labs/dtmdriver-http v1.2.0 + github.com/dtm-labs/dtmdriver-http v1.2.2 github.com/dtm-labs/dtmdriver-kratos v0.0.4 github.com/dtm-labs/dtmdriver-polaris v0.0.4 github.com/dtm-labs/dtmdriver-protocol1 v0.0.1 @@ -38,4 +38,4 @@ require ( // replace github.com/dtm-labs/dtmdriver v0.0.2 => /Users/wangxi/dtm/dtmdriver -// replace github.com/horseLk/dtmdriver-nacos v1.1.0 => /Users/wangxi/dtm/dtmdriver-http-nacos +// replace github.com/dtm-labs/dtmdriver-http => /Users/wangxi/dtm/dtmdriver-http-nacos diff --git a/go.sum b/go.sum index 810d7a7..5add7e0 100644 --- a/go.sum +++ b/go.sum @@ -121,6 +121,8 @@ github.com/dtm-labs/dtmdriver-gozero v0.0.2 h1:T+JH9kwVNMmISPU1BNviiTrvPdMA7UMFD github.com/dtm-labs/dtmdriver-gozero v0.0.2/go.mod h1:5AAKwYok5f56e0kATOXvc+DAsfu4elISDuCV+G3+fYE= github.com/dtm-labs/dtmdriver-http v1.2.0 h1:9v1od77rSrJUuiBnZ/o6Ic4jRJpToxjP2nUOnx9CIas= github.com/dtm-labs/dtmdriver-http v1.2.0/go.mod h1:UtWShS61TiiudZUAabQ2ww0CzSEpBYF3AS3F3G2Jc2o= +github.com/dtm-labs/dtmdriver-http v1.2.2 h1:QOul+PpK1KQyXXx5viNrHrEFIc/nFxmX4fJfI3DLUqI= +github.com/dtm-labs/dtmdriver-http v1.2.2/go.mod h1:UtWShS61TiiudZUAabQ2ww0CzSEpBYF3AS3F3G2Jc2o= github.com/dtm-labs/dtmdriver-kratos v0.0.4 h1:jDVvrwiw8GwVrampIxhoXZ9TewwQKHFpcDcQXyU2Qyc= github.com/dtm-labs/dtmdriver-kratos v0.0.4/go.mod h1:MjrFIa2A191ATVb/xy2vnA2ZKqMK9zC/1m3pjxXwkac= github.com/dtm-labs/dtmdriver-polaris v0.0.4 h1:yli0YmAsEgl47ymJHTxIzULeNe5dnmfN2ixLJRWm2Ok= From 8833ea517e3e260f00f36b471b8f477b4218d602 Mon Sep 17 00:00:00 2001 From: yedf2 <120050102@qq.com> Date: Sun, 17 Apr 2022 16:10:17 +0800 Subject: [PATCH 2/2] fix lint error --- dtmcli/dtmimp/consts.go | 5 +++++ dtmsvr/trans_class.go | 2 +- dtmsvr/trans_status.go | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dtmcli/dtmimp/consts.go b/dtmcli/dtmimp/consts.go index 95757ac..54586af 100644 --- a/dtmcli/dtmimp/consts.go +++ b/dtmcli/dtmimp/consts.go @@ -55,4 +55,9 @@ const ( // XaBarrier1 const for xa barrier id XaBarrier1 = "01" + + // ProtocolGRPC const for protocol grpc + ProtocolGRPC = "grpc" + // ProtocolHTTP const for protocol http + ProtocolHTTP = "http" ) diff --git a/dtmsvr/trans_class.go b/dtmsvr/trans_class.go index 5023e06..bedb590 100644 --- a/dtmsvr/trans_class.go +++ b/dtmsvr/trans_class.go @@ -31,7 +31,7 @@ func (t *TransGlobal) setupPayloads() { } } if t.Protocol == "" { - t.Protocol = "http" + t.Protocol = dtmimp.ProtocolHTTP } } diff --git a/dtmsvr/trans_status.go b/dtmsvr/trans_status.go index 2d78241..6184c2f 100644 --- a/dtmsvr/trans_status.go +++ b/dtmsvr/trans_status.go @@ -89,7 +89,7 @@ func (t *TransGlobal) getURLResult(uri string, branchID, op string, branchPayloa if uri == "" { // empty url is success return nil } - if t.Protocol == "http" || strings.HasPrefix(uri, "http://") || strings.HasPrefix(uri, "https://") { + if t.Protocol == dtmimp.ProtocolHTTP || strings.HasPrefix(uri, "http://") || strings.HasPrefix(uri, "https://") { if t.RequestTimeout != 0 { dtmimp.RestyClient.SetTimeout(time.Duration(t.RequestTimeout) * time.Second) } @@ -146,7 +146,7 @@ func (t *TransGlobal) getURLResult(uri string, branchID, op string, branchPayloa } return dtmimp.RespAsErrorCompatible(resp) } - dtmimp.PanicIf(t.Protocol == "http", fmt.Errorf("bad url for http: %s", uri)) + dtmimp.PanicIf(t.Protocol == dtmimp.ProtocolHTTP, fmt.Errorf("bad url for http: %s", uri)) // grpc handler server, method, err := dtmdriver.GetDriver().ParseServerMethod(uri) if err != nil {