From 70515ab169879f691c8c14f8c0a896412b204980 Mon Sep 17 00:00:00 2001
From: aszerW <aszer27937@gmail.com>
Date: Tue, 12 May 2026 22:02:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20SSH=E5=AF=86=E9=92=A5=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E4=BB=8E=E6=A0=B9=E7=9B=AE=E5=BD=95=E8=BF=81=E7=A7=BB=E5=88=B0?=
 =?UTF-8?q?config=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改内容：
1. datasource/flask_server.py
   - 默认路径从 'hk_ecs.pem' 改为 'config/hk_ecs.pem'

2. docker-compose.yml
   - 挂载路径从 './hk_ecs.pem:/app/hk_ecs.pem'
   - 改为 './config/hk_ecs.pem:/app/config/hk_ecs.pem'

3. build-and-push.sh
   - 示例命令中的路径同步更新

4. README.md
   - 项目结构说明中更新密钥位置

验证：
- rotation.yaml 已使用 config/hk_ecs.pem（无需修改）
- flask_server 默认路径正确指向 config/hk_ecs.pem
- 密钥文件存在于 config/hk_ecs.pem
---
 README.md                  | 2 +-
 build-and-push.sh          | 8 ++++----
 datasource/flask_server.py | 2 +-
 docker-compose.yml         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index be53ac6..1a9df69 100644
--- a/README.md
+++ b/README.md
@@ -124,7 +124,7 @@ portfolio = executor.execute(signals, data)
 ├── docker-compose.yml            # Docker部署
 ├── Dockerfile                    # 应用镜像
 ├── Dockerfile_base               # 基础镜像
-├── hk_ecs.pem                    # SSH密钥
+├── config/hk_ecs.pem               # SSH密钥（港美股数据隧道）
 ├── README.md                     # 本文件
 └── requirements.txt              # 依赖
 ```
diff --git a/build-and-push.sh b/build-and-push.sh
index 579a2df..71a892d 100755
--- a/build-and-push.sh
+++ b/build-and-push.sh
@@ -80,10 +80,10 @@ echo "========================================="
 echo "镜像地址: ${FULL_IMAGE_NAME}"
 echo ""
 echo "可以使用以下命令运行容器："
-echo "docker run -d --name etf-scheduler-container \\"
-echo "  -v /path/to/.env:/app/.env \\"
-echo "  -v /path/to/hk_ecs.pem:/app/hk_ecs.pem \\"
-echo "  -v /path/to/data:/app/data \\"
+echo "docker run -d --name etf-scheduler-container \"
+echo "  -v /path/to/.env:/app/.env \"
+echo "  -v /path/to/config/hk_ecs.pem:/app/config/hk_ecs.pem \"
+echo "  -v /path/to/data:/app/data \"
 echo "  ${FULL_IMAGE_NAME}"
 echo ""
 echo "或者在其他机器上拉取镜像："
diff --git a/datasource/flask_server.py b/datasource/flask_server.py
index eedf9e4..ce6a468 100644
--- a/datasource/flask_server.py
+++ b/datasource/flask_server.py
@@ -92,7 +92,7 @@ def get_ssh_config() -> Optional[Dict]:
         "host": os.getenv('SSH_HOST', ''),
         "port": int(os.getenv('SSH_PORT', '22')),
         "username": os.getenv('SSH_USERNAME', ''),
-        "key_path": os.getenv('SSH_KEY_PATH', 'hk_ecs.pem'),
+        "key_path": os.getenv('SSH_KEY_PATH', 'config/hk_ecs.pem'),
         "local_port": int(os.getenv('SSH_LOCAL_PORT', '1080')),
     }
 
diff --git a/docker-compose.yml b/docker-compose.yml
index c8d6992..3754f27 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
       # 挂载环境变量文件（必需）
       - ./.env:/app/.env:ro
       # 挂载 SSH 私钥（必需，用于 yfinance 数据下载）
-      - ./hk_ecs.pem:/app/hk_ecs.pem:ro
+      - ./config/hk_ecs.pem:/app/config/hk_ecs.pem:ro
       # 挂载数据目录（持久化）
       - ./data:/app/data
       # 挂载日志目录