From 1d7f510fc65d1a5d50adbe4790e38fc42923c5f2 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Fri, 19 Sep 2025 21:09:32 +0800
Subject: [PATCH] update
---
config/config.yaml | 2 +-
scripts/init_container.sh | 2 +-
src/data/data_fetcher.py | 3 +--
src/strategy/kline_pattern_strategy.py | 8 +-------
web/templates/index.html | 4 ++--
web/templates/pullbacks.html | 4 ++--
web/templates/signals.html | 5 ++---
7 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/config/config.yaml b/config/config.yaml
index 7e1fd9f..3411b1a 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -56,7 +56,7 @@ strategy:
enabled: true # 是否启用K线形态策略
min_entity_ratio: 0.55 # 前两根阳线实体最小占振幅比例（55%）
final_yang_min_ratio: 0.40 # 最后阳线实体最小占振幅比例（40%）
- timeframes: ["1h", "daily", "weekly"] # 支持的时间周期
+ timeframes: ["daily", "weekly"] # 支持的时间周期
scan_stocks_count: 5000 # 扫描股票数量限制
analysis_days: 60 # 分析的历史天数
follow_up_days: 30 # 后续强势验证天数（形态完成后N天内不回踩阴线高点且不跌破EMA20）
diff --git a/scripts/init_container.sh b/scripts/init_container.sh
index 701bfc2..1b725a5 100644
--- a/scripts/init_container.sh
+++ b/scripts/init_container.sh
@@ -71,7 +71,7 @@ strategy:
enabled: true # 是否启用K线形态策略
min_entity_ratio: 0.55 # 前两根阳线实体最小占振幅比例（55%）
final_yang_min_ratio: 0.40 # 最后阳线实体最小占振幅比例（40%）
- timeframes: ["1h", "daily", "weekly"] # 支持的时间周期
+ timeframes: ["daily", "weekly"] # 支持的时间周期
scan_stocks_count: 100 # Docker环境默认扫描股票数量
analysis_days: 60 # 分析的历史天数
follow_up_days: 30 # 后续强势验证天数（形态完成后N天内不回踩阴线高点且不跌破EMA20）
diff --git a/src/data/data_fetcher.py b/src/data/data_fetcher.py
index f1e2597..aafa3ff 100644
--- a/src/data/data_fetcher.py
+++ b/src/data/data_fetcher.py
@@ -334,7 +334,7 @@ class ADataFetcher:
stock_code: 股票代码
start_date: 开始日期
end_date: 结束日期
- period: 数据周期 ('1h', 'daily', 'weekly', 'monthly')
+ period: 数据周期 ('daily', 'weekly', 'monthly')
Returns:
历史行情DataFrame
@@ -348,7 +348,6 @@ class ADataFetcher:
# 根据周期设置k_type参数
k_type_map = {
- '1h': 60, # 1小时线(60分钟)
'daily': 1, # 日线
'weekly': 2, # 周线
'monthly': 3 # 月线
diff --git a/src/strategy/kline_pattern_strategy.py b/src/strategy/kline_pattern_strategy.py
index 3ad8eb7..f7fa857 100644
--- a/src/strategy/kline_pattern_strategy.py
+++ b/src/strategy/kline_pattern_strategy.py
@@ -283,13 +283,7 @@ class KLinePatternStrategy:
end_date = datetime.now().strftime('%Y-%m-%d')
for timeframe in self.timeframes:
- # 针对1小时周期调整分析天数，避免数据量过大
- if timeframe == '1h':
- # 1小时数据只分析最近7天
- analysis_days = min(days, 7)
- else:
- analysis_days = days
-
+ analysis_days = days
start_date = (datetime.now() - timedelta(days=analysis_days)).strftime('%Y-%m-%d')
logger.info(f"🔍 分析股票: {stock_code}({stock_name}) | 周期: {timeframe}")
diff --git a/web/templates/index.html b/web/templates/index.html
index 01a1b34..cb9a4bc 100644
--- a/web/templates/index.html
+++ b/web/templates/index.html
@@ -107,8 +107,8 @@
{{ signal.strategy_name }}
|
-
- {{ 'D' if signal.timeframe == 'daily' else ('1H' if signal.timeframe == '1h' else 'W') }}
+
+ {{ 'D' if signal.timeframe == 'daily' else 'W' }}
|
{{ signal.signal_date | datetime_format('%m-%d') }} |
diff --git a/web/templates/pullbacks.html b/web/templates/pullbacks.html
index 78f0475..f48d9d3 100644
--- a/web/templates/pullbacks.html
+++ b/web/templates/pullbacks.html
@@ -96,8 +96,8 @@
-
- {{ '日线' if alert.timeframe == 'daily' else ('1小时' if alert.timeframe == '1h' else '周线') }}
+
+ {{ '日线' if alert.timeframe == 'daily' else '周线' }}
|
{{ alert.original_signal_date | datetime_format('%Y-%m-%d') }} |
diff --git a/web/templates/signals.html b/web/templates/signals.html
index b667235..749f94b 100644
--- a/web/templates/signals.html
+++ b/web/templates/signals.html
@@ -18,7 +18,6 @@
-