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 be5d502614592b8e9b86add7ceea2d2dc8b4e7b7..de831c72b1e2c458d0e4456deeb2fe97e0e504eb 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,7 @@ public class RegisterServiceImpl implements RegisterService, InitializingBean { save(register); } else { dbRegister.setLastUpdateTime(new Date()); + dbRegister.setIsDelete(0); registerDAO.update(dbRegister); } } diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/thread/TriggerThread.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/thread/TriggerThread.java index c6e9f44932bc939ff8c4696619c0a39a04b961f3..6b0999a5d2ecb6cdecb50543bc9b959963e0622a 100644 --- a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/thread/TriggerThread.java +++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/thread/TriggerThread.java @@ -118,6 +118,7 @@ public class TriggerThread { SocketMessage call = CLIENT.call(rpcRequest, SocketMessage.class); if (call.isSuccess()) { + register.setIsDelete(0); register.setLastUpdateTime(new Date()); registerService.save(register); } else { @@ -173,6 +174,7 @@ public class TriggerThread { SocketMessage call = CLIENT.call(rpcRequest, SocketMessage.class); if (call.isSuccess()) { + register.setIsDelete(0); register.setLastUpdateTime(new Date()); registerService.save(register); } else { diff --git a/rec-engine/rec-engine-sdk/src/main/java/cn/icanci/rec/engine/sdk/rule/repository/EngineRepositoryHolder.java b/rec-engine/rec-engine-sdk/src/main/java/cn/icanci/rec/engine/sdk/rule/repository/EngineRepositoryHolder.java index d6c5c8d66a4a2c5349e40bf6b8bd1023c13840ab..7544b1750b834cbde37c730e260fee673a3e0e98 100644 --- a/rec-engine/rec-engine-sdk/src/main/java/cn/icanci/rec/engine/sdk/rule/repository/EngineRepositoryHolder.java +++ b/rec-engine/rec-engine-sdk/src/main/java/cn/icanci/rec/engine/sdk/rule/repository/EngineRepositoryHolder.java @@ -56,15 +56,24 @@ public class EngineRepositoryHolder implements InitializingBean { if (CollectionUtils.isEmpty(domainCodes)) { return; } - String domain = recProperties.getDomain(); - if (StringUtils.isBlank(domain)) { + if (!recProperties.isLoad()) { return; } - Set domains = Sets.newHashSet(domain.replaceAll("\\s*", StringUtils.EMPTY).split(",")); - for (String domainCode : domainCodes) { - for (String currDomain : domains) { - if (StringUtils.equals(domainCode, currDomain)) { - refresh(domainCode); + if (recProperties.isLoadAll()) { + for (String domainCode : domainCodes) { + refresh(domainCode); + } + } else { + String domain = recProperties.getDomain(); + if (StringUtils.isBlank(domain)) { + return; + } + Set domains = Sets.newHashSet(domain.replaceAll("\\s*", StringUtils.EMPTY).split(",")); + for (String domainCode : domainCodes) { + for (String currDomain : domains) { + if (StringUtils.equals(domainCode, currDomain)) { + refresh(domainCode); + } } } } diff --git a/rec-engine/rec-engine-sdk/src/main/java/cn/icanci/rec/engine/sdk/server/RegisterClient.java b/rec-engine/rec-engine-sdk/src/main/java/cn/icanci/rec/engine/sdk/server/RegisterClient.java index 30648c345bbd7b073eba2867299422b4eba127fe..845082e3df1490d005c5eb73c5be7f5c9e60852b 100644 --- a/rec-engine/rec-engine-sdk/src/main/java/cn/icanci/rec/engine/sdk/server/RegisterClient.java +++ b/rec-engine/rec-engine-sdk/src/main/java/cn/icanci/rec/engine/sdk/server/RegisterClient.java @@ -118,6 +118,7 @@ public class RegisterClient implements InitializingBean { if (loadAll) { Set domainCodes = domainSPI.loadAllDomainCodes(); engineRepositoryHolder.refresh(domainCodes); + return; } String domain = recProperties.getDomain();