可以查询配置文件

main.go

@@ -9,16 +9,15 @@ import (
 	"git.x2erp.com/qdy/go-db/factory/database"
 	"git.x2erp.com/qdy/go-db/myhandle"
 	"git.x2erp.com/qdy/go-db/sqldef"
-	"git.x2erp.com/qdy/go-svc-agent/functions"
 	"go-micro.dev/v4/web"
 
-	// 导入表定义包，触发 init() 函数
-	_ "git.x2erp.com/qdy/go-svc-configure/tables" // 确保这里的路径正确
+	"git.x2erp.com/qdy/go-svc-configure/service"
+	_ "git.x2erp.com/qdy/go-svc-configure/tables" // 导入表定义包，触发 init() 函数
 )
 
 var (
-	serviceName    = "svc-agent"
-	serviceVersion = "1.0.0"
+	serviceName    = "svc-configure"
+	serviceVersion = "1"
 )
 
 func main() {
@@ -31,10 +30,9 @@ func main() {
 
 	//构建数据库工厂
 	bootstrapper.InitDatabase()
-	defer bootstrapper.CleanupDatabase()
 
 	//创建表到数据库
-	cretetabel(bootstrapper.DbFactory)
+	creteTabel(bootstrapper.DbFactory)
 
 	// 启动服务，传入路由注册函数
 	bootstrapper.Run(registerRoutes)
@@ -44,23 +42,15 @@ func main() {
 // 注册所有路由
 func registerRoutes(webService web.Service, dbFactory *database.DBFactory) {
 
-	// 查询接口 - JSON
-	webService.Handle("/api/query/json", middleware.JWTAuthMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		myhandle.QueryHandlerJson(w, r, dbFactory, functions.QueryToJSON)
+	// 查询yaml配置文件
+	webService.Handle("/api/query/yaml", middleware.JWTAuthMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		myhandle.QueryHandlerMap(w, r, dbFactory, service.QueryYamlConfigure)
 	})))
 
-	// 查询接口 - CSV
-	webService.Handle("/api/query/csv", middleware.JWTAuthMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		myhandle.QueryHandlerBytes(w, r, dbFactory, functions.QueryToCSV)
-	})))
-
-	// 查询接口 - CSV with positional params
-	webService.Handle("/api/query/csv/param", middleware.JWTAuthMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		myhandle.QueryHandlerBytes(w, r, dbFactory, functions.QueryPositionalToCSV)
-	})))
 }
 
