ZF/weiyu
1
0
Fork 0
mirror of https://gitee.com/270580156/weiyu.git synced 2025-12-30 10:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
jack ning
2025-07-24 06:46:04 +08:00
parent 91ed58e02e
commit 1bf8910e76
4 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/docker/docker-compose-ollama.yaml
View File

@@ -152,7 +152,7 @@ services:
SERVER_PORT: 9003
# bytedesk config
BYTEDESK_DEBUG: "false"
BYTEDESK_VERSION: 0.8.9
BYTEDESK_VERSION: 0.8.8
BYTEDESK_LICENSE_KEY: ZjoyMDI1LTA4LTA2OkVOVEVSUFJJU0U6Ojo6
# enable custom config: name, logo, description
BYTEDESK_CUSTOM_ENABLED: "false"

2
deploy/docker/docker-compose.yaml
View File

@@ -132,7 +132,7 @@ services:
SERVER_PORT: 9003
# bytedesk config
BYTEDESK_DEBUG: "false"
BYTEDESK_VERSION: 0.8.9
BYTEDESK_VERSION: 0.8.8
BYTEDESK_LICENSE_KEY: ZjoyMDI1LTA4LTA2OkVOVEVSUFJJU0U6Ojo6
# enable custom config: name, logo, description
BYTEDESK_CUSTOM_ENABLED: "false"

5
modules/core/src/main/java/com/bytedesk/core/workflow/WorkflowRestController.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-05-11 18:25:36
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-07-02 10:51:37
* @LastEditTime: 2025-07-24 06:36:37
* @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.
@@ -16,6 +16,7 @@ package com.bytedesk.core.workflow;
import org.springframework.data.domain.Page;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.context.annotation.Description;
@@ -131,7 +132,7 @@ public class WorkflowRestController extends BaseRestController<WorkflowRequest>
@ApiResponse(responseCode = "200", description = "执行成功")
@ActionAnnotation(title = "工作流", action = "执行", description = "execute workflow")
@PostMapping("/execute")
public ResponseEntity<?> execute(WorkflowRequest request) {
public ResponseEntity<?> execute(@RequestBody WorkflowRequest request) {
WorkflowResponse workflow = workflowService.execute(request);

34
modules/core/src/main/java/com/bytedesk/core/workflow/WorkflowService.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2025-06-25 09:58:23
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-07-23 23:10:55
* @LastEditTime: 2025-07-24 06:42:53
* @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.
@@ -105,7 +105,7 @@ public class WorkflowService {
* @param nodeId 当前节点UID
* @param request 请求参数
*/
private void executeWorkflowFromNode(WorkflowEntity workflow, String nodeId, WorkflowRequest request) {
private WorkflowEntity executeWorkflowFromNode(WorkflowEntity workflow, String nodeId, WorkflowRequest request) {
try {
log.debug("Executing from node: {}", nodeId);
@@ -130,8 +130,8 @@ public class WorkflowService {
if (nextNodeUid != null) {
// 更新当前节点并继续执行
workflow.setCurrentNodeId(nextNodeUid);
workflowRestService.save(workflow);
executeWorkflowFromNode(workflow, nextNodeUid, request);
workflow = workflowRestService.save(workflow);
workflow = executeWorkflowFromNode(workflow, nextNodeUid, request);
}
break;
@@ -145,8 +145,8 @@ public class WorkflowService {
// 处理条件节点逻辑
String conditionResult = evaluateCondition(currentNode, request);
workflow.setCurrentNodeId(conditionResult);
workflowRestService.save(workflow);
executeWorkflowFromNode(workflow, conditionResult, request);
workflow = workflowRestService.save(workflow);
workflow = executeWorkflowFromNode(workflow, conditionResult, request);
break;
case LOOP:
@@ -162,8 +162,8 @@ public class WorkflowService {
String llmNextNodeUid = findNextNode(jsonObject, nodeId);
if (llmNextNodeUid != null) {
workflow.setCurrentNodeId(llmNextNodeUid);
workflowRestService.save(workflow);
executeWorkflowFromNode(workflow, llmNextNodeUid, request);
workflow = workflowRestService.save(workflow);
workflow = executeWorkflowFromNode(workflow, llmNextNodeUid, request);
}
break;
@@ -174,8 +174,8 @@ public class WorkflowService {
String textNextNodeUid = findNextNode(jsonObject, nodeId);
if (textNextNodeUid != null) {
workflow.setCurrentNodeId(textNextNodeUid);
workflowRestService.save(workflow);
executeWorkflowFromNode(workflow, textNextNodeUid, request);
workflow = workflowRestService.save(workflow);
workflow = executeWorkflowFromNode(workflow, textNextNodeUid, request);
}
break;
@@ -185,8 +185,8 @@ public class WorkflowService {
String commentNextNodeUid = findNextNode(jsonObject, nodeId);
if (commentNextNodeUid != null) {
workflow.setCurrentNodeId(commentNextNodeUid);
workflowRestService.save(workflow);
executeWorkflowFromNode(workflow, commentNextNodeUid, request);
workflow = workflowRestService.save(workflow);
workflow = executeWorkflowFromNode(workflow, commentNextNodeUid, request);
}
break;
@@ -204,6 +204,7 @@ public class WorkflowService {
log.error("执行节点失败: {}", e.getMessage(), e);
throw new RuntimeException("执行节点失败: " + e.getMessage(), e);
}
return workflow;
}
/**
@@ -291,7 +292,7 @@ public class WorkflowService {
/**
* 执行LLM节点
*/
private void executeLLMNode(WorkflowEntity workflow, JSONObject llmNode, WorkflowRequest request) {
private WorkflowEntity executeLLMNode(WorkflowEntity workflow, JSONObject llmNode, WorkflowRequest request) {
// LLM节点的逻辑实现
log.debug("执行LLM节点: {}", llmNode.getString("name"));
@@ -312,12 +313,13 @@ public class WorkflowService {
// 简化处理，不保存实际响应
}
}
return workflow;
}
/**
* 执行文本节点
*/
private void executeTextNode(WorkflowEntity workflow, JSONObject textNode, WorkflowRequest request) {
private WorkflowEntity executeTextNode(WorkflowEntity workflow, JSONObject textNode, WorkflowRequest request) {
// 文本节点的逻辑实现
log.debug("执行文本节点: {}", textNode.getString("name"));
@@ -333,12 +335,13 @@ public class WorkflowService {
// 简化处理，不做实际处理
}
}
return workflow;
}
/**
* 执行分组节点
*/
private void executeGroupNode(WorkflowEntity workflow, JSONObject groupNode, WorkflowRequest request) {
private WorkflowEntity executeGroupNode(WorkflowEntity workflow, JSONObject groupNode, WorkflowRequest request) {
// 分组节点的逻辑实现
log.debug("执行分组节点: {}", groupNode.getString("name"));
@@ -356,6 +359,7 @@ public class WorkflowService {
// 简化处理，不实际执行分组内的子流程
}
}
return workflow;
}
/**