Tune market move alert cadence

README.md

@@ -115,12 +115,14 @@ DISABLE_WORKER=true .venv/bin/uvicorn app.main:app --host 0.0.0.0 --port 7860
 - `STRATEGY_SEC_8K_SCAN_LIMIT`：启动或最新 8-K 变化时最多扫描多少份 8-K，默认 `20`。
 - `SEC_USER_AGENT`：SEC API User-Agent，建议配置成包含联系方式的字符串。
 - `ENABLE_MARKET_MOVE`：是否启用全市场日/月涨跌监控，默认 `true`。
+- `MARKET_MOVE_WEWORK_WEBHOOK`：全市场日/月涨跌监控专用企业微信机器人；未配置时使用代码内默认的“寻找牛市标的”机器人。
 - `MARKET_MOVE_INTERVAL_SEC`：全市场涨跌监控轮询间隔，默认 `300`。
-- `MARKET_MOVE_THRESHOLD_PCT`：24h/30d 涨跌提醒阈值百分比，默认 `30`。
+- `MARKET_MOVE_THRESHOLD_PCT`：兼容旧配置；当前实际提醒规则为 30% 每 24 小时、50% 每 12 小时、60% 每 6 小时、70% 每 3 小时、80% 每 1 小时，首次触发立即通知。
 - `MARKET_MOVE_LOOKBACK_DAYS`：月线对比天数，默认 `30`。
 - `MARKET_MOVE_EXCHANGES`：启用的交易所列表，逗号分隔；默认启用 Binance、OKX、Bitget、Hyperliquid、Asterdex、Bybit、Gate、KuCoin、MEXC、Kraken、Upbit。
 - `MARKET_MOVE_COINS`：覆盖默认币种列表，格式如 `BTC,ETH,HYPE:Hyperliquid`。
 - `MARKET_MOVE_EXTRA_COINS`：在默认币种列表后追加币种，格式同上。
+- `STRATEGY_TREASURY_WEWORK_WEBHOOK`：Strategy 财务监控专用企业微信机器人；未配置时使用代码内默认的 Strategy 财务机器人。
 - `BINANCE_API_KEY` / `BINANCE_API_SECRET`：币安私有接口凭证，可选。
 - `BINANCE_SPOT_BASE` / `BINANCE_FAPI_BASE` / `BINANCE_FSTREAM_BASE`：币安接口基址，可选。
 - `BINANCE_ALPHA_BASE`：Binance Alpha 公共行情基址，默认 `https://www.binance.com`。

app/monitors/market_move.py

@@ -17,6 +17,18 @@ SERVICE_ID = "market_move:service"
 CONFIG_KEY = "market_move:config"
 ALERT_STATE_KEY = "market_move:alert_state"
 HEALTH_ALERT_COOLDOWN_SEC = 3600
