Browse Source

fix bug

pull/237/head
yedf2 4 years ago
parent
commit
f7e859d9f5
  1. 2
      dtmsvr/trans_status.go
  2. 3
      test/busi/base_jrpc.go
  3. 2
      test/msg_jrpc_test.go

2
dtmsvr/trans_status.go

@ -99,7 +99,7 @@ func (t *TransGlobal) getURLResult(uri string, branchID, op string, branchPayloa
if t.RequestTimeout != 0 { if t.RequestTimeout != 0 {
dtmimp.RestyClient.SetTimeout(time.Duration(t.RequestTimeout) * time.Second) dtmimp.RestyClient.SetTimeout(time.Duration(t.RequestTimeout) * time.Second)
} }
if t.Protocol == "json-rpc" { if t.Protocol == "json-rpc" && strings.Contains(uri, "method") {
var params map[string]interface{} var params map[string]interface{}
dtmimp.MustUnmarshal(branchPayload, &params) dtmimp.MustUnmarshal(branchPayload, &params)
u, err := url.Parse(uri) u, err := url.Parse(uri)

3
test/busi/base_jrpc.go

@ -9,7 +9,8 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
var BusiJrpcUrl = fmt.Sprintf("http://localhost:%d/api/json-rpc?method=", BusiPort) // BusiJrpcURL url prefix for busi
var BusiJrpcURL = fmt.Sprintf("http://localhost:%d/api/json-rpc?method=", BusiPort)
func addJrpcRoute(app *gin.Engine) { func addJrpcRoute(app *gin.Engine) {
app.POST("/api/json-rpc", dtmutil.WrapHandler2(func(c *gin.Context) interface{} { app.POST("/api/json-rpc", dtmutil.WrapHandler2(func(c *gin.Context) interface{} {

2
test/msg_jrpc_test.go

@ -138,7 +138,7 @@ func genJrpcMsg(gid string) *dtmcli.Msg {
req := busi.GenTransReq(30, false, false) req := busi.GenTransReq(30, false, false)
msg := dtmcli.NewMsg(dtmutil.DefaultJrpcServer, gid). msg := dtmcli.NewMsg(dtmutil.DefaultJrpcServer, gid).
Add(busi.Busi+"/TransOut", &req). Add(busi.Busi+"/TransOut", &req).
Add(busi.BusiJrpcUrl+"TransIn", &req) Add(busi.BusiJrpcURL+"TransIn", &req)
msg.QueryPrepared = busi.Busi + "/QueryPrepared" msg.QueryPrepared = busi.Busi + "/QueryPrepared"
msg.Protocol = dtmimp.Jrpc msg.Protocol = dtmimp.Jrpc
return msg return msg

Loading…
Cancel
Save