refactor: 清理 YAML 支付配置遗留代码,重命名 Card* 常量为 Asset*,新增支付配置相关错误码
- 删除 PaymentConfig 结构体和 WechatConfig.Payment 字段(YAML 方案已废弃) - 删除 wechat.payment 配置节和 NewPaymentApp() 函数 - 删除 validateWechatConfig 中所有 wechatCfg.Payment.* 校验代码 - pkg/constants/wallet.go: Card* 前缀统一重命名为 Asset*,旧名保留废弃别名 - pkg/constants/redis.go: 新增 RedisWechatConfigActiveKey() - pkg/errors/codes.go: 新增错误码 1170-1175 - go.mod: 新增 golang.org/x/text 依赖(富友支付 GBK 编解码) Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
@@ -5,7 +5,6 @@ import (
|
||||
|
||||
"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel"
|
||||
"github.com/ArtisanCloud/PowerWeChat/v3/src/officialAccount"
|
||||
"github.com/ArtisanCloud/PowerWeChat/v3/src/payment"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/config"
|
||||
"github.com/redis/go-redis/v9"
|
||||
"go.uber.org/zap"
|
||||
@@ -50,36 +49,3 @@ func NewOfficialAccountApp(cfg *config.Config, cache kernel.CacheInterface, logg
|
||||
logger.Info("微信公众号应用初始化成功", zap.String("app_id", oaCfg.AppID))
|
||||
return app, nil
|
||||
}
|
||||
|
||||
// NewPaymentApp 创建微信支付应用实例
|
||||
func NewPaymentApp(cfg *config.Config, cache kernel.CacheInterface, logger *zap.Logger) (*payment.Payment, error) {
|
||||
payCfg := cfg.Wechat.Payment
|
||||
if payCfg.AppID == "" || payCfg.MchID == "" {
|
||||
return nil, fmt.Errorf("微信支付配置不完整:缺少 AppID 或 MchID")
|
||||
}
|
||||
|
||||
userConfig := &payment.UserConfig{
|
||||
AppID: payCfg.AppID,
|
||||
MchID: payCfg.MchID,
|
||||
MchApiV3Key: payCfg.APIV3Key,
|
||||
Key: payCfg.APIV2Key,
|
||||
CertPath: payCfg.CertPath,
|
||||
KeyPath: payCfg.KeyPath,
|
||||
SerialNo: payCfg.SerialNo,
|
||||
NotifyURL: payCfg.NotifyURL,
|
||||
HttpDebug: payCfg.HttpDebug,
|
||||
Cache: cache,
|
||||
}
|
||||
|
||||
app, err := payment.NewPayment(userConfig)
|
||||
if err != nil {
|
||||
logger.Error("创建微信支付应用失败", zap.Error(err))
|
||||
return nil, fmt.Errorf("创建微信支付应用失败: %w", err)
|
||||
}
|
||||
|
||||
logger.Info("微信支付应用初始化成功",
|
||||
zap.String("app_id", payCfg.AppID),
|
||||
zap.String("mch_id", payCfg.MchID),
|
||||
)
|
||||
return app, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user