From a33a800e130f5f2a50432d9849c3aa8491bc38ba Mon Sep 17 00:00:00 2001
From: gewuyou <gewuyou1024@gmail.com>
Date: Sun, 11 May 2025 16:12:46 +0800
Subject: [PATCH] =?UTF-8?q?ci(deploy):=20=E4=BD=BF=E7=94=A8=20sshpass?=
 =?UTF-8?q?=E6=9B=BF=E4=BB=A3=20native=20scp=20=E8=BF=9B=E8=A1=8C=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BC=A0=E8=BE=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 安装 sshpass 以支持密码认证
- 更新内部服务器和新加坡服务器的文件传输方式
- 使用 sshpass命令行参数传递服务器密码
---
 .gitea/workflows/deploy.master.yml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gitea/workflows/deploy.master.yml b/.gitea/workflows/deploy.master.yml
index 4e51c8d..857eba6 100644
--- a/.gitea/workflows/deploy.master.yml
+++ b/.gitea/workflows/deploy.master.yml
@@ -76,16 +76,21 @@ jobs:
         uses: ${{env.JCNC_GITEA_URL}}/gradle/actions/setup-gradle@v4
         with:
           gradle-version: wrapper           # 使用项目自带的gradle-wrapper
-      - name: 📦 Copy Compose File to Internal Server (via native scp)
+      - name: 🔧 Install sshpass
         run: |
-          scp -P ${{ env.INTERNAL_SERVER_PROT }} -o StrictHostKeyChecking=no \
-              ${{ env.MAIN_COMPOSE_FILE }} \
-              root@${{ env.INTERNAL_SERVER_HOST }}:/home/luke/deploy/llmx/
-      - name: 📦 Copy Compose File to Singapore Server (via native scp)
+          apt-get update && apt-get install -y sshpass
+      - name: 📦 Copy Compose File to Internal Server (with password)
         run: |
-          scp -P ${{ env.SSH_PROT }} -o StrictHostKeyChecking=no \
-              ${{ env.AGENT_COMPOSE_FILE }} \
-              root@${{ env.SINGAPORE_SERVER_HOST }}:/home/deploy/llmx/
+          sshpass -p "${{ secrets.INTERNAL_SERVER_PASSWORD }}" \
+            scp -P ${{ env.INTERNAL_SERVER_PROT }} -o StrictHostKeyChecking=no \
+            ${{ env.MAIN_COMPOSE_FILE }} \
+            root@${{ env.INTERNAL_SERVER_HOST }}:/home/luke/deploy/llmx/
+      - name: 📦 Copy Compose File to Singapore Server (with password)
+        run: |
+          sshpass -p "${{ secrets.SINGAPORE_SERVER_PASSWORD }}" \
+            scp -P ${{ env.SSH_PROT }} -o StrictHostKeyChecking=no \
+            ${{ env.AGENT_COMPOSE_FILE }} \
+            root@${{ env.SINGAPORE_SERVER_HOST }}:/home/deploy/llmx/
       # ========== 5. 构建阶段 ==========
       - name: 🏗️ Build with Jib
         run: |