mcp测试通过+http

internal/auth/auth_middleware.go

@@ -3,11 +3,18 @@ package auth
 import (
 	"context"
 	"net/http"
+
+	"git.x2erp.com/qdy/go-db/factory/database"
 )
 
 // authMiddleware 验证 Authorization 头和项目 ID 头
-func AuthMiddleware(next http.Handler, authToken, projectIDHeader string) http.Handler {
+func AuthMiddleware(next http.Handler, dbFactory *database.DBFactory) http.Handler {
+
+	projectIDHeader := "X-Project-ID"
+	authToken := "123"
+
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+
 		// 验证 Authorization 头
 		authHeader := r.Header.Get("Authorization")
 		if authHeader == "" {

internal/handler/register_router.go

@@ -0,0 +1,45 @@
+package handler
+
+import (
+	"encoding/json"
+	"log"
+
+	"git.x2erp.com/qdy/go-base/ctx"
+	"git.x2erp.com/qdy/go-base/middleware"
+	"git.x2erp.com/qdy/go-base/model/response"
+	"git.x2erp.com/qdy/go-base/webx/router"
+	"git.x2erp.com/qdy/go-db/factory/database"
+)
+
+func RegisterRouter(ws *router.RouterService, dbFactory *database.DBFactory) {
+
+	// POST示例：Body参数绑定
+	ws.POST("/api/tenant/config",
+		func(req ctx.RequestContext, reqCtx *ctx.RequestContext) (*response.QueryResult[interface{}], error) {
+			log.Print("ctx TenantID:", reqCtx.TenantID)
+			//log.Print("mongoDBFactory:", mongoDBFactory.GetConfig().URI)
+			//log.Print("dbFactory:", dbFactory.GetDBName())
+			jsonBytes, _ := json.Marshal(req)
+			log.Printf("TenantConfig :%s", string(jsonBytes))
+
+			//queryResult, err := dbFactory.InsertOne("tenant_configs", req)
+			//log.Print("TenantConfig InsertOne:", queryResult)
+			// req 自动从JSON Body绑定
+			return nil, nil
+		},
+	).Use(middleware.JWTAuthMiddleware).Register()
+
+	// // 您的业务路由
+	// ws.POST("/api/query/yaml",
+	// 	func() (interface{}, error) {
+	// 		return queryYaml(nil) // 需要修改queryYaml函数以获取dbFactory
+	// 	},
+	// ).Use(middleware.JWTAuthMiddleware).Register()
+
+	// ws.POST("/api/init/config/template",
+	// 	func() (interface{}, error) {
+	// 		return initConfigTemplate(nil) // 需要修改initConfigTemplate函数以获取dbFactory
+	// 	},
+	// ).Use(middleware.JWTAuthMiddleware).Register()
+
+}

internal/model/dim_ business.go

@@ -0,0 +1,50 @@
+package model
+
+import (
+	"time"
+
+	"git.x2erp.com/qdy/go-db/sqldef"
+)
+
+func init() {
+	sqldef.AddRegistration(func(r *sqldef.Registry) {
+		tb := sqldef.NewTable("dim_business", "业务词典表").
+			ID("id", 64).Comment("主键ID").End().
+			String("project_id", 8).NotNull().Comment("项目编号").End().
+			String("table_name", 64).NotNull().Comment("表名").End().
+			String("field_name", 64).NotNull().Comment("字段名称（英文）").End().
+			String("business_alias", 128).NotNull().Comment("业务别名").End().
+			String("description", 128).Comment("描述").End().
+			String("creator", 32).NotNull().Comment("创建人").End().
+			DateTime("created_at").NotNull().Default("CURRENT_TIMESTAMP").Comment("创建时间").End().
+			DateTime("updated_at").NotNull().Default("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP").Comment("更新时间").End()
+
+		// 核心唯一索引：同一项目下业务别名必须唯一
+		tb.AddUniqueIndex("uk_project_alias", "project_id", "business_alias")
+
+		// 常用查询索引
+		tb.AddIndex("idx_project_table_field", "project_id", "table_name", "field_name")
+		tb.AddIndex("idx_standard_name", "standard_cn_name")
+		tb.AddIndex("idx_category", "category")
+		tb.AddIndex("idx_created_at", "created_at")
+
+		r.RegisterTable(tb.Build())
+	})
+}
+
+// DimBusiness 业务词典结构体
+type DimBusiness struct {
+	ID            string    `gorm:"column:id;type:varchar(64);primaryKey;comment:主键ID"`
+	ProjectID     string    `gorm:"column:project_id;type:varchar(8);not null;index:idx_project_id;comment:项目编号"`
+	TableName     string    `gorm:"column:table_name;type:varchar(64);not null;comment:表名"`
+	FieldName     string    `gorm:"column:field_name;type:varchar(64);not null;comment:字段名称（英文）"`
+	BusinessAlias string    `gorm:"column:business_alias;type:varchar(128);not null;comment:业务别名"`
+	Description   string    `gorm:"column:description;type:text;comment:描述"`
+	Creator       string    `gorm:"column:creator;type:varchar(32);not null;comment:创建人"`
+	CreatedAt     time.Time `gorm:"column:created_at;type:datetime;not null;default:CURRENT_TIMESTAMP;comment:创建时间"`
+	UpdatedAt     time.Time `gorm:"column:updated_at;type:datetime;not null;default:CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;comment:更新时间"`
+}
+
+func (DimBusiness) DimBusiness() string {
+	return "dim_business"
+}

internal/model/dim_table.go

@@ -0,0 +1,41 @@
+package model
+
+import (
+	"time"
+
+	"git.x2erp.com/qdy/go-db/sqldef"
+)
+
+func init() {
+	sqldef.AddRegistration(func(r *sqldef.Registry) {
+		tb := sqldef.NewTable("dim_table", "表字典").
+			ID("id", 64).Comment("主键ID").End().
+			String("projectId", 8).NotNull().Comment("项目编号").End().
+			String("table_name", 64).NotNull().Comment("表名").End().       // 最大64字符
+			String("table_name_cn", 128).NotNull().Comment("中文表名").End(). // 中文名可以稍长
+			Text("description").Comment("描述").End().
+			String("primary_key_field_name", 64).NotNull().Comment("主键字段名").End(). // 修改为64
+			String("creator", 32).NotNull().Comment("创建人").End().
+			DateTime("created_at").NotNull().Default("CURRENT_TIMESTAMP").Comment("创建时间").End()
+		r.RegisterTable(tb.Build())
+
+		tb.AddIndex("idx_table_name", "table_name")
+
+	})
+}
+
+// TableRequest 表字典结构体
+type DimTable struct {
+	ID                  string    `gorm:"column:id;type:varchar(64);primaryKey;comment:主键ID"`
+	ProjectId           string    `gorm:"column:project_id;type:varchar(8);not null;comment:项目名称"`
+	TableName           string    `gorm:"column:table_name;type:varchar(64);not null;comment:表名"`
+	TableNameCN         string    `gorm:"column:table_name_cn;type:varchar(128);not null;comment:中文表名"`
+	Description         string    `gorm:"column:description;type:text;comment:描述"`
+	PrimaryKeyFieldName string    `gorm:"column:primary_key_field_name;type:varchar(64);not null;comment:主键字段名"`
+	Creator             string    `gorm:"column:creator;type:varchar(32);not null;comment:创建人"`
+	CreatedAt           time.Time `gorm:"column:created_at;type:datetime;not null;default:CURRENT_TIMESTAMP;comment:创建时间"`
+}
+
+func (DimTable) DimTable() string {
+	return "dim_table"
+}

internal/model/dim_table_field.go

@@ -0,0 +1,61 @@
+package model
+
+import (
+	"time"
+
+	"git.x2erp.com/qdy/go-db/sqldef"
+)
+
+func init() {
+	sqldef.AddRegistration(func(r *sqldef.Registry) {
+		tb := sqldef.NewTable("dim_table_field", "表字段字典").
+			ID("id", 64).Comment("主键ID").End().
+			String("project_id", 8).NotNull().Comment("项目编号").End().
+			String("table_name", 64).NotNull().Comment("表名").End().
+			String("field_name", 64).NotNull().Comment("字段名称（英文）").End().
+			String("field_name_cn", 128).NotNull().Comment("字段中文名称").End().
+			Text("description").Comment("字段描述").End().
+			String("field_type", 64).NotNull().Comment("字段类型（如：varchar, int, datetime等）").End().
+			Int("field_length").Comment("字段长度/精度").End().
+			Bool("is_primary_key").Default("0").NotNull().Comment("是否为主键（0:否, 1:是）").End().
+			Bool("is_nullable").Default("1").NotNull().Comment("是否允许为空（0:否, 1:是）").End().
+			Int("decimal_places").Comment("小数位数（对于decimal类型）").End().
+			String("creator", 32).NotNull().Comment("创建人").End().
+			DateTime("created_at").NotNull().Default("CURRENT_TIMESTAMP").Comment("创建时间").End().
+			DateTime("updated_at").NotNull().Default("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP").Comment("更新时间").End()
+
+		// 添加唯一索引：同一项目下同一表的字段名不能重复
+		//tb.AddUniqueIndex("uk_project_table_field", "project_id", "table_name", "field_name")
+
+		// 添加普通索引，方便查询
+		tb.AddIndex("idx_project_id", "project_id")
+		tb.AddIndex("idx_table_name", "table_name")
+		tb.AddIndex("idx_field_name", "field_name")
+		tb.AddIndex("idx_field_name_cn", "field_name_cn")
+		tb.AddIndex("idx_description", "description")
+
+		r.RegisterTable(tb.Build())
+	})
+}
+
+// DimTableField 表字段字典结构体
+type DimTableField struct {
+	ID            string    `gorm:"column:id;type:varchar(64);primaryKey;comment:主键ID"`
+	ProjectID     string    `gorm:"column:project_id;type:varchar(8);not null;index:idx_project_id;comment:项目编号"`
+	TableName     string    `gorm:"column:table_name;type:varchar(64);not null;index:idx_table_name;comment:表名"`
+	FieldName     string    `gorm:"column:field_name;type:varchar(64);not null;comment:字段名称（英文）"`
+	FieldNameCN   string    `gorm:"column:field_name_cn;type:varchar(128);not null;comment:字段中文名称"`
+	Description   string    `gorm:"column:description;type:text;comment:字段描述"`
+	FieldType     string    `gorm:"column:field_type;type:varchar(64);not null;comment:字段类型（如：varchar, int, datetime等）"`
+	FieldLength   *int      `gorm:"column:field_length;type:int;comment:字段长度/精度"`
+	IsPrimaryKey  bool      `gorm:"column:is_primary_key;type:tinyint(1);not null;default:0;comment:是否为主键（0:否, 1:是）"`
+	IsNullable    bool      `gorm:"column:is_nullable;type:tinyint(1);not null;default:1;comment:是否允许为空（0:否, 1:是）"`
+	DecimalPlaces *int      `gorm:"column:decimal_places;type:int;comment:小数位数（对于decimal类型）"`
+	Creator       string    `gorm:"column:creator;type:varchar(32);not null;comment:创建人"`
+	CreatedAt     time.Time `gorm:"column:created_at;type:datetime;not null;default:CURRENT_TIMESTAMP;comment:创建时间"`
+	UpdatedAt     time.Time `gorm:"column:updated_at;type:datetime;not null;default:CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;comment:更新时间"`
+}
+
+func (DimTableField) DimTableField() string {
+	return "dim_table_field"
+}

main.go

@@ -3,10 +3,11 @@ package main
 import (
 	"log"
 	"net/http"
-	"os"
 
 	"git.x2erp.com/qdy/go-svc-mcp/internal/auth"
+	"git.x2erp.com/qdy/go-svc-mcp/internal/handler"
 	"git.x2erp.com/qdy/go-svc-mcp/internal/mcp"
+
 	_ "git.x2erp.com/qdy/go-svc-mcp/internal/tools" // 触发工具自动注册
 
 	"git.x2erp.com/qdy/go-base/config"
@@ -14,6 +15,9 @@ import (
 	"git.x2erp.com/qdy/go-base/ctx"
 	"git.x2erp.com/qdy/go-base/graceful"
 	"git.x2erp.com/qdy/go-base/logger"
+	"git.x2erp.com/qdy/go-base/webx"
+	"git.x2erp.com/qdy/go-base/webx/router"
+
 	"git.x2erp.com/qdy/go-db/factory/database"
 	mcpsdk "github.com/modelcontextprotocol/go-sdk/mcp"
 )
@@ -42,6 +46,44 @@ func main() {
 	dbFactory := container.Create(ctr, database.CreateDBFactory)
 	dbFactory.TestConnection()
 
+	// 创建mongodb
+	//mongoDBFactory := container.Create(ctr, mongodb.CreateFactory)
+	//mongoDBFactory.TestConnection()
+
+	// 创建mcpservice
+	mcpServer := createMcpService(cfg, dbFactory)
+
+	//启用运行日志
+	container.Create(ctr, logger.InitRuntimeLogger)
+
+	//建立httpservice
+	webxService := createMHttpService(cfg, dbFactory)
+
+	//等待关闭
+	graceful.WaitForShutdown(cfg.GetServiceConfig().ServiceName, ctr, mcpServer.GetHTTPServer(), webxService.GetServer())
+}
+
+// 创建httpService
+func createMHttpService(cfg config.IConfig, dbFactory *database.DBFactory) *webx.WebService {
+	//得到webservice服务工厂
+	webxFactory := webx.GetWebServiceFactory()
+
+	//建立hhtpService服务
+	webServcie, _ := webxFactory.CreateService(cfg.GetServiceConfig())
+
+	//建立路由-api
+	routerService := router.NewWebService(webServcie.GetRouter())
+	//注册路由--api
+	handler.RegisterRouter(routerService, dbFactory)
+
+	//启动服务
+	webServcie.Run()
+	return webServcie
+}
+
+// createMcpService 创建mcpService
+func createMcpService(cfg config.IConfig, dbFactory *database.DBFactory) *mcp.Server {
+
 	// 4. 创建基础请求上下文（可从配置或认证中提取）
 	baseCtx := &ctx.RequestContext{
 		TenantID: "default-tenant", // 实际应从认证中间件获取
@@ -54,8 +96,8 @@ func main() {
 		Description: "MCP 工具服务，提供自动注册发现和依赖注入",
 		DBFactory:   dbFactory,
 		BaseCtx:     baseCtx,
-		Port:        cfg.GetServiceConfig().Port,
-		ServiceName: cfg.GetServiceConfig().ServiceName,
+		Port:        cfg.GetMcpServiceConfig().Port,
+		ServiceName: cfg.GetMcpServiceConfig().ServiceName,
 	})
 	if err != nil {
 		log.Fatalf("Failed to create MCP server: %v", err)
@@ -65,26 +107,13 @@ func main() {
 	// 6. 获取 SDK 服务器实例
 	sdkServer := mcpServer.GetSDKServer()
 
-	// 7. 创建 HTTP 处理器（带验证中间件）
-	authToken := os.Getenv("MCP_AUTH_TOKEN")
-	if authToken == "" {
-		authToken = "123" // 仅用于开发，生产环境必须设置
-	}
-	projectIDHeader := os.Getenv("MCP_PROJECT_ID_HEADER")
-	if projectIDHeader == "" {
-		projectIDHeader = "X-Project-ID"
-	}
 	mcpHandler := mcpsdk.NewStreamableHTTPHandler(func(req *http.Request) *mcpsdk.Server {
 		return sdkServer
 	}, nil)
 	// 包装验证中间件
-	handler := auth.AuthMiddleware(mcpHandler, authToken, projectIDHeader)
+	handler := auth.AuthMiddleware(mcpHandler, dbFactory)
 
 	mcpServer.Run(handler)
 
-	//启用运行日志
-	container.Create(ctr, logger.InitRuntimeLogger)
-
-	//等待关闭
-	graceful.WaitForShutdown(appName, mcpServer.GetHTTPServer(), ctr)
+	return mcpServer
 }