task: 完成支付宝共享基础（迁移/WechatConfig/PaymentStore/pkg/alipay）
This commit is contained in:
@@ -10,7 +10,7 @@ import (
|
||||
type CreateWechatConfigRequest struct {
|
||||
Name string `json:"name" validate:"required,min=1,max=100" required:"true" minLength:"1" maxLength:"100" description:"配置名称"`
|
||||
Description string `json:"description" validate:"omitempty,max=500" maxLength:"500" description:"配置描述"`
|
||||
ProviderType string `json:"provider_type" validate:"required,oneof=wechat fuiou" required:"true" description:"支付渠道类型 (wechat:微信直连, fuiou:富友)"`
|
||||
ProviderType string `json:"provider_type" validate:"required,oneof=wechat wechat_v2 fuiou" required:"true" description:"支付渠道类型 (wechat:微信直连v3, wechat_v2:微信直连v2, fuiou:富友)"`
|
||||
|
||||
OaAppID string `json:"oa_app_id" validate:"omitempty,max=100" maxLength:"100" description:"公众号AppID"`
|
||||
OaAppSecret string `json:"oa_app_secret" validate:"omitempty,max=200" maxLength:"200" description:"公众号AppSecret"`
|
||||
@@ -36,13 +36,22 @@ type CreateWechatConfigRequest struct {
|
||||
FyPublicKey string `json:"fy_public_key" validate:"omitempty" description:"富友公钥(PEM格式)"`
|
||||
FyAPIURL string `json:"fy_api_url" validate:"omitempty,max=500" maxLength:"500" description:"富友API地址"`
|
||||
FyNotifyURL string `json:"fy_notify_url" validate:"omitempty,max=500" maxLength:"500" description:"富友支付回调地址"`
|
||||
|
||||
// 支付宝配置字段（并存能力，不受 provider_type 限制）
|
||||
AliAppID string `json:"ali_app_id" validate:"omitempty,max=100" maxLength:"100" description:"支付宝应用ID"`
|
||||
AliPrivateKey string `json:"ali_private_key" validate:"omitempty" description:"支付宝应用私钥(PEM格式)"`
|
||||
AliPublicKey string `json:"ali_public_key" validate:"omitempty" description:"支付宝公钥(PEM格式，用于验签)"`
|
||||
AliNotifyURL string `json:"ali_notify_url" validate:"omitempty,max=500" maxLength:"500" description:"支付宝异步通知地址"`
|
||||
AliReturnURL string `json:"ali_return_url" validate:"omitempty,max=500" maxLength:"500" description:"支付宝同步跳转地址"`
|
||||
AliProduction bool `json:"ali_production" description:"是否生产环境 (true:生产, false:沙箱)"`
|
||||
AliPayExpireMinutes int `json:"ali_pay_expire_minutes" validate:"omitempty,min=1,max=1440" minimum:"1" maximum:"1440" description:"支付过期分钟数 (默认30分钟)"`
|
||||
}
|
||||
|
||||
// UpdateWechatConfigRequest 更新微信参数配置请求
|
||||
type UpdateWechatConfigRequest struct {
|
||||
Name *string `json:"name" validate:"omitempty,min=1,max=100" minLength:"1" maxLength:"100" description:"配置名称"`
|
||||
Description *string `json:"description" validate:"omitempty,max=500" maxLength:"500" description:"配置描述"`
|
||||
ProviderType *string `json:"provider_type" validate:"omitempty,oneof=wechat fuiou" description:"支付渠道类型 (wechat:微信直连, fuiou:富友)"`
|
||||
ProviderType *string `json:"provider_type" validate:"omitempty,oneof=wechat wechat_v2 fuiou" description:"支付渠道类型 (wechat:微信直连v3, wechat_v2:微信直连v2, fuiou:富友)"`
|
||||
|
||||
OaAppID *string `json:"oa_app_id" validate:"omitempty,max=100" maxLength:"100" description:"公众号AppID"`
|
||||
OaAppSecret *string `json:"oa_app_secret" validate:"omitempty,max=200" maxLength:"200" description:"公众号AppSecret"`
|
||||
@@ -68,6 +77,15 @@ type UpdateWechatConfigRequest struct {
|
||||
FyPublicKey *string `json:"fy_public_key" validate:"omitempty" description:"富友公钥(PEM格式)"`
|
||||
FyAPIURL *string `json:"fy_api_url" validate:"omitempty,max=500" maxLength:"500" description:"富友API地址"`
|
||||
FyNotifyURL *string `json:"fy_notify_url" validate:"omitempty,max=500" maxLength:"500" description:"富友支付回调地址"`
|
||||
|
||||
// 支付宝配置字段（并存能力，不受 provider_type 限制）
|
||||
AliAppID *string `json:"ali_app_id" validate:"omitempty,max=100" maxLength:"100" description:"支付宝应用ID"`
|
||||
AliPrivateKey *string `json:"ali_private_key" validate:"omitempty" description:"支付宝应用私钥(PEM格式)"`
|
||||
AliPublicKey *string `json:"ali_public_key" validate:"omitempty" description:"支付宝公钥(PEM格式，用于验签)"`
|
||||
AliNotifyURL *string `json:"ali_notify_url" validate:"omitempty,max=500" maxLength:"500" description:"支付宝异步通知地址"`
|
||||
AliReturnURL *string `json:"ali_return_url" validate:"omitempty,max=500" maxLength:"500" description:"支付宝同步跳转地址"`
|
||||
AliProduction *bool `json:"ali_production" description:"是否生产环境 (true:生产, false:沙箱)"`
|
||||
AliPayExpireMinutes *int `json:"ali_pay_expire_minutes" validate:"omitempty,min=1,max=1440" minimum:"1" maximum:"1440" description:"支付过期分钟数"`
|
||||
}
|
||||
|
||||
// UpdateWechatConfigParams 更新微信参数配置聚合参数 (用于文档生成)
|
||||
@@ -80,7 +98,7 @@ type UpdateWechatConfigParams struct {
|
||||
type WechatConfigListRequest struct {
|
||||
Page int `json:"page" query:"page" validate:"omitempty,min=1" minimum:"1" description:"页码"`
|
||||
PageSize int `json:"page_size" query:"page_size" validate:"omitempty,min=1,max=100" minimum:"1" maximum:"100" description:"每页数量"`
|
||||
ProviderType *string `json:"provider_type" query:"provider_type" validate:"omitempty,oneof=wechat fuiou" description:"支付渠道类型 (wechat:微信直连, fuiou:富友)"`
|
||||
ProviderType *string `json:"provider_type" query:"provider_type" validate:"omitempty,oneof=wechat wechat_v2 fuiou" description:"支付渠道类型 (wechat:微信直连v3, wechat_v2:微信直连v2, fuiou:富友)"`
|
||||
IsActive *bool `json:"is_active" query:"is_active" description:"是否激活 (true:已激活, false:未激活)"`
|
||||
}
|
||||
|
||||
@@ -89,7 +107,7 @@ type WechatConfigResponse struct {
|
||||
ID uint `json:"id" description:"配置ID"`
|
||||
Name string `json:"name" description:"配置名称"`
|
||||
Description string `json:"description" description:"配置描述"`
|
||||
ProviderType string `json:"provider_type" description:"支付渠道类型 (wechat:微信直连, fuiou:富友)"`
|
||||
ProviderType string `json:"provider_type" description:"支付渠道类型 (wechat:微信直连v3, wechat_v2:微信直连v2, fuiou:富友)"`
|
||||
IsActive bool `json:"is_active" description:"是否激活"`
|
||||
|
||||
OaAppID string `json:"oa_app_id" description:"公众号AppID"`
|
||||
@@ -117,6 +135,15 @@ type WechatConfigResponse struct {
|
||||
FyAPIURL string `json:"fy_api_url" description:"富友API地址"`
|
||||
FyNotifyURL string `json:"fy_notify_url" description:"富友支付回调地址"`
|
||||
|
||||
// 支付宝配置字段（敏感字段已脱敏）
|
||||
AliAppID string `json:"ali_app_id" description:"支付宝应用ID"`
|
||||
AliPrivateKey string `json:"ali_private_key" description:"支付宝应用私钥(配置状态)"`
|
||||
AliPublicKey string `json:"ali_public_key" description:"支付宝公钥(配置状态)"`
|
||||
AliNotifyURL string `json:"ali_notify_url" description:"支付宝异步通知地址"`
|
||||
AliReturnURL string `json:"ali_return_url" description:"支付宝同步跳转地址"`
|
||||
AliProduction bool `json:"ali_production" description:"是否生产环境"`
|
||||
AliPayExpireMinutes int `json:"ali_pay_expire_minutes" description:"支付过期分钟数"`
|
||||
|
||||
CreatedAt string `json:"created_at" description:"创建时间"`
|
||||
UpdatedAt string `json:"updated_at" description:"更新时间"`
|
||||
}
|
||||
@@ -180,6 +207,14 @@ func FromWechatConfigModel(m *model.WechatConfig) *WechatConfigResponse {
|
||||
FyAPIURL: m.FyAPIURL,
|
||||
FyNotifyURL: m.FyNotifyURL,
|
||||
|
||||
AliAppID: m.AliAppID,
|
||||
AliPrivateKey: MaskLongSecret(m.AliPrivateKey),
|
||||
AliPublicKey: MaskLongSecret(m.AliPublicKey),
|
||||
AliNotifyURL: m.AliNotifyURL,
|
||||
AliReturnURL: m.AliReturnURL,
|
||||
AliProduction: m.AliProduction,
|
||||
AliPayExpireMinutes: m.AliPayExpireMinutes,
|
||||
|
||||
CreatedAt: m.CreatedAt.Format("2006-01-02 15:04:05"),
|
||||
UpdatedAt: m.UpdatedAt.Format("2006-01-02 15:04:05"),
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user