From 432dc0ba076d11c0c9a711e377c9608e9da57713 Mon Sep 17 00:00:00 2001
From: icanci <qiang1.zhu@ly.com>
Date: Sat, 26 Nov 2022 12:33:40 +0800
Subject: [PATCH] bugfix

---
 .../biz/service/impl/RegisterServiceImpl.java |  1 +
 .../rec/admin/biz/thread/TriggerThread.java   |  2 ++
 .../repository/EngineRepositoryHolder.java    | 23 +++++++++++++------
 .../rec/engine/sdk/server/RegisterClient.java |  1 +
 4 files changed, 20 insertions(+), 7 deletions(-)

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 be5d502..de831c7 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 c6e9f44..6b0999a 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 d6c5c8d..7544b17 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<String> 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<String> 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 30648c3..845082e 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<String> domainCodes = domainSPI.loadAllDomainCodes();
             engineRepositoryHolder.refresh(domainCodes);
+            return;
         }
 
         String domain = recProperties.getDomain();
-- 
Gitee