-func cretetabel(factory *database.DBFactory) {
+func creteTabel(factory *database.DBFactory) {
+
 	// 获取数据库连接和类型
 	db := factory.GetDB()
 	dbType := factory.GetDBType()
@@ -68,12 +58,12 @@ func cretetabel(factory *database.DBFactory) {
 	// 创建表同步器
 	syncer, err := sqldef.NewTableSyncer(db, dbType)
 	if err != nil {
-		log.Fatalf("创建 - 建立器失败: %v", err)
+		log.Printf("创建 - 建立器失败: %v", err)
 	}
 
 	// 创建表
-	if err := syncer.RecreateTables(); err != nil {
-		log.Fatalf("建表失败: %v", err)
+	if err := syncer.CreateTables(); err != nil {
+		log.Printf("建表失败: %v", err)
 	}
 
 	log.Println("数据库表建立完成！")

service/query_yaml_configure.go

@@ -0,0 +1,227 @@
+package service
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"git.x2erp.com/qdy/go-base/ctx"
+	"git.x2erp.com/qdy/go-base/logger"
+	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-db/factory/database"
+	"github.com/jmoiron/sqlx"
+)
+
+func QueryYamlConfigure(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) *types.QueryResult[map[string]interface{}] {
+	return query(dbFactory.GetDB(), req, reqCtx)
+
+}
+
+// QueryYamlConfigure 执行带位置参数的查询
+func query(db *sqlx.DB, req types.QueryRequest, reqCtx *ctx.RequestContext) *types.QueryResult[map[string]interface{}] {
+
+	startTime := time.Now()
+
+	// 安全检查
+	if db == nil {
+		return createErrorResult("database connection is nil", startTime, reqCtx)
+	}
+
+	sqlStr := `
+		SELECT b.config_startup_detail_id, b.config_key, b.config_value 
+		FROM config_startup a
+		JOIN config_startup_detail b ON a.config_startup_id = b.config_startup_id 
+		WHERE a.config_environment_id = $1
+		  AND a.config_service_id = $2;`
+
+	params := req.PositionalParams
+	logger.DebugC(reqCtx, sqlStr)
+	logger.DebugC(reqCtx, fmt.Sprintf("PositionalParams: %v", params))
+
+	// 执行查询
+	rows, err := db.Queryx(sqlStr, params...)
+	if err != nil {
+		return createErrorResult(fmt.Sprintf("Query execution failed: %v", err), startTime, reqCtx)
+	}
+	defer rows.Close()
+
+	// 处理结果集
+	return processQueryResult(rows, startTime, reqCtx)
+}
+
+func processQueryResult(rows *sqlx.Rows, startTime time.Time, reqCtx *ctx.RequestContext) *types.QueryResult[map[string]interface{}] {
+	// 初始化结果结构体
+	result := &types.QueryResult[map[string]interface{}]{
+		Metadata: reqCtx,
+	}
+
+	// 获取列信息
+	columns, err := rows.Columns()
+	if err != nil {
+		return createErrorResult(fmt.Sprintf("Failed to get columns: %v", err), startTime, reqCtx)
+	}
+
+	// 存储最终结果：根key -> 内层配置map
+	results := make(map[string]interface{})
+	count := 0
+
+	// 记录已经出现的内层key，用于检测重复
+	// outerKey -> innerKey -> rowNumber
+	//keyTracker := make(map[string]map[string]int)
+
+	// 遍历行数据
+	for rows.Next() {
+		count++
+		values := make([]interface{}, len(columns))
+		valuePtrs := make([]interface{}, len(columns))
+		for i := range columns {
+			valuePtrs[i] = &values[i]
+		}
+
+		// 扫描行数据
+		if err := rows.Scan(valuePtrs...); err != nil {
+			return createErrorResult(fmt.Sprintf("Scan row %d failed: %v", count, err), startTime, reqCtx)
+		}
+
+		// 提取当前行的三个核心字段
+		var detailID, configKey string
+		var configValue interface{}
+		for i, col := range columns {
+			v := values[i]
+			if v == nil {
+				continue
+			}
+
+			switch col {
+			case "config_startup_detail_id":
+				detailID = toString(v) // detailID 需要字符串
+			case "config_key":
+				configKey = toString(v) // config_key 需要字符串
+			case "config_value":
+				configValue = convertValue(v) // config_value 需要带类型转换
+			}
+		}
+
+		//logger.DebugC(reqCtx, fmt.Sprintf("Row %d - detailID: %s, configKey: %s", count, detailID, configKey))
+
+		// 解析 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)
+		}
+
+		rootKey := parts[len(parts)-3] // 取倒数第3段，例如 "database"
+
+		// 获取或创建外层key对应的map
+		configMap, exists := results[rootKey]
+		if !exists {
+			// 不存在则创建
+			configMap = make(map[string]interface{})
+			results[rootKey] = configMap
+		}
+
+		// 添加或覆盖内层配置
+		configMap.(map[string]interface{})[configKey] = configValue
+	}
+
+	// 检查行遍历错误
+	if err := rows.Err(); err != nil {
+		return createErrorResult(fmt.Sprintf("Row iteration error: %v", err), startTime, reqCtx)
+	}
+
+	// 构建成功结果
+	result.Success = true
+	result.Data = results
+	result.Count = count
+	result.Time = time.Since(startTime).String()
+	result.Message = "Query success"
+
+	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) {
+	case string:
+		return val
+	case []byte:
+		return string(val)
+	case int64:
+		return strconv.FormatInt(val, 10)
+	case int32:
+		return strconv.FormatInt(int64(val), 10)
+	case int:
+		return strconv.Itoa(val)
+	case float64:
+		return strconv.FormatFloat(val, 'f', -1, 64)
+	case float32:
+		return strconv.FormatFloat(float64(val), 'f', -1, 32)
+	case bool:
+		return strconv.FormatBool(val)
+	default:
+		return fmt.Sprintf("%v", val)
+	}
+}
+
+// 辅助函数：转换值，保持合适的数据类型
+func convertValue(v interface{}) interface{} {
+	switch val := v.(type) {
+	case []byte:
+		// 尝试解析为合适的数据类型
+		strVal := string(val)
+		return parseStringValue(strVal)
+
+	case string:
+		return parseStringValue(val)
+
+	case int64, int32, int:
+		return val
+
+	case float64, float32:
+		return val
+
+	case bool:
+		return val
+
+	default:
+		// 其他类型转换为字符串
+		return toString(val)
+	}
+}
+
+// 辅助函数：解析字符串值为合适的数据类型
+func parseStringValue(strVal string) interface{} {
+	// 1. 尝试布尔值 (支持 true/false, yes/no, on/off, 1/0)
+	lowerVal := strings.ToLower(strings.TrimSpace(strVal))
+	if lowerVal == "true" || lowerVal == "yes" || lowerVal == "on" || lowerVal == "1" {
+		return true
+	}
+	if lowerVal == "false" || lowerVal == "no" || lowerVal == "off" || lowerVal == "0" {
+		return false
+	}
+
+	// 2. 尝试整数
+	if intVal, err := strconv.ParseInt(strVal, 10, 64); err == nil {
+		return intVal
+	}
+
+	// 3. 尝试浮点数
+	if floatVal, err := strconv.ParseFloat(strVal, 64); err == nil {
+		return floatVal
+	}
+
+	// 4. 保持为字符串
+	return strVal
+}

tables/config_environment.go

@@ -1,6 +1,9 @@
 package tables
 
 import (
+	"fmt"
+	"time"
+
 	"git.x2erp.com/qdy/go-db/sqldef"
 )
 
@@ -20,3 +23,55 @@ func init() {
 		r.RegisterTable(tb.Build())
 	})
 }
