From 669b54ae0abf4bb333e9a73893070a438e5a9e2b Mon Sep 17 00:00:00 2001
From: SuperJacky6 <adding2003@gmail.com>
Date: Sat, 8 Aug 2026 17:16:59 +0800
Subject: [PATCH] v4

---
 .gitea/workflows/deploy-on-merge.yml | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/deploy-on-merge.yml b/.gitea/workflows/deploy-on-merge.yml
index e191f1f..b3d9565 100644
--- a/.gitea/workflows/deploy-on-merge.yml
+++ b/.gitea/workflows/deploy-on-merge.yml
@@ -22,10 +22,28 @@ jobs:
             set -e
             cd ${{ secrets.DEPLOY_PATH }}
             git config --global --add safe.directory ${{ secrets.DEPLOY_PATH }}
-            git pull origin main
-            # 严格匹配文件夹拼写 pyporject_evn
+            git fetch origin main
+
+            # 备份运行时db快照
+            if [ -f data/miniapp_v3.db ]; then
+              cp data/miniapp_v3.db data/miniapp_v3.db.tmp
+            fi
+
+            # 检出远端main全部文件（含git里的db）
+            git checkout origin/main -- .
+
+            # 判断本次提交是否更新了db
+            CHANGED=\$(git diff --name-only HEAD FETCH_HEAD | grep "data/miniapp_v3.db" || true)
+            if [ -z "\$CHANGED" ]; then
+              # git未更新db：恢复服务器运行时的db
+              if [ -f data/miniapp_v3.db.tmp ]; then
+                cp data/miniapp_v3.db.tmp data/miniapp_v3.db
+              fi
+            fi
+
+            rm -f data/miniapp_v3.db.tmp
+
             /www/server/pyporject_evn/versions/3.12.13/bin/pip install -r requirements.txt
             chown -R www:www .
-            # 宝塔项目重启脚本不变
             /www/server/panel/pyenv/bin/python3 /www/server/panel/plugin/python/project.py restart Hulumath-Web-Demo
           EOF
\ No newline at end of file