From 5c98b1cb6ac93dbad01cac0af547f6b42f6ad6ec Mon Sep 17 00:00:00 2001 From: aszerW Date: Tue, 12 May 2026 22:31:43 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20SSH=E5=AF=86=E9=92=A5=E7=A7=BB?= =?UTF-8?q?=E5=88=B0=E6=A0=B9=E7=9B=AE=E5=BD=95=EF=BC=8C=E5=88=A0=E9=99=A4?= =?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 迁移内容: - config/hk_ecs.pem → hk_ecs.pem(根目录) - 删除 config 目录(无其他内容) 路径更新: - datasource/flask_server.py:默认路径改为 hk_ecs.pem - strategies/rotation/config.yaml:SSH配置路径 - docker-compose.yml:挂载路径 - build-and-push.sh:示例命令 - README.md:项目结构说明 设计原则:敏感文件集中放在根目录 - .env:环境变量 - hk_ecs.pem:SSH密钥 --- README.md | 2 +- build-and-push.sh | 2 +- datasource/flask_server.py | 2 +- docker-compose.yml | 2 +- config/hk_ecs.pem => hk_ecs.pem | 0 strategies/rotation/config.yaml | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename config/hk_ecs.pem => hk_ecs.pem (100%) diff --git a/README.md b/README.md index 1a9df69..cfdca19 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,7 @@ portfolio = executor.execute(signals, data) ├── docker-compose.yml # Docker部署 ├── Dockerfile # 应用镜像 ├── Dockerfile_base # 基础镜像 -├── config/hk_ecs.pem # SSH密钥(港美股数据隧道) +├── hk_ecs.pem # SSH密钥(港美股数据隧道) ├── README.md # 本文件 └── requirements.txt # 依赖 ``` diff --git a/build-and-push.sh b/build-and-push.sh index 71a892d..a3233eb 100755 --- a/build-and-push.sh +++ b/build-and-push.sh @@ -82,7 +82,7 @@ echo "" echo "可以使用以下命令运行容器:" 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/hk_ecs.pem:/app/hk_ecs.pem \" echo " -v /path/to/data:/app/data \" echo " ${FULL_IMAGE_NAME}" echo "" diff --git a/datasource/flask_server.py b/datasource/flask_server.py index ce6a468..eedf9e4 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', 'config/hk_ecs.pem'), + "key_path": os.getenv('SSH_KEY_PATH', 'hk_ecs.pem'), "local_port": int(os.getenv('SSH_LOCAL_PORT', '1080')), } diff --git a/docker-compose.yml b/docker-compose.yml index 3754f27..c8d6992 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: # 挂载环境变量文件(必需) - ./.env:/app/.env:ro # 挂载 SSH 私钥(必需,用于 yfinance 数据下载) - - ./config/hk_ecs.pem:/app/config/hk_ecs.pem:ro + - ./hk_ecs.pem:/app/hk_ecs.pem:ro # 挂载数据目录(持久化) - ./data:/app/data # 挂载日志目录 diff --git a/config/hk_ecs.pem b/hk_ecs.pem similarity index 100% rename from config/hk_ecs.pem rename to hk_ecs.pem diff --git a/strategies/rotation/config.yaml b/strategies/rotation/config.yaml index 7690985..ac48a59 100644 --- a/strategies/rotation/config.yaml +++ b/strategies/rotation/config.yaml @@ -124,5 +124,5 @@ ssh_tunnel: host: "8.218.167.69" # SSH 服务器地址(阿里云香港 ECS IP) port: 22 # SSH 端口 username: "root" # SSH 用户名 - key_path: "config/hk_ecs.pem" # SSH 私钥路径(相对于项目根目录) + key_path: "hk_ecs.pem" # SSH 私钥路径(相对于项目根目录) local_port: 1080 # 本地 SOCKS5 代理端口