From fe180364781cdb8867a1b0b936f8c84db7dc96fa Mon Sep 17 00:00:00 2001
From: Mrx <18278715334@163.com>
Date: Sat, 9 May 2026 21:39:32 +0800
Subject: [PATCH] f

---
 app/main/api/etc/main.dev.yaml              |  7 +++----
 app/main/api/etc/merchant/pub_key.pem       | 14 +++++++-------
 app/main/api/internal/svc/servicecontext.go |  8 +++-----
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/app/main/api/etc/main.dev.yaml b/app/main/api/etc/main.dev.yaml
index 07017e4..88a9758 100644
--- a/app/main/api/etc/main.dev.yaml
+++ b/app/main/api/etc/main.dev.yaml
@@ -32,7 +32,6 @@ Alipay:
     AppCertPath: "etc/merchant/appCertPublicKey_2021006121698606.crt"
     AlipayCertPath: "etc/merchant/alipayCertPublicKey_RSA2.crt"
     AlipayRootCertPath: "etc/merchant/alipayRootCert.crt"
-
     AppIDBak: "2021004161631930"
     PrivateKeyBak: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCRrZNr8DNs4LhPSulTLEg4RLREWVSFGS+Nl5Q2FxQ8DgkUYV+p3kfi4XmB2W/Ruz4egPxEB0V/xj75OktVphVKY8rI6OaNnVoFVe5NqGa5MTj3wLwBIv/hMHA1VAru2KLIv9R1FR7LpWmreHSkpJ65CD2mZqYuMCekOfzMQZIGgSagEU4my0bLbFWw7M3qZz4vm2KUtm4Ew28OUJDkqygjPzXgS5l5niYQvqPjiQNdnTtoIcNcHo07tS8lmf/hdgq9EtVfY7Y0brESfgvOoVJeg1hTHEj0hyWnnWPeA4HD2izANP/5ObRX4ZVqpVju+7PSpbeFd71fxbR1blAVnrqTAgMBAAECggEASpkwHN3r9507xJ7/zG+oq+fCyB1WgrHbAA7W/rviyL4HOECE1F/XP/9mUXAfKq9PqB81D0EJ/dxu8wE/AqUB0g44EZnyNiKVrpXKakoKEFt8aKJxo8NgdNhxHV3kG1skQNi62xntoysZaY1NbeI+xVHLACMghhZytk5bfd02Ac3rMBz3X8Cl1R+3mgU0zFc5f476VRxywiRQM+QNJIaHDNB4vw1TKI0K92mEKD8lOuNZD7d5TCBZi3r08t8FFAkMjIMDiFvFRFmAqMg3NyaIGUkLVDU2zUP0Vlzmo9ghCV9hluqDqeP4RhxQydOw+rxGBk+crYQBhPyYOI/I9PFXAQKBgQDHSRRTPqYbCfztmwk3AIH7VN6izyU3FljEXAsdf+UVJpRa8429J3e+sB96jxhiwVlCzX4CDjsa/Pu0iQQx22a0AZs5GTE0MJ1FVydfGlyqF6/hRS4TswSkklW3be7/KDAjgj2+/wap+mN7rRmDkdvxgCJG6MiWuRAthhg/g16wIwKBgQC7Iu7D4yQXRKheL6p6pbMtE+oD58/EJ2vO8ZUz3LiPc9pZ6+bp4nkBP6JOuYiB5jkzWQifKe6hsXpv06kWzaBEzz4f4SUpWDmdBchNoct3pB/k66FaxHLO/pG4RV86hqscqTdutmdC62bbwM6yCtJ+3rS5rlCxDGQkGJbM+wM60QKBgH5nQyYeCbwC1NRdTzX883VYerLoEyHi4cEC5OX8NnD4/IbIDzJYc2KXUhAp7XzOSPDPaMqi/ih7KKh1dByvnnA0yKEp8oS5BThzNHzlOruEtMF9YOGL3jkIvKfRahOcCRSsyr94AWEVeb57qEBE5y5CaPtzMbAwiCtn779xc0DjAoGAZwEGXWokDm6rIhSoiJO2OQSyFW4+LSDptWHCF2bRa5yAPmiblHck1awaAa0b1yxKpdnG5hzljbirxOvDMZsDMXzFHDUICGbYZ3asVxbMcNE1AQM1sElbTFZRDRWaIhPIEaGOsnDSC8KYvjK1UsikLlMVNPMe1SUV5cxnDPLJR1ECgYEAw8M09uLylPtfGq7oyE2R6xC2kUA8EJ6aapJgUs/UZ6dtjtvudbYzUo0Cgnb12hpN3hfLc5O0/P4nRzZ72Hm43cMiRNLJi4BYCa0m/mCxq+RcoBWYQTIraHnR17yIQhxt5IBRVjgbvYCnryx5Jd5wjOvv7DdnGFJLepzSJwlGqeU="
     AlipayPublicKeyBak: ""
