From ecbc72465fc4710d28458d4d744666ab110cd80d Mon Sep 17 00:00:00 2001
From: hxuanyu <2252193204@qq.com>
Date: Mon, 4 Nov 2024 18:24:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=AE=8C=E6=95=B4=E7=9A=84ac?=
 =?UTF-8?q?tions=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/build-deploy.yaml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/build-deploy.yaml b/.gitea/workflows/build-deploy.yaml
index cf0ab07..76b64ca 100644
--- a/.gitea/workflows/build-deploy.yaml
+++ b/.gitea/workflows/build-deploy.yaml
@@ -47,7 +47,17 @@ jobs:
           port: ${{ secrets.SERVER_PORT }}
           source: target/${{ vars.JAR_NAME }}
           target: /home/tools/${{ vars.APP_NAME }}/package
-      # 停止远程服务进程
+      # 停止原版应用
+      - name: 使用新版jar包启动应用
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USERNAME }}
+          password: ${{ secrets.SERVER_PASSWORD }}
+          port: ${{ secrets.SERVER_PORT }}
+          script: |
+            if screen -list | grep -q 'PetGuardian'; then screen -S PetGuardian -X quit
+      # 使用新版jar包启动应用
       - name: 使用新版jar包启动应用
         uses: appleboy/ssh-action@master
         with:
@@ -58,5 +68,4 @@ jobs:
           script: |
             rm -f /home/tools/${{ vars.APP_NAME }}/${{ vars.JAR_NAME }}
             mv /home/tools/${{ vars.APP_NAME }}/package/target/${{ vars.JAR_NAME }} /home/tools/${{ vars.APP_NAME }}/${{ vars.JAR_NAME }}
-            screen -S ${{ vars.APP_NAME }} -X quit
             screen -dmS ${{ vars.APP_NAME }} /usr/local/java/jdk1.8.0_202/bin/java -jar /home/tools/${{ vars.APP_NAME }}/${{ vars.JAR_NAME }}