From 0d140cd75c8044247a1068df11394207a77132c4 Mon Sep 17 00:00:00 2001 From: jeremygan2021 Date: Mon, 2 Mar 2026 12:59:46 +0800 Subject: [PATCH] action --- .env | 2 +- .env.docker | 2 +- .env.example | 2 +- .gitea/workflows/deploy.yaml | 44 ++++++++++++++++++++++++++++++++++++ .trae/rules/project_rules.md | 2 +- config.py | 2 +- 6 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 .gitea/workflows/deploy.yaml diff --git a/.env b/.env index d65c67d..ce1e002 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ # 环境变量配置文件 # 数据库配置 -# DATABASE_URL=postgresql://luna:123luna@121.43.104.161:6432/luna +# DATABASE_URL=postgresql://luna:123luna@121.43.104.161:6433/luna DATABASE_URL=postgresql://luna:123luna@6.6.6.66:5432/luna DASHSCOPE_API_KEY=sk-a294f382488d46a1aa0d7cd8e750729b diff --git a/.env.docker b/.env.docker index ab5fa99..b5e18d7 100644 --- a/.env.docker +++ b/.env.docker @@ -1,7 +1,7 @@ # 环境变量配置文件 # 数据库配置 -# DATABASE_URL=postgresql://luna:123luna@121.43.104.161:6432/luna +# DATABASE_URL=postgresql://luna:123luna@121.43.104.161:6433/luna DATABASE_URL=postgresql://luna:123luna@6.6.6.66:5432/luna # MQTT配置 MQTT_BROKER_HOST=luna-mqtt diff --git a/.env.example b/.env.example index 0bc8ad2..cd42436 100644 --- a/.env.example +++ b/.env.example @@ -1,7 +1,7 @@ # 环境变量配置文件 # 数据库配置 -# DATABASE_URL=postgresql://luna:123luna@121.43.104.161:6432/luna +# DATABASE_URL=postgresql://luna:123luna@121.43.104.161:6433/luna DATABASE_URL=postgresql://luna:123luna@6.6.6.66:5432/luna # MQTT配置 MQTT_BROKER_HOST=luna-mqtt diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml new file mode 100644 index 0000000..30a0036 --- /dev/null +++ b/.gitea/workflows/deploy.yaml @@ -0,0 +1,44 @@ +name: Deploy to Server + +on: + push: + branches: + - main + - master + +jobs: + deploy: + runs-on: ubuntu + steps: + - name: Checkout + uses: actions/checkout@v3 + + # 建议在 Gitea 仓库设置中配置 Secrets,而不是直接写在文件中 + # SERVER_HOST, SERVER_USER, SERVER_PASSWORD + - name: Copy files to server + uses: appleboy/scp-action@v0.1.7 + with: + host: "6.6.6.66" + username: "quant-speed" + password: "123quant-speed" + source: "." + target: "/home/quant-speed/luna2025" + # 排除不需要上传的文件 + exclude: ".git,.github,.gitea,.trae,__pycache__,*.pyc,*.pyo,*.pyd,.DS_Store" + + - name: Deploy on server + uses: appleboy/ssh-action@v1.0.3 + with: + host: "6.6.6.66" + username: "quant-speed" + password: "123quant-speed" + script: | + # 进入项目目录 + cd /home/quant-speed/luna2025 + + # 停止容器并删除同名镜像 + # --rmi local: 删除服务构建的镜像 + echo "123quant-speed" | sudo -S docker compose down --rmi local + + # 启动服务 + echo "123quant-speed" | sudo -S docker compose up -d diff --git a/.trae/rules/project_rules.md b/.trae/rules/project_rules.md index 4193e9f..9e5b352 100644 --- a/.trae/rules/project_rules.md +++ b/.trae/rules/project_rules.md @@ -1,7 +1,7 @@ 使用fastAPI框架 python 3.12 -- 使用pg数据库 url http://121.43.104.161:6432 +- 使用pg数据库 url http://121.43.104.161:6433 - 用户名:luna - 密码:123luna diff --git a/config.py b/config.py index 46c07e8..4a13057 100644 --- a/config.py +++ b/config.py @@ -3,7 +3,7 @@ from typing import Optional class Settings(BaseSettings): # 数据库配置1 - #database_url: str = "postgresql://luna:123luna@121.43.104.161:6432/luna" + #database_url: str = "postgresql://luna:123luna@121.43.104.161:6433/luna" database_url: str = "postgresql://luna:123luna@6.6.6.66:5432/luna"