@@ -49,7 +48,7 @@ Wxpay:
     MchApiv3Key: "K2d8F5gJ1sP7zQ3bN9mR4xV6c0hL5tU2"
     MchPrivateKeyPath: "etc/merchant/apiclient_key.pem"
     MchPublicKeyID: "PUB_KEY_ID_0111052766902026050900112134001605"
-    MchPublicKeyPath: "etc/merchant/apiclient_cert.pem"
+    MchPublicKeyPath: "etc/merchant/pub_key.pem"
     MchPlatformRAS: "PUB_KEY_ID_0111052766902026050900112134001605"
     NotifyUrl: "https://www.tianyuancha.cn/api/v1/pay/wechat/callback"
     RefundNotifyUrl: "https://www.tianyuancha.cn/api/v1/wechat/refund_callback"
@@ -69,8 +68,8 @@ SystemConfig:
     ThreeVerify: false
     CommissionSafeMode: false # 佣金安全防御模式：true-冻结模式，false-直接结算模式
 WechatH5:
-    AppID: "wxe323cdc072127c27"
-    AppSecret: "e68035927b054a20b8bfdb7f0caffebf"
+    AppID: "wxd391e40295bd9dfb"
+    AppSecret: "f0fa74f7ed8c3c9953677465d44a4c0c"
 WechatMini:
     AppID: "wx781abb66b3368963" # 小程序的AppID
     AppSecret: "c7d02cdb0fc23c35c93187af9243b00d" # 小程序的AppSecret
diff --git a/app/main/api/etc/merchant/pub_key.pem b/app/main/api/etc/merchant/pub_key.pem
index 9356d8d..281ab18 100644
--- a/app/main/api/etc/merchant/pub_key.pem
+++ b/app/main/api/etc/merchant/pub_key.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvwSy7dS/ICZV38tI0HxM
-SAIE7+Ug92qryuNlkNyaNDRjfsykHsrPCSsUUQEZblBNmZOLfLQxmAaWC+cQqWCv
-zfy4rXGAHE1widWFkHGzQzaw6cB0VdDXatK9yAt1PgXdp5jzBRzOn9Z3u4t0s771
-2zjuxCnLxMq84DovNgh2y0LBiuorWbtuTFTd8SXUGk2Jyuojq/02U3KTuyh+7SmW
-ffJXKrzhrKwSpGh59e/fFxqX2xGlVoJ1kdohMZPo/7k+e5jP7qjrf93l7JVeUKYa
-V27hNVowJ4oho21WVCJ1AYo41IbPJWI+6WxlaVeoR4zKix0Mb2timaWayyLoN53y
-aQIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4/k/xM+ybCzcWPi73Es5
+XHPPqR2oGFdI7TPvbSnNcCpUAdewiuLFJZ3x7/6uTPKRuaxJPA9n0wjQ9x3Crwpt
+t+XZW8+gHU8kq1vG1cg+oBZedyS3434i+FCovK8iFQnsr5W+ROtVq8pxys0w5P3Z
+rYsdTZ7TxQ/3h/5hd7poehFUIIX1ZgO8tjCqq9wsvb70FRn4hf8NvyuxMtg+Va8U
+XdvDiUCa8NeCkvxpfPjEoZTNPsNbEYyYEJ1NSlte/5bLUBKm0rU6QGITuzXdPcF/
+R5PweiMXFNy0l5A4eNFyO4I0evC36mB58geZ2rgdq92LZMQQTS6Rf63AtC2ECs5B
+wQIDAQAB
 -----END PUBLIC KEY-----
diff --git a/app/main/api/internal/svc/servicecontext.go b/app/main/api/internal/svc/servicecontext.go
index c074a44..974510c 100644
--- a/app/main/api/internal/svc/servicecontext.go
+++ b/app/main/api/internal/svc/servicecontext.go
@@ -190,9 +190,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 
 	// ============================== 业务服务初始化 ==============================
 	alipayService := service.NewAliPayService(c)
-	// wechatPayService := service.NewWechatPayService(c, userAuthModel, service.InitTypeWxPayPubKey)
-	// 为暂时关闭微信支付，将 WechatPayService 置为 nil，避免在项目启动时初始化微信支付相关配置
-	var wechatPayService *service.WechatPayService
+	wechatPayService := service.NewWechatPayService(c, userAuthModel, service.InitTypeWxPayPubKey)
 	applePayService := service.NewApplePayService(c)
 	apiRequestService := service.NewApiRequestService(c, featureModel, productFeatureModel, tianyuanapi)
 	verificationService := service.NewVerificationService(c, tianyuanapi, apiRequestService)
@@ -223,8 +221,8 @@ func NewServiceContext(c config.Config) *ServiceContext {
 
 	// ============================== 返回服务上下文 ==============================
 	return &ServiceContext{
-		Config:              c,
-		Redis:               redisClient,
+		Config:                 c,
+		Redis:                  redisClient,
 		AuthInterceptor:        middleware.NewAuthInterceptorMiddleware(c).Handle,
 		UserAuthInterceptor:    middleware.NewUserAuthInterceptorMiddleware().Handle,
 		UserDisableInterceptor: middleware.NewUserDisableInterceptorMiddleware(userModel).Handle,