+
+// ConfigEnvironment 环境表结构体
+type ConfigEnvironment struct {
+	// 环境编码，主键
+	ConfigEnvironmentID string `gorm:"column:config_environment_id;type:varchar(8);primaryKey;not null;comment:环境编码，主键"`
+	// 环境名称
+	EnvName string `gorm:"column:env_name;type:varchar(64);not null;comment:环境名称"`
+	// 环境描述
+	Description *string `gorm:"column:description;type:varchar(64);comment:环境描述"`
+	// 创建人
+	Creator string `gorm:"column:creator;type:varchar(32);not null;comment:创建人"`
+	// 创建时间
+	CreatedAt time.Time `gorm:"column:created_at;not null;default:CURRENT_TIMESTAMP;comment:创建时间"`
+	// 更新时间
+	UpdatedAt *time.Time `gorm:"column:updated_at;default:CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;comment:更新时间"`
+}
+
+// TableName 指定表名
+func (ConfigEnvironment) TableName() string {
+	return "config_environment"
+}
+
+// GetDefaultDataSQL 获取环境表默认数据的SQL语句（PostgreSQL版本）
+func GetDefaultDataSQL() []string {
+	now := time.Now().Format("2006-01-02 15:04:05")
+
+	return []string{
+		// 清空表数据（可选，根据需要决定是否包含）
+		// "TRUNCATE TABLE config_environment RESTART IDENTITY;",
+
+		// 单条SQL插入所有数据（PostgreSQL多行插入）
+		fmt.Sprintf(`INSERT INTO config_environment 
+			(config_environment_id, env_name, description, creator, created_at, updated_at) 
+			VALUES 
+			('dev', '开发环境', '用于开发人员本地开发和调试的环境', 'system', '%s', '%s'),
+			('test', '测试环境', '用于功能测试、集成测试的环境', 'system', '%s', '%s'),
+			('pre', '预发布环境', '用于生产前最后验证的环境，与生产环境配置一致', 'system', '%s', '%s'),
+			('prod', '生产环境', '正式对外提供服务的生产环境', 'system', '%s', '%s'),
+			('demo', '演示环境', '用于产品演示和客户体验的环境', 'system', '%s', '%s')
+			ON CONFLICT (config_environment_id) DO UPDATE SET
+			env_name = EXCLUDED.env_name,
+			description = EXCLUDED.description,
+			creator = EXCLUDED.creator,
+			updated_at = EXCLUDED.updated_at;`,
+			now, now, // dev
+			now, now, // test
+			now, now, // pre
+			now, now, // prod
+			now, now, // demo
+		),
+	}
+}

