diff --git a/Jenkinsfile b/Jenkinsfile
index d6a7d3d..36e2b8c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -164,14 +164,22 @@ print('versions.json updated, platformVersion=' + d.get('platformVersion', ''))
           def serviceVersions = new groovy.json.JsonSlurperClassic().parseText(env.SERVICE_VERSIONS_JSON)
           def versionFiles = serviceVersions.keySet().collect { "VERSION.${it}" }.join(' ')
           def summary = serviceVersions.collect { svc, ver -> "${svc}=${ver}" }.join(', ')
+          // 先本地提交（幂等）
           bat """
             chcp 65001 >nul
             git config user.email "jenkins@xuqm.com"
             git config user.name "Jenkins CI"
             git add ${versionFiles}
             git diff --cached --quiet || git commit -m "ci: bump versions [${summary}] [skip ci]"
-            git push origin HEAD:main
           """
+          // push 加 retry + rebase，应对多 job 并发推送冲突
+          retry(3) {
+            bat """
+              chcp 65001 >nul
+              git pull --rebase origin main
+              git push origin HEAD:main
+            """
+          }
         }
       }
     }
diff --git a/push-service/src/main/java/com/xuqm/push/entity/DeviceTokenEntity.java b/push-service/src/main/java/com/xuqm/push/entity/DeviceTokenEntity.java
index 9b18eaa..d8aa84e 100644
--- a/push-service/src/main/java/com/xuqm/push/entity/DeviceTokenEntity.java
+++ b/push-service/src/main/java/com/xuqm/push/entity/DeviceTokenEntity.java
@@ -58,6 +58,12 @@ public class DeviceTokenEntity {
     @Column(nullable = false)
     private boolean receivePush = true;
 
+    @Column(length = 16)
+    private String appState; // FOREGROUND | BACKGROUND | TERMINATED
+
+    @Column
+    private LocalDateTime appStateAt;
+
     @Column
     private LocalDateTime lastLoginAt;