chore(merge): 合并 origin/develop 的看门狗周期巡检与 admin-api Redis 配置

watchdog.ps1 冲突取本地实现:计数落盘用 Import/Export 函数,另含 Webhook
三级兜底与告警节流,为远程内联版本的超集。
This commit is contained in:
Zhou Weidong authored and trae-solo-agent committed 2026-10-28 18:53:11 +08:00
commit 0d161f318f
2 files changed
+14 -2

No files matched your search

+8 -2
View File
@@ -17,11 +17,17 @@
<ExecutionTimeLimit>PT10M</ExecutionTimeLimit> <ExecutionTimeLimit>PT10M</ExecutionTimeLimit>
</Settings> </Settings>
<Triggers> <Triggers>
<BootTrigger> <!-- BootTrigger 上挂 <Repetition> 在 Windows 计划任务里不生效(导入后 Next Run Time 为 N/A,
实际只在开机跑一次)。改成 TimeTrigger + 无限重复,配合 StartWhenAvailable
保证开机后若错过也会立即补跑;这样才真正做到每 2 分钟巡检一次。 -->
<TimeTrigger>
<StartBoundary>2026-01-01T00:00:00</StartBoundary>
<Repetition> <Repetition>
<Interval>PT2M</Interval> <Interval>PT2M</Interval>
<Duration>P3650D</Duration>
<StopAtDurationEnd>false</StopAtDurationEnd>
</Repetition> </Repetition>
</BootTrigger> </TimeTrigger>
</Triggers> </Triggers>
<Actions Context="Author"> <Actions Context="Author">
<Exec> <Exec>
@@ -14,6 +14,12 @@ spring:
url: ${DB_URL:jdbc:postgresql://127.0.0.1:5432/fruitshorts} url: ${DB_URL:jdbc:postgresql://127.0.0.1:5432/fruitshorts}
username: ${DB_USER:fruitshorts} username: ${DB_USER:fruitshorts}
password: ${DB_PASSWORD:fruitshorts} password: ${DB_PASSWORD:fruitshorts}
data:
redis:
# 与 app-api 共用同一个 Redis 实例;容器内必须显式指定 host,
# 否则 Spring Boot 默认连 127.0.0.1(容器内即自身)导致健康检查报 DOWN。
host: ${REDIS_HOST:127.0.0.1}
port: ${REDIS_PORT:6379}
jackson: jackson:
date-format: yyyy-MM-dd HH:mm:ss date-format: yyyy-MM-dd HH:mm:ss
time-zone: Asia/Shanghai time-zone: Asia/Shanghai