解决冲突

pkg/config/defaults/config.yaml

@@ -105,14 +105,13 @@ default_admin:
   password: ""
   phone: ""
 
-<<<<<<< HEAD
 # Gateway 服务配置
 gateway:
   base_url: "https://lplan.whjhft.com/openapi"
   app_id: "60bgt1X8i7AvXqkd"
   app_secret: "BZeQttaZQt0i73moF"
   timeout: 30
-=======
+
 # 微信配置（必填项需通过环境变量设置）
 wechat:
   official_account:
@@ -132,4 +131,3 @@ wechat:
     notify_url: ""            # 必填：JUNHONG_WECHAT_PAYMENT_NOTIFY_URL
     http_debug: false
     timeout: "30s"
->>>>>>> emdash/wechat-official-account-payment-integration-30g

pkg/config/loader.go

@@ -113,6 +113,25 @@ func bindEnvVariables(v *viper.Viper) {
 		"default_admin.username",
 		"default_admin.password",
 		"default_admin.phone",
+		"gateway.base_url",
+		"gateway.app_id",
+		"gateway.app_secret",
+		"gateway.timeout",
+		"wechat.official_account.app_id",
+		"wechat.official_account.app_secret",
+		"wechat.official_account.token",
+		"wechat.official_account.aes_key",
+		"wechat.official_account.oauth_redirect_url",
+		"wechat.payment.app_id",
+		"wechat.payment.mch_id",
+		"wechat.payment.api_v3_key",
+		"wechat.payment.api_v2_key",
+		"wechat.payment.cert_path",
+		"wechat.payment.key_path",
+		"wechat.payment.serial_no",
+		"wechat.payment.notify_url",
+		"wechat.payment.http_debug",
+		"wechat.payment.timeout",
 	}
 
 	for _, key := range bindings {