From f07cbab9b4b6b6086c5791f3ca0b7197c56cfb2c Mon Sep 17 00:00:00 2001
From: BretRen <bretren2013@gmail.com>
Date: Mon, 22 Dec 2025 19:00:28 -0800
Subject: [PATCH 1/4] Add port configuration for deployment script

---
 .github/workflows/deploy.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 73d57c7..8306b84 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -17,6 +17,7 @@ jobs:
           host: ${{ secrets.REMOTE_HOST }}
           username: ${{ secrets.REMOTE_USER }}
           password: ${{ secrets.SSH_PASS }}
+          port: 2222
           script: |
             # 1. 进入目录并拉取代码
             cd ~/account-dev
@@ -36,4 +37,4 @@ jobs:
             pm2 restart 0
             
             # 保存 PM2 状态，确保服务器重启后自动启动
-            pm2 save
\ No newline at end of file
+            pm2 save

From 51e05a608417b3d2ae1eb99f666406770503f091 Mon Sep 17 00:00:00 2001
From: BretRen <bretren2013@gmail.com>
Date: Mon, 22 Dec 2025 19:02:28 -0800
Subject: [PATCH 2/4] Update deploy script to use pnpx for PM2 commands

---
 .github/workflows/deploy.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 8306b84..92c1a61 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,6 +20,7 @@ jobs:
           port: 2222
           script: |
             # 1. 进入目录并拉取代码
+            
             cd ~/account-dev
             git pull origin main
 
@@ -34,7 +35,7 @@ jobs:
             pnpm install --prod
 
             # 4. 使用 PM2 平滑重启
-            pm2 restart 0
+            pnpx pm2 restart 0
             
             # 保存 PM2 状态，确保服务器重启后自动启动
-            pm2 save
+            pnpx pm2 save

From 662a3447f08146492e581d6d5996ad75d8906cb5 Mon Sep 17 00:00:00 2001
From: BretRen <bretren2013@gmail.com>
Date: Mon, 22 Dec 2025 19:04:17 -0800
Subject: [PATCH 3/4] Add PNPM_HOME and update PATH in deploy script

Set up PNPM environment variables for deployment.
---
 .github/workflows/deploy.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 92c1a61..9f08c26 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -19,6 +19,8 @@ jobs:
           password: ${{ secrets.SSH_PASS }}
           port: 2222
           script: |
+            export PNPM_HOME="/home/deploy/.local/share/pnpm"
+            export PATH="$PNPM_HOME:$PATH"
             # 1. 进入目录并拉取代码
             
             cd ~/account-dev

From 1aa5d4160d29427e4dc2296072f6becd69f9eb23 Mon Sep 17 00:00:00 2001
From: BretRen <bretren2013@gmail.com>
Date: Tue, 23 Dec 2025 16:10:48 -0800
Subject: [PATCH 4/4] Potential fix for code scanning alert no. 2: Workflow
 does not contain permissions

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
---
 .github/workflows/deploy.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 9f08c26..9cd7b15 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,5 +1,8 @@
 name: Deploy AdonisJS App
 
+permissions:
+  contents: read
+
 on:
   push:
     branches: [ main ]  # 当 main 分支收到推送时触发