From e4cb7124f9fe6830d33ad90f0f1fc41d8a7712ac Mon Sep 17 00:00:00 2001
From: jack ning <github@bytedesk.com>
Date: Thu, 24 Jul 2025 12:14:06 +0800
Subject: [PATCH] update modules/core: mod       10 files

---
 .../core/ip/access/IpAccessRestService.java   |  2 +-
 .../core/ip/white/IpWhitelistRepository.java  |  6 +--
 .../core/ip/white/IpWhitelistRestService.java | 14 ++++--
 .../bytedesk/core/thread/ThreadEntity.java    | 13 ++---
 .../core/thread/ThreadProcessStatusEnum.java  | 10 ++--
 .../bytedesk/core/thread/ThreadProtobuf.java  | 13 ++---
 .../RobotThreadRoutingStrategy.java           |  4 +-
 .../WorkflowThreadRoutingStrategy.java        |  2 +-
 .../WorkgroupThreadRoutingStrategy.java       |  4 +-
 .../visitor_thread/VisitorThreadService.java  | 48 ++++++++++++++++++-
 10 files changed, 84 insertions(+), 32 deletions(-)

diff --git a/modules/core/src/main/java/com/bytedesk/core/ip/access/IpAccessRestService.java b/modules/core/src/main/java/com/bytedesk/core/ip/access/IpAccessRestService.java
index c28f034552..fa1f3ca23f 100644
--- a/modules/core/src/main/java/com/bytedesk/core/ip/access/IpAccessRestService.java
+++ b/modules/core/src/main/java/com/bytedesk/core/ip/access/IpAccessRestService.java
@@ -203,7 +203,7 @@ public class IpAccessRestService extends BaseRestService<IpAccessEntity, IpAcces
 
     public Boolean isIpBlocked(String ip) {
         // 检查是否在白名单中
-        if (ipWhitelistRepository.existsByIp(ip)) {
+        if (ipWhitelistRepository.existsByIpAndDeletedFalse(ip)) {
             return false;
         }
 
diff --git a/modules/core/src/main/java/com/bytedesk/core/ip/white/IpWhitelistRepository.java b/modules/core/src/main/java/com/bytedesk/core/ip/white/IpWhitelistRepository.java
index 4821824e99..6f395a0e9e 100644
--- a/modules/core/src/main/java/com/bytedesk/core/ip/white/IpWhitelistRepository.java
+++ b/modules/core/src/main/java/com/bytedesk/core/ip/white/IpWhitelistRepository.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-12-24 17:49:18
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2025-01-17 16:09:56
+ * @LastEditTime: 2025-07-24 11:44:28
  * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
  *   Please be aware of the BSL license restrictions before installing Bytedesk IM – 
  *  selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. 
@@ -20,9 +20,9 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 public interface IpWhitelistRepository extends JpaRepository<IpWhitelistEntity, Long>, JpaSpecificationExecutor<IpWhitelistEntity> {
     
-    boolean existsByIp(String ip);
+    boolean existsByIpAndDeletedFalse(String ip);
 
-    Optional<IpWhitelistEntity> findByIp(String ip);
+    Optional<IpWhitelistEntity> findByIpAndDeletedFalse(String ip);
 
     Optional<IpWhitelistEntity> findByUid(String uid);
 } 
diff --git a/modules/core/src/main/java/com/bytedesk/core/ip/white/IpWhitelistRestService.java b/modules/core/src/main/java/com/bytedesk/core/ip/white/IpWhitelistRestService.java
index 13e9e7bdfb..886b985d0a 100644
--- a/modules/core/src/main/java/com/bytedesk/core/ip/white/IpWhitelistRestService.java
+++ b/modules/core/src/main/java/com/bytedesk/core/ip/white/IpWhitelistRestService.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-12-24 22:18:54
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2025-07-04 12:59:53
+ * @LastEditTime: 2025-07-24 11:45:22
  * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
  *   Please be aware of the BSL license restrictions before installing Bytedesk IM – 
  *  selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -53,7 +53,7 @@ public class IpWhitelistRestService extends BaseRestService<IpWhitelistEntity, I
 
     @Cacheable(value = "ipWhitelist", key = "#ip", unless = "#result == null")
     public Optional<IpWhitelistEntity> findByIp(String ip) {
-        return ipWhitelistRepository.findByIp(ip);
+        return ipWhitelistRepository.findByIpAndDeletedFalse(ip);
     }
 
     @Override
@@ -77,14 +77,14 @@ public class IpWhitelistRestService extends BaseRestService<IpWhitelistEntity, I
     public IpWhitelistResponse create(IpWhitelistRequest request) {
         Optional<IpWhitelistEntity> ipWhitelist = findByIp(request.getIp());
         if (ipWhitelist.isPresent()) {
-            throw new RuntimeException("ipWhitelist is present");
+            throw new RuntimeException("ipWhitelist already exists");
         }
         IpWhitelistEntity ipWhitelistEntity = modelMapper.map(request, IpWhitelistEntity.class);
         ipWhitelistEntity.setUid(uidUtils.getUid());
         // 保存
         IpWhitelistEntity savedIpWhitelistEntity = ipWhitelistRepository.save(ipWhitelistEntity);
         if (savedIpWhitelistEntity == null) {
-            throw new RuntimeException("ipWhitelist is null");
+            throw new RuntimeException("ipWhitelist save failed");
         }
         return convertToResponse(savedIpWhitelistEntity);
     }
@@ -96,7 +96,11 @@ public class IpWhitelistRestService extends BaseRestService<IpWhitelistEntity, I
             throw new RuntimeException("ipWhitelist is not present");
         }
         IpWhitelistEntity ipWhitelistEntity = modelMapper.map(request, IpWhitelistEntity.class);
-        return convertToResponse(ipWhitelistRepository.save(ipWhitelistEntity));
+        IpWhitelistEntity savedIpWhitelistEntity = ipWhitelistRepository.save(ipWhitelistEntity);
+        if (savedIpWhitelistEntity == null) {
+            throw new RuntimeException("ipWhitelist save failed");
+        }
+        return convertToResponse(savedIpWhitelistEntity);
     }
 
     public long count() { 
diff --git a/modules/core/src/main/java/com/bytedesk/core/thread/ThreadEntity.java b/modules/core/src/main/java/com/bytedesk/core/thread/ThreadEntity.java
index ee409d73a6..b9ae92752b 100644
--- a/modules/core/src/main/java/com/bytedesk/core/thread/ThreadEntity.java
+++ b/modules/core/src/main/java/com/bytedesk/core/thread/ThreadEntity.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-01-29 16:21:24
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2025-07-10 10:38:19
+ * @LastEditTime: 2025-07-24 11:49:23
  * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
  *   Please be aware of the BSL license restrictions before installing Bytedesk IM – 
  *  selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. 
@@ -75,7 +75,8 @@ public class ThreadEntity extends AbstractThreadEntity {
 
     // ROBOTING
     public Boolean isRoboting() {
-        return ThreadProcessStatusEnum.ROBOTING.name().equals(getStatus());
+        // return ThreadProcessStatusEnum.ROBOTING.name().equals(getStatus());
+        return isRobotType() && isChatting();
     }
 
     // LLMING
@@ -140,10 +141,10 @@ public class ThreadEntity extends AbstractThreadEntity {
 
     // ---------------------------
 
-    public ThreadEntity setRoboting() {
-        setStatus(ThreadProcessStatusEnum.ROBOTING.name());
-        return this;
-    }
+    // public ThreadEntity setRoboting() {
+    //     setStatus(ThreadProcessStatusEnum.ROBOTING.name());
+    //     return this;
+    // }
 
     // public ThreadEntity setLlmIng() {
     //     setStatus(ThreadProcessStatusEnum.LLMING.name());
diff --git a/modules/core/src/main/java/com/bytedesk/core/thread/ThreadProcessStatusEnum.java b/modules/core/src/main/java/com/bytedesk/core/thread/ThreadProcessStatusEnum.java
index ebc7cefbe2..87b5a3a211 100644
--- a/modules/core/src/main/java/com/bytedesk/core/thread/ThreadProcessStatusEnum.java
+++ b/modules/core/src/main/java/com/bytedesk/core/thread/ThreadProcessStatusEnum.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-05-25 10:43:58
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2025-07-24 11:30:05
+ * @LastEditTime: 2025-07-24 11:49:43
  * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
  *   Please be aware of the BSL license restrictions before installing Bytedesk IM – 
  *  selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -19,8 +19,8 @@ package com.bytedesk.core.thread;
 // Chatting结束后，直接Closed
 public enum ThreadProcessStatusEnum {
     NEW, // 新会话，待处理
-    ROBOTING, // 机器人接待中，外部访客跟大模型机器人会话
-    LLMING, // 大模型对话中，内部成员跟大模型对话
+    // ROBOTING, // 机器人接待中，外部访客跟大模型机器人会话
+    // LLMING, // 大模型对话中，内部成员跟大模型对话
     OFFLINE, // 客服离线
     QUEUING, // 排队中
     CHATTING, // 对话中
@@ -60,8 +60,8 @@ public enum ThreadProcessStatusEnum {
         switch (this) {
             case NEW:
                 return "新会话";
-            case ROBOTING:
-                return "机器人接待中";
+            // case ROBOTING:
+            //     return "机器人接待中";
             // case LLMING:
             //     return "大模型对话中";
             case OFFLINE:
diff --git a/modules/core/src/main/java/com/bytedesk/core/thread/ThreadProtobuf.java b/modules/core/src/main/java/com/bytedesk/core/thread/ThreadProtobuf.java
index 167759b1a3..2a27b05abb 100644
--- a/modules/core/src/main/java/com/bytedesk/core/thread/ThreadProtobuf.java
+++ b/modules/core/src/main/java/com/bytedesk/core/thread/ThreadProtobuf.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-02-21 10:01:27
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2025-07-10 10:38:44
+ * @LastEditTime: 2025-07-24 11:49:50
  * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
  *   Please be aware of the BSL license restrictions before installing Bytedesk IM – 
  *  selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -66,13 +66,14 @@ public class ThreadProtobuf implements Serializable {
 
     // ROBOTING
     public Boolean isRoboting() {
-        return ThreadProcessStatusEnum.ROBOTING.equals(getStatus());
-    }
+        // return ThreadProcessStatusEnum.ROBOTING.equals(getStatus());
+        return isRobotType() && isChatting();
+    }   
 
     // LLMING
-    public Boolean isLlmIng() {
-        return ThreadProcessStatusEnum.LLMING.equals(getStatus());
-    }
+    // public Boolean isLlmIng() {
+    //     return ThreadProcessStatusEnum.LLMING.equals(getStatus());
+    // }
 
     // queuing
     public Boolean isQueuing() {
diff --git a/modules/service/src/main/java/com/bytedesk/service/routing_strategy/RobotThreadRoutingStrategy.java b/modules/service/src/main/java/com/bytedesk/service/routing_strategy/RobotThreadRoutingStrategy.java
index 1be099b6b3..8fdaf1d8b4 100644
--- a/modules/service/src/main/java/com/bytedesk/service/routing_strategy/RobotThreadRoutingStrategy.java
+++ b/modules/service/src/main/java/com/bytedesk/service/routing_strategy/RobotThreadRoutingStrategy.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-07-15 15:58:33
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2025-04-10 10:53:14
+ * @LastEditTime: 2025-07-24 11:50:50
  * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
  *   Please be aware of the BSL license restrictions before installing Bytedesk IM – 
  *  selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -104,7 +104,7 @@ public class RobotThreadRoutingStrategy implements ThreadRoutingStrategy {
             content = "您好，请问有什么可以帮助您？";
         }
         // 更新线程状态
-        thread.setRoboting().setContent(content).setUnreadCount(0);
+        thread.setChatting().setContent(content).setUnreadCount(0);
         // 
         String robotString = ConvertAiUtils.convertToRobotProtobufString(robotEntity);
         thread.setRobot(robotString);
diff --git a/modules/service/src/main/java/com/bytedesk/service/routing_strategy/WorkflowThreadRoutingStrategy.java b/modules/service/src/main/java/com/bytedesk/service/routing_strategy/WorkflowThreadRoutingStrategy.java
index 5f0d17bac1..38954eccaa 100644
--- a/modules/service/src/main/java/com/bytedesk/service/routing_strategy/WorkflowThreadRoutingStrategy.java
+++ b/modules/service/src/main/java/com/bytedesk/service/routing_strategy/WorkflowThreadRoutingStrategy.java
@@ -84,7 +84,7 @@ public class WorkflowThreadRoutingStrategy implements ThreadRoutingStrategy {
             } else if (threadOptional.get().isRoboting()) {
                 thread = threadOptional.get();
                 // 
-                thread = visitorThreadService.reInitRobotThreadExtra(thread, robotEntity); // 方便测试
+                thread = visitorThreadService.reInitRobotThreadExtra(thread, workflowEntity); // 方便测试
                 // 返回未关闭，或 非留言状态的会话
                 log.info("Already have a processing robot thread {}", topic);
                 return getRobotContinueMessage(robotEntity, thread);
diff --git a/modules/service/src/main/java/com/bytedesk/service/routing_strategy/WorkgroupThreadRoutingStrategy.java b/modules/service/src/main/java/com/bytedesk/service/routing_strategy/WorkgroupThreadRoutingStrategy.java
index 6b44b3e53f..4ba448dcd2 100644
--- a/modules/service/src/main/java/com/bytedesk/service/routing_strategy/WorkgroupThreadRoutingStrategy.java
+++ b/modules/service/src/main/java/com/bytedesk/service/routing_strategy/WorkgroupThreadRoutingStrategy.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-07-15 15:58:23
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2025-07-08 14:47:00
+ * @LastEditTime: 2025-07-24 11:51:02
  * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
  *   Please be aware of the BSL license restrictions before installing Bytedesk IM – 
  *  selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -373,7 +373,7 @@ public class WorkgroupThreadRoutingStrategy implements ThreadRoutingStrategy {
         }
         // 更新线程状态
         thread.setUserUid(robotEntity.getUid());
-        thread.setRoboting().setContent(content).setUnreadCount(0);
+        thread.setChatting().setContent(content).setUnreadCount(0);
         // 
         String robotString = ConvertAiUtils.convertToRobotProtobufString(robotEntity);
         thread.setRobot(robotString);
diff --git a/modules/service/src/main/java/com/bytedesk/service/visitor_thread/VisitorThreadService.java b/modules/service/src/main/java/com/bytedesk/service/visitor_thread/VisitorThreadService.java
index e6359f1914..1cb6569d72 100644
--- a/modules/service/src/main/java/com/bytedesk/service/visitor_thread/VisitorThreadService.java
+++ b/modules/service/src/main/java/com/bytedesk/service/visitor_thread/VisitorThreadService.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-06-29 13:08:52
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2025-07-10 16:20:25
+ * @LastEditTime: 2025-07-24 12:06:08
  * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
  *   Please be aware of the BSL license restrictions before installing Bytedesk IM – 
  *  selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. 
@@ -49,6 +49,7 @@ import com.bytedesk.service.utils.ServiceConvertUtils;
 import com.bytedesk.service.visitor.VisitorRequest;
 import com.bytedesk.service.workgroup.WorkgroupEntity;
 import com.bytedesk.core.utils.BdDateUtils;
+import com.bytedesk.core.workflow.WorkflowEntity;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -253,6 +254,51 @@ public class VisitorThreadService
         return savedEntity;
     }
 
+    public ThreadEntity createWorkflowThread(VisitorRequest visitorRequest, WorkflowEntity workflow, String topic) {
+        //
+        String robotString = ConvertAiUtils.convertToRobotProtobufString(workflow);
+        String visitor = ServiceConvertUtils.convertToVisitorProtobufJSONString(visitorRequest);
+        String extra = ServiceConvertUtils
+                .convertToServiceSettingsResponseVisitorJSONString(workflow.getServiceSettings());
+        //
+        ThreadEntity thread = ThreadEntity.builder()
+                .uid(uidUtils.getUid())
+                .topic(topic)
+                .type(ThreadTypeEnum.WORKFLOW.name())
+                // .agent(robotString) // 人工客服
+                .robot(robotString) // 机器人
+                .userUid(workflow.getUid()) // 机器人uid
+                .user(visitor)
+                .channel(visitorRequest.getChannel())
+                .orgUid(workflow.getOrgUid())
+                .extra(extra)
+                .build();
+        ThreadEntity savedEntity = threadRestService.save(thread);
+        if (savedEntity == null) {
+            throw new RuntimeException("Could not save visitor thread");
+        }
+        return savedEntity;
+    }
+
+    public ThreadEntity reInitWorkflowThreadExtra(ThreadEntity thread, RobotEntity robot) {
+        //
+        String extra = ServiceConvertUtils
+                .convertToServiceSettingsResponseVisitorJSONString(robot.getServiceSettings());
+        thread.setExtra(extra);
+        // 使用agent的serviceSettings配置
+        String robotString = ConvertAiUtils.convertToRobotProtobufString(robot);
+        // thread.setAgent(robotString); // 人工客服
+        thread.setRobot(robotString); // 机器人
+        // 保存
+        ThreadEntity savedEntity = threadRestService.save(thread);
+        if (savedEntity == null) {
+            throw new RuntimeException("Could not save visitor thread");
+        }
+        //
+        return savedEntity;
+    }
+
+    
     public VisitorThreadEntity update(ThreadEntity thread) {
         Optional<VisitorThreadEntity> visitorThreadOpt = findByUid(thread.getUid());
         if (visitorThreadOpt.isPresent()) {