Merge branch 'emdash/wechat-official-account-payment-integration-30g'

# Conflicts:
#	README.md
#	cmd/api/main.go
#	internal/bootstrap/dependencies.go
#	pkg/config/config.go
#	pkg/config/defaults/config.yaml

cmd/api/main.go

@@ -41,31 +41,37 @@ func main() {
 
 	// 3. 初始化日志
 	appLogger := initLogger(cfg)
+
+	// 4. 验证微信配置
+	validateWechatConfig(cfg, appLogger)
 	defer func() {
 		_ = logger.Sync()
 	}()
 
-	// 4. 初始化数据库
+	// 5. 初始化数据库
 	db := initDatabase(cfg, appLogger)
 	defer closeDatabase(db, appLogger)
 
-	// 5. 初始化 Redis
+	// 6. 初始化 Redis
 	redisClient := initRedis(cfg, appLogger)
 	defer closeRedis(redisClient, appLogger)
 
-	// 6. 初始化队列客户端
+	// 7. 初始化队列客户端
 	queueClient := initQueue(redisClient, appLogger)
 	defer closeQueue(queueClient, appLogger)
 
-	// 7. 初始化认证管理器
+	// 8. 初始化认证管理器
 	jwtManager, tokenManager, verificationSvc := initAuthComponents(cfg, redisClient, appLogger)
 
-	// 8. 初始化对象存储服务（可选）
+	// 9. 初始化对象存储服务（可选）
 	storageSvc := initStorage(cfg, appLogger)
 
+<<<<<<< HEAD
 	// 9. 初始化 Gateway 客户端（可选）
 	gatewayClient := initGateway(cfg, appLogger)
 
+=======
+>>>>>>> emdash/wechat-official-account-payment-integration-30g
 	// 10. 初始化所有业务组件（通过 Bootstrap）
 	result, err := bootstrap.Bootstrap(&bootstrap.Dependencies{
 		DB:                  db,
@@ -333,6 +339,7 @@ func initStorage(cfg *config.Config, appLogger *zap.Logger) *storage.Service {
 	return storage.NewService(provider, &cfg.Storage)
 }
 
+<<<<<<< HEAD
 func initGateway(cfg *config.Config, appLogger *zap.Logger) *gateway.Client {
 	if cfg.Gateway.BaseURL == "" {
 		appLogger.Info("Gateway 未配置，跳过初始化")
@@ -350,4 +357,65 @@ func initGateway(cfg *config.Config, appLogger *zap.Logger) *gateway.Client {
 		zap.String("app_id", cfg.Gateway.AppID))
 
 	return client
+=======
+func validateWechatConfig(cfg *config.Config, appLogger *zap.Logger) {
+	wechatCfg := cfg.Wechat
+
+	if wechatCfg.OfficialAccount.AppID == "" && wechatCfg.Payment.AppID == "" {
+		appLogger.Warn("微信配置未设置，微信相关功能将不可用")
+		return
+	}
+
+	if wechatCfg.OfficialAccount.AppID != "" {
+		if wechatCfg.OfficialAccount.AppSecret == "" {
+			appLogger.Fatal("微信公众号配置不完整",
+				zap.String("missing", "app_secret"),
+				zap.String("env", "JUNHONG_WECHAT_OFFICIAL_ACCOUNT_APP_SECRET"))
+		}
+		appLogger.Info("微信公众号配置已验证",
+			zap.String("app_id", wechatCfg.OfficialAccount.AppID))
+	}
+
+	if wechatCfg.Payment.AppID != "" {
+		missingFields := []string{}
+
+		if wechatCfg.Payment.MchID == "" {
+			missingFields = append(missingFields, "mch_id (JUNHONG_WECHAT_PAYMENT_MCH_ID)")
+		}
+		if wechatCfg.Payment.APIV3Key == "" {
+			missingFields = append(missingFields, "api_v3_key (JUNHONG_WECHAT_PAYMENT_API_V3_KEY)")
+		}
+		if wechatCfg.Payment.CertPath == "" {
+			missingFields = append(missingFields, "cert_path (JUNHONG_WECHAT_PAYMENT_CERT_PATH)")
+		}
+		if wechatCfg.Payment.KeyPath == "" {
+			missingFields = append(missingFields, "key_path (JUNHONG_WECHAT_PAYMENT_KEY_PATH)")
+		}
+		if wechatCfg.Payment.SerialNo == "" {
+			missingFields = append(missingFields, "serial_no (JUNHONG_WECHAT_PAYMENT_SERIAL_NO)")
+		}
+		if wechatCfg.Payment.NotifyURL == "" {
+			missingFields = append(missingFields, "notify_url (JUNHONG_WECHAT_PAYMENT_NOTIFY_URL)")
+		}
+
+		if len(missingFields) > 0 {
+			appLogger.Fatal("微信支付配置不完整",
+				zap.Strings("missing_fields", missingFields))
+		}
+
+		if _, err := os.Stat(wechatCfg.Payment.CertPath); os.IsNotExist(err) {
+			appLogger.Fatal("微信支付证书文件不存在",
+				zap.String("cert_path", wechatCfg.Payment.CertPath))
+		}
+
+		if _, err := os.Stat(wechatCfg.Payment.KeyPath); os.IsNotExist(err) {
+			appLogger.Fatal("微信支付私钥文件不存在",
+				zap.String("key_path", wechatCfg.Payment.KeyPath))
+		}
+
+		appLogger.Info("微信支付配置已验证",
+			zap.String("app_id", wechatCfg.Payment.AppID),
+			zap.String("mch_id", wechatCfg.Payment.MchID))
+	}
+>>>>>>> emdash/wechat-official-account-payment-integration-30g
 }