From 0a4413cc2d4e412fa7c6316ecf5bb42c13f7a1b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AD=90=E9=93=AD?= Date: Thu, 7 Nov 2024 11:03:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/alipay_cpn/go.mod | 2 +- plugins/alipay_cpn/go.sum | 2 ++ plugins/alipay_cpn/internal/transform.go | 1 + plugins/alipay_redpack/go.mod | 2 +- plugins/alipay_redpack/go.sum | 2 ++ plugins/alipay_redpack/internal/transform.go | 1 + plugins/union_pay_cpn/go.mod | 2 +- plugins/union_pay_cpn/go.sum | 2 ++ plugins/union_pay_cpn/internal/transform.go | 16 +++++++++------- plugins/union_pay_redpack/go.mod | 2 +- plugins/union_pay_redpack/go.sum | 2 ++ plugins/union_pay_redpack/internal/transform.go | 2 +- plugins/zltx/go.mod | 2 +- plugins/zltx/go.sum | 2 ++ plugins/zltx/internal/transform.go | 1 + plugins/zltx_card/go.mod | 2 +- plugins/zltx_card/go.sum | 2 ++ plugins/zltx_card/internal/transform.go | 1 + plugins/zltx_v2/go.mod | 2 +- plugins/zltx_v2/go.sum | 2 ++ plugins/zltx_v2/internal/transform.go | 1 + plugins/zltx_v2/internal/zltx_v2_test.go | 8 ++++---- 22 files changed, 40 insertions(+), 19 deletions(-) diff --git a/plugins/alipay_cpn/go.mod b/plugins/alipay_cpn/go.mod index 396eae2..97444e7 100644 --- a/plugins/alipay_cpn/go.mod +++ b/plugins/alipay_cpn/go.mod @@ -5,7 +5,7 @@ go 1.22.2 replace plugins/utils => ../../utils require ( - gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca + gitea.cdlsxd.cn/sdk/plugin v1.0.6 github.com/carlmjohnson/requests v0.24.2 github.com/go-playground/validator/v10 v10.22.0 github.com/hashicorp/go-plugin v1.6.1 diff --git a/plugins/alipay_cpn/go.sum b/plugins/alipay_cpn/go.sum index 143cd34..26c0f6e 100644 --- a/plugins/alipay_cpn/go.sum +++ b/plugins/alipay_cpn/go.sum @@ -1,5 +1,7 @@ gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca h1:snL161P7OynMA8hRVMLDjwnzZA2Q4mePg/iT/dyIfzA= gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca/go.mod h1:cd+ZFTmd/ZxrrVc1OZCkrh2wAMPDaAa8ce13FAAkBg0= +gitea.cdlsxd.cn/sdk/plugin v1.0.6 h1:fcQrgdRT4zVmxqK8rsB4Oo7jnhnXDqsgQ8GagR+DSic= +gitea.cdlsxd.cn/sdk/plugin v1.0.6/go.mod h1:cd+ZFTmd/ZxrrVc1OZCkrh2wAMPDaAa8ce13FAAkBg0= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= github.com/carlmjohnson/requests v0.24.2 h1:JDakhAmTIKL/qL/1P7Kkc2INGBJIkIFP6xUeUmPzLso= diff --git a/plugins/alipay_cpn/internal/transform.go b/plugins/alipay_cpn/internal/transform.go index b7b27d2..b63c29b 100644 --- a/plugins/alipay_cpn/internal/transform.go +++ b/plugins/alipay_cpn/internal/transform.go @@ -130,5 +130,6 @@ func notifyResp(n *po.Notify) *proto.NotifyResponse { TradeNo: b.VoucherID, Message: fmt.Sprintf("%s, %s", b.BizType.GetText(), b.VoucherStatus.GetText()), }, + Return: "success", } } diff --git a/plugins/alipay_redpack/go.mod b/plugins/alipay_redpack/go.mod index 9e49714..4d280f5 100644 --- a/plugins/alipay_redpack/go.mod +++ b/plugins/alipay_redpack/go.mod @@ -5,7 +5,7 @@ go 1.22.2 replace plugins/utils => ../../utils require ( - gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca + gitea.cdlsxd.cn/sdk/plugin v1.0.6 github.com/carlmjohnson/requests v0.24.2 github.com/go-playground/validator/v10 v10.22.0 github.com/hashicorp/go-plugin v1.6.1 diff --git a/plugins/alipay_redpack/go.sum b/plugins/alipay_redpack/go.sum index 122939a..e36b7ab 100644 --- a/plugins/alipay_redpack/go.sum +++ b/plugins/alipay_redpack/go.sum @@ -1,5 +1,7 @@ gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca h1:snL161P7OynMA8hRVMLDjwnzZA2Q4mePg/iT/dyIfzA= gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca/go.mod h1:cd+ZFTmd/ZxrrVc1OZCkrh2wAMPDaAa8ce13FAAkBg0= +gitea.cdlsxd.cn/sdk/plugin v1.0.6 h1:fcQrgdRT4zVmxqK8rsB4Oo7jnhnXDqsgQ8GagR+DSic= +gitea.cdlsxd.cn/sdk/plugin v1.0.6/go.mod h1:cd+ZFTmd/ZxrrVc1OZCkrh2wAMPDaAa8ce13FAAkBg0= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= github.com/carlmjohnson/requests v0.24.2 h1:JDakhAmTIKL/qL/1P7Kkc2INGBJIkIFP6xUeUmPzLso= diff --git a/plugins/alipay_redpack/internal/transform.go b/plugins/alipay_redpack/internal/transform.go index c941c62..05916f5 100644 --- a/plugins/alipay_redpack/internal/transform.go +++ b/plugins/alipay_redpack/internal/transform.go @@ -147,5 +147,6 @@ func notifyResp(n *po.Notify) *proto.NotifyResponse { TradeNo: b.OrderId, Message: b.Status.GetText(), }, + Return: "success", } } diff --git a/plugins/union_pay_cpn/go.mod b/plugins/union_pay_cpn/go.mod index 73eb09a..55b37bc 100644 --- a/plugins/union_pay_cpn/go.mod +++ b/plugins/union_pay_cpn/go.mod @@ -5,7 +5,7 @@ go 1.22.2 replace plugins/utils => ../../utils require ( - gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca + gitea.cdlsxd.cn/sdk/plugin v1.0.6 github.com/carlmjohnson/requests v0.24.2 github.com/go-playground/validator/v10 v10.22.0 github.com/hashicorp/go-plugin v1.6.1 diff --git a/plugins/union_pay_cpn/go.sum b/plugins/union_pay_cpn/go.sum index f253f82..7cd524d 100644 --- a/plugins/union_pay_cpn/go.sum +++ b/plugins/union_pay_cpn/go.sum @@ -1,6 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca h1:snL161P7OynMA8hRVMLDjwnzZA2Q4mePg/iT/dyIfzA= gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca/go.mod h1:cd+ZFTmd/ZxrrVc1OZCkrh2wAMPDaAa8ce13FAAkBg0= +gitea.cdlsxd.cn/sdk/plugin v1.0.6 h1:fcQrgdRT4zVmxqK8rsB4Oo7jnhnXDqsgQ8GagR+DSic= +gitea.cdlsxd.cn/sdk/plugin v1.0.6/go.mod h1:cd+ZFTmd/ZxrrVc1OZCkrh2wAMPDaAa8ce13FAAkBg0= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= diff --git a/plugins/union_pay_cpn/internal/transform.go b/plugins/union_pay_cpn/internal/transform.go index 4c27003..46eebb8 100644 --- a/plugins/union_pay_cpn/internal/transform.go +++ b/plugins/union_pay_cpn/internal/transform.go @@ -120,12 +120,14 @@ func notifyReq(in *proto.NotifyRequest) *po.Notify { } func notifyResp(request *proto.NotifyRequest, n *po.Notify) *proto.NotifyResponse { - result := &proto.Result{ - OrderNo: n.Body.TransSeq, - TradeNo: n.Body.CouponCd, - Status: n.Body.OperTp.GetOrderStatus(), - Message: n.Body.OperTp.GetText(), - Data: request.Body, + return &proto.NotifyResponse{ + Result: &proto.Result{ + OrderNo: n.Body.TransSeq, + TradeNo: n.Body.CouponCd, + Status: n.Body.OperTp.GetOrderStatus(), + Message: n.Body.OperTp.GetText(), + Data: request.Body, + }, + Return: "success", } - return &proto.NotifyResponse{Result: result} } diff --git a/plugins/union_pay_redpack/go.mod b/plugins/union_pay_redpack/go.mod index adaadd8..424ce5d 100644 --- a/plugins/union_pay_redpack/go.mod +++ b/plugins/union_pay_redpack/go.mod @@ -5,7 +5,7 @@ go 1.22.2 replace plugins/utils => ../../utils require ( - gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca + gitea.cdlsxd.cn/sdk/plugin v1.0.6 github.com/carlmjohnson/requests v0.24.2 github.com/go-playground/validator/v10 v10.22.0 github.com/hashicorp/go-plugin v1.6.1 diff --git a/plugins/union_pay_redpack/go.sum b/plugins/union_pay_redpack/go.sum index f253f82..7cd524d 100644 --- a/plugins/union_pay_redpack/go.sum +++ b/plugins/union_pay_redpack/go.sum @@ -1,6 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca h1:snL161P7OynMA8hRVMLDjwnzZA2Q4mePg/iT/dyIfzA= gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca/go.mod h1:cd+ZFTmd/ZxrrVc1OZCkrh2wAMPDaAa8ce13FAAkBg0= +gitea.cdlsxd.cn/sdk/plugin v1.0.6 h1:fcQrgdRT4zVmxqK8rsB4Oo7jnhnXDqsgQ8GagR+DSic= +gitea.cdlsxd.cn/sdk/plugin v1.0.6/go.mod h1:cd+ZFTmd/ZxrrVc1OZCkrh2wAMPDaAa8ce13FAAkBg0= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= diff --git a/plugins/union_pay_redpack/internal/transform.go b/plugins/union_pay_redpack/internal/transform.go index 7a745ca..2efeaec 100644 --- a/plugins/union_pay_redpack/internal/transform.go +++ b/plugins/union_pay_redpack/internal/transform.go @@ -131,5 +131,5 @@ func notifyResp() *proto.NotifyResponse { Data: nil, Extra: nil, } - return &proto.NotifyResponse{Result: result} + return &proto.NotifyResponse{Result: result, Return: "success"} } diff --git a/plugins/zltx/go.mod b/plugins/zltx/go.mod index 876da20..46db29a 100644 --- a/plugins/zltx/go.mod +++ b/plugins/zltx/go.mod @@ -3,7 +3,7 @@ module plugins/zltx go 1.22.2 require ( - gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca + gitea.cdlsxd.cn/sdk/plugin v1.0.6 github.com/carlmjohnson/requests v0.24.2 github.com/go-playground/validator/v10 v10.22.0 github.com/hashicorp/go-plugin v1.6.1 diff --git a/plugins/zltx/go.sum b/plugins/zltx/go.sum index 143cd34..26c0f6e 100644 --- a/plugins/zltx/go.sum +++ b/plugins/zltx/go.sum @@ -1,5 +1,7 @@ gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca h1:snL161P7OynMA8hRVMLDjwnzZA2Q4mePg/iT/dyIfzA= gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca/go.mod h1:cd+ZFTmd/ZxrrVc1OZCkrh2wAMPDaAa8ce13FAAkBg0= +gitea.cdlsxd.cn/sdk/plugin v1.0.6 h1:fcQrgdRT4zVmxqK8rsB4Oo7jnhnXDqsgQ8GagR+DSic= +gitea.cdlsxd.cn/sdk/plugin v1.0.6/go.mod h1:cd+ZFTmd/ZxrrVc1OZCkrh2wAMPDaAa8ce13FAAkBg0= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= github.com/carlmjohnson/requests v0.24.2 h1:JDakhAmTIKL/qL/1P7Kkc2INGBJIkIFP6xUeUmPzLso= diff --git a/plugins/zltx/internal/transform.go b/plugins/zltx/internal/transform.go index 05f7bdc..10af588 100644 --- a/plugins/zltx/internal/transform.go +++ b/plugins/zltx/internal/transform.go @@ -85,6 +85,7 @@ func notifyResp(in po.Notify) (*proto.NotifyResponse, error) { Data: data, Extra: nil, }, + Return: "success", } return pb, nil } diff --git a/plugins/zltx_card/go.mod b/plugins/zltx_card/go.mod index 0661da0..0674116 100644 --- a/plugins/zltx_card/go.mod +++ b/plugins/zltx_card/go.mod @@ -3,7 +3,7 @@ module plugins/zltx_card go 1.22.2 require ( - gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca + gitea.cdlsxd.cn/sdk/plugin v1.0.6 github.com/carlmjohnson/requests v0.24.2 github.com/go-playground/validator/v10 v10.22.0 github.com/hashicorp/go-plugin v1.6.1 diff --git a/plugins/zltx_card/go.sum b/plugins/zltx_card/go.sum index 143cd34..26c0f6e 100644 --- a/plugins/zltx_card/go.sum +++ b/plugins/zltx_card/go.sum @@ -1,5 +1,7 @@ gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca h1:snL161P7OynMA8hRVMLDjwnzZA2Q4mePg/iT/dyIfzA= gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca/go.mod h1:cd+ZFTmd/ZxrrVc1OZCkrh2wAMPDaAa8ce13FAAkBg0= +gitea.cdlsxd.cn/sdk/plugin v1.0.6 h1:fcQrgdRT4zVmxqK8rsB4Oo7jnhnXDqsgQ8GagR+DSic= +gitea.cdlsxd.cn/sdk/plugin v1.0.6/go.mod h1:cd+ZFTmd/ZxrrVc1OZCkrh2wAMPDaAa8ce13FAAkBg0= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= github.com/carlmjohnson/requests v0.24.2 h1:JDakhAmTIKL/qL/1P7Kkc2INGBJIkIFP6xUeUmPzLso= diff --git a/plugins/zltx_card/internal/transform.go b/plugins/zltx_card/internal/transform.go index d018a0f..9430b69 100644 --- a/plugins/zltx_card/internal/transform.go +++ b/plugins/zltx_card/internal/transform.go @@ -86,6 +86,7 @@ func notifyResp(in po.Notify, appKey string) (*proto.NotifyResponse, error) { Data: data, Extra: nil, }, + Return: "success", } if in.CardCode != "" { s, err := cardCodeDecode(in.CardCode, []byte(appKey)) diff --git a/plugins/zltx_v2/go.mod b/plugins/zltx_v2/go.mod index 0a81379..785fa9b 100644 --- a/plugins/zltx_v2/go.mod +++ b/plugins/zltx_v2/go.mod @@ -5,7 +5,7 @@ go 1.22.2 replace plugins/utils => ../../utils require ( - gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca + gitea.cdlsxd.cn/sdk/plugin v1.0.6 gitee.com/chengdu_blue_brothers/openapi-go-sdk-v2 v0.0.0-20240919023950-493c464e0ed7 github.com/carlmjohnson/requests v0.24.2 github.com/go-playground/validator/v10 v10.22.0 diff --git a/plugins/zltx_v2/go.sum b/plugins/zltx_v2/go.sum index 2e30056..d3d5945 100644 --- a/plugins/zltx_v2/go.sum +++ b/plugins/zltx_v2/go.sum @@ -1,5 +1,7 @@ gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca h1:snL161P7OynMA8hRVMLDjwnzZA2Q4mePg/iT/dyIfzA= gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240911021858-7f3ba37bbbca/go.mod h1:cd+ZFTmd/ZxrrVc1OZCkrh2wAMPDaAa8ce13FAAkBg0= +gitea.cdlsxd.cn/sdk/plugin v1.0.6 h1:fcQrgdRT4zVmxqK8rsB4Oo7jnhnXDqsgQ8GagR+DSic= +gitea.cdlsxd.cn/sdk/plugin v1.0.6/go.mod h1:cd+ZFTmd/ZxrrVc1OZCkrh2wAMPDaAa8ce13FAAkBg0= gitee.com/chengdu_blue_brothers/openapi-go-sdk-v2 v0.0.0-20240919023950-493c464e0ed7 h1:2wOzkUfS17P6U/i6CWFjLyXrdLMnW3osk897ZfOUCxY= gitee.com/chengdu_blue_brothers/openapi-go-sdk-v2 v0.0.0-20240919023950-493c464e0ed7/go.mod h1:aS6ecVHvGLGzYYFIhxBrRWmq69ifo6pt1G92QblSdQQ= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= diff --git a/plugins/zltx_v2/internal/transform.go b/plugins/zltx_v2/internal/transform.go index 89eec35..1b545b8 100644 --- a/plugins/zltx_v2/internal/transform.go +++ b/plugins/zltx_v2/internal/transform.go @@ -155,6 +155,7 @@ func notifyResp(appKey string, resp *notify.OrderReq) (*proto.NotifyResponse, er Data: data, Extra: nil, }, + Return: "SUCCESS", } b, err := getNotifyCard(appKey, resp.Cards) if err != nil { diff --git a/plugins/zltx_v2/internal/zltx_v2_test.go b/plugins/zltx_v2/internal/zltx_v2_test.go index 8831ed8..70dc3c8 100644 --- a/plugins/zltx_v2/internal/zltx_v2_test.go +++ b/plugins/zltx_v2/internal/zltx_v2_test.go @@ -17,7 +17,7 @@ func config() []byte { AppId: "23329", AppKey: "8db16e8cc8363ed4eb4c14f9520bcc32", BaseUri: "http://211.137.105.198:17100", - NotifyUrl: "http://192.168.6.184:8090/ping", + NotifyUrl: "https://utils.85938.cn/utils/v1/wechat/notify", } marshal, _ := json.Marshal(c) return marshal @@ -35,13 +35,13 @@ func TestOrder(t *testing.T) { request := &proto.OrderRequest{ Config: config(), Order: &proto.OrderRequest_Order{ - OrderNo: "test_zltx_v2_3", - Account: "", + OrderNo: "test_zltx_v2_5", + Account: "18666173766", Quantity: 1, Extra: nil, }, Product: &proto.OrderRequest_Product{ - ProductNo: "CEMLKRLK9640", + ProductNo: "106", Extra: []byte(`{}`), }, }