+MARKET_MOVE_WEWORK_WEBHOOK = os.getenv(
+    "MARKET_MOVE_WEWORK_WEBHOOK",
+    "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=1b44a22e-5d3d-4336-86a0-4662a3b9460f",
+)
+
+MOVEMENT_ALERT_RULES = [
+    {"threshold": 80.0, "cooldown": 3600, "label": "80%+", "frequency": "1小时"},
+    {"threshold": 70.0, "cooldown": 3 * 3600, "label": "70%+", "frequency": "3小时"},
+    {"threshold": 60.0, "cooldown": 6 * 3600, "label": "60%+", "frequency": "6小时"},
+    {"threshold": 50.0, "cooldown": 12 * 3600, "label": "50%+", "frequency": "12小时"},
+    {"threshold": 30.0, "cooldown": 24 * 3600, "label": "30%+", "frequency": "24小时"},
+]
 
 SUPPORTED_EXCHANGES = [
     "binance",
@@ -219,6 +231,14 @@ def format_pct(value):
     return f"{value:+.2f}%"
 
 
+def movement_alert_rule(change_pct):
+    magnitude = abs(num(change_pct, 0) or 0)
+    for rule in MOVEMENT_ALERT_RULES:
+        if magnitude >= rule["threshold"]:
+            return rule
+    return None
+
+
 def market_type_label(value):
     return "现货" if value == "spot" else "合约"
 
@@ -1179,7 +1199,7 @@ class MarketMoveMonitor(BaseMonitor):
         self._failure_counts = {}
         self._health_alert_at = {}
         self.client = PublicMarketDataClient(self.log, self.config)
-        self.pusher = legacy.WeWorkBotPusher(legacy.WEWORK_BOT_WEBHOOK)
+        self.pusher = legacy.WeWorkBotPusher(MARKET_MOVE_WEWORK_WEBHOOK)
         self._register_monitors()
 
     def start(self):
@@ -1390,8 +1410,6 @@ class MarketMoveMonitor(BaseMonitor):
         return candles[0].close
 
     def _handle_snapshot_alerts(self, snapshot, cfg):
-        threshold = float(cfg.get("threshold_pct", 30.0))
-        reset_threshold = threshold * float(cfg.get("reset_ratio", 0.8))
         state = self.store.get_kv(ALERT_STATE_KEY, {})
         sent = 0
         changed = False
@@ -1400,39 +1418,57 @@ class MarketMoveMonitor(BaseMonitor):
         for window, change_info in snapshot.get("changes", {}).items():
             change_pct = change_info.get("change_pct")
             key = f"{snapshot['symbol']}:{window}"
-            if change_pct is None:
+            rule = movement_alert_rule(change_pct)
+            if change_pct is None or rule is None:
+                if key in state:
+                    state.pop(key, None)
+                    changed = True
                 continue
-            if abs(change_pct) >= threshold:
-                direction = "涨" if change_pct > 0 else "跌"
-                previous = state.get(key) or {}
-                if previous.get("direction") != direction or not previous.get("active"):
-                    delivered = self._send_move_alert(snapshot, window, change_info, direction, threshold)
-                    sent += 1
-                    self.stats["alerts"] += 1
-                    if not delivered:
-                        self.stats["notify_fails"] += 1
-                state[key] = {
-                    "active": True,
-                    "direction": direction,
-                    "change_pct": change_pct,
-                    "last_seen_at": now,
-                    "last_alert_at": previous.get("last_alert_at") or now,
-                }
-                changed = True
-            elif abs(change_pct) <= reset_threshold and key in state:
-                state.pop(key, None)
-                changed = True
+
+            direction = "涨" if change_pct > 0 else "跌"
+            previous = state.get(key) or {}
+            previous_threshold = float(
+                previous.get("band_threshold")
+                or (30.0 if previous.get("active") else 0.0)
+            )
+            last_alert_at = float(previous.get("last_alert_at") or 0)
+            is_first_alert = last_alert_at <= 0
+            direction_changed = previous.get("direction") and previous.get("direction") != direction
+            escalated = rule["threshold"] > previous_threshold
+            cooldown_elapsed = now - last_alert_at >= rule["cooldown"]
+            should_send = is_first_alert or direction_changed or escalated or cooldown_elapsed
+
+            if should_send:
+                delivered = self._send_move_alert(snapshot, window, change_info, direction, rule)
+                sent += 1
+                self.stats["alerts"] += 1
+                if not delivered:
+                    self.stats["notify_fails"] += 1
+                last_alert_at = now
+
+            state[key] = {
+                "active": True,
+                "direction": direction,
+                "band_threshold": rule["threshold"],
+                "band_label": rule["label"],
+                "cooldown_seconds": rule["cooldown"],
+                "change_pct": change_pct,
+                "last_seen_at": now,
+                "last_alert_at": last_alert_at,
+            }
+            changed = True
         if changed:
             self.store.set_kv(ALERT_STATE_KEY, state)
         return sent
 
-    def _send_move_alert(self, snapshot, window, change_info, direction, threshold):
-        title = f"{snapshot['symbol']} {change_info.get('label') or window}涨跌超过 {threshold:g}%"
+    def _send_move_alert(self, snapshot, window, change_info, direction, rule):
+        title = f"{snapshot['symbol']} {change_info.get('label') or window}涨跌超过 {rule['threshold']:g}%"
         text = (
-            "币种价格异动\n\n"
+            "寻找牛市标的\n\n"
             f"币种：{snapshot.get('name')} ({snapshot.get('symbol')})\n"
             f"方向：{direction}\n"
             f"周期：{change_info.get('label') or window}\n"
+            f"触发档位：{rule['label']}（{rule['frequency']}内最多通知一次）\n"
             f"涨跌幅：{format_pct(change_info.get('change_pct'))}\n"
             f"当前价格：{fmt_price(snapshot.get('price'))}\n"
             f"参考价格：{fmt_price(change_info.get('reference_price'))}\n"

app/monitors/strategy_treasury.py

@@ -13,6 +13,10 @@ from app.monitors.base import BaseMonitor
 SERVICE_ID = "strategy:service"
 BTC_MONITOR_ID = "strategy:btc_holdings"
 CASH_MONITOR_ID = "strategy:cash_reserve"
+STRATEGY_TREASURY_WEWORK_WEBHOOK = os.getenv(
+    "STRATEGY_TREASURY_WEWORK_WEBHOOK",
+    "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=39502f69-f08e-43f8-afb2-6546ec722dfa",
+)
 
 
 def utc_now_iso():
@@ -248,7 +252,7 @@ class StrategyTreasuryMonitor(BaseMonitor):
         self._stop_event = threading.Event()
         self._thread = None
         self.client = StrategyTreasuryClient(self.log)
-        self.pusher = legacy.WeWorkBotPusher(legacy.WEWORK_BOT_WEBHOOK)
+        self.pusher = legacy.WeWorkBotPusher(STRATEGY_TREASURY_WEWORK_WEBHOOK)
         self.stats = {"loops": 0, "alerts": 0, "notify_fails": 0, "api_fails": 0}
         self._register_monitors()