From f6184653228aa083bc42593fa1adfa7130fc735c Mon Sep 17 00:00:00 2001 From: icanci Date: Tue, 13 Dec 2022 22:18:36 +0800 Subject: [PATCH] fix --- .../rec/admin/biz/service/impl/RegisterServiceImpl.java | 2 ++ .../admin/web/controller/register/RegisterController.java | 7 +++++++ .../cn/icanci/rec/engine/sdk/server/RegisterServer.java | 1 + 3 files changed, 10 insertions(+) diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/RegisterServiceImpl.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/RegisterServiceImpl.java index 7ca8028..23cb8ca 100644 --- a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/RegisterServiceImpl.java +++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/RegisterServiceImpl.java @@ -67,6 +67,8 @@ public class RegisterServiceImpl implements RegisterService, InitializingBean { @Override public void doRegister(List registers) { // 查询,如果有,则更新时间,没有则插入 + // TODO 查询是否有此域,如果没有,则不能注册 + // 返回注册失败的域给SDK for (RegisterVO register : registers) { RegisterDO dbRegister = registerDAO.queryUnionOne(register.getDomain(), register.getClientAddress(), register.getClientPort()); if (dbRegister == null) { diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/register/RegisterController.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/register/RegisterController.java index 828b9d1..1cba0e7 100644 --- a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/register/RegisterController.java +++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/register/RegisterController.java @@ -46,6 +46,13 @@ public class RegisterController { return R.builderOk().build(); } + /** + * TODO SDK注册的时候需要返回注册的结果 + * 要识别注册的结果,然后SDK做响应的操作 + * 也就是当全部域都发生注册的时候,就不再自动注册 + * @param register register + * @return 返回注册的结果 + */ @PostMapping("doRegister") public R register(@RequestBody RegisterDTO register) { doRegister(register); diff --git a/rec-engine/rec-engine-sdk/src/main/java/cn/icanci/rec/engine/sdk/server/RegisterServer.java b/rec-engine/rec-engine-sdk/src/main/java/cn/icanci/rec/engine/sdk/server/RegisterServer.java index 0750065..635b185 100644 --- a/rec-engine/rec-engine-sdk/src/main/java/cn/icanci/rec/engine/sdk/server/RegisterServer.java +++ b/rec-engine/rec-engine-sdk/src/main/java/cn/icanci/rec/engine/sdk/server/RegisterServer.java @@ -73,6 +73,7 @@ public class RegisterServer implements InitializingBean { } String[] addresses = serverAddress.split(","); + // TODO 注册地址打散,防止压力放在同一个机器上 for (String address : addresses) { try { FutureTask task = new FutureTask<>(new RegisterCallable(address, clientPort, appName, domain, serverPort)); -- Gitee