From ce6e5febd67293b4c0021dca6d6ebeb35e1a59b9 Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Thu, 9 Nov 2023 14:23:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=202.4.0=201.=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=B3=A8=E5=86=8C=E7=BB=AD=E7=BA=A6?= =?UTF-8?q?=E9=97=AE=E9=A2=98=202.=20=E4=BC=98=E5=8C=96=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E9=85=8D=E7=BD=AE=E4=B8=8D=E6=8F=90=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- easy-retry-client/easy-retry-client-common/pom.xml | 5 +++++ .../easy/retry/client/job/core/cache/ThreadPoolCache.java | 2 +- .../retry/server/common/register/AbstractRegister.java | 4 ++-- .../easy/retry/server/common/register/ClientRegister.java | 7 ++----- .../easy/retry/server/common/register/ServerRegister.java | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/easy-retry-client/easy-retry-client-common/pom.xml b/easy-retry-client/easy-retry-client-common/pom.xml index 48def0bcd..6271dbe71 100644 --- a/easy-retry-client/easy-retry-client-common/pom.xml +++ b/easy-retry-client/easy-retry-client-common/pom.xml @@ -41,6 +41,11 @@ com.aizuda easy-retry-common-server-api + + org.springframework.boot + spring-boot-configuration-processor + true + diff --git a/easy-retry-client/easy-retry-client-job-core/src/main/java/com/aizuda/easy/retry/client/job/core/cache/ThreadPoolCache.java b/easy-retry-client/easy-retry-client-job-core/src/main/java/com/aizuda/easy/retry/client/job/core/cache/ThreadPoolCache.java index 6828a9aec..75be2f900 100644 --- a/easy-retry-client/easy-retry-client-job-core/src/main/java/com/aizuda/easy/retry/client/job/core/cache/ThreadPoolCache.java +++ b/easy-retry-client/easy-retry-client-job-core/src/main/java/com/aizuda/easy/retry/client/job/core/cache/ThreadPoolCache.java @@ -29,7 +29,7 @@ public class ThreadPoolCache { }; ThreadPoolExecutor threadPoolExecutor = supplier.get(); - CACHE_THREAD_POOL.putIfAbsent(taskBatchId, supplier.get()); + CACHE_THREAD_POOL.putIfAbsent(taskBatchId, threadPoolExecutor); return threadPoolExecutor; } diff --git a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/AbstractRegister.java b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/AbstractRegister.java index f600ed4bc..2897af1f6 100644 --- a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/AbstractRegister.java +++ b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/AbstractRegister.java @@ -35,6 +35,7 @@ public abstract class AbstractRegister implements Register, Lifecycle { protected void refreshExpireAt(ServerNode serverNode) { try { + serverNode.setExpireAt(getExpireAt()); serverNodeMapper.insertOrUpdate(serverNode); // 刷新本地缓存过期时间 CacheRegisterTable.refreshExpireAt(serverNode.getGroupName(), serverNode); @@ -56,13 +57,12 @@ public abstract class AbstractRegister implements Register, Lifecycle { serverNode.setNodeType(getNodeType()); serverNode.setCreateDt(LocalDateTime.now()); serverNode.setContextPath(context.getContextPath()); - serverNode.setExpireAt(getExpireAt(context)); serverNode.setExtAttrs(context.getExtAttrs()); return serverNode; } - protected abstract LocalDateTime getExpireAt(RegisterContext context); + protected abstract LocalDateTime getExpireAt(); protected abstract boolean doRegister(RegisterContext context, ServerNode serverNode); diff --git a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/ClientRegister.java b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/ClientRegister.java index 4b462094d..b162eb9bc 100644 --- a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/ClientRegister.java +++ b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/ClientRegister.java @@ -41,11 +41,10 @@ public class ClientRegister extends AbstractRegister implements Runnable { @Override protected void beforeProcessor(RegisterContext context) { - } @Override - protected LocalDateTime getExpireAt(RegisterContext context) { + protected LocalDateTime getExpireAt() { return LocalDateTime.now().plusSeconds(DELAY_TIME); } @@ -93,14 +92,12 @@ public class ClientRegister extends AbstractRegister implements Runnable { } } - }catch (InterruptedException e) { - LogUtils.info(log, "[{}] thread stop.", Thread.currentThread().getName()); } catch (Exception e) { LogUtils.error(log, "client refresh expireAt error."); } finally { // 防止刷的过快 try { - TimeUnit.MILLISECONDS.sleep(1000); + TimeUnit.MILLISECONDS.sleep(5000); } catch (InterruptedException ignored) { } } diff --git a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/ServerRegister.java b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/ServerRegister.java index 5644b0a77..38507d033 100644 --- a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/ServerRegister.java +++ b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/ServerRegister.java @@ -70,7 +70,7 @@ public class ServerRegister extends AbstractRegister { } @Override - protected LocalDateTime getExpireAt(RegisterContext context) { + protected LocalDateTime getExpireAt() { return LocalDateTime.now().plusSeconds(DELAY_TIME); }