diff --git a/Makefile b/Makefile index 7b533f5..0006b0e 100644 --- a/Makefile +++ b/Makefile @@ -33,15 +33,30 @@ union_pay_cpn: make build-mac name=union_pay_cpn && \ make build-linux name=union_pay_cpn +.PHONY: union_pay_redpack +union_pay_redpack: + make build-mac name=union_pay_redpack && \ + make build-linux name=union_pay_redpack + .PHONY: alipay_cpn alipay_cpn: make build-mac name=alipay_cpn && \ make build-linux name=alipay_cpn +.PHONY: alipay_redpack +alipay_redpack: + make build-mac name=alipay_redpack && \ + make build-linux name=alipay_redpack + .PHONY: weixin_cpn weixin_cpn: make build-mac name=weixin_cpn && \ make build-linux name=weixin_cpn +.PHONY: weixin_redpack +weixin_redpack: + make build-mac name=weixin_redpack && \ + make build-linux name=weixin_redpack + .PHONY: all -all: zltx union_pay_cpn alipay_cpn weixin_cpn \ No newline at end of file +all: zltx union_pay_cpn union_pay_redpack alipay_cpn alipay_redpack weixin_cpn weixin_redpack \ No newline at end of file diff --git a/plugins/alipay_redpack/internal/transform.go b/plugins/alipay_redpack/internal/transform.go index 64b0c07..0779b12 100644 --- a/plugins/alipay_redpack/internal/transform.go +++ b/plugins/alipay_redpack/internal/transform.go @@ -80,7 +80,7 @@ func orderReq(order *proto.OrderRequest_Order, product *proto.OrderRequest_Produ } o := &po.OrderReq{ OutBizNo: order.OrderNo, - TransAmount: fmt.Sprintf("%.2f", product.Price), + TransAmount: fmt.Sprintf("%.2f", order.Amount), ProductCode: product.ProductNo, BizScene: "DIRECT_TRANSFER", OrderTitle: extra.Wishing, diff --git a/plugins/union_pay_redpack/go.sum b/plugins/union_pay_redpack/go.sum index 4b1602a..06c67ce 100644 --- a/plugins/union_pay_redpack/go.sum +++ b/plugins/union_pay_redpack/go.sum @@ -1,18 +1,30 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +gitea.cdlsxd.cn/BaseSystem/plugin v0.0.0-20240821033242-d9c3e7ad88f6 h1:L+z3IjcLEbj9UJAQCZv1YA1HqIrZZxBlZ9I4tQF6dXY= gitea.cdlsxd.cn/BaseSystem/plugin v0.0.0-20240821033242-d9c3e7ad88f6/go.mod h1:59zYRFcPur2HizJEIfttVOMY0AscollDYKX0yvPJS7k= 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= +github.com/carlmjohnson/requests v0.23.4 h1:AxcvapfB9RPXLSyvAHk9YJoodQ43ZjzNHj6Ft3tQGdg= github.com/carlmjohnson/requests v0.23.4/go.mod h1:Qzp6tW4DQyainPP+tGwiJTzwxvElTIKm0B191TgTtOA= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao= github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -25,28 +37,45 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/hashicorp/go-hclog v0.14.1 h1:nQcJDQwIAGnmoUWp8ubocEX40cCml/17YkF6csQLReU= github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-plugin v1.6.1 h1:P7MR2UP6gNKGPp+y7EZw2kOiq4IR9WiqLvp0XOsVdwI= github.com/hashicorp/go-plugin v1.6.1/go.mod h1:XPHFku2tFo3o3QKFgSYo+cghcUhw1NA1hZyMK0PWAw0= +github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= +github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= +github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.10 h1:qxFzApOv4WsAL965uUPIsXzAKCZxN2p9UqdhFS4ZW10= github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 h1:7GoSOOW2jpsfkntVKaS2rAr1TJqfcxotyaUcuxoZSzg= github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho= github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -58,6 +87,7 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -69,9 +99,11 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -83,11 +115,13 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc= google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -95,8 +129,11 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/plugins/union_pay_redpack/internal/po/order.go b/plugins/union_pay_redpack/internal/po/order.go index 84c3929..2d12806 100644 --- a/plugins/union_pay_redpack/internal/po/order.go +++ b/plugins/union_pay_redpack/internal/po/order.go @@ -6,20 +6,22 @@ import ( ) type OrderReq struct { - ChNlId string `validate:"required" json:"chnlId"` // 渠道方代码-必填 - AccessId string `validate:"required" json:"accessId"` - TransDtTm string `validate:"required" json:"transDtTm"` - InsAcctTp string `validate:"required" json:"insAcctTp"` - InsAcctId string `validate:"required" json:"insAcctId"` - AcctEntityTp string `validate:"required" json:"acctEntityTp"` - Mobile string `validate:"required" json:"mobile"` - PointTp string `validate:"required" json:"pointTp"` - PointId string `validate:"required" json:"pointId"` - PointAt string `validate:"required" json:"pointAt"` - DelayIn string `validate:"required" json:"delayIn"` - TempIn string `validate:"required" json:"tempIn"` - InOutTransFlag string `validate:"required" json:"inOutTransFlag"` - TransDigest string `validate:"required" json:"transDigest"` + ChNlId string `validate:"required" json:"chnlId"` // 渠道方代码 + AccessId string `validate:"required" json:"accessId"` // 接入方ID + TransSeq string `validate:"required" json:"transSeq"` // 流水号 + TransDtTm string `validate:"required" json:"transDtTm"` // 交易日期时间 + InsAcctTp string `validate:"required" json:"insAcctTp"` // 机构账户类型 + InsAcctId string `validate:"required" json:"insAcctId"` // 机构账户代码-P打头的接入方账户代码 + AcctEntityTp string `validate:"required" json:"acctEntityTp"` // UP01-手机号 UP02-卡号 UP03-云闪付注册用户ID + Mobile string `validate:"required" json:"mobile"` // sm4加密手机号 + PointTp string `validate:"required" json:"pointTp"` // 默认41-专享红包 + PointId string `validate:"required" json:"pointId"` // 积分ID-积分类别代码，41开头的16位数字 + PointAt string `validate:"required" json:"pointAt"` // 积分额-单位为分 + DelayIn string `validate:"required" json:"delayIn"` // 是否延迟生效-不填则默认0-非延迟生效。0-非延迟生效，1-延迟生效 + TempIn string `validate:"required" json:"tempIn"` // 暂存标志-一般默认填写0-非暂存。非暂存代表发给用户后，立即可以使用。0-非暂存 ；1-暂存 + InOutTransFlag string `validate:"required" json:"inOutTransFlag"` // 0-境内交易；1-境外交易 + TransDigest string `validate:"required" json:"transDigest"` // 交易摘要-交易摘要，最大200位,赠送积分说明，用于在云闪付APP内向用户展示获取说明-必填 + ValidEndDtTm string `validate:"required" json:"validEndDtTm"` // 有效截止时间 } type OrderResp struct { @@ -27,8 +29,6 @@ type OrderResp struct { Msg string `json:"msg"` SubCode vo.SubCode `json:"subCode"` SubMsg string `json:"subMsg"` - - TransSeq string `json:"transSeq"` } func (o *OrderResp) GetMsg() string { diff --git a/plugins/union_pay_redpack/internal/po/po.go b/plugins/union_pay_redpack/internal/po/po.go index 9043b4c..73a7d9b 100644 --- a/plugins/union_pay_redpack/internal/po/po.go +++ b/plugins/union_pay_redpack/internal/po/po.go @@ -9,6 +9,7 @@ import ( type Req interface { Validate() error ToJson() []byte + GetReId() string } var _ Req = (*OrderReq)(nil) @@ -29,6 +30,10 @@ func (req *OrderReq) ToJson() []byte { return b } +func (req *OrderReq) GetReId() string { + return req.TransSeq +} + func (req *QueryReq) Validate() error { err := validator.New().Struct(req) if err != nil { @@ -43,3 +48,7 @@ func (req *QueryReq) ToJson() []byte { b, _ := json.Marshal(req) return b } + +func (req *QueryReq) GetReId() string { + return req.TransSeq +} diff --git a/plugins/union_pay_redpack/internal/po/query.go b/plugins/union_pay_redpack/internal/po/query.go index 51421ba..5e307b3 100644 --- a/plugins/union_pay_redpack/internal/po/query.go +++ b/plugins/union_pay_redpack/internal/po/query.go @@ -6,13 +6,13 @@ import ( ) type QueryReq struct { - ChNlId string `validate:"required" json:"chnlId"` // 渠道方代码-必填 - TransSeq string `validate:"required" json:"transSeq"` - TransDtTm string `validate:"required" json:"transDtTm"` - OrigTransSeq string `validate:"required" json:"origTransSeq"` - OrigTransDtTm string `validate:"required" json:"origTransDtTm"` - AcctEntityTp string `validate:"required" json:"acctEntityTp"` - Mobile string `validate:"required" json:"mobile"` + ChNlId string `validate:"required" json:"chnlId"` // 渠道方代码 + TransSeq string `validate:"required" json:"transSeq"` // 流水号 + TransDtTm string `validate:"required" json:"transDtTm"` // 交易日期时间 + OrigTransSeq string `validate:"required" json:"origTransSeq"` // 原交易日期时间 + OrigTransDtTm string `validate:"required" json:"origTransDtTm"` // 原交易流水号 + AcctEntityTp string `validate:"required" json:"acctEntityTp"` // 账户主体类型 + Mobile string `validate:"required" json:"mobile"` // 账户主体标识_手机号 } type QueryResp struct { diff --git a/plugins/union_pay_redpack/internal/transform.go b/plugins/union_pay_redpack/internal/transform.go index 55f019e..4b1183a 100644 --- a/plugins/union_pay_redpack/internal/transform.go +++ b/plugins/union_pay_redpack/internal/transform.go @@ -2,6 +2,7 @@ package internal import ( "encoding/json" + "fmt" "gitea.cdlsxd.cn/BaseSystem/plugin/proto" "plugins/union_pay_redpack/internal/po" "plugins/union_pay_redpack/internal/utils" @@ -17,6 +18,9 @@ type Config struct { KEY string `json:"key"` // 加密密钥 Prk string `json:"prk"` // 私钥 Npk string `json:"npk"` // 回调公钥 + + PointId string `json:"point_id"` // 积分ID-积分类别代码，41开头的16位数字 + InsAcctId string `json:"ins_acct_id"` // 机构账户代码 } func transConfig(config []byte) (*Config, error) { @@ -30,10 +34,15 @@ func transConfig(config []byte) (*Config, error) { func (c *Config) orderReq(in *proto.OrderRequest) (*po.OrderReq, error) { type OrderExtra struct { - OrderDt string `json:"orderDt"` + TransDtTm string `json:"transDtTm"` // 交易日期时间 + ValidEndDtTm string `json:"validEndDtTm"` // 有效截止时间 + TransDigest string `json:"transDigest"` // 交易摘要 } var e OrderExtra - _ = json.Unmarshal(in.Order.Extra, &e) + err := json.Unmarshal(in.Order.Extra, &e) + if err != nil { + return nil, fmt.Errorf("order extra json unmarshal error: %v", err) + } mobile, err := utils.Encrypt([]byte(in.Order.Account), []byte(c.KEY), []byte(c.IV)) if err != nil { @@ -42,18 +51,20 @@ func (c *Config) orderReq(in *proto.OrderRequest) (*po.OrderReq, error) { return &po.OrderReq{ ChNlId: c.ChNlId, AccessId: vo.AccessId, - TransDtTm: "", - InsAcctTp: "", - InsAcctId: "", - AcctEntityTp: "", + TransSeq: in.Order.OrderNo, + TransDtTm: e.TransDtTm, + InsAcctTp: vo.InsAcctTp, + InsAcctId: c.InsAcctId, + AcctEntityTp: vo.AcctEntityTp, Mobile: mobile, - PointTp: "", - PointId: "", - PointAt: "", - DelayIn: "", - TempIn: "", - InOutTransFlag: "", - TransDigest: "", + PointTp: vo.PointTp, + PointId: c.PointId, + PointAt: fmt.Sprintf("%f", in.Order.Amount*100), + DelayIn: vo.DelayIn, + TempIn: vo.TempIn, + InOutTransFlag: vo.InOutTransFlag, + TransDigest: e.TransDigest, + ValidEndDtTm: e.ValidEndDtTm, }, nil } @@ -61,7 +72,7 @@ func orderResp(request *proto.OrderRequest, resp po.OrderResp) *proto.OrderRespo data, _ := json.Marshal(resp) result := &proto.Result{ OrderNo: request.Order.OrderNo, - TradeNo: resp.TransSeq, + TradeNo: "", Message: resp.Msg, Data: data, } @@ -74,21 +85,30 @@ func orderResp(request *proto.OrderRequest, resp po.OrderResp) *proto.OrderRespo return &proto.OrderResponse{Result: result} } -func queryReq(in *proto.QueryRequest, chNlId string) *po.QueryReq { +func (c *Config) queryReq(in *proto.QueryRequest, chNlId string) (*po.QueryReq, error) { type OrderExtra struct { - OrigDate string `json:"origDate"` + TransSeq string `json:"transSeq"` // 当前交易号 + TransDtTm string `json:"transDtTm"` // 交易日期时间 + OrigTransSeq string `json:"origTransSeq"` // 原交易日期时间 } var e OrderExtra - _ = json.Unmarshal(in.Order.Extra, &e) + err := json.Unmarshal(in.Order.Extra, &e) + if err != nil { + return nil, fmt.Errorf("order extra json unmarshal error: %v", err) + } + mobile, err := utils.Encrypt([]byte(in.Order.Account), []byte(c.KEY), []byte(c.IV)) + if err != nil { + return nil, err + } return &po.QueryReq{ ChNlId: chNlId, - TransSeq: "", - TransDtTm: "", - OrigTransSeq: "", - OrigTransDtTm: "", - AcctEntityTp: "", - Mobile: "", - } + TransSeq: e.TransSeq, // 当前交易号 + TransDtTm: e.TransDtTm, // 交易日期时间 + OrigTransDtTm: in.Order.OrderNo, // 原交易流水号 + OrigTransSeq: e.OrigTransSeq, // 原交易日期时间 + AcctEntityTp: vo.AcctEntityTp, + Mobile: mobile, + }, nil } func queryResp(request *proto.QueryRequest, resp po.QueryResp) *proto.QueryResponse { diff --git a/plugins/union_pay_redpack/internal/union_pay_redpack.go b/plugins/union_pay_redpack/internal/union_pay_redpack.go index bf08ab3..6f3908a 100644 --- a/plugins/union_pay_redpack/internal/union_pay_redpack.go +++ b/plugins/union_pay_redpack/internal/union_pay_redpack.go @@ -51,17 +51,20 @@ func (p *UnionPayCpnService) Order(ctx context.Context, request *proto.OrderRequ } func (p *UnionPayCpnService) Query(ctx context.Context, request *proto.QueryRequest) (*proto.QueryResponse, error) { - conf, err := transConfig(request.Config) + c, err := transConfig(request.Config) + if err != nil { + return nil, err + } + uv, err := c.queryReq(request, c.ChNlId) if err != nil { return nil, err } - uv := queryReq(request, conf.ChNlId) if err = uv.Validate(); err != nil { return nil, err } var response po.QueryResp - url := fmt.Sprintf("%s%s", conf.BaseUri, queryMethod) - err = requests.URL(url).Headers(headers(conf, uv, queryBizMethod)).BodyJSON(uv).ToJSON(&response).Fetch(ctx) + url := fmt.Sprintf("%s%s", c.BaseUri, queryMethod) + err = requests.URL(url).Headers(headers(c, uv, queryBizMethod)).BodyJSON(uv).ToJSON(&response).Fetch(ctx) if err != nil { return nil, fmt.Errorf("请求异常，msg:" + err.Error()) } diff --git a/plugins/union_pay_redpack/internal/union_pay_redpack_test.go b/plugins/union_pay_redpack/internal/union_pay_redpack_test.go index 181154b..a716e8b 100644 --- a/plugins/union_pay_redpack/internal/union_pay_redpack_test.go +++ b/plugins/union_pay_redpack/internal/union_pay_redpack_test.go @@ -18,6 +18,9 @@ func config() []byte { KEY: "16fb034dead44ff6f599b1ca373ccfd1", Prk: "MIIEogIBAAKCAQEAllAo3AbVfNg1iDT3CisgueIm2Pya2C6qatF0S8/aAKW8A6HBIuvrk1sb2TjbI0UDVowaNDsPa7nNdZHkQa6CQKf2BwFRy7gB8vAD1YSq23NTwplGe5IpuRe2Cbljh5diQ/+0zwZPZQEvjSMqZJILYVluGBw656JSndRdXHCs608CBib14l35A6D7rSZNd53nM9yXj/WOpLuY/jX0sbKJrBUIhcQcMiCFK/Nx06vhhCGZSWwaj0TTSMEOj9nyU+56MMx+N7527JUnOYMyVbbEx5h1S5sPjntMVVzz8c8FC5MKbgXCgjTt5Depl6YgrvoSCNNXZqnXN2l9dtBxKGSEdQIDAQABAoIBAD7r606/pZqPP0l3MnqVNyvY2X43r/ITBs+UQmSB67Ydqqiyi5C8xW530x6JSGJpP055c3atynTD4Jf4rF46WNgL91dTXBQ1QMubYV9+G6+lhUiOtQyBUOnkXRWQ/3MBEed5IQ0QjSew6WDheZuD7zOfJhD9sELKll7vSO2rVRdi5Kf3pps0K4aeYLvlelHjPtu2EkMyAD4d37QO2q8A/+acOf7wyx1uZ55nobe0jVgQBa2Tuuwhd2JilmsgMvcVxeAJoocyQxPVTU+iMidgZKxyW/fJUaR7V2KgKfP0H2OZbSruD2HyHL7o70+/XBg250msh691oTCXSGWiITFXRDkCgYEA1KF3daSzWK2vTZeNMxj++VRNZfyigNqBwgRZxrSGIUeNGpDdDp7flldM/fO/0RijKnh+nXLBCMZlxffSI7W3jkkjosEq0uyXv6Ez4WlhwHEAE6KrZYQ8VDU3We1LXERu/3SMU16Uq2Vme8J6kpshr7OLGeuTNfsSG79lpHU/OO8CgYEAtPjF/AY/t85u4JV0w6FJ/K7Iya+AyIyZhsgnxsPv5NwVtNsQzTRbXlpgnVmaKUXzLBTBJA2P6Gie35R6kJuOuMnvHjtG7umI5lOUJaqYk5GZEXHxbIKTXUxAbv+WKRHcFwcH54Ppurs7bN6ultWdE+yyU5PvabFRAidL+rV+MNsCgYBkqx2XwSZ4MaLxpXLgYlE1UkhipL17K/iLFuw6O3XVg762eSdvqKBK2YJGKYUDRhraHLo1aQMjWGsO00nWRk5lOxN4FuRjgEhIHdYmPnJdXiKfKUDkizrU020lUkd/o5a5s0BMqFbS3usqZOULTA8i1GpjFzlXMUtdf7xrpGcOWQKBgFJXWuX4Befg8owXFKCqc1qYQF2cEBGv/27XBVon7rAH/4xhnHxx1RzSLGGL0lvzKtikvNhln1PUvmzmRvoi/UZRAw6TVAwCkDqUTrTwsSl7ttS8Lmf75Ycu2aZnfnBDYwvLNCp/18oRxNEdZPzWRvk42k6y4d0KQ9yh+q0hBUC/AoGASgJro5HgKWkSzYx1Fk3rvo7EWeZwXNfWuzIhtCiVDG4+df0ZdybkbjxbaRwL2rbTSBeqSaZw4UwpE1JyF8erfzx0qpHCY5V3ocnA8kg56mX9kE5H9WKjMe1tbuZpba4i08zvM8vpz9gASf3z/WrWWqgpvynxDWpy4xFAqrWC0VQ=", Npk: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy05sCMKEYZQGryKKq7qxxMi4uIRcOuv0aQcptjEifc/TS56bU0iGlkuH9k90tPp6EoKYLUfnL1FdHQOWXboFktwoxjy372gc6CsQfU9ZNjsWMYI8CTZF6gWLk4HjfBO4HcCKJs7oGntgVZxfVqVxJ8N/M1ZC2sDuVkoHYymONgNwgO+yYXrAlPPfJBltG5QNOcGTHBZ4PTc6A0M17+2BiskKUJfLEbN2soEZR0b5v5qy0D1xe5w+CdNcvtEb5CemPRxxRYjIqfHlhQPO7ZCUFPmhtoIbtBYG+BIU+qK3Q1DDiBndOVkQGVBQcOnMfYpxp82hlA1TAVeRICWubH3nJwIDAQAB", + + PointId: "4120060413537864", + InsAcctId: "P230704143053405", } marshal, _ := json.Marshal(c) return marshal @@ -30,13 +33,15 @@ func TestOrder(t *testing.T) { Config: config(), Order: &proto.OrderRequest_Order{ OrderNo: "240403164049635931", - Account: "13100720242", // R2wVgntY8aP9QTvCN/bWfw== + Account: "18666173766", Quantity: 1, - Extra: []byte(`{"orderDt":"20240704"}`), + Amount: 1, + Extra: []byte(`{"transDtTm":"20230710165534","validEndDtTm":"20230710165535","transDigest":"测试红包"}`), }, Product: &proto.OrderRequest_Product{ - ProductNo: "3102024032977191", - Extra: []byte(`{}`), + ProductNo: "", + Price: 1, + Extra: []byte(``), }, } t.Run("TestOrder", func(t *testing.T) { @@ -54,10 +59,10 @@ func TestQuery(t *testing.T) { request := &proto.QueryRequest{ Config: config(), Order: &proto.QueryRequest_Order{ - OrderNo: "240403164049635931", + OrderNo: "24082210051220960113", // 原交易号 TradeNo: "", - Account: "", - Extra: []byte(`{"origDate":"20240704"}`), + Account: "13975287758", + Extra: []byte(`{"transSeq":"v3-1","transDtTm":"20230710165534","origTransSeq":"20240822"}`), }, } t.Run("TestQuery", func(t *testing.T) { @@ -75,8 +80,8 @@ func TestNotify(t *testing.T) { in := &proto.NotifyRequest{ Config: config(), Queries: nil, - Headers: []byte(`{"bizmethod":"mkt.CpnStateUpdtNotify","apptype":"00","appid":"up_49pau3fu6latj_03h","sign":"F1WQAg3CRdXsBE+1dmAy+ulNkxFWDRkI6Q\/5xcpC\/bOCbcEFeun536hfhU0In+e+5GHPbfpIqyZjjglTm60QvSwvutqOiVlEBy\/G4GpIJPuLy6hdzy9Z+f56qSa0wzIjSxKqG1VuaFd2uS4WzSrx8E6hdPotXkuKzdcRwCCq\/wlmFPVxRRIVNTf6KgqkX4aNsC\/MGdLN9E5DOfoFdC8+oPqV5N71i6SjLvrzo4yaGJm+utSqEORsWZLgfZLUw+pZGjS83rQpFEKC5UyL6KwbIefNJ7a\/5cykiNIGzTRR9Tzz+UxuoiVglJ4AeUb2vs0rL8SoUjr8aLAAqPcXzPE5wQ==","reqts":"1690252684000","version":"1.0.0","signmethod":"RSA2","reqid":"8091_lsxd6688-10","content-type":"application/json"}`), - Body: []byte(`{"couponNum":"1","traceId":"lsxd6688-10","OperTp":"","chnlId":"9001","transChnl":"","couponNm":"众邦银行1元立减-测试","operTp":"04","couponCd":"INNER_23072510380403358473638771025186","couponId":"3102023071900090","orderAt":"0","transSeq":"lsxd6688-10","posTmn":"","discountAt":"0","couponCdInfos":[{"subAcctOperAt":"1","couponCd":"INNER_23072510380403358473638771025186"}],"mchntCd":"","transDtTm":"20230725103804"}`), + Headers: []byte(``), + Body: []byte(``), } t.Run("TestNotify", func(t *testing.T) { got, err := server.Notify(context.Background(), in) diff --git a/plugins/union_pay_redpack/internal/util.go b/plugins/union_pay_redpack/internal/util.go index cf28908..d04c07d 100644 --- a/plugins/union_pay_redpack/internal/util.go +++ b/plugins/union_pay_redpack/internal/util.go @@ -7,7 +7,6 @@ import ( "plugins/union_pay_redpack/internal/po" "plugins/union_pay_redpack/internal/utils" "plugins/union_pay_redpack/internal/vo" - "strings" "time" ) @@ -35,21 +34,3 @@ func headers(config *Config, req po.Req, bizMethod string) map[string][]string { h.Add("sign", signValue) return h } - -func verify(config *Config, req *po.Notify, notifyBizMethod string) error { - if req.Headers.SignMethod != vo.SignMethod { - return fmt.Errorf("签名方式不匹配") - } - if req.Headers.AppId != config.AppId { - return fmt.Errorf("appId不匹配") - } - if req.Headers.BizMethod != notifyBizMethod { - return fmt.Errorf("业务方法不匹配") - } - rehash := utils.Sha(req.Headers.Version, config.AppId, req.Headers.BizMethod, req.GetReId(), string(req.ToJson())) - lowerStr := strings.ToLower(rehash) - if utils.Verify(lowerStr, req.Headers.Sign, []byte(sdkutils.NewPublic().Build(config.Npk))) { - return nil - } - return fmt.Errorf("验签失败") -} diff --git a/plugins/union_pay_redpack/internal/utils/sign_test.go b/plugins/union_pay_redpack/internal/utils/sign_test.go index e69de29..53879d0 100644 --- a/plugins/union_pay_redpack/internal/utils/sign_test.go +++ b/plugins/union_pay_redpack/internal/utils/sign_test.go @@ -0,0 +1,23 @@ +package utils + +import ( + sdkutils "gitea.cdlsxd.cn/BaseSystem/plugin/utils" + "testing" +) + +var privateKeyPEM = sdkutils.NewPrivate().Build("MIIEogIBAAKCAQEAllAo3AbVfNg1iDT3CisgueIm2Pya2C6qatF0S8/aAKW8A6HBIuvrk1sb2TjbI0UDVowaNDsPa7nNdZHkQa6CQKf2BwFRy7gB8vAD1YSq23NTwplGe5IpuRe2Cbljh5diQ/+0zwZPZQEvjSMqZJILYVluGBw656JSndRdXHCs608CBib14l35A6D7rSZNd53nM9yXj/WOpLuY/jX0sbKJrBUIhcQcMiCFK/Nx06vhhCGZSWwaj0TTSMEOj9nyU+56MMx+N7527JUnOYMyVbbEx5h1S5sPjntMVVzz8c8FC5MKbgXCgjTt5Depl6YgrvoSCNNXZqnXN2l9dtBxKGSEdQIDAQABAoIBAD7r606/pZqPP0l3MnqVNyvY2X43r/ITBs+UQmSB67Ydqqiyi5C8xW530x6JSGJpP055c3atynTD4Jf4rF46WNgL91dTXBQ1QMubYV9+G6+lhUiOtQyBUOnkXRWQ/3MBEed5IQ0QjSew6WDheZuD7zOfJhD9sELKll7vSO2rVRdi5Kf3pps0K4aeYLvlelHjPtu2EkMyAD4d37QO2q8A/+acOf7wyx1uZ55nobe0jVgQBa2Tuuwhd2JilmsgMvcVxeAJoocyQxPVTU+iMidgZKxyW/fJUaR7V2KgKfP0H2OZbSruD2HyHL7o70+/XBg250msh691oTCXSGWiITFXRDkCgYEA1KF3daSzWK2vTZeNMxj++VRNZfyigNqBwgRZxrSGIUeNGpDdDp7flldM/fO/0RijKnh+nXLBCMZlxffSI7W3jkkjosEq0uyXv6Ez4WlhwHEAE6KrZYQ8VDU3We1LXERu/3SMU16Uq2Vme8J6kpshr7OLGeuTNfsSG79lpHU/OO8CgYEAtPjF/AY/t85u4JV0w6FJ/K7Iya+AyIyZhsgnxsPv5NwVtNsQzTRbXlpgnVmaKUXzLBTBJA2P6Gie35R6kJuOuMnvHjtG7umI5lOUJaqYk5GZEXHxbIKTXUxAbv+WKRHcFwcH54Ppurs7bN6ultWdE+yyU5PvabFRAidL+rV+MNsCgYBkqx2XwSZ4MaLxpXLgYlE1UkhipL17K/iLFuw6O3XVg762eSdvqKBK2YJGKYUDRhraHLo1aQMjWGsO00nWRk5lOxN4FuRjgEhIHdYmPnJdXiKfKUDkizrU020lUkd/o5a5s0BMqFbS3usqZOULTA8i1GpjFzlXMUtdf7xrpGcOWQKBgFJXWuX4Befg8owXFKCqc1qYQF2cEBGv/27XBVon7rAH/4xhnHxx1RzSLGGL0lvzKtikvNhln1PUvmzmRvoi/UZRAw6TVAwCkDqUTrTwsSl7ttS8Lmf75Ycu2aZnfnBDYwvLNCp/18oRxNEdZPzWRvk42k6y4d0KQ9yh+q0hBUC/AoGASgJro5HgKWkSzYx1Fk3rvo7EWeZwXNfWuzIhtCiVDG4+df0ZdybkbjxbaRwL2rbTSBeqSaZw4UwpE1JyF8erfzx0qpHCY5V3ocnA8kg56mX9kE5H9WKjMe1tbuZpba4i08zvM8vpz9gASf3z/WrWWqgpvynxDWpy4xFAqrWC0VQ=") +var publicKeyPEM = sdkutils.NewPublic().Build("MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3ErEoBiGNPT3iIt9ZIuf8znScpOpVk8cToo810EGP8AE/Z6M2s7r18kHCLPCBHvxOjcOTJNWwD2bbDnfY5HNHCXSTWwQUDtFpPAsm4orEaB4Qsh6ohTXTcyNhWp9cCIg42i7jVi5Eq7TVzKuVezCXk3XeLltT56wuCVRfe35SNPe8RDakvbE+fl46+yorz0AKXBoqvsgR8q9QKc6HDSUcFEDZkuFCt7PnMek6L0dQdmb7NHQdG2+8RnUAR4wMEVKuGAX5nCp4IeDE4L23658KPijK1Hg6u6dAqKTfCarj4Act+WOjYYCaARcU/rNX8RGthdvLhUc4lT0ALnbmOEj2QIDAQAB") + +func Test_sign_verify(t *testing.T) { + data := "123456" + t.Run("test_sign", func(t *testing.T) { + got, err := Sign(data, []byte(privateKeyPEM)) + if err != nil { + t.Errorf("sign() error = %v", err) + return + } + t.Log(got) + b := Verify(data, got, []byte(publicKeyPEM)) + t.Log(b) + }) +} diff --git a/plugins/union_pay_redpack/internal/utils/sm4_test.go b/plugins/union_pay_redpack/internal/utils/sm4_test.go index e69de29..3bdee32 100644 --- a/plugins/union_pay_redpack/internal/utils/sm4_test.go +++ b/plugins/union_pay_redpack/internal/utils/sm4_test.go @@ -0,0 +1,29 @@ +package utils + +import ( + "testing" +) + +var iv = "0123456789123456" +var key = "16fb034dead44ff6f599b1ca373ccfd1" + +func TestEncrypt(t *testing.T) { + text := "13100720242" + e, err := Encrypt([]byte(text), []byte(key), []byte(iv)) + if err != nil { + t.Errorf("sm4加密失败:%s\n", err) + return + } + t.Logf("sm4加密结果:%s\n", e) +} + +func TestDecrypt(t *testing.T) { + //text := "R2wVgntY8aP9QTvCN/bWfw==" + text := "/CdDsyQqyOfS2jXOFjX3Iw==" + d, err := Decrypt(text, []byte(key), []byte(iv)) + if err != nil { + t.Errorf("sm4解密失败:%s\n", err) + return + } + t.Logf("sm4解密结果:%s\n", d) +}