xieyinlu/ruoyi-ai
1
0
Fork 0
mirror of https://gitcode.com/ageerle/ruoyi-ai.git synced 2026-09-13 08:25:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: streamline workflow orchestration and chat routing

Browse Source 
Add Zhipu web search integration, remove obsolete workflow nodes and resume handling, and separate model, agent, and workflow chat execution.
This commit is contained in:
ageerle
2026-07-30 00:15:44 +08:00
parent 83fd1ee983
commit 6e264ad500
45 changed files with 1217 additions and 1580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/enums/ErrorEnum.java
View File

@@ -54,7 +54,6 @@ public enum ErrorEnum {
A_WF_RUNTIME_NOT_FOUND("A00045", "工作流运行时数据找不到"),
A_SEARCH_QUERY_IS_EMPTY("A00046", "搜索内容不能为空"),
A_WF_COMPONENT_NOT_FOUND("A00047", "工作流基础组件找不到"),
A_WF_RESUME_FAIL("A00048", "工作流恢复执行时失败"),
A_MAIL_SENDER_EMPTY("A00049", "邮件发送人不能为空"),
A_MAIL_SENDER_CONFIG_ERROR("A00050", "邮件发送人配置错误"),
A_MAIL_RECEIVER_EMPTY("A00051", "邮件接收人不能为空"),

8
ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/service/workFlow/IWorkFlowStarterService.java
View File

@@ -22,12 +22,4 @@ public interface IWorkFlowStarterService {
* @return 流式输出结果
*/
SseEmitter streaming(User user, String workflowUuid, List<ObjectNode> userInputs, Long sessionId);
/**
* 恢复工作流
* @param runtimeUuid 运行时UUID
* @param userInput 用户输入
* @param sseEmitter SSE连接对象
*/
void resumeFlow(String runtimeUuid, String userInput, SseEmitter sseEmitter);
}

8
ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java
View File

@@ -15,9 +15,6 @@ import me.zhyd.oauth.utils.HttpUtils;
import me.zhyd.oauth.utils.StringUtils;
import me.zhyd.oauth.utils.UrlBuilder;
// 临时保留FastJson用于JustAuth库兼容
import com.alibaba.fastjson.JSON;
/**
* <p>
* 企业微信登录父类
@@ -64,11 +61,8 @@ public abstract class AbstractAuthWeChatEnterpriseRequest extends AuthDefaultReq
String userTicket = object.has("user_ticket") ? object.get("user_ticket").asText() : null;
JsonNode userDetail = getUserDetail(authToken.getAccessToken(), userId, userTicket);
// 将JsonNode转换为JSONObject以兼容JustAuth库
com.alibaba.fastjson.JSONObject rawUserInfo = com.alibaba.fastjson.JSON.parseObject(userDetail.toString());
// rawUserInfo 为 JustAuth 的 fastjson 类型字段, 项目内无消费方, 不再设置
return AuthUser.builder()
.rawUserInfo(rawUserInfo)
.username(userDetail.has("name") ? userDetail.get("name").asText() : null)
.nickname(userDetail.has("alias") ? userDetail.get("alias").asText() : null)
.avatar(userDetail.has("avatar") ? userDetail.get("avatar").asText() : null)

8
ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AuthDingTalkV2Request.java
View File

@@ -19,9 +19,6 @@ import me.zhyd.oauth.utils.UrlBuilder;
import java.util.HashMap;
import java.util.Map;
// 临时保留FastJson用于JustAuth库兼容
import com.alibaba.fastjson.JSON;
/**
* 新版钉钉二维码登录
*
@@ -92,13 +89,10 @@ public class AuthDingTalkV2Request extends AuthDefaultRequest {
String response = new HttpUtils(config.getHttpConfig()).get(this.source.userInfo(), null, header, false).getBody();
JsonNode object = objectMapper.readTree(response);
// 将JsonNode转换为JSONObject以兼容JustAuth库
com.alibaba.fastjson.JSONObject rawUserInfo = com.alibaba.fastjson.JSON.parseObject(object.toString());
authToken.setOpenId(object.has("openId") ? object.get("openId").asText() : null);
authToken.setUnionId(object.has("unionId") ? object.get("unionId").asText() : null);
// rawUserInfo 为 JustAuth 的 fastjson 类型字段, 项目内无消费方, 不再设置
return AuthUser.builder()
.rawUserInfo(rawUserInfo)
.uuid(object.has("unionId") ? object.get("unionId").asText() : null)
.username(object.has("nick") ? object.get("nick").asText() : null)
.nickname(object.has("nick") ? object.get("nick").asText() : null)