Merge branch 'master' of https://github.com/bishshi/myblogsource

.github/workflows/main.yml

@@ -3,7 +3,7 @@ name: 自动部署
 on:
   push:
     branches:
-      - main 
+      - master
 
   release:
     types:
@@ -64,18 +64,18 @@ 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/
           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 分支最新内容"