From 68bb68b2b4d4758c0fc3e16b78facb15256970c1 Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Sat, 7 Nov 2026 04:21:06 -0500 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=AB=8B=E5=8D=B3=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=8F=8A=E6=97=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=97=B6=E9=97=B4=20=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/resource-rental.md | 2 +- .../system/chain/ChainExecutorClient.java | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/docs/resource-rental.md b/docs/resource-rental.md index 587a2d0..d65f9db 100644 --- a/docs/resource-rental.md +++ b/docs/resource-rental.md @@ -2,7 +2,7 @@ ## 启用与兼容 -默认关闭:`USDT_RESOURCE_RENTAL_ENABLED=false`。关闭时保留原转账通道、燃烧预算、审核和账务结算行为,不查询新增资源表。此功能仅用于归集、代付,普通钱包操作不自动购买资源。 +默认关闭:`USDT_RESOURCE_RENTAL_ENABLED:USDT_RESOURCE_RENTAL_ENABLED=false`。关闭时保留原转账通道、燃烧预算、审核和账务结算行为,不查询新增资源表。此功能仅用于归集、代付,普通钱包操作不自动购买资源。 部署前备份数据库,依次执行 `sql/chain_executor.sql`、`sql/resource_rental.sql`。均为增量建表,不删除旧数据。后端与执行器必须共享同一数据库;远程模式还需按 [执行器说明](chain-executor.md) 部署执行器。不要在生产数据库上运行测试脚本。 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/chain/ChainExecutorClient.java b/ruoyi-system/src/main/java/com/ruoyi/system/chain/ChainExecutorClient.java index 7951762..a0ef61d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/chain/ChainExecutorClient.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/chain/ChainExecutorClient.java @@ -47,6 +47,7 @@ public class ChainExecutorClient { private ChainExecutorRuntimeState runtimeState; private RestTemplate http; private final AtomicBoolean checking = new AtomicBoolean(); + private final Object healthCheckCompletion = new Object(); private volatile boolean reachable; private volatile boolean checked; private volatile int consecutiveFailures; @@ -144,12 +145,16 @@ public class ChainExecutorClient { log.error("内网链上执行器后台探测异常,后续仍将继续检查,异常类型={}", rootType(failure)); } finally { checking.set(false); + synchronized (healthCheckCompletion) { + healthCheckCompletion.notifyAll(); + } } } /** 页面状态读取同时触发实时探测,“立即检查”不得只返回进程内旧缓存。 */ public Map refreshAvailability() { monitor(); + waitForOngoingCheck(); return availability(); } @@ -244,6 +249,26 @@ public class ChainExecutorClient { } } + /** + * 状态请求撞上后台探测时等待其完成,避免“立即检查”返回探测前的旧时间。 + * 最大等待覆盖两次内网HTTP检查的连接与读取超时;中断时保留线程中断标记。 + */ + private void waitForOngoingCheck() { + long deadline = System.currentTimeMillis() + 9000L; + synchronized (healthCheckCompletion) { + while (checking.get()) { + long remaining = deadline - System.currentTimeMillis(); + if (remaining <= 0) return; + try { + healthCheckCompletion.wait(remaining); + } catch (InterruptedException interrupted) { + Thread.currentThread().interrupt(); + return; + } + } + } + } + /** * 使用独立守护线程执行健康检查,不依赖资源租赁模块是否启用Spring全局调度。 */