Update 订阅与聚合.py

订阅与聚合.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import asyncio
+import os, json
 from 插件_行情.公共WS import OKX公共WS
 from 插件_行情.类型定义 import 蜡烛
 from 插件_行情.K线聚合器 import 多周期聚合器
@@ -11,7 +12,32 @@ from 插件_接口.上传接口 import 应用 as 上传服务应用  # 若要同
 合约本.注册(合约('OKX', 'UXLINK-USDT-SWAP', 'UXLINK主连'))
 合约本.注册(合约('OKX', 'GPS-USDT-SWAP', 'GPS主连'))
 
-目标周期 = [60, 120, 240]  # 你可以改成 30/60/120/240 等
+def 推断目标周期():
+    base = [30, 60, 120, 240]
+    tf = None
+    env_tf = os.getenv('AUTO_TF')
+    if env_tf and str(env_tf).strip().isdigit():
+        tf = int(str(env_tf).strip())
+    else:
+        param_path = os.getenv('PARAM_JSON')
+        if param_path and os.path.exists(param_path):
+            try:
+                with open(param_path, 'r', encoding='utf-8') as f:
+                    d = json.load(f)
+                for k in ('tf', 'period', '周期', 'bar_min', 'timeframe'):
+                    v = d.get(k)
+                    if isinstance(v, (int, float)) and int(v) > 0:
+                        tf = int(v); break
+                    if isinstance(v, str) and v.strip().isdigit():
+                        tf = int(v.strip()); break
+            except Exception:
+                pass
+    if tf is None:
+        tf = 60
+    base.append(tf)
+    return sorted(set(base))
+
+目标周期 = 推断目标周期()  # 自动推断并与基础周期合并
 
 async def 行情主任务():
     # 为每个合约创建聚合器