diff --git a/cmd/main.go b/cmd/main.go index 57c4ed7..0d4db5d 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -3,9 +3,9 @@ package main import ( "context" "encoding/json" - "gitea.cdlsxd.cn/BaseSystem/plugin/instance" - "gitea.cdlsxd.cn/BaseSystem/plugin/manage" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/instance" + "gitea.cdlsxd.cn/sdk/plugin/manage" + "gitea.cdlsxd.cn/sdk/plugin/proto" "log" ) diff --git a/go.mod b/go.mod index eb081ba..c842727 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module plugins go 1.22.2 -require gitea.cdlsxd.cn/BaseSystem/plugin v0.0.0-20240821033242-d9c3e7ad88f6 +require gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b require ( github.com/fatih/color v1.7.0 // indirect @@ -21,7 +21,7 @@ require ( github.com/oklog/run v1.0.0 // indirect github.com/pkg/errors v0.9.1 // indirect golang.org/x/crypto v0.26.0 // indirect - golang.org/x/net v0.22.0 // indirect + golang.org/x/net v0.27.0 // indirect golang.org/x/sys v0.23.0 // indirect golang.org/x/text v0.17.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect diff --git a/go.sum b/go.sum index 7a7267b..b9956f5 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ -gitea.cdlsxd.cn/BaseSystem/plugin v0.0.0-20240731020946-65ddbab65854 h1:+lG+QB1dfA70NSF35pN3qZCxfIJ0n+1JMS02gM0+vzI= -gitea.cdlsxd.cn/BaseSystem/plugin v0.0.0-20240731020946-65ddbab65854/go.mod h1:59zYRFcPur2HizJEIfttVOMY0AscollDYKX0yvPJS7k= -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= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b h1:x8Gf1EJ6oLHEIgK/SilgMZ5EDgcEknef9zhGrFvXXMg= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b/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/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -50,8 +48,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= -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/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= diff --git a/plugins/Makefile b/plugins/Makefile index aa1675d..b919653 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -1,6 +1,6 @@ .PHONY: tidy tidy: - find . -type d -depth 1 -print | xargs -L 1 bash -c 'cd $$0 && pwd && go get -u gitea.cdlsxd.cn/BaseSystem/plugin && go mod tidy' + find . -type d -depth 1 -print | xargs -L 1 bash -c 'cd $$0 && pwd && go get -u gitea.cdlsxd.cn/sdk/plugin && go mod tidy' .PHONY: build build: diff --git a/plugins/alipay_cpn/go.mod b/plugins/alipay_cpn/go.mod index 4501b93..756e390 100644 --- a/plugins/alipay_cpn/go.mod +++ b/plugins/alipay_cpn/go.mod @@ -3,8 +3,8 @@ module plugins/alipay_cpn go 1.22.2 require ( - gitea.cdlsxd.cn/BaseSystem/plugin v0.0.0-20240821033242-d9c3e7ad88f6 - github.com/carlmjohnson/requests v0.23.4 + gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b + github.com/carlmjohnson/requests v0.24.2 github.com/go-playground/validator/v10 v10.22.0 github.com/hashicorp/go-plugin v1.6.1 github.com/stretchr/testify v1.9.0 @@ -25,10 +25,10 @@ require ( github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 // indirect github.com/oklog/run v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - golang.org/x/crypto v0.21.0 // indirect - golang.org/x/net v0.22.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/crypto v0.25.0 // indirect + golang.org/x/net v0.27.0 // indirect + golang.org/x/sys v0.22.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/plugins/alipay_cpn/go.sum b/plugins/alipay_cpn/go.sum index 48be51b..058d5d1 100644 --- a/plugins/alipay_cpn/go.sum +++ b/plugins/alipay_cpn/go.sum @@ -1,9 +1,9 @@ -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= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b h1:x8Gf1EJ6oLHEIgK/SilgMZ5EDgcEknef9zhGrFvXXMg= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b/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.23.4 h1:AxcvapfB9RPXLSyvAHk9YJoodQ43ZjzNHj6Ft3tQGdg= -github.com/carlmjohnson/requests v0.23.4/go.mod h1:Qzp6tW4DQyainPP+tGwiJTzwxvElTIKm0B191TgTtOA= +github.com/carlmjohnson/requests v0.24.2 h1:JDakhAmTIKL/qL/1P7Kkc2INGBJIkIFP6xUeUmPzLso= +github.com/carlmjohnson/requests v0.24.2/go.mod h1:duYA/jDnyZ6f3xbcF5PpZ9N8clgopubP2nK5i6MVMhU= 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/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= @@ -46,16 +46,16 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN 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= -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/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20191008105621-543471e840be/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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= 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.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= diff --git a/plugins/alipay_cpn/internal/alipay_cpn.go b/plugins/alipay_cpn/internal/alipay_cpn.go index 88f0e70..c909785 100644 --- a/plugins/alipay_cpn/internal/alipay_cpn.go +++ b/plugins/alipay_cpn/internal/alipay_cpn.go @@ -3,7 +3,7 @@ package internal import ( "context" "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "github.com/carlmjohnson/requests" "plugins/alipay_cpn/internal/po" ) diff --git a/plugins/alipay_cpn/internal/alipay_test.go b/plugins/alipay_cpn/internal/alipay_test.go index 275cd99..2ae4f19 100644 --- a/plugins/alipay_cpn/internal/alipay_test.go +++ b/plugins/alipay_cpn/internal/alipay_test.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "github.com/stretchr/testify/assert" "testing" ) diff --git a/plugins/alipay_cpn/internal/po/order.go b/plugins/alipay_cpn/internal/po/order.go index a96a4bf..d43a577 100644 --- a/plugins/alipay_cpn/internal/po/order.go +++ b/plugins/alipay_cpn/internal/po/order.go @@ -2,7 +2,7 @@ package po import ( "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "plugins/alipay_cpn/internal/vo" ) diff --git a/plugins/alipay_cpn/internal/transform.go b/plugins/alipay_cpn/internal/transform.go index 061cc9a..0ae3002 100644 --- a/plugins/alipay_cpn/internal/transform.go +++ b/plugins/alipay_cpn/internal/transform.go @@ -3,7 +3,7 @@ package internal import ( "encoding/json" "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "html" "plugins/alipay_cpn/internal/po" "plugins/alipay_cpn/internal/vo" diff --git a/plugins/alipay_cpn/internal/util.go b/plugins/alipay_cpn/internal/util.go index a59e02f..c4019c5 100644 --- a/plugins/alipay_cpn/internal/util.go +++ b/plugins/alipay_cpn/internal/util.go @@ -10,7 +10,7 @@ import ( "encoding/pem" "errors" "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/utils" + "gitea.cdlsxd.cn/sdk/plugin/utils" "net/url" "plugins/alipay_cpn/internal/po" "strings" diff --git a/plugins/alipay_cpn/internal/vo/notify_biz_type.go b/plugins/alipay_cpn/internal/vo/notify_biz_type.go index d194bb9..e79e6d5 100644 --- a/plugins/alipay_cpn/internal/vo/notify_biz_type.go +++ b/plugins/alipay_cpn/internal/vo/notify_biz_type.go @@ -1,6 +1,6 @@ package vo -import "gitea.cdlsxd.cn/BaseSystem/plugin/proto" +import "gitea.cdlsxd.cn/sdk/plugin/proto" type NotifyBizType string diff --git a/plugins/alipay_cpn/internal/vo/query_status.go b/plugins/alipay_cpn/internal/vo/query_status.go index de0f9ad..5edb371 100644 --- a/plugins/alipay_cpn/internal/vo/query_status.go +++ b/plugins/alipay_cpn/internal/vo/query_status.go @@ -1,6 +1,6 @@ package vo -import "gitea.cdlsxd.cn/BaseSystem/plugin/proto" +import "gitea.cdlsxd.cn/sdk/plugin/proto" type QueryStatus string diff --git a/plugins/alipay_cpn/main.go b/plugins/alipay_cpn/main.go index f42abf2..00d1e41 100644 --- a/plugins/alipay_cpn/main.go +++ b/plugins/alipay_cpn/main.go @@ -1,7 +1,7 @@ package main import ( - "gitea.cdlsxd.cn/BaseSystem/plugin/shared" + "gitea.cdlsxd.cn/sdk/plugin/shared" "github.com/hashicorp/go-plugin" "plugins/alipay_cpn/internal" ) diff --git a/plugins/alipay_redpack/go.mod b/plugins/alipay_redpack/go.mod index 5b42090..48b9fb6 100644 --- a/plugins/alipay_redpack/go.mod +++ b/plugins/alipay_redpack/go.mod @@ -5,8 +5,8 @@ go 1.22.2 replace plugins/utils => ../../utils require ( - gitea.cdlsxd.cn/BaseSystem/plugin v0.0.0-20240821033242-d9c3e7ad88f6 - github.com/carlmjohnson/requests v0.23.4 + gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b + github.com/carlmjohnson/requests v0.24.2 github.com/go-playground/validator/v10 v10.22.0 github.com/hashicorp/go-plugin v1.6.1 github.com/stretchr/testify v1.9.0 @@ -29,7 +29,7 @@ require ( github.com/oklog/run v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect golang.org/x/crypto v0.26.0 // indirect - golang.org/x/net v0.23.0 // indirect + golang.org/x/net v0.27.0 // indirect golang.org/x/sys v0.24.0 // indirect golang.org/x/text v0.17.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect diff --git a/plugins/alipay_redpack/go.sum b/plugins/alipay_redpack/go.sum index 34eb58d..bbe35c1 100644 --- a/plugins/alipay_redpack/go.sum +++ b/plugins/alipay_redpack/go.sum @@ -1,9 +1,9 @@ -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= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b h1:x8Gf1EJ6oLHEIgK/SilgMZ5EDgcEknef9zhGrFvXXMg= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b/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.23.4 h1:AxcvapfB9RPXLSyvAHk9YJoodQ43ZjzNHj6Ft3tQGdg= -github.com/carlmjohnson/requests v0.23.4/go.mod h1:Qzp6tW4DQyainPP+tGwiJTzwxvElTIKm0B191TgTtOA= +github.com/carlmjohnson/requests v0.24.2 h1:JDakhAmTIKL/qL/1P7Kkc2INGBJIkIFP6xUeUmPzLso= +github.com/carlmjohnson/requests v0.24.2/go.mod h1:duYA/jDnyZ6f3xbcF5PpZ9N8clgopubP2nK5i6MVMhU= 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/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= @@ -51,8 +51,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/plugins/alipay_redpack/internal/alipay_redpack.go b/plugins/alipay_redpack/internal/alipay_redpack.go index 6dfc0a0..a18a674 100644 --- a/plugins/alipay_redpack/internal/alipay_redpack.go +++ b/plugins/alipay_redpack/internal/alipay_redpack.go @@ -3,7 +3,7 @@ package internal import ( "context" "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "github.com/carlmjohnson/requests" "plugins/alipay_redpack/internal/po" "plugins/utils/alipay" diff --git a/plugins/alipay_redpack/internal/alipay_redpack_test.go b/plugins/alipay_redpack/internal/alipay_redpack_test.go index 64babd1..7fe7101 100644 --- a/plugins/alipay_redpack/internal/alipay_redpack_test.go +++ b/plugins/alipay_redpack/internal/alipay_redpack_test.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "github.com/stretchr/testify/assert" "testing" ) diff --git a/plugins/alipay_redpack/internal/po/order.go b/plugins/alipay_redpack/internal/po/order.go index 0302cc3..7f2cf25 100644 --- a/plugins/alipay_redpack/internal/po/order.go +++ b/plugins/alipay_redpack/internal/po/order.go @@ -2,7 +2,7 @@ package po import ( "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "plugins/alipay_redpack/internal/vo" ) diff --git a/plugins/alipay_redpack/internal/transform.go b/plugins/alipay_redpack/internal/transform.go index e488cdb..ee9014a 100644 --- a/plugins/alipay_redpack/internal/transform.go +++ b/plugins/alipay_redpack/internal/transform.go @@ -3,7 +3,7 @@ package internal import ( "encoding/json" "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "html" "plugins/alipay_redpack/internal/po" "plugins/alipay_redpack/internal/vo" @@ -26,6 +26,18 @@ func transConfig(config []byte) (*Config, error) { if err != nil { return nil, err } + //dir, _ := os.Getwd() + //filePath := fmt.Sprintf("%s/%s/%s/%s", dir, "cert", "alipay", c.AppId) + //if !fileExists(filePath) { + // return nil, fmt.Errorf("授权文件信息不存在,请联系技术人员处理") + //} + /** + AppId: a.bc.Alipay.AppId, + Prk: a.bc.Alipay.GetPrk(), + PukPath: fmt.Sprintf("%s/%s", filePath, "alipayCertPublicKey_RSA2.crt"), + MchCertPath: fmt.Sprintf("%s/%s", filePath, a.bc.Alipay.MchCertName), + RootCertPath: fmt.Sprintf("%s/%s", filePath, "alipayRootCert.crt"), + */ return &c, nil } diff --git a/plugins/alipay_redpack/internal/util.go b/plugins/alipay_redpack/internal/util.go index 55e51c8..2aea271 100644 --- a/plugins/alipay_redpack/internal/util.go +++ b/plugins/alipay_redpack/internal/util.go @@ -10,8 +10,9 @@ import ( "encoding/pem" "errors" "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/utils" + "gitea.cdlsxd.cn/sdk/plugin/utils" "net/url" + "os" "plugins/alipay_redpack/internal/po" "regexp" "strings" @@ -27,6 +28,11 @@ func isEmailValid(email string) bool { return emailRegex.MatchString(email) } +func fileExists(filePath string) bool { + _, err := os.Stat(filePath) + return err == nil || os.IsExist(err) +} + func req(config *Config, req *po.Param) (url.Values, error) { var strToBeSigned strings.Builder uv := url.Values{} diff --git a/plugins/alipay_redpack/internal/vo/status.go b/plugins/alipay_redpack/internal/vo/status.go index 691bff5..9842808 100644 --- a/plugins/alipay_redpack/internal/vo/status.go +++ b/plugins/alipay_redpack/internal/vo/status.go @@ -1,6 +1,6 @@ package vo -import "gitea.cdlsxd.cn/BaseSystem/plugin/proto" +import "gitea.cdlsxd.cn/sdk/plugin/proto" type Status string diff --git a/plugins/alipay_redpack/main.go b/plugins/alipay_redpack/main.go index 0f707b0..4ca4251 100644 --- a/plugins/alipay_redpack/main.go +++ b/plugins/alipay_redpack/main.go @@ -1,7 +1,7 @@ package main import ( - "gitea.cdlsxd.cn/BaseSystem/plugin/shared" + "gitea.cdlsxd.cn/sdk/plugin/shared" "github.com/hashicorp/go-plugin" "plugins/alipay_redpack/internal" ) diff --git a/plugins/union_pay_cpn/go.mod b/plugins/union_pay_cpn/go.mod index 9796977..b6c2e55 100644 --- a/plugins/union_pay_cpn/go.mod +++ b/plugins/union_pay_cpn/go.mod @@ -5,8 +5,8 @@ go 1.22.2 replace plugins/utils => ../../utils require ( - gitea.cdlsxd.cn/BaseSystem/plugin v0.0.0-20240821033242-d9c3e7ad88f6 - github.com/carlmjohnson/requests v0.23.4 + gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b + github.com/carlmjohnson/requests v0.24.2 github.com/go-playground/validator/v10 v10.22.0 github.com/hashicorp/go-plugin v1.6.1 github.com/stretchr/testify v1.9.0 @@ -29,10 +29,10 @@ require ( github.com/oklog/run v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/tjfoc/gmsm v1.4.1 // indirect - golang.org/x/crypto v0.21.0 // indirect - golang.org/x/net v0.22.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/crypto v0.25.0 // indirect + golang.org/x/net v0.27.0 // indirect + golang.org/x/sys v0.22.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/plugins/union_pay_cpn/go.sum b/plugins/union_pay_cpn/go.sum index 06c67ce..028d206 100644 --- a/plugins/union_pay_cpn/go.sum +++ b/plugins/union_pay_cpn/go.sum @@ -1,11 +1,11 @@ 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= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b h1:x8Gf1EJ6oLHEIgK/SilgMZ5EDgcEknef9zhGrFvXXMg= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b/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= -github.com/carlmjohnson/requests v0.23.4 h1:AxcvapfB9RPXLSyvAHk9YJoodQ43ZjzNHj6Ft3tQGdg= -github.com/carlmjohnson/requests v0.23.4/go.mod h1:Qzp6tW4DQyainPP+tGwiJTzwxvElTIKm0B191TgTtOA= +github.com/carlmjohnson/requests v0.24.2 h1:JDakhAmTIKL/qL/1P7Kkc2INGBJIkIFP6xUeUmPzLso= +github.com/carlmjohnson/requests v0.24.2/go.mod h1:duYA/jDnyZ6f3xbcF5PpZ9N8clgopubP2nK5i6MVMhU= 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= @@ -75,8 +75,8 @@ github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVc 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/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= 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= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -87,8 +87,8 @@ 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/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= 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= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -99,12 +99,12 @@ 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/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.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/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= 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= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= diff --git a/plugins/union_pay_cpn/internal/transform.go b/plugins/union_pay_cpn/internal/transform.go index 2506091..0f848d2 100644 --- a/plugins/union_pay_cpn/internal/transform.go +++ b/plugins/union_pay_cpn/internal/transform.go @@ -2,7 +2,7 @@ package internal import ( "encoding/json" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "plugins/union_pay_cpn/internal/po" "plugins/union_pay_cpn/internal/vo" "plugins/utils/union_pay" diff --git a/plugins/union_pay_cpn/internal/union_pay_cpn.go b/plugins/union_pay_cpn/internal/union_pay_cpn.go index c4e6f5f..625d8bb 100644 --- a/plugins/union_pay_cpn/internal/union_pay_cpn.go +++ b/plugins/union_pay_cpn/internal/union_pay_cpn.go @@ -3,7 +3,7 @@ package internal import ( "context" "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "github.com/carlmjohnson/requests" "plugins/union_pay_cpn/internal/po" ) diff --git a/plugins/union_pay_cpn/internal/union_pay_cpn_test.go b/plugins/union_pay_cpn/internal/union_pay_cpn_test.go index 1c58276..7461ca0 100644 --- a/plugins/union_pay_cpn/internal/union_pay_cpn_test.go +++ b/plugins/union_pay_cpn/internal/union_pay_cpn_test.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "github.com/stretchr/testify/assert" "testing" ) diff --git a/plugins/union_pay_cpn/internal/util.go b/plugins/union_pay_cpn/internal/util.go index 6f60b21..0d43880 100644 --- a/plugins/union_pay_cpn/internal/util.go +++ b/plugins/union_pay_cpn/internal/util.go @@ -2,7 +2,7 @@ package internal import ( "fmt" - sdkutils "gitea.cdlsxd.cn/BaseSystem/plugin/utils" + sdkutils "gitea.cdlsxd.cn/sdk/plugin/utils" "net/http" "plugins/union_pay_cpn/internal/po" "plugins/union_pay_cpn/internal/vo" diff --git a/plugins/union_pay_cpn/internal/vo/opera_st.go b/plugins/union_pay_cpn/internal/vo/opera_st.go index 1cc777e..2578672 100644 --- a/plugins/union_pay_cpn/internal/vo/opera_st.go +++ b/plugins/union_pay_cpn/internal/vo/opera_st.go @@ -1,6 +1,6 @@ package vo -import "gitea.cdlsxd.cn/BaseSystem/plugin/proto" +import "gitea.cdlsxd.cn/sdk/plugin/proto" // OperaSt 原操作状态;10表示原操作未被受理;00表示原操作成功;01表示原操作结果未明;其他表示原操作失败 type OperaSt string diff --git a/plugins/union_pay_cpn/internal/vo/opera_tp.go b/plugins/union_pay_cpn/internal/vo/opera_tp.go index b6d6e21..95396ff 100644 --- a/plugins/union_pay_cpn/internal/vo/opera_tp.go +++ b/plugins/union_pay_cpn/internal/vo/opera_tp.go @@ -1,6 +1,6 @@ package vo -import "gitea.cdlsxd.cn/BaseSystem/plugin/proto" +import "gitea.cdlsxd.cn/sdk/plugin/proto" type OperaTp string diff --git a/plugins/union_pay_cpn/main.go b/plugins/union_pay_cpn/main.go index 085ca9f..718c75a 100644 --- a/plugins/union_pay_cpn/main.go +++ b/plugins/union_pay_cpn/main.go @@ -1,7 +1,7 @@ package main import ( - "gitea.cdlsxd.cn/BaseSystem/plugin/shared" + "gitea.cdlsxd.cn/sdk/plugin/shared" "github.com/hashicorp/go-plugin" "plugins/union_pay_cpn/internal" ) diff --git a/plugins/union_pay_redpack/go.mod b/plugins/union_pay_redpack/go.mod index 30149ba..81812f6 100644 --- a/plugins/union_pay_redpack/go.mod +++ b/plugins/union_pay_redpack/go.mod @@ -5,8 +5,8 @@ go 1.22.2 replace plugins/utils => ../../utils require ( - gitea.cdlsxd.cn/BaseSystem/plugin v0.0.0-20240821033242-d9c3e7ad88f6 - github.com/carlmjohnson/requests v0.23.4 + gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b + github.com/carlmjohnson/requests v0.24.2 github.com/go-playground/validator/v10 v10.22.0 github.com/hashicorp/go-plugin v1.6.1 github.com/stretchr/testify v1.9.0 @@ -29,10 +29,10 @@ require ( github.com/oklog/run v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/tjfoc/gmsm v1.4.1 // indirect - golang.org/x/crypto v0.21.0 // indirect - golang.org/x/net v0.22.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/crypto v0.25.0 // indirect + golang.org/x/net v0.27.0 // indirect + golang.org/x/sys v0.22.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/plugins/union_pay_redpack/go.sum b/plugins/union_pay_redpack/go.sum index 06c67ce..028d206 100644 --- a/plugins/union_pay_redpack/go.sum +++ b/plugins/union_pay_redpack/go.sum @@ -1,11 +1,11 @@ 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= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b h1:x8Gf1EJ6oLHEIgK/SilgMZ5EDgcEknef9zhGrFvXXMg= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b/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= -github.com/carlmjohnson/requests v0.23.4 h1:AxcvapfB9RPXLSyvAHk9YJoodQ43ZjzNHj6Ft3tQGdg= -github.com/carlmjohnson/requests v0.23.4/go.mod h1:Qzp6tW4DQyainPP+tGwiJTzwxvElTIKm0B191TgTtOA= +github.com/carlmjohnson/requests v0.24.2 h1:JDakhAmTIKL/qL/1P7Kkc2INGBJIkIFP6xUeUmPzLso= +github.com/carlmjohnson/requests v0.24.2/go.mod h1:duYA/jDnyZ6f3xbcF5PpZ9N8clgopubP2nK5i6MVMhU= 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= @@ -75,8 +75,8 @@ github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVc 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/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= 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= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -87,8 +87,8 @@ 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/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= 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= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -99,12 +99,12 @@ 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/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.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/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= 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= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= diff --git a/plugins/union_pay_redpack/internal/transform.go b/plugins/union_pay_redpack/internal/transform.go index 0c204fb..bb652ba 100644 --- a/plugins/union_pay_redpack/internal/transform.go +++ b/plugins/union_pay_redpack/internal/transform.go @@ -3,7 +3,7 @@ package internal import ( "encoding/json" "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "plugins/union_pay_redpack/internal/po" "plugins/union_pay_redpack/internal/vo" "plugins/utils/union_pay" diff --git a/plugins/union_pay_redpack/internal/union_pay_redpack.go b/plugins/union_pay_redpack/internal/union_pay_redpack.go index 636e20e..2add1b8 100644 --- a/plugins/union_pay_redpack/internal/union_pay_redpack.go +++ b/plugins/union_pay_redpack/internal/union_pay_redpack.go @@ -3,7 +3,7 @@ package internal import ( "context" "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "github.com/carlmjohnson/requests" "net/http" "plugins/union_pay_redpack/internal/po" 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 a716e8b..d29e3d6 100644 --- a/plugins/union_pay_redpack/internal/union_pay_redpack_test.go +++ b/plugins/union_pay_redpack/internal/union_pay_redpack_test.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "github.com/stretchr/testify/assert" "testing" ) diff --git a/plugins/union_pay_redpack/internal/util.go b/plugins/union_pay_redpack/internal/util.go index a93eb11..79e7ca4 100644 --- a/plugins/union_pay_redpack/internal/util.go +++ b/plugins/union_pay_redpack/internal/util.go @@ -2,7 +2,7 @@ package internal import ( "fmt" - sdkutils "gitea.cdlsxd.cn/BaseSystem/plugin/utils" + sdkutils "gitea.cdlsxd.cn/sdk/plugin/utils" "net/http" "plugins/union_pay_redpack/internal/po" "plugins/union_pay_redpack/internal/vo" diff --git a/plugins/union_pay_redpack/internal/vo/acquire_st.go b/plugins/union_pay_redpack/internal/vo/acquire_st.go index 999f5d0..2e63901 100644 --- a/plugins/union_pay_redpack/internal/vo/acquire_st.go +++ b/plugins/union_pay_redpack/internal/vo/acquire_st.go @@ -1,6 +1,6 @@ package vo -import "gitea.cdlsxd.cn/BaseSystem/plugin/proto" +import "gitea.cdlsxd.cn/sdk/plugin/proto" type AcquireSt string diff --git a/plugins/union_pay_redpack/main.go b/plugins/union_pay_redpack/main.go index 4cbfbac..b04140c 100644 --- a/plugins/union_pay_redpack/main.go +++ b/plugins/union_pay_redpack/main.go @@ -1,7 +1,7 @@ package main import ( - "gitea.cdlsxd.cn/BaseSystem/plugin/shared" + "gitea.cdlsxd.cn/sdk/plugin/shared" "github.com/hashicorp/go-plugin" "plugins/union_pay_redpack/internal" ) diff --git a/plugins/weixin_cpn/go.mod b/plugins/weixin_cpn/go.mod index c98fb7a..c26b85d 100644 --- a/plugins/weixin_cpn/go.mod +++ b/plugins/weixin_cpn/go.mod @@ -5,7 +5,7 @@ go 1.22.2 replace plugins/utils => ../../utils require ( - gitea.cdlsxd.cn/BaseSystem/plugin v0.0.0-20240821033242-d9c3e7ad88f6 + gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b github.com/hashicorp/go-plugin v1.6.1 github.com/stretchr/testify v1.9.0 github.com/wechatpay-apiv3/wechatpay-go v0.2.18 @@ -23,9 +23,9 @@ require ( github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 // indirect github.com/oklog/run v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - golang.org/x/net v0.22.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/net v0.27.0 // indirect + golang.org/x/sys v0.22.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/plugins/weixin_cpn/go.sum b/plugins/weixin_cpn/go.sum index 2d8f3aa..28a9433 100644 --- a/plugins/weixin_cpn/go.sum +++ b/plugins/weixin_cpn/go.sum @@ -1,5 +1,5 @@ -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= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b h1:x8Gf1EJ6oLHEIgK/SilgMZ5EDgcEknef9zhGrFvXXMg= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b/go.mod h1:cd+ZFTmd/ZxrrVc1OZCkrh2wAMPDaAa8ce13FAAkBg0= github.com/agiledragon/gomonkey v2.0.2+incompatible h1:eXKi9/piiC3cjJD1658mEE2o3NjkJ5vDLgYjCQu0Xlw= github.com/agiledragon/gomonkey v2.0.2+incompatible/go.mod h1:2NGfXu1a80LLr2cmWXGBDaHEjb1idR6+FVlX5T3D9hw= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= @@ -43,14 +43,14 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/wechatpay-apiv3/wechatpay-go v0.2.18 h1:vj5tvSmnEIz3ZsnFNNUzg+3Z46xgNMJbrO4aD4wP15w= github.com/wechatpay-apiv3/wechatpay-go v0.2.18/go.mod h1:A254AUBVB6R+EqQFo3yTgeh7HtyqRRtN2w9hQSOrd4Q= -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/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20191008105621-543471e840be/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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= 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.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= diff --git a/plugins/weixin_cpn/internal/transform.go b/plugins/weixin_cpn/internal/transform.go index 3199da0..29605ef 100644 --- a/plugins/weixin_cpn/internal/transform.go +++ b/plugins/weixin_cpn/internal/transform.go @@ -3,7 +3,7 @@ package internal import ( "encoding/json" "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "github.com/wechatpay-apiv3/wechatpay-go/core" "github.com/wechatpay-apiv3/wechatpay-go/services/cashcoupons" "go/types" diff --git a/plugins/weixin_cpn/internal/vo/query_status.go b/plugins/weixin_cpn/internal/vo/query_status.go index cdcfb42..9bc6744 100644 --- a/plugins/weixin_cpn/internal/vo/query_status.go +++ b/plugins/weixin_cpn/internal/vo/query_status.go @@ -1,6 +1,6 @@ package vo -import "gitea.cdlsxd.cn/BaseSystem/plugin/proto" +import "gitea.cdlsxd.cn/sdk/plugin/proto" type QueryStatus string diff --git a/plugins/weixin_cpn/internal/weixin_cpn.go b/plugins/weixin_cpn/internal/weixin_cpn.go index 77168e2..cb46f87 100644 --- a/plugins/weixin_cpn/internal/weixin_cpn.go +++ b/plugins/weixin_cpn/internal/weixin_cpn.go @@ -2,7 +2,7 @@ package internal import ( "context" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "plugins/weixin_cpn/internal/vo" ) diff --git a/plugins/weixin_cpn/internal/weixin_cpn_test.go b/plugins/weixin_cpn/internal/weixin_cpn_test.go index 42fdb41..91609dc 100644 --- a/plugins/weixin_cpn/internal/weixin_cpn_test.go +++ b/plugins/weixin_cpn/internal/weixin_cpn_test.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "github.com/stretchr/testify/assert" "plugins/utils/weixin" "testing" diff --git a/plugins/weixin_cpn/main.go b/plugins/weixin_cpn/main.go index a2d9db3..e688302 100644 --- a/plugins/weixin_cpn/main.go +++ b/plugins/weixin_cpn/main.go @@ -1,7 +1,7 @@ package main import ( - "gitea.cdlsxd.cn/BaseSystem/plugin/shared" + "gitea.cdlsxd.cn/sdk/plugin/shared" "github.com/hashicorp/go-plugin" "plugins/weixin_cpn/internal" ) diff --git a/plugins/weixin_redpack/go.mod b/plugins/weixin_redpack/go.mod index f57c0d7..54edae3 100644 --- a/plugins/weixin_redpack/go.mod +++ b/plugins/weixin_redpack/go.mod @@ -5,7 +5,7 @@ go 1.22.2 replace plugins/utils => ../../utils require ( - gitea.cdlsxd.cn/BaseSystem/plugin v0.0.0-20240821033242-d9c3e7ad88f6 + gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b github.com/hashicorp/go-plugin v1.6.1 github.com/stretchr/testify v1.9.0 github.com/wechatpay-apiv3/wechatpay-go v0.2.18 @@ -23,9 +23,9 @@ require ( github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 // indirect github.com/oklog/run v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - golang.org/x/net v0.22.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/net v0.27.0 // indirect + golang.org/x/sys v0.22.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/plugins/weixin_redpack/go.sum b/plugins/weixin_redpack/go.sum index 2d8f3aa..28a9433 100644 --- a/plugins/weixin_redpack/go.sum +++ b/plugins/weixin_redpack/go.sum @@ -1,5 +1,5 @@ -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= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b h1:x8Gf1EJ6oLHEIgK/SilgMZ5EDgcEknef9zhGrFvXXMg= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b/go.mod h1:cd+ZFTmd/ZxrrVc1OZCkrh2wAMPDaAa8ce13FAAkBg0= github.com/agiledragon/gomonkey v2.0.2+incompatible h1:eXKi9/piiC3cjJD1658mEE2o3NjkJ5vDLgYjCQu0Xlw= github.com/agiledragon/gomonkey v2.0.2+incompatible/go.mod h1:2NGfXu1a80LLr2cmWXGBDaHEjb1idR6+FVlX5T3D9hw= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= @@ -43,14 +43,14 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/wechatpay-apiv3/wechatpay-go v0.2.18 h1:vj5tvSmnEIz3ZsnFNNUzg+3Z46xgNMJbrO4aD4wP15w= github.com/wechatpay-apiv3/wechatpay-go v0.2.18/go.mod h1:A254AUBVB6R+EqQFo3yTgeh7HtyqRRtN2w9hQSOrd4Q= -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/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20191008105621-543471e840be/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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= 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.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= diff --git a/plugins/weixin_redpack/internal/transform.go b/plugins/weixin_redpack/internal/transform.go index c813c20..a86166f 100644 --- a/plugins/weixin_redpack/internal/transform.go +++ b/plugins/weixin_redpack/internal/transform.go @@ -3,7 +3,7 @@ package internal import ( "encoding/json" "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "github.com/wechatpay-apiv3/wechatpay-go/core" "github.com/wechatpay-apiv3/wechatpay-go/services/transferbatch" "plugins/utils/weixin" diff --git a/plugins/weixin_redpack/internal/vo/query_status.go b/plugins/weixin_redpack/internal/vo/query_status.go index 9e5356f..99b4820 100644 --- a/plugins/weixin_redpack/internal/vo/query_status.go +++ b/plugins/weixin_redpack/internal/vo/query_status.go @@ -1,6 +1,6 @@ package vo -import "gitea.cdlsxd.cn/BaseSystem/plugin/proto" +import "gitea.cdlsxd.cn/sdk/plugin/proto" // QueryStatus // INIT: 初始态。 系统转账校验中 diff --git a/plugins/weixin_redpack/internal/weixin_redpack.go b/plugins/weixin_redpack/internal/weixin_redpack.go index ea8b9bf..0abb9bf 100644 --- a/plugins/weixin_redpack/internal/weixin_redpack.go +++ b/plugins/weixin_redpack/internal/weixin_redpack.go @@ -2,7 +2,7 @@ package internal import ( "context" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "plugins/weixin_redpack/internal/vo" ) diff --git a/plugins/weixin_redpack/internal/weixin_redpack_test.go b/plugins/weixin_redpack/internal/weixin_redpack_test.go index 66a2721..b3c4acb 100644 --- a/plugins/weixin_redpack/internal/weixin_redpack_test.go +++ b/plugins/weixin_redpack/internal/weixin_redpack_test.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "github.com/stretchr/testify/assert" "plugins/utils/weixin" "testing" diff --git a/plugins/weixin_redpack/main.go b/plugins/weixin_redpack/main.go index c2cbf82..dd4f1be 100644 --- a/plugins/weixin_redpack/main.go +++ b/plugins/weixin_redpack/main.go @@ -1,7 +1,7 @@ package main import ( - "gitea.cdlsxd.cn/BaseSystem/plugin/shared" + "gitea.cdlsxd.cn/sdk/plugin/shared" "github.com/hashicorp/go-plugin" "plugins/weixin_redpack/internal" ) diff --git a/plugins/zltx/go.mod b/plugins/zltx/go.mod index 6b75193..d807617 100644 --- a/plugins/zltx/go.mod +++ b/plugins/zltx/go.mod @@ -3,8 +3,8 @@ module plugins/zltx go 1.22.2 require ( - gitea.cdlsxd.cn/BaseSystem/plugin v0.0.0-20240821033242-d9c3e7ad88f6 - github.com/carlmjohnson/requests v0.23.5 + gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b + github.com/carlmjohnson/requests v0.24.2 github.com/go-playground/validator/v10 v10.22.0 github.com/hashicorp/go-plugin v1.6.1 github.com/stretchr/testify v1.9.0 @@ -25,10 +25,10 @@ require ( github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 // indirect github.com/oklog/run v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - golang.org/x/crypto v0.21.0 // indirect - golang.org/x/net v0.22.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/crypto v0.25.0 // indirect + golang.org/x/net v0.27.0 // indirect + golang.org/x/sys v0.22.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/plugins/zltx/go.sum b/plugins/zltx/go.sum index fecd6b4..058d5d1 100644 --- a/plugins/zltx/go.sum +++ b/plugins/zltx/go.sum @@ -1,9 +1,9 @@ -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= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b h1:x8Gf1EJ6oLHEIgK/SilgMZ5EDgcEknef9zhGrFvXXMg= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b/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.23.5 h1:NPANcAofwwSuC6SIMwlgmHry2V3pLrSqRiSBKYbNHHA= -github.com/carlmjohnson/requests v0.23.5/go.mod h1:zG9P28thdRnN61aD7iECFhH5iGGKX2jIjKQD9kqYH+o= +github.com/carlmjohnson/requests v0.24.2 h1:JDakhAmTIKL/qL/1P7Kkc2INGBJIkIFP6xUeUmPzLso= +github.com/carlmjohnson/requests v0.24.2/go.mod h1:duYA/jDnyZ6f3xbcF5PpZ9N8clgopubP2nK5i6MVMhU= 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/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= @@ -46,16 +46,16 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN 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= -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/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20191008105621-543471e840be/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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= 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.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= diff --git a/plugins/zltx/internal/transform.go b/plugins/zltx/internal/transform.go index c2abea7..21abd52 100644 --- a/plugins/zltx/internal/transform.go +++ b/plugins/zltx/internal/transform.go @@ -2,7 +2,7 @@ package internal import ( "encoding/json" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "plugins/zltx/internal/po" "time" ) diff --git a/plugins/zltx/internal/util.go b/plugins/zltx/internal/util.go index cd649b9..25b3b24 100644 --- a/plugins/zltx/internal/util.go +++ b/plugins/zltx/internal/util.go @@ -3,7 +3,7 @@ package internal import ( "crypto/md5" "encoding/hex" - "gitea.cdlsxd.cn/BaseSystem/plugin/utils" + "gitea.cdlsxd.cn/sdk/plugin/utils" "net/url" "plugins/zltx/internal/po" "strings" diff --git a/plugins/zltx/internal/vo/status.go b/plugins/zltx/internal/vo/status.go index 4a70347..2ac899c 100644 --- a/plugins/zltx/internal/vo/status.go +++ b/plugins/zltx/internal/vo/status.go @@ -1,7 +1,7 @@ package vo import ( - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" ) type OrderStatus string diff --git a/plugins/zltx/internal/zltx.go b/plugins/zltx/internal/zltx.go index dc0ef68..15e7532 100644 --- a/plugins/zltx/internal/zltx.go +++ b/plugins/zltx/internal/zltx.go @@ -5,7 +5,7 @@ import ( "encoding/json" "errors" "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "github.com/carlmjohnson/requests" "plugins/zltx/internal/po" ) diff --git a/plugins/zltx/internal/zltx_test.go b/plugins/zltx/internal/zltx_test.go index 00d7bbd..b411bd6 100644 --- a/plugins/zltx/internal/zltx_test.go +++ b/plugins/zltx/internal/zltx_test.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" "fmt" - "gitea.cdlsxd.cn/BaseSystem/plugin/proto" + "gitea.cdlsxd.cn/sdk/plugin/proto" "github.com/stretchr/testify/assert" "testing" ) diff --git a/plugins/zltx/main.go b/plugins/zltx/main.go index 8a54a9a..0fd2b80 100644 --- a/plugins/zltx/main.go +++ b/plugins/zltx/main.go @@ -1,7 +1,7 @@ package main import ( - "gitea.cdlsxd.cn/BaseSystem/plugin/shared" + "gitea.cdlsxd.cn/sdk/plugin/shared" "github.com/hashicorp/go-plugin" "plugins/zltx/internal" ) diff --git a/utils/go.mod b/utils/go.mod index 7085a6c..8b60e5d 100644 --- a/utils/go.mod +++ b/utils/go.mod @@ -3,9 +3,11 @@ module plugins/utils go 1.22.2 require ( - gitea.cdlsxd.cn/BaseSystem/plugin v0.0.0-20240821033242-d9c3e7ad88f6 github.com/tjfoc/gmsm v1.4.1 github.com/wechatpay-apiv3/wechatpay-go v0.2.18 ) -require github.com/stretchr/testify v1.8.4 // indirect +require ( + gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b // indirect + github.com/stretchr/testify v1.8.4 // indirect +) diff --git a/utils/go.sum b/utils/go.sum index 47413b4..36a6e4d 100644 --- a/utils/go.sum +++ b/utils/go.sum @@ -1,6 +1,8 @@ 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= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240821033242-d9c3e7ad88f6 h1:L+z3IjcLEbj9UJAQCZv1YA1HqIrZZxBlZ9I4tQF6dXY= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240821033242-d9c3e7ad88f6/go.mod h1:59zYRFcPur2HizJEIfttVOMY0AscollDYKX0yvPJS7k= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b h1:x8Gf1EJ6oLHEIgK/SilgMZ5EDgcEknef9zhGrFvXXMg= +gitea.cdlsxd.cn/sdk/plugin v0.0.0-20240830100334-2e99a5df732b/go.mod h1:cd+ZFTmd/ZxrrVc1OZCkrh2wAMPDaAa8ce13FAAkBg0= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/agiledragon/gomonkey v2.0.2+incompatible h1:eXKi9/piiC3cjJD1658mEE2o3NjkJ5vDLgYjCQu0Xlw= github.com/agiledragon/gomonkey v2.0.2+incompatible/go.mod h1:2NGfXu1a80LLr2cmWXGBDaHEjb1idR6+FVlX5T3D9hw= diff --git a/utils/union_pay/sign_test.go b/utils/union_pay/sign_test.go index 68beee3..5703623 100644 --- a/utils/union_pay/sign_test.go +++ b/utils/union_pay/sign_test.go @@ -1,7 +1,7 @@ package union_pay import ( - sdkutils "gitea.cdlsxd.cn/BaseSystem/plugin/utils" + sdkutils "gitea.cdlsxd.cn/sdk/plugin/utils" "testing" )