Release v0.1.12.15.13.29

main.go

@@ -47,6 +47,11 @@ func registerRoutes(webService web.Service, dbFactory *database.DBFactory) {
 		myhandle.QueryHandlerMap(w, r, dbFactory, service.QueryYamlConfigure)
 	})))
 
+	// 初始化配置模版
+	webService.Handle("/api/init/config/template", middleware.JWTAuthMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		myhandle.QueryHandlerMap(w, r, dbFactory, service.InitConfigTemplates)
+	})))
+
 }
 
 func creteTabel(factory *database.DBFactory) {

models/Config_template_builder.go

@@ -19,17 +19,17 @@ func NewConfigTemplateBuilder() *ConfigTemplateBuilder {
 }
 
 // StartTemplate 开始创建新模板
-func (b *ConfigTemplateBuilder) StartTemplate(name, rootKey, description string) *ConfigTemplateBuilder {
+func (b *ConfigTemplateBuilder) StartTemplate(id, name, description string) *ConfigTemplateBuilder {
 	b.current = &ConfigTemplate{
-		TemplateName: name,
-		YamlRootKey:  rootKey,
-		Description:  description,
-		IsDefault:    true,
-		SortOrder:    len(b.templates) + 1,
-		Creator:      "system",
-		CreatedAt:    time.Now(),
-		UpdatedAt:    time.Now(),
-		Details:      make([]ConfigTemplateDetail, 0),
+		ConfigTemplateID: id,
+		TemplateName:     name,
+		Description:      description,
+		IsDefault:        true,
+		SortOrder:        len(b.templates) + 1,
+		Creator:          "system",
+		CreatedAt:        time.Now(),
+		UpdatedAt:        time.Now(),
+		Details:          make([]ConfigTemplateDetail, 0),
 	}
 	return b
 }
@@ -76,56 +76,26 @@ func (b *ConfigTemplateBuilder) GetTemplates() []*ConfigTemplate {
 	return b.templates
 }
 
-// // BuildSampleTemplates 构建示例模板
-// func (b *ConfigTemplateBuilder) BuildSampleTemplates() *ConfigTemplateBuilder {
-// 	// Service模板
-// 	b.StartTemplate("Service配置", "service", "服务基础配置").
-// 		AddInt("port", "服务监听端口").Default("8080").Min(1024).Max(65535).Required().FinishDetail().
-// 		AddString("service_name", "服务名称").Default("svc-configure").Pattern("^[a-zA-Z][a-zA-Z0-9_-]*$").Required().FinishDetail().
-// 		AddString("instance_name", "实例名称").Default("svc-configure-01").Required().FinishDetail().
-// 		AddInt("read_timeout", "读取超时时间（秒）").Default("30").Min(1).Max(300).Required().FinishDetail().
-// 		AddInt("write_timeout", "写入超时时间（秒）").Default("30").Min(1).Max(300).Required().FinishDetail().
-// 		AddInt("idle_timeout", "空闲超时时间（秒）").Default("60").Min(10).Max(600).Required().FinishDetail().
-// 		FinishTemplate()
-
-// 	// Log模板
-// 	b.StartTemplate("日志配置", "log", "日志相关配置").
-// 		AddEnum("level", "日志级别", []string{"debug", "info", "warn", "error", "fatal"}).Default("debug").Required().FinishDetail().
-// 		AddString("output", "日志输出目标").Default("console,file").FinishDetail().
-// 		AddBoolean("json_format", "是否以JSON格式输出日志").Default("true").FinishDetail().
-// 		FinishTemplate()
-
-// 	// Doris模板
-// 	b.StartTemplate("Doris配置", "doris", "Doris数据库连接配置").
-// 		AddString("fe_host", "Doris FE节点主机地址").Default("161.189.89.196").Pattern(`^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$`).Required().FinishDetail().
-// 		AddInt("fe_port", "Doris FE端口号").Default("8040").Min(1).Max(65535).Required().FinishDetail().
-// 		AddString("fe_username", "Doris FE用户名").Default("root").Required().FinishDetail().
-// 		AddString("fe_password", "Doris FE密码").Default("mos8555").Sensitive().Required().MinLength(6).MaxLength(100).FinishDetail().
-// 		AddInt("stream_load_timeout", "Stream Load超时时间（秒）").Default("300").Min(10).Max(3600).FinishDetail().
-// 		AddInt("batch_size", "批量大小").Default("1000").Min(1).Max(10000).FinishDetail().
-// 		FinishTemplate()
-
-// 	return b
-// }
-
 // 私有方法
 func (b *ConfigTemplateBuilder) addDetail(key, description, valueType, dataType string) *DetailBuilder {
 	if b.current == nil {
-		b.StartTemplate("未命名模板", "untitled", "未描述模板")
+		b.StartTemplate("untitled", "未命名模板", "未描述模板")
 	}
-
+	detailID := b.current.ConfigTemplateID + "." + key
 	detail := ConfigTemplateDetail{
-		ConfigKey:   key,
-		Description: description,
-		ValueType:   valueType,
-		DataType:    dataType,
-		IsRequired:  false,
-		IsSensitive: false,
-		IsReadonly:  false,
-		SortOrder:   len(b.current.Details) + 1,
-		Creator:     "system",
-		CreatedAt:   time.Now(),
-		UpdatedAt:   time.Now(),
+		ConfigTemplateDetailID: detailID,
+		ConfigTemplateID:       b.current.ConfigTemplateID,
+		ConfigKey:              key,
+		Description:            description,
+		ValueType:              valueType,
+		DataType:               dataType,
+		IsRequired:             false,
+		IsSensitive:            false,
+		IsReadonly:             false,
+		SortOrder:              len(b.current.Details) + 1,
+		Creator:                "system",
+		CreatedAt:              time.Now(),
+		UpdatedAt:              time.Now(),
 	}
 
 	return &DetailBuilder{
@@ -237,27 +207,27 @@ func CreateSampleConfigTemplates() []*ConfigTemplate {
 	return builder.GetTemplates()
 }
 
-// 更简洁的使用示例
-func CreateConfigTemplates() []*ConfigTemplate {
-	builder := NewConfigTemplateBuilder()
+// // 更简洁的使用示例
+// func CreateConfigTemplates() []*ConfigTemplate {
+// 	builder := NewConfigTemplateBuilder()
 
-	// Service模板 - 更简洁的写法
-	builder.StartTemplate("Service配置", "service", "服务基础配置")
-	builder.AddInt("port", "服务监听端口").Default("8080").Min(1024).Max(65535).Required().FinishDetail()
-	builder.AddString("service_name", "服务名称").Default("svc-configure").Required().FinishDetail()
-	builder.FinishTemplate()
+// 	// Service模板 - 更简洁的写法
+// 	builder.StartTemplate("Service配置", "service", "服务基础配置")
+// 	builder.AddInt("port", "服务监听端口").Default("8080").Min(1024).Max(65535).Required().FinishDetail()
+// 	builder.AddString("service_name", "服务名称").Default("svc-configure").Required().FinishDetail()
+// 	builder.FinishTemplate()
 
-	// Log模板
-	builder.StartTemplate("日志配置", "log", "日志相关配置")
-	builder.AddEnum("level", "日志级别", []string{"debug", "info", "warn", "error", "fatal"}).Default("debug").Required().FinishDetail()
-	builder.AddString("output", "日志输出").Default("console,file").FinishDetail()
-	builder.FinishTemplate()
+// 	// Log模板
+// 	builder.StartTemplate("日志配置", "log", "日志相关配置")
+// 	builder.AddEnum("level", "日志级别", []string{"debug", "info", "warn", "error", "fatal"}).Default("debug").Required().FinishDetail()
+// 	builder.AddString("output", "日志输出").Default("console,file").FinishDetail()
+// 	builder.FinishTemplate()
 
-	// Doris模板
-	builder.StartTemplate("Doris配置", "doris", "Doris连接配置")
-	builder.AddString("fe_host", "FE主机").Default("localhost").Required().FinishDetail()
-	builder.AddString("fe_password", "密码").Sensitive().Required().FinishDetail()
-	builder.FinishTemplate()
+// 	// Doris模板
+// 	builder.StartTemplate("Doris配置", "doris", "Doris连接配置")
+// 	builder.AddString("fe_host", "FE主机").Default("localhost").Required().FinishDetail()
+// 	builder.AddString("fe_password", "密码").Sensitive().Required().FinishDetail()
+// 	builder.FinishTemplate()
 
-	return builder.GetTemplates()
-}
+// 	return builder.GetTemplates()
+// }

models/config_template.go

@@ -6,9 +6,8 @@ import (
 
 // ConfigTemplate 配置模板
 type ConfigTemplate struct {
-	ConfigTemplateID int64     `gorm:"column:config_template_id;primaryKey;autoIncrement" json:"config_template_id"`
+	ConfigTemplateID string    `gorm:"column:config_template_id;primaryKey;type:varchar(128)" json:"config_template_id"`
 	TemplateName     string    `gorm:"column:template_name;type:varchar(100);not null;uniqueIndex;comment:模板名称" json:"template_name"`
-	YamlRootKey      string    `gorm:"column:yaml_root_key;type:varchar(100);comment:YAML根键名" json:"yaml_root_key"`
 	IsDefault        bool      `gorm:"column:is_default;type:boolean;default:false;comment:是否为默认模板" json:"is_default"`
 	SortOrder        int       `gorm:"column:sort_order;type:integer;default:0;comment:排序序号" json:"sort_order"`
 	Description      string    `gorm:"column:description;type:text;comment:模板描述" json:"description"`
@@ -27,8 +26,8 @@ func (ConfigTemplate) TableName() string {
 
 // ConfigTemplateDetail 配置模板详情
 type ConfigTemplateDetail struct {
-	ConfigTemplateDetailID int64     `gorm:"column:config_template_detail_id;primaryKey;autoIncrement" json:"config_template_detail_id"`
-	ConfigTemplateID       int64     `gorm:"column:config_template_id;not null;index" json:"config_template_id"`
+	ConfigTemplateDetailID string    `gorm:"column:config_template_detail_id;primaryKey;autoIncrement" json:"config_template_detail_id"`
+	ConfigTemplateID       string    `gorm:"column:config_template_id;not null;index" json:"config_template_id"`
 	ConfigKey              string    `gorm:"column:config_key;type:varchar(100);not null;index" json:"config_key"`
 	ConfigValue            string    `gorm:"column:config_value;type:text" json:"config_value"`
 	ValueType              string    `gorm:"column:value_type;type:varchar(20);not null;default:'string';comment:值类型：string,number,boolean,json,array" json:"value_type"`

service/create_config_template.go

@@ -4,18 +4,28 @@ import (
 	"fmt"
 	"time"
 
+	"git.x2erp.com/qdy/go-base/ctx"
+	"git.x2erp.com/qdy/go-base/logger"
+	"git.x2erp.com/qdy/go-base/myservice"
+	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-db/factory/database"
 	"git.x2erp.com/qdy/go-svc-configure/models"
 	"github.com/jmoiron/sqlx"
 )
 
+func InitConfigTemplates(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) *types.QueryResult[map[string]interface{}] {
+	return initConfigTemplates(dbFactory.GetDB(), reqCtx)
+
+}
+
 // InitConfigTemplates 初始化默认配置信息
-func InitConfigTemplates(db *sqlx.DB) error {
+func initConfigTemplates(db *sqlx.DB, reqCtx *ctx.RequestContext) *types.QueryResult[map[string]interface{}] {
 
 	builder := models.NewConfigTemplateBuilder()
 
 	templates := builder.
 		// Service模板
-		StartTemplate("Service配置", "service", "服务基础配置").
+		StartTemplate("service", "Service配置", "服务基础配置").
 		AddInt("port", "服务监听端口").Default("8080").Min(1024).Max(65535).Required().FinishDetail().
 		AddString("service_name", "服务名称").Default("svc-configure").Pattern("^[a-zA-Z][a-zA-Z0-9_-]*$").Required().FinishDetail().
 		AddString("instance_name", "实例名称").Default("svc-configure-01").Required().FinishDetail().
@@ -24,8 +34,37 @@ func InitConfigTemplates(db *sqlx.DB) error {
 		AddInt("idle_timeout", "空闲超时时间（秒）").Default("60").Min(10).Max(600).Required().FinishDetail().
 		FinishTemplate().
 
+		// 通用数据库配置
+		StartTemplate("database", "通用数据库配置", "关系型数据库通用连接配置").
+		AddEnum("type", "数据库类型", []string{"postgresql", "mysql", "oracle"}).Default("postgresql").Required().FinishDetail().
+		AddString("host", "数据库主机地址").Default("localhost").Required().FinishDetail().
+		AddInt("port", "数据库端口").Default("5432").Min(1).Max(65535).Required().FinishDetail().
+		AddString("database", "数据库名称").Default("").Required().FinishDetail().
+		AddString("username", "用户名").Default("").Required().FinishDetail().
+		AddString("password", "密码").Default("").Sensitive().Required().FinishDetail().
+		AddInt("max_conns", "最大连接数").Default("100").Min(1).Max(1000).FinishDetail().
+		AddInt("min_conns", "最小连接数").Default("5").Min(0).Max(100).FinishDetail().
+		AddInt("max_lifetime", "连接最大生存时间（秒）").Default("3600").Min(60).Max(86400).FinishDetail().
+		AddInt("max_idle_time", "连接最大空闲时间（秒）").Default("1800").Min(30).Max(3600).FinishDetail().
+		AddInt("connect_timeout", "连接超时时间（秒）").Default("5").Min(1).Max(30).FinishDetail().
+		AddInt("read_timeout", "读取超时时间（秒）").Default("30").Min(1).Max(300).FinishDetail().
+		AddInt("write_timeout", "写入超时时间（秒）").Default("30").Min(1).Max(300).FinishDetail().
+		AddBoolean("ssl_enabled", "启用SSL加密").Default("false").FinishDetail().
+		AddString("ssl_ca", "CA证书路径").Default("").FinishDetail().
+		AddString("ssl_cert", "客户端证书路径").Default("").FinishDetail().
+		AddString("ssl_key", "客户端密钥路径").Default("").FinishDetail().
+		AddString("charset", "字符集").Default("utf8mb4").FinishDetail().
+		AddString("timezone", "时区").Default("Asia/Shanghai").FinishDetail().
+		AddBoolean("parse_time", "解析时间字段").Default("true").FinishDetail().
+		AddString("loc", "时区位置").Default("Asia/Shanghai").FinishDetail().
+		AddInt("max_prepared_stmt_count", "最大预处理语句数").Default("128").Min(0).Max(1024).FinishDetail().
+		AddInt("max_allowed_packet", "最大允许数据包大小（MB）").Default("64").Min(1).Max(1024).FinishDetail().
+		AddInt("timeout", "全局超时时间（秒）").Default("30").Min(1).Max(300).FinishDetail().
+		AddBoolean("debug_mode", "调试模式").Default("false").FinishDetail().
+		FinishTemplate().
+
 		// Log模板
-		StartTemplate("日志增强配置", "log", "增强版日志配置").
+		StartTemplate("log", "日志增强配置", "增强版日志配置").
 		AddEnum("level", "日志级别", []string{"debug", "info", "warn", "error", "fatal"}).Default("debug").Required().FinishDetail().
 		AddString("output", "日志输出目标").Default("console,es").FinishDetail().
 		//AddBoolean("json_format", "JSON格式输出").Default("true").FinishDetail().
@@ -40,7 +79,7 @@ func InitConfigTemplates(db *sqlx.DB) error {
 		FinishTemplate().
 
 		// Doris模板
-		StartTemplate("Doris配置", "doris", "Doris数据库连接配置").
+		StartTemplate("doris", "Doris配置", "Doris数据库连接配置").
 		AddString("fe_host", "Doris FE节点主机地址").Default("161.189.89.196").Pattern(`^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$`).Required().FinishDetail().
 		AddInt("fe_port", "Doris FE端口号").Default("8040").Min(1).Max(65535).Required().FinishDetail().
 		AddString("fe_username", "Doris FE用户名").Default("root").Required().FinishDetail().
@@ -50,7 +89,7 @@ func InitConfigTemplates(db *sqlx.DB) error {
 		FinishTemplate().
 
 		// micro 注册发现配置
-		StartTemplate("Micro服务配置", "micro", "Micro服务基础配置").
+		StartTemplate("micro", "Micro服务配置", "Micro服务基础配置").
 		AddString("service_name", "服务名称").Default("svc-worker").Required().FinishDetail().
 		AddString("service_address", "服务地址").Default(":7070").Required().FinishDetail().
 		AddString("registry_address", "注册中心地址").Default("localhost:8500").Required().FinishDetail().
@@ -59,7 +98,7 @@ func InitConfigTemplates(db *sqlx.DB) error {
 		FinishTemplate().
 
 		// rabbitmq
-		StartTemplate("RabbitMQ配置", "rabbitmq", "RabbitMQ消息队列配置").
+		StartTemplate("rabbitmq", "RabbitMQ配置", "RabbitMQ消息队列配置").
 		AddString("host", "主机地址").Default("localhost").Required().FinishDetail().
 		AddInt("port", "端口").Default("5672").Required().FinishDetail().
 		AddString("username", "用户名").Default("guest").Required().FinishDetail().
@@ -87,19 +126,26 @@ func InitConfigTemplates(db *sqlx.DB) error {
 		FinishTemplate().
 		GetTemplates()
 
-	return CreateOrUpdateConfigTemplates(db, templates)
+	return createOrUpdateConfigTemplates(db, templates, reqCtx)
+}
+
+func CreateOrUpdateConfigTemplates(dbFactory *database.DBFactory, req *models.ConfigTemplate, reqCtx *ctx.RequestContext) *types.QueryResult[map[string]interface{}] {
+	configTemplates := []*models.ConfigTemplate{req}
+	return createOrUpdateConfigTemplates(dbFactory.GetDB(), configTemplates, reqCtx)
+
 }
 
 // CreateOrUpdateConfigTemplates 创建或更新配置模板（支持部分更新）
-func CreateOrUpdateConfigTemplates(db *sqlx.DB, templates []*models.ConfigTemplate) error {
+func createOrUpdateConfigTemplates(db *sqlx.DB, templates []*models.ConfigTemplate, reqCtx *ctx.RequestContext) *types.QueryResult[map[string]interface{}] {
+	startTime := time.Now()
 	if db == nil {
-		return fmt.Errorf("database connection is nil")
+		return myservice.CreateErrorResult[map[string]interface{}]("database connection is nil", startTime, reqCtx)
 	}
 
 	// 开始事务
 	tx, err := db.Beginx()
 	if err != nil {
-		return fmt.Errorf("begin transaction failed: %v", err)
+		return myservice.CreateErrorResult[map[string]interface{}](fmt.Sprintf("begin transaction failed: %v", err), startTime, reqCtx)
 	}
 	defer func() {
 		if err != nil {
@@ -117,29 +163,35 @@ func CreateOrUpdateConfigTemplates(db *sqlx.DB, templates []*models.ConfigTempla
 		template.UpdatedAt = now
 
 		// 1. 插入或更新模板主表
-		templateID, err := upsertTemplate(tx, template, now)
+		err := upsertTemplate(tx, template, now, reqCtx)
 		if err != nil {
-			return err
+			return myservice.CreateErrorResult[map[string]interface{}](fmt.Sprintf("upsertTemplate: %v", err), startTime, reqCtx)
 		}
 
 		// 2. 处理模板详情（部分更新）
 		if len(template.Details) > 0 {
-			err = upsertTemplateDetails(tx, templateID, template.Details, now)
+			err = upsertTemplateDetails(tx, template.Details, now)
 			if err != nil {
-				return err
+				return myservice.CreateErrorResult[map[string]interface{}](fmt.Sprintf("upsertTemplateDetails: %v", err), startTime, reqCtx)
+
 			}
 		}
 	}
 
-	return tx.Commit()
+	errCommit := tx.Commit()
+	if errCommit != nil {
+		return myservice.CreateErrorResult[map[string]interface{}](fmt.Sprintf("db commit: %v", errCommit), startTime, reqCtx)
+	}
+
+	return myservice.CreateSuccessResult[map[string]interface{}](startTime, reqCtx)
 }
 
 // upsertTemplate 插入或更新模板主表
-func upsertTemplate(tx *sqlx.Tx, template *models.ConfigTemplate, now time.Time) (int64, error) {
+func upsertTemplate(tx *sqlx.Tx, template *models.ConfigTemplate, now time.Time, reqCtx *ctx.RequestContext) error {
 	sqlStr := `
 		INSERT INTO config_template (
+			config_template_id,
 			template_name, 
-			yaml_root_key, 
 			is_default, 
 			sort_order, 
 			description, 
@@ -147,8 +199,7 @@ func upsertTemplate(tx *sqlx.Tx, template *models.ConfigTemplate, now time.Time)
 			created_at, 
 			updated_at
 		) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
-		ON CONFLICT (template_name) DO UPDATE SET
-			yaml_root_key = EXCLUDED.yaml_root_key,
+		ON CONFLICT (config_template_id) DO UPDATE SET
 			is_default = EXCLUDED.is_default,
 			sort_order = EXCLUDED.sort_order,
 			description = EXCLUDED.description,
@@ -156,10 +207,10 @@ func upsertTemplate(tx *sqlx.Tx, template *models.ConfigTemplate, now time.Time)
 			updated_at = $8
 		RETURNING config_template_id`
 
-	var templateID int64
+	var templateID string
 	err := tx.QueryRow(sqlStr,
+		template.ConfigTemplateID,
 		template.TemplateName,
-		template.YamlRootKey,
 		template.IsDefault,
 		template.SortOrder,
 		template.Description,
@@ -169,24 +220,25 @@ func upsertTemplate(tx *sqlx.Tx, template *models.ConfigTemplate, now time.Time)
 	).Scan(&templateID)
 
 	if err != nil {
-		return 0, fmt.Errorf("upsert template failed: %v", err)
+		return logger.ErrorCf(reqCtx, "upsert template failed: %v", err)
 	}
-
-	return templateID, nil
+	logger.DebugC(reqCtx, "save data:%s", templateID)
+	return nil
 }
 
 // upsertTemplateDetails 插入或更新模板详情（基于config_key唯一性）
-func upsertTemplateDetails(tx *sqlx.Tx, templateID int64, details []models.ConfigTemplateDetail, now time.Time) error {
+func upsertTemplateDetails(tx *sqlx.Tx, details []models.ConfigTemplateDetail, now time.Time) error {
 	for _, detail := range details {
 		// 设置时间和模板ID
 		if detail.CreatedAt.IsZero() {
 			detail.CreatedAt = now
 		}
 		detail.UpdatedAt = now
-		detail.ConfigTemplateID = templateID
+		//detail.ConfigTemplateID = templateID
 
 		sqlStr := `
 			INSERT INTO config_template_detail (
+				config_template_detail_id,
 				config_template_id,
 				config_key,
 				config_value,
@@ -202,8 +254,8 @@ func upsertTemplateDetails(tx *sqlx.Tx, templateID int64, details []models.Confi
 				creator,
 				created_at,
 				updated_at
-			) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15)
-			ON CONFLICT (config_template_id, config_key) DO UPDATE SET
+			) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15,$16)
+			ON CONFLICT (config_template_detail_id) DO UPDATE SET
 				config_value = EXCLUDED.config_value,
 				value_type = EXCLUDED.value_type,
 				data_type = EXCLUDED.data_type,
@@ -218,6 +270,7 @@ func upsertTemplateDetails(tx *sqlx.Tx, templateID int64, details []models.Confi
 				updated_at = $15`
 
 		_, err := tx.Exec(sqlStr,
+			detail.ConfigTemplateDetailID,
 			detail.ConfigTemplateID,
 			detail.ConfigKey,
 			detail.ConfigValue,

service/query_yaml_configure.go

@@ -8,6 +8,7 @@ import (
 
 	"git.x2erp.com/qdy/go-base/ctx"
 	"git.x2erp.com/qdy/go-base/logger"
+	"git.x2erp.com/qdy/go-base/myservice"
 	"git.x2erp.com/qdy/go-base/types"
 	"git.x2erp.com/qdy/go-db/factory/database"
 	"github.com/jmoiron/sqlx"
@@ -25,7 +26,7 @@ func query(db *sqlx.DB, req types.QueryRequest, reqCtx *ctx.RequestContext) *typ
 
 	// 安全检查
 	if db == nil {
-		return createErrorResult("database connection is nil", startTime, reqCtx)
+		return myservice.CreateErrorResult[map[string]interface{}]("database connection is nil", startTime, reqCtx)
 	}
 
 	sqlStr := `
@@ -42,7 +43,7 @@ func query(db *sqlx.DB, req types.QueryRequest, reqCtx *ctx.RequestContext) *typ
 	// 执行查询
 	rows, err := db.Queryx(sqlStr, params...)
 	if err != nil {
-		return createErrorResult(fmt.Sprintf("Query execution failed: %v", err), startTime, reqCtx)
+		return myservice.CreateErrorResult[map[string]interface{}](fmt.Sprintf("Query execution failed: %v", err), startTime, reqCtx)
 	}
 	defer rows.Close()
 
@@ -59,7 +60,7 @@ func processQueryResult(rows *sqlx.Rows, startTime time.Time, reqCtx *ctx.Reques
 	// 获取列信息
 	columns, err := rows.Columns()
 	if err != nil {
-		return createErrorResult(fmt.Sprintf("Failed to get columns: %v", err), startTime, reqCtx)
+		return myservice.CreateErrorResult[map[string]interface{}](fmt.Sprintf("Failed to get columns: %v", err), startTime, reqCtx)
 	}
 
 	// 存储最终结果：根key -> 内层配置map
@@ -81,7 +82,7 @@ func processQueryResult(rows *sqlx.Rows, startTime time.Time, reqCtx *ctx.Reques
 
 		// 扫描行数据
 		if err := rows.Scan(valuePtrs...); err != nil {
-			return createErrorResult(fmt.Sprintf("Scan row %d failed: %v", count, err), startTime, reqCtx)
+			return myservice.CreateErrorResult[map[string]interface{}](fmt.Sprintf("Scan row %d failed: %v", count, err), startTime, reqCtx)
 		}
 
 		// 提取当前行的三个核心字段
@@ -108,7 +109,7 @@ func processQueryResult(rows *sqlx.Rows, startTime time.Time, reqCtx *ctx.Reques
 		// 解析 detailID 获取根key（倒数第3段）
 		parts := strings.Split(detailID, ".")
 		if len(parts) < 3 {
-			return createErrorResult(fmt.Sprintf("Row %d detailID format error: %s", count, detailID), startTime, reqCtx)
+			return myservice.CreateErrorResult[map[string]interface{}](fmt.Sprintf("Row %d detailID format error: %s", count, detailID), startTime, reqCtx)
 		}
 
 		rootKey := parts[len(parts)-3] // 取倒数第3段，例如 "database"
@@ -127,7 +128,7 @@ func processQueryResult(rows *sqlx.Rows, startTime time.Time, reqCtx *ctx.Reques
 
 	// 检查行遍历错误
 	if err := rows.Err(); err != nil {
-		return createErrorResult(fmt.Sprintf("Row iteration error: %v", err), startTime, reqCtx)
+		return myservice.CreateErrorResult[map[string]interface{}](fmt.Sprintf("Row iteration error: %v", err), startTime, reqCtx)
 	}
 
 	// 构建成功结果
@@ -140,17 +141,6 @@ func processQueryResult(rows *sqlx.Rows, startTime time.Time, reqCtx *ctx.Reques
 	return result
 }
 
-// createErrorResult 创建错误结果的辅助函数（复用你提供的）
-func createErrorResult(errorMsg string, startTime time.Time, reqCtx *ctx.RequestContext) *types.QueryResult[map[string]interface{}] {
-	logger.ErrorC(reqCtx, errorMsg)
-	return &types.QueryResult[map[string]interface{}]{
-		Success:  false,
-		Error:    errorMsg,
-		Time:     time.Since(startTime).String(),
-		Metadata: reqCtx,
-	}
-}
-
 // 辅助函数：转换为字符串
 func toString(v interface{}) string {
 	switch val := v.(type) {

tables/config_template.go

@@ -9,7 +9,7 @@ func init() {
 		tb := sqldef.NewTable("config_template", "配置模版").
 			ID("config_template_id", 128).NotNull().Comment("主键ID").End().
 			String("template_name", 64).NotNull().Comment("模版名称").End().
-			String("yaml_root_key", 32).NotNull().Comment("YAML配置的根节点名称").End().
+			//String("yaml_root_key", 32).NotNull().Comment("YAML配置的根节点名称").End().
 			//String("service_type", 32).Comment("适用服务类型，如：auth/order/payment").End().
 			Bool("is_default").NotNull().Default("0").Comment("是否默认模版").End().
 			Int("sort_order").NotNull().Default("0").Comment("排序号，小的在前").End().
@@ -19,9 +19,9 @@ func init() {
 			DateTime("updated_at").Default("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP").Comment("更新时间").End()
 
 		// 添加索引
-		tb.AddIndex("idx_type_code", "yaml_root_key")
+		//tb.AddIndex("idx_type_code", "yaml_root_key")
 		//AddIndex("idx_service_type", "service_type").
-		//AddIndex("idx_sort_order", "sort_order")
+		tb.AddIndex("idx_sort_order", "sort_order")
 		//AddUniqueIndex("uk_name_type", "template_name", "yaml_root_key")
 
 		// 注册表

test/my_init_template_test.go

@@ -0,0 +1,73 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"testing"
+
+	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-db/factory/http"
+)
+
+func TestInit(t *testing.T) {
+	// 记录总开始时间
+	//totalStartTime := time.Now()
+
+	// 1. 获取HTTP工厂实例
+	httpFactory, err := http.GetHTTPFactory()
+	if err != nil {
+		t.Fatalf("Failed to get HTTP factory: %v", err)
+	}
+	fmt.Println("HTTP factory created successfully")
+
+	// 7. 获取Doris工厂实例
+	//dorisFactory1, err := doris.GetDorisFactory(httpFactory)
+	if err != nil {
+		t.Fatalf("Failed to get Doris factory: %v", err)
+	}
+	//fmt.Println("Doris factory created successfully")
+
+	// 获取Doris配置
+	//cfg, err := config.GetConfig()
+	if err != nil {
+		t.Fatalf("failed to load config: %v", err)
+		return
+	}
+
+	queryParams := []interface{}{
+		"dev",
+		"svc-worker",
+	}
+	// 准备查询请求
+	queryRequest := types.QueryRequest{
+
+		PositionalParams: queryParams,
+	}
+
+	httpClient := httpFactory.CreateClient()
+	// 发送POST请求到 /api/query/csv 获取CSV格式数据
+	resp, err := httpClient.PostWithAuth(
+		"http://localhost:8080/api/init/config/template",
+		queryRequest,
+		"123", // Bearer Token
+		nil,
+	)
+
+	if err != nil {
+		csvData := string(resp.Body())
+		log.Printf("查询失败:%v", err)
+		log.Printf("csvData--err:%s", csvData)
+
+		return
+	}
+
+	if resp.StatusCode() != 200 {
+		log.Printf("\n 询请求失败, 状态码: %d", resp.StatusCode())
+	}
+
+	// 获取CSV数据
+	csvData := string(resp.Body())
+
+	log.Printf("\n csvData:%s", csvData)
+
+}

test/my_post_query_test.go

@@ -25,7 +25,7 @@ func TestQuery(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to get Doris factory: %v", err)
 	}
-	fmt.Println("Doris factory created successfully")
+	//fmt.Println("Doris factory created successfully")
 
 	// 获取Doris配置
 	//cfg, err := config.GetConfig()