From 488688aeaca9130d900ef96d4f1c3433e4ec3e00 Mon Sep 17 00:00:00 2001 From: wangjia <809946525@qq.com> Date: Mon, 13 Jul 2026 08:17:11 +0800 Subject: [PATCH] =?UTF-8?q?fix(reward):=20TG=20webhook=20=E7=A9=BA=20secre?= =?UTF-8?q?t=20fail-fast=20+=20=E9=A6=96=E5=85=85=E5=A5=96=E5=8A=B1?= =?UTF-8?q?=E6=96=87=E6=A1=88=E5=85=AD=E8=AF=AD=2015=E2=86=927(=E7=BB=88?= =?UTF-8?q?=E5=AE=A1=E5=BF=85=E4=BF=AE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.8 (1M context) --- client/lib/l10n/strings_en.dart | 2 +- client/lib/l10n/strings_es.dart | 2 +- client/lib/l10n/strings_ja.dart | 2 +- client/lib/l10n/strings_ko.dart | 2 +- client/lib/l10n/strings_ru.dart | 2 +- client/lib/l10n/strings_zh.dart | 2 +- server/cmd/server/main.go | 6 +++++- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/client/lib/l10n/strings_en.dart b/client/lib/l10n/strings_en.dart index bff9460..94befe1 100644 --- a/client/lib/l10n/strings_en.dart +++ b/client/lib/l10n/strings_en.dart @@ -488,7 +488,7 @@ class StringsEn extends AppText { @override String get inviteRewardRegister => 'Sign up · +3 days each'; @override - String get inviteRewardFirstBuy => 'First purchase · +15 days each'; + String get inviteRewardFirstBuy => 'First purchase · +7 days each'; @override String get inviteRewardJoinTg => 'Join TG · +3 days'; @override diff --git a/client/lib/l10n/strings_es.dart b/client/lib/l10n/strings_es.dart index a45bb9d..3691752 100644 --- a/client/lib/l10n/strings_es.dart +++ b/client/lib/l10n/strings_es.dart @@ -489,7 +489,7 @@ class StringsEs extends AppText { @override String get inviteRewardRegister => 'Registro de amigo · +3 días cada uno'; @override - String get inviteRewardFirstBuy => 'Primera compra del amigo · +15 días cada uno'; + String get inviteRewardFirstBuy => 'Primera compra del amigo · +7 días cada uno'; @override String get inviteRewardJoinTg => 'Unirse al canal de TG · +3 días'; @override diff --git a/client/lib/l10n/strings_ja.dart b/client/lib/l10n/strings_ja.dart index 0d44c77..dedbabe 100644 --- a/client/lib/l10n/strings_ja.dart +++ b/client/lib/l10n/strings_ja.dart @@ -489,7 +489,7 @@ class StringsJa extends AppText { @override String get inviteRewardRegister => '友達が登録 · 双方に3日間付与'; @override - String get inviteRewardFirstBuy => '友達が初回購入 · 双方に15日間付与'; + String get inviteRewardFirstBuy => '友達が初回購入 · 双方に7日間付与'; @override String get inviteRewardJoinTg => 'TGチャンネルに参加 · 3日間付与'; @override diff --git a/client/lib/l10n/strings_ko.dart b/client/lib/l10n/strings_ko.dart index 3063289..d5463e3 100644 --- a/client/lib/l10n/strings_ko.dart +++ b/client/lib/l10n/strings_ko.dart @@ -489,7 +489,7 @@ class StringsKo extends AppText { @override String get inviteRewardRegister => '친구 가입 · 양쪽 각 3일 지급'; @override - String get inviteRewardFirstBuy => '친구 첫 구매 · 양쪽 각 15일 지급'; + String get inviteRewardFirstBuy => '친구 첫 구매 · 양쪽 각 7일 지급'; @override String get inviteRewardJoinTg => 'TG 채널 가입 · 3일 지급'; @override diff --git a/client/lib/l10n/strings_ru.dart b/client/lib/l10n/strings_ru.dart index 9752908..64093ce 100644 --- a/client/lib/l10n/strings_ru.dart +++ b/client/lib/l10n/strings_ru.dart @@ -489,7 +489,7 @@ class StringsRu extends AppText { @override String get inviteRewardRegister => 'Регистрация друга · +3 дня каждому'; @override - String get inviteRewardFirstBuy => 'Первая покупка друга · +15 дней каждому'; + String get inviteRewardFirstBuy => 'Первая покупка друга · +7 дней каждому'; @override String get inviteRewardJoinTg => 'Вступление в TG-канал · +3 дня'; @override diff --git a/client/lib/l10n/strings_zh.dart b/client/lib/l10n/strings_zh.dart index 446d833..2a165d9 100644 --- a/client/lib/l10n/strings_zh.dart +++ b/client/lib/l10n/strings_zh.dart @@ -482,7 +482,7 @@ class StringsZh extends AppText { @override String get inviteRewardRegister => '好友注册 · 双方各得 3 天'; @override - String get inviteRewardFirstBuy => '好友首购 · 双方各得 15 天'; + String get inviteRewardFirstBuy => '好友首购 · 双方各得 7 天'; @override String get inviteRewardJoinTg => '加入 TG 频道 · 得 3 天'; @override diff --git a/server/cmd/server/main.go b/server/cmd/server/main.go index c8c0f13..e594141 100644 --- a/server/cmd/server/main.go +++ b/server/cmd/server/main.go @@ -335,10 +335,14 @@ func mountV1(r chi.Router, sqlDB *sql.DB, rdb *redis.Client, nodeSvc *nodes.Serv tgBotToken := os.Getenv("TG_REWARD_BOT_TOKEN") tgEnabled := tgBotToken != "" if tgEnabled { + tgWebhookSecret := os.Getenv("TG_WEBHOOK_SECRET") + if tgWebhookSecret == "" { + log.Fatal("TG_REWARD_BOT_TOKEN 已设置但 TG_WEBHOOK_SECRET 为空,/v1/tg/webhook 将无鉴权,拒绝启动") + } rewardSvc.SetTelegram( getenvDefault("TG_REWARD_BOT_USER", "pangolin_reward_bot"), getenvDefault("TG_REWARD_CHANNEL", "@pangolin_app"), - tgBotToken, os.Getenv("TG_WEBHOOK_SECRET")) + tgBotToken, tgWebhookSecret) } rewardHandler := reward.NewHandler(rewardSvc, rewardStore, tgEnabled, getenvDefault("TG_REWARD_CHANNEL", "@pangolin_app"))