mcp测试通过+http

config/config.go

@@ -24,7 +24,8 @@ type IConfig interface {
 	GetDbsConfig(name string) (*subconfigs.DatabaseConfig, bool) // 获取指定数据库连接
 
 	//服务支持
-	GetServiceConfig() *subconfigs.ServiceConfig //获取默认微服务配置
+	GetServiceConfig() *subconfigs.ServiceConfig       //获取默认微服务配置
+	GetMcpServiceConfig() *subconfigs.McpServiceConfig //获取默认微服务配置
 
 	// 其他配置（保持不变）
 	GetRedisConfig() *subconfigs.RedisConfig
@@ -137,6 +138,13 @@ func (c *Config) GetServiceConfig() *subconfigs.ServiceConfig {
 	return nil
 }
 
+func (c *Config) GetMcpServiceConfig() *subconfigs.McpServiceConfig {
+	if config := subconfigs.GetRegisteredConfig("mcpservice"); config != nil {
+		return config.(*subconfigs.McpServiceConfig)
+	}
+	return nil
+}
+
 func (c *Config) GetHTTPConfig() *subconfigs.HTTPConfig {
 	if config := subconfigs.GetRegisteredConfig("http"); config != nil {
 		return config.(*subconfigs.HTTPConfig)
@@ -282,6 +290,13 @@ func GetServiceConfig() *subconfigs.ServiceConfig {
 	return cfgInstance.GetServiceConfig()
 }
 
+func GetMcpServiceConfig() *subconfigs.McpServiceConfig {
+	if cfgInstance == nil {
+		return &subconfigs.McpServiceConfig{}
+	}
+	return cfgInstance.GetMcpServiceConfig()
+}
+
 var (
 	cfgInstance *Config
 	once        sync.Once

config/subconfigs/mcp_config.go

@@ -0,0 +1,69 @@
+// subconfigs/service_config.go
+package subconfigs
+
+import (
+	"fmt"
+	"log"
+)
+
+// ServiceConfig 数据库配置
+type McpServiceConfig struct {
+	BaseConfig
+	Port         int    `yaml:"port"`
+	ServiceName  string `yaml:"service_name"`
+	InstanceName string `yaml:"instance_name"`
+	ReadTimeout  int    `yaml:"read_timeout"`
+	WriteTimeout int    `yaml:"write_timeout"`
+	IdleTimeout  int    `yaml:"idle_timeout"`
+}
+
+// SetDefaults 设置默认值 - 实现 ConfigLoader 接口
+func (c *McpServiceConfig) SetDefaults() {
+
+	if c.Port == 0 {
+		c.Port = 8080
+	}
+	if c.IdleTimeout == 0 {
+		c.IdleTimeout = 60
+	}
+	if c.ReadTimeout == 0 {
+		c.ReadTimeout = 30
+	}
+	if c.WriteTimeout == 0 {
+		c.WriteTimeout = 30
+	}
+}
+
+// Load 从yaml数据加载 - 实现 ConfigLoader 接口
+func (c *McpServiceConfig) Load(data map[string]interface{}) error {
+	// 虽然可能不会被直接调用，但为了接口完整性还是要实现
+	return c.LoadFromYAML(data, c)
+}
+
+// ========== 业务方法 ==========
+
+// Validate 验证配置（数据库配置）
+func (c *McpServiceConfig) Validate() error {
+
+	if c.Port <= 0 || c.Port > 65535 {
+		return fmt.Errorf("invalid service port: %d", c.Port)
+	}
+
+	return nil
+}
+
+// IsConfigured 判断是否已配置（数据库配置）
+func (c *McpServiceConfig) IsConfigured() bool {
+
+	if c.Port <= 0 {
+		log.Println("⚠️  警告: 微服务 Port 未配置或无效")
+		return false
+	}
+
+	return true
+}
+
+// 自动注册
+func init() {
+	Register("mcpservice", &McpServiceConfig{})
+}

go.mod

@@ -4,11 +4,13 @@ go 1.25.4
 
 require (
 	github.com/hashicorp/consul/api v1.9.0
+	github.com/oapi-codegen/runtime v1.1.2
 	go.mongodb.org/mongo-driver v1.17.6
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
+	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect
 	github.com/elastic/elastic-transport-go/v8 v8.7.0 // indirect
 	github.com/fatih/color v1.9.0 // indirect
@@ -16,6 +18,7 @@ require (
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/google/btree v1.0.0 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/google/uuid v1.5.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
 	github.com/hashicorp/go-hclog v0.12.0 // indirect
@@ -26,7 +29,7 @@ require (
 	github.com/hashicorp/golang-lru v0.5.3 // indirect
 	github.com/hashicorp/serf v0.9.5 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
-	github.com/mattn/go-colorable v0.1.8 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/mapstructure v1.3.3 // indirect
 	github.com/rogpeppe/go-internal v1.14.1 // indirect

go.sum

@@ -1,9 +1,13 @@
+github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk=
+github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
+github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -25,6 +29,8 @@ github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
+github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hashicorp/consul/api v1.9.0 h1:T6dKIWcaihG2c21YUi0BMAHbJanVXiYuz+mPgqxY3N4=
 github.com/hashicorp/consul/api v1.9.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M=
 github.com/hashicorp/consul/sdk v0.8.0 h1:OJtKBtEjboEZvG6AOUdh4Z1Zbyu0WcxQ0qatRrZHTVU=
@@ -64,6 +70,7 @@ github.com/hashicorp/serf v0.9.5 h1:EBWvyu9tcRszt3Bxp3KNssBMP1KuHWyO51lz9+786iM=
 github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
 github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=
 github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
+github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -75,13 +82,14 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
-github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
@@ -97,6 +105,8 @@ github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:F
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.3.3 h1:SzB1nHZ2Xi+17FP0zVQBHIZqvwRN9408fJO8h+eeNA8=
 github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/oapi-codegen/runtime v1.1.2 h1:P2+CubHq8fO4Q6fV1tqDBZHCwpVpvPg7oKiYzQgXIyI=
+github.com/oapi-codegen/runtime v1.1.2/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
@@ -113,10 +123,12 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
@@ -162,6 +174,7 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
 golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=

graceful/shutdown.go

@@ -15,7 +15,7 @@ import (
 )
 
 // WaitForShutdown 带可选清理函数的优雅关闭
-func WaitForShutdown(serviceName string, server *http.Server, containerFactory *container.ContainerFactory) {
+func WaitForShutdown(serviceName string, containerFactory *container.ContainerFactory, servers ...*http.Server) {
 
 	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
@@ -33,13 +33,17 @@ func WaitForShutdown(serviceName string, server *http.Server, containerFactory *
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel()
 
-	// 停止接收新请求，完成当前请求
-	if err := server.Shutdown(ctx); err != nil {
-		log.Printf("服务 %s 关闭失败: %v", serviceName, err)
-	} else {
-		log.Printf("服务 %s 已关闭", serviceName)
+	for _, srv := range servers {
+		p := srv.Addr
+		if err := srv.Shutdown(ctx); err != nil {
+			log.Printf("服务 %s 关闭失败: %v", p, err)
+		} else {
+			log.Printf("服务 %s 已关闭", p)
+		}
 	}
 
+	// 停止接收新请求，完成当前请求
+
 	// 执行关闭处理
 	if containerFactory != nil {
 		containerFactory.CloseAll()
@@ -47,7 +51,7 @@ func WaitForShutdown(serviceName string, server *http.Server, containerFactory *
 
 	// 停止日志写入
 	logger.StopESWriter()
-	log.Printf("服务 %s 优雅关闭完成", serviceName)
+	log.Printf("%s 服务全部优雅关闭完成", serviceName)
 
 	// 等待一小段时间确保日志写入完成
 	time.Sleep(100 * time.Millisecond)

model/request/requset_model.go

@@ -101,3 +101,38 @@ type QueryRequest struct {
 	DorisTable       string                 `json:"dorisTable,omitempty"`       //doris数据库里的表名称
 
 }
+
+// TableRequest 表字典
+type TableRequest struct {
+	TableName           string `json:"table_name"`
+	TableNameCN         string `json:"table_name_cn"`
+	Description         string `json:"description"`
+	PrimaryKeyFieldName string `json:"primary_key_field_name"`
+}
+
+// TablesRequest 表字典集合
+type TablesRequest struct {
+	TableNames []*TableRequest `json:"table_names"`
+	FieldInfos []*FieldInfo    `json:"field_names"`
+}
+
+// FieldInfo 字段信息
+type FieldInfo struct {
+	TableName string `json:"table_name"`
+	// 字段名称（英文/数据库字段名）
+	FieldName string `json:"field_name"`
+	// 字段中文名称
+	FieldNameCN string `json:"field_name_cn"`
+	// 字段描述
+	Description string `json:"description"`
+	// 字段类型（如：varchar, int, datetime等）
+	FieldType string `json:"field_type"`
+	// 字段长度/精度
+	FieldLength *int `json:"field_length,omitempty"`
+	// 是否为主键
+	IsPrimaryKey bool `json:"is_primary_key"`
+	// 是否允许为空
+	IsNullable bool `json:"is_nullable"`
+	// 小数位数（对于decimal类型）
+	DecimalPlaces *int `json:"decimal_places,omitempty"`
+}