feat: 调整mcp tools的持久化结构; #241

Author: heqingpan

.gitignore

@@ -9,3 +9,5 @@ naming.db
 nacos_db/
 .env
 cluster_example/
+.kiro/
+

src/common/pb/data_object.proto

@@ -14,26 +14,59 @@ message McpServerDo {
   string token = 5;
 }
 
+// 工具规范版本
+message ToolSpecVersionDo {
+  uint64 version = 1;
+  string parameters_json = 2;
+  string op_user = 3;
+  int64 update_time = 4;
+  int64 ref_count = 5;
+}
+
+// 工具键
+message ToolKey {
+  string namespace = 1;
+  string group = 2;
+  string tool_name = 3;
+}
+
+// MCP 工具规范
 message McpToolSpecDo {
   string namespace = 1;
   string group = 2;
   string tool_name = 3;
-  uint64 version = 4;
-  string name = 5;
-  string description = 6;
+  uint64 current_version = 4;
+  int64 create_time = 5;
+  string create_user = 6;
+  repeated ToolSpecVersionDo versions = 7;
 }
 
-message McpToolDo {
-  uint64 id = 1;
-  string tool_name = 2;
-  string namespace = 3;
-  string group = 4;
-  uint64 version = 5;
+// 转换类型
+enum ConvertType {
+  NONE = 0;
+  FORM_TO_JSON = 1;
+  CUSTOM = 2;
 }
 
+// 工具路由规则
 message ToolRouteRuleDo {
   string protocol = 1;
   string url = 2;
   string method = 3;
+  string addition_headers_json = 4;
+  string convert_type = 5;
+  string service_namespace = 6;
+  string service_group = 7;
+  string service_name = 8;
 }
 
+// MCP 工具
+message McpToolDo {
+  uint64 id = 1;
+  string tool_name = 2;
+  string namespace = 3;
+  string group = 4;
+  uint64 version = 5;
+  string spec_json = 6;
+  string route_rule_json = 7;
+}

src/common/pb/data_object.rs

@@ -6,8 +6,7 @@ use crate::mcp::model::actor_model::{
     McpToolSpecQueryParam, ToolSpecDto,
 };
 use crate::mcp::model::mcp::{
-    McpQueryParam, McpServer, McpServerDto, McpServerParam, McpServerWrap, ToolKey, ToolSpec,
-    ToolSpecParam,
+    McpQueryParam, McpServer, McpServerDto, McpServerParam, McpServerWrap,
 };
 use crate::raft::filestore::model::SnapshotRecordDto;
 use crate::raft::filestore::raftapply::{RaftApplyDataRequest, RaftApplyDataResponse};
@@ -18,6 +17,7 @@ use bean_factory::{bean, BeanFactory, FactoryData, Inject};
 use quick_protobuf::{BytesReader, Writer};
 use std::collections::BTreeMap;
 use std::sync::Arc;
+use crate::mcp::model::tools::{ToolKey, ToolSpec, ToolSpecParam};
 
 #[bean(inject)]
 pub struct McpManager {

src/mcp/core.rs

@@ -1,9 +1,10 @@
 use crate::mcp::model::mcp::{
-    McpQueryParam, McpServer, McpServerDto, McpServerParam, ToolSpec, ToolSpecParam,
+    McpQueryParam, McpServer, McpServerDto, McpServerParam,
 };
 use actix::Message;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
+use crate::mcp::model::tools::{ToolSpec, ToolSpecParam};
 
 /// MCP 查询请求
 #[derive(Debug, Message)]
@@ -60,27 +61,28 @@ pub struct McpToolSpecQueryParam {
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ToolSpecDto {
-    pub namespace: String,
-    pub group: String,
-    pub tool_name: String,
+    pub namespace: Arc<String>,
+    pub group: Arc<String>,
+    pub tool_name: Arc<String>,
     pub version: u64,
     pub name: String,
     pub description: String,
-    pub create_time: u64,
-    pub last_modified_millis: u64,
+    pub create_time: i64,
+    pub last_modified_millis: i64,
 }
 
 impl ToolSpecDto {
     pub fn new_from(tool_spec: &ToolSpec) -> Self {
+        let current_version = tool_spec.get_current_version().unwrap_or_default();
         Self {
-            namespace: tool_spec.key.namespace.to_string(),
-            group: tool_spec.key.group.to_string(),
-            tool_name: tool_spec.key.tool_name.to_string(),
-            version: tool_spec.version,
-            name: tool_spec.name.to_string(),
-            description: tool_spec.description.to_string(),
-            create_time: 0,          // 实际实现中需要从 tool_spec 获取
-            last_modified_millis: 0, // 实际实现中需要从 tool_spec 获取
+            namespace: tool_spec.key.namespace.clone(),
+            group: tool_spec.key.group.clone(),
+            tool_name: tool_spec.key.tool_name.clone(),
+            version: tool_spec.current_version,
+            name: current_version.parameters.name.clone(),
+            description: current_version.parameters.name.clone(),
+            create_time: 0, // 实际实现中需要从 tool_spec 获取
+            last_modified_millis: current_version.update_time, // 实际实现中需要从 tool_spec 获取
         }
     }
 }