BaseSystem
/
plugins
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调试插件

This commit is contained in:
李子铭 2024-11-21 10:10:35 +08:00
parent 407f71d208
commit 952d7e35a6
8 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/zltx_card_v1/go.mod
View File

@ -3,7 +3,7 @@ module plugins/zltx_card_v1
go 1.22.2
require (
gitea.cdlsxd.cn/sdk/plugin v1.0.12
gitea.cdlsxd.cn/sdk/plugin v1.0.13
github.com/go-playground/validator/v10 v10.22.0
github.com/hashicorp/go-plugin v1.6.1
github.com/stretchr/testify v1.9.0

2
plugins/zltx_card_v1/go.sum
View File

@ -1,5 +1,7 @@
gitea.cdlsxd.cn/sdk/plugin v1.0.12 h1:gA7zRagOro38rbRVIfFgGRuGOr+Wig8EjeqQkYedFXc=
gitea.cdlsxd.cn/sdk/plugin v1.0.12/go.mod h1:FLuWLP2QP2aBzI2HCdZ7tvl1ieMuMOpTWvItmNGCeGA=
gitea.cdlsxd.cn/sdk/plugin v1.0.13 h1:v9YUJci9Npb6svojARQkkbWpdsm74/X9g/uAECtrCJg=
gitea.cdlsxd.cn/sdk/plugin v1.0.13/go.mod h1:FLuWLP2QP2aBzI2HCdZ7tvl1ieMuMOpTWvItmNGCeGA=
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=

2
plugins/zltx_v1/go.mod
View File

@ -3,7 +3,7 @@ module plugins/zltx_v1
go 1.22.2
require (
gitea.cdlsxd.cn/sdk/plugin v1.0.12
gitea.cdlsxd.cn/sdk/plugin v1.0.13
github.com/go-playground/validator/v10 v10.22.0
github.com/hashicorp/go-plugin v1.6.1
github.com/stretchr/testify v1.9.0

2
plugins/zltx_v1/go.sum
View File

@ -2,6 +2,8 @@ gitea.cdlsxd.cn/sdk/plugin v1.0.11 h1:NMMgw2p7ZF7EbWjkSO7ttM62BLhsG0bGmPdGGS1gpJ
gitea.cdlsxd.cn/sdk/plugin v1.0.11/go.mod h1:FLuWLP2QP2aBzI2HCdZ7tvl1ieMuMOpTWvItmNGCeGA=
gitea.cdlsxd.cn/sdk/plugin v1.0.12 h1:gA7zRagOro38rbRVIfFgGRuGOr+Wig8EjeqQkYedFXc=
gitea.cdlsxd.cn/sdk/plugin v1.0.12/go.mod h1:FLuWLP2QP2aBzI2HCdZ7tvl1ieMuMOpTWvItmNGCeGA=
gitea.cdlsxd.cn/sdk/plugin v1.0.13 h1:v9YUJci9Npb6svojARQkkbWpdsm74/X9g/uAECtrCJg=
gitea.cdlsxd.cn/sdk/plugin v1.0.13/go.mod h1:FLuWLP2QP2aBzI2HCdZ7tvl1ieMuMOpTWvItmNGCeGA=
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=

23
plugins/zltx_v1/internal/transform.go
View File

@ -6,7 +6,9 @@ import (
"gitea.cdlsxd.cn/sdk/plugin/dctw/v1/api/direct"
"gitea.cdlsxd.cn/sdk/plugin/dctw/v1/core"
"gitea.cdlsxd.cn/sdk/plugin/proto"
"gitea.cdlsxd.cn/sdk/plugin/utils"
"github.com/go-playground/validator/v10"
"regexp"
)
type Config struct {
@ -50,18 +52,31 @@ func (c *Config) server() (*core.DctWServer, error) {
)
}
func (c *Config) orderReq(in *proto.OrderRequest) *direct.Order {
var a direct.AccountType
func (c *Config) orderReq(in *proto.OrderRequest) (*direct.Order, error) {
// 账号类型(1:手机号 2:QQ号 其他：0)
accountType := int8(0)
if utils.IsPhoneNumber(in.Order.Account) {
accountType = 1
} else {
qqPattern := `^[1-9][0-9]{4,11}$`
qqRegex, err := regexp.Compile(qqPattern)
if err != nil {
return nil, fmt.Errorf("正则表达式编译失败: %v", err)
}
if qqRegex.MatchString(in.Order.Account) {
accountType = 2
}
}
return &direct.Order{
Number: in.Order.Quantity,
MerchantId: c.MerchantId,
OutTradeNo: in.Order.OrderNo,
ProductId: in.Product.ProductNo,
AccountType: a.AccountType(in.Order.Account),
AccountType: accountType,
RechargeAccount: in.Order.Account,
NotifyUrl: c.NotifyUrl,
Version: "1.0",
}
}, nil
}
func orderResp(request *proto.OrderRequest, resp *direct.OrderResp) *proto.OrderResponse {

6
plugins/zltx_v1/internal/zltx_v1.go
View File

@ -32,8 +32,12 @@ func (p *ZLTXV1Service) Order(ctx context.Context, request *proto.OrderRequest)
return nil, err
}
req, err := c.orderReq(request)
if err != nil {
return nil, err
}
a := &direct.Direct{DctWServer: server}
resp, err := a.Order(ctx, c.orderReq(request))
resp, err := a.Order(ctx, req)
if err != nil {
return nil, err
}

2
plugins/zltx_v1/internal/zltx_v1_test.go
View File

@ -36,7 +36,7 @@ func TestOrder(t *testing.T) {
Config: config(),
Order: &proto.OrderRequest_Order{
OrderNo: "test_plugin_zltx_v1_direct_1",
Account: "18666666666",
Account: "583989020@qq.com",
Quantity: 1,
Extra: nil,
},

15
utils/helper/common.go
View File

@ -21,12 +21,19 @@ func ToChinese(s string) string {
// IsPhoneNumber 检查给定的字符串是否为有效的手机号码
func IsPhoneNumber(phoneNumber string) bool {
phoneRegex := `^1[34578]\d{9}$`
return regexp.MustCompile(phoneRegex).MatchString(phoneNumber)
regex := `^1[0-9]{10}$`
return regexp.MustCompile(regex).MatchString(phoneNumber)
}
// IsEmail 检查给定的字符串是否为有效的电子邮箱地址
func IsEmail(email string) bool {
var emailRegex = regexp.MustCompile(`[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$`)
return emailRegex.MatchString(email)
regex := `^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$`
return regexp.MustCompile(regex).MatchString(email)
}
// IsValidQQ 检查给定的字符串是否为有效的 QQ 号
func IsValidQQ(qq string) bool {
// QQ号正则表达式：5到11位数字，且开头不为0的情况
re := regexp.MustCompile(`^(?!0)[0-9]{5,11}$`)
return re.MatchString(qq)
}