From c5c0141fe71df14f1cca9b75bed2f10c1ca6d682 Mon Sep 17 00:00:00 2001
From: bishsh <bishsh2006@outlook.com>
Date: Tue, 12 Aug 2025 15:35:34 +0800
Subject: [PATCH 1/3] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ec583a4..1f4d2f8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,7 +3,7 @@ name: 自动部署
 on:
   push:
     branches:
-      - main 
+      - master
 
   release:
     types:

From b7bb28ba8e694f167501ad2fcf2d3a5a709dbcf7 Mon Sep 17 00:00:00 2001
From: bishsh <bishsh2006@outlook.com>
Date: Tue, 12 Aug 2025 15:37:00 +0800
Subject: [PATCH 2/3] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1f4d2f8..255c913 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -76,6 +76,6 @@ jobs:
           cd /opt/1panel/www/sites/blog.biss.click/index/
           git config --global --add safe.directory "$(pwd)"
           git fetch --all --depth=1
-          git reset --hard origin/main
+          git reset --hard origin/page
           git pull --depth=1
           echo "✅ 已拉取 page 分支最新内容"

From 06e2893d2390b0906d4af0faefe221f3b2c70c12 Mon Sep 17 00:00:00 2001
From: bishsh <bishsh2006@outlook.com>
Date: Tue, 12 Aug 2025 16:08:11 +0800
Subject: [PATCH 3/3] Update main.yml

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 255c913..a5fe7dd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -64,13 +64,13 @@ jobs:
         git add .
         git commit -m "${{ github.event.head_commit.message }}··[$(date +"%Z %Y-%m-%d %A %H:%M:%S")]"
         git push --force --quiet "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git" master:page
+        
     - name: 服务器执行拉取命令
       uses: appleboy/ssh-action@v1
       with:
         host: ${{ secrets.SERVER_IP }}
         username: ${{ secrets.USERNAME }}
-        key: ${{ secrets.KEY }}
-        passphrase: ${{ secrets.PASSPHRASE }}
+        password: ${{ secrets.PASSWORD }}
         port: ${{ secrets.PORT }}
         script: |
           cd /opt/1panel/www/sites/blog.biss.click/index/