tables/config_service.go

@@ -1,7 +1,11 @@
 // 微服务登记表。保存整个项目有哪些微服务
 package tables
 
-import "git.x2erp.com/qdy/go-db/sqldef"
+import (
+	"time"
+
+	"git.x2erp.com/qdy/go-db/sqldef"
+)
 
 func init() {
 	sqldef.AddRegistration(func(r *sqldef.Registry) {
@@ -17,3 +21,22 @@ func init() {
 		r.RegisterTable(tb.Build())
 	})
 }
+
+// ConfigService 微服务档案表结构体
+type ConfigService struct {
+	// 服务编码，主键
+	ConfigServiceID string `gorm:"column:config_service_id;type:varchar(32);primaryKey;not null;comment:服务编码，主键"`
+	// 服务名称
+	ServiceName string `gorm:"column:service_name;type:varchar(64);not null;comment:服务名称"`
+	// 当前版本
+	ServiceVersion string `gorm:"column:service_version;type:varchar(32);not null;default:'1.0.0';comment:当前版本"`
+	// 创建人
+	Creator string `gorm:"column:creator;type:varchar(32);not null;comment:创建人"`
+	// 创建时间
+	CreatedAt time.Time `gorm:"column:created_at;not null;default:CURRENT_TIMESTAMP;comment:创建时间"`
+}
+
+// TableName 指定表名
+func (ConfigService) TableName() string {
+	return "config_service"
+}

test/my_post_query_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 TestQuery(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/query/yaml",
+		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)
+
+}

yaml-插入启动配置.sql

@@ -0,0 +1,29 @@
+INSERT INTO public.config_startup
+    (config_startup_id, config_template_id, config_service_id,config_environment_id,"version", creator, created_at, updated_at)
+SELECT 
+    'svn-configure.dev.'|| config_template_id || '.1' as config_startup_id,
+    config_template_id,
+    'svn-configure' as config_service_id,
+    'dev' as config_environment_id,
+    1 as "version",
+   	creator,
+    created_at,
+    updated_at
+FROM public.config_template 
+where config_template_id='postgresql';
+
+
+
+INSERT INTO public.config_startup_detail
+    (config_startup_detail_id, config_template_detail_id, config_startup_id, config_key, config_value, creator, created_at, updated_at)
+SELECT 
+    'dev.'|| a.yaml_root_key || '.' || b.config_key  as config_startup_detail_id,
+    b.config_template_detail_id,
+    'dev.'|| b.config_template_id as config_startup_id,
+    b.config_key,
+    b.config_value,
+    b.creator,
+    b.created_at,
+    b.updated_at
+FROM public.config_template a , public.config_template_detail b 
+WHERE a.config_template_id =b.config_template_id and b.config_template_id='postgresql';