初始提交

go.mod

@@ -0,0 +1,23 @@
+module git.x2erp.com/qdy/x6-service-agent
+
+go 1.25.4
+
+require (
+	git.x2erp.com/qdy/go-base v0.1.1
+	git.x2erp.com/qdy/go-db v0.1.0
+	github.com/gorilla/mux v1.8.1
+)
+
+require (
+	filippo.io/edwards25519 v1.1.0 // indirect
+	github.com/go-sql-driver/mysql v1.9.3 // indirect
+	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
+	github.com/golang-sql/sqlexp v0.1.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/lib/pq v1.10.9 // indirect
+	github.com/microsoft/go-mssqldb v1.9.4 // indirect
+	github.com/sijms/go-ora/v2 v2.9.0 // indirect
+	golang.org/x/crypto v0.45.0 // indirect
+	golang.org/x/text v0.31.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+)

go.sum

@@ -0,0 +1,60 @@
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+git.x2erp.com/qdy/go-base v0.1.1 h1:Yj6rFTCL9CShqdQeE6mUYQMugUpI25nWNL0i09SFtXo=
+git.x2erp.com/qdy/go-base v0.1.1/go.mod h1:+NdHouWcxqex8sJUwDTGSl/OIh5fKOT6tJteefD1MMA=
+git.x2erp.com/qdy/go-db v0.1.0 h1:vZhio4jZtaphpaPqV/vLmPbvU4sFrUQOwRP1yJR3K2I=
+git.x2erp.com/qdy/go-db v0.1.0/go.mod h1:YnHSjNaopoQEa04pu11rihPDwUedsZO/LrmyBCLx0JA=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 h1:Gt0j3wceWMwPmiazCa8MzMA0MfhmPIz0Qp0FJ6qcM0U=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0/go.mod h1:Ot/6aikWnKWi4l9QB7qVSwa8iMphQNqkWALMoNT3rzM=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 h1:B+blDbyVIG3WaikNxPnhPiJ1MThR03b3vKGtER95TP4=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1/go.mod h1:JdM5psgjfBf5fo2uWOZhflPWyDBZ/O/CNAH9CtsuZE4=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 h1:FPKJS1T+clwv+OLGt13a8UjqeRuh0O4SJ3lUriThc+4=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1/go.mod h1:j2chePtV91HrC22tGoRX3sGY42uF13WzmmV80/OdVAA=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.3.1 h1:Wgf5rZba3YZqeTNJPtvqZoBu1sBN/L4sry+u2U3Y75w=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.3.1/go.mod h1:xxCBG/f/4Vbmh2XQJBsOmNdxWUY5j/s27jujKPbQf14=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1 h1:bFWuoEKg+gImo7pvkiQEFAc8ocibADgXeiLAxWhWmkI=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1/go.mod h1:Vih/3yc6yac2JzU4hzpaDupBJP0Flaia9rXXrU8xyww=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 h1:oygO0locgZJe7PpYPXT5A29ZkwJaPqcva7BVeemZOZs=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
+github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
+github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
+github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
+github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
+github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
+github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
+github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/microsoft/go-mssqldb v1.9.4 h1:sHrj3GcdgkxytZ09aZ3+ys72pMeyEXJowT44j74pNgs=
+github.com/microsoft/go-mssqldb v1.9.4/go.mod h1:GBbW9ASTiDC+mpgWDGKdm3FnFLTUsLYN3iFL90lQ+PA=
+github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
+github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sijms/go-ora/v2 v2.9.0 h1:+iQbUeTeCOFMb5BsOMgUhV8KWyrv9yjKpcK4x7+MFrg=
+github.com/sijms/go-ora/v2 v2.9.0/go.mod h1:QgFInVi3ZWyqAiJwzBQA+nbKYKH77tdp1PYoCqhR2dU=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
+golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
+golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
+golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
+golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
+golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -0,0 +1,204 @@
+package main
+
+import (
+	"database/sql"
+	"encoding/json"
+	"fmt"
+	"log"
+	"net/http"
+	"time"
+
+	"git.x2erp.com/qdy/go-base/types"
+	// 注意：这里要使用 factory 包的正确导入路径（和你原代码一致）
+	"git.x2erp.com/qdy/go-db/factory"
+	"github.com/gorilla/mux"
+)
+
+// 全局变量，只初始化一次（复用原逻辑，确保工厂和DB连接单例）
+var dbFactory *factory.DBFactory
+var db *sql.DB
+
+// QueryRequest 请求结构体（接收前端SQL参数）
+type QueryRequest struct {
+	SQL string `json:"sql"`
+}
+
+func main() {
+	var err error
+
+	// 1. 创建数据库工厂（只执行一次）
+	dbFactory, err = factory.NewDBFactory()
+	if err != nil {
+		log.Fatalf("Failed to create DB factory: %v", err)
+	}
+
+	// 2. 显示基础信息（保留原日志输出）
+	drivers := dbFactory.GetAvailableDrivers()
+	fmt.Printf("Available database drivers: %v\n", drivers)
+
+	config := dbFactory.GetConfig()
+	fmt.Printf("Using database type: %s\n", config.Database.Type)
+	fmt.Printf("Database host: %s:%d\n", config.Database.Host, config.Database.Port)
+	fmt.Printf("Database name: %s\n", config.Database.Database)
+
+	// 3. 创建数据库连接（全局复用）
+	db, err = dbFactory.CreateDB()
+	if err != nil {
+		log.Fatalf("Failed to create database connection: %v", err)
+	}
+	defer db.Close()
+
+	// 4. 测试连接（保留原校验逻辑）
+	if err := testConnection(db, config.Database.Type); err != nil {
+		log.Fatalf("Database connection test failed: %v", err)
+	} else {
+		fmt.Println("Database connection test passed!")
+	}
+
+	// 5. 启动HTTP服务
+	startHTTPServer()
+}
+
+// 启动HTTP服务器（简化，直接使用全局DB连接）
+func startHTTPServer() {
+	router := mux.NewRouter()
+
+	// 核心路由：SQL查询（POST）- 直接返回 types.QueryResult
+	router.HandleFunc("/api/query", queryHandler).Methods("POST")
+	// 辅助路由：健康检查、数据库信息（保留原功能）
+	router.HandleFunc("/api/health", healthHandler).Methods("GET")
+	router.HandleFunc("/api/info", infoHandler).Methods("GET")
+
+	// 服务器配置（保留原超时设置）
+	server := &http.Server{
+		Addr:         ":8080",
+		Handler:      router,
+		ReadTimeout:  30 * time.Second,
+		WriteTimeout: 30 * time.Second,
+		IdleTimeout:  60 * time.Second,
+	}
+
+	// 启动日志（保留原格式）
+	fmt.Println("Database microservice starting on :8080")
+	fmt.Println("Endpoints:")
+	fmt.Println("  POST /api/query  - Execute SQL query (return types.QueryResult)")
+	fmt.Println("  GET  /api/health - Health check")
+	fmt.Println("  GET  /api/info   - Database info")
+
+	log.Fatal(server.ListenAndServe())
+}
+
+// queryHandler SQL查询处理（核心修改）
+// 1. 修复 factory.QuickQueryToJSON 调用（确保导入路径正确）
+// 2. 直接返回 types.QueryResult，不二次封装
+func queryHandler(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json")
+
+	// 1. 解析请求参数
+	var req QueryRequest
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+		// 参数错误时，返回 types.QueryResult 格式的错误响应
+		json.NewEncoder(w).Encode(&types.QueryResult{
+			Success: false,
+			Error:   fmt.Sprintf("Invalid request body: %v", err),
+			Data:    nil,
+		})
+		return
+	}
+
+	// 2. 校验SQL非空
+	if req.SQL == "" {
+		json.NewEncoder(w).Encode(&types.QueryResult{
+			Success: false,
+			Error:   "SQL statement cannot be empty",
+			Data:    nil,
+		})
+		return
+	}
+
+	// 3. 核心逻辑：调用 factory.QuickQueryToJSON（确保工厂包导出了该方法）
+	// 注意：如果仍提示 undefined，检查 factory 包是否真的导出了 QuickQueryToJSON（首字母大写）
+	result := factory.QuickQueryToJSON(db, req.SQL)
+
+	// 4. 直接返回结果（types.QueryResult 原生格式）
+	json.NewEncoder(w).Encode(result)
+}
+
+// healthHandler 健康检查（修复语法错误，保持返回格式统一）
+func healthHandler(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json")
+
+	// 校验DB连接状态
+	err := db.Ping()
+	success := err == nil
+
+	// 标准 if-else 赋值状态
+	var status string
+	if success {
+		status = "UP"
+	} else {
+		status = "DOWN"
+	}
+
+	// 返回 types.QueryResult 格式（和查询接口保持一致）
+	json.NewEncoder(w).Encode(&types.QueryResult{
+		Success: success,
+		Data: map[string]interface{}{
+			"status":   status,
+			"time":     time.Now().Format(time.RFC3339),
+			"database": dbFactory.GetConfig().Database.Type,
+		},
+		Error: func() string {
+			if err != nil {
+				return err.Error()
+			}
+			return ""
+		}(),
+	})
+}
+
+// infoHandler 数据库信息（返回 types.QueryResult 格式）
+func infoHandler(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json")
+
+	config := dbFactory.GetConfig()
+	drivers := dbFactory.GetAvailableDrivers()
+
+	// 直接返回 types.QueryResult 格式
+	json.NewEncoder(w).Encode(&types.QueryResult{
+		Success: true,
+		Data: map[string]interface{}{
+			"database_type":     config.Database.Type,
+			"database_host":     fmt.Sprintf("%s:%d", config.Database.Host, config.Database.Port),
+			"database_name":     config.Database.Database,
+			"available_drivers": drivers,
+			"service_time":      time.Now().Format(time.RFC3339),
+		},
+		Error: "",
+	})
+}
+
+// testConnection 测试数据库连接（保留原逻辑）
+func testConnection(db *sql.DB, dbType string) error {
+	var query string
+	switch dbType {
+	case "mysql", "postgres", "sqlserver":
+		query = "SELECT 1"
+	case "oracle":
+		query = "SELECT 1 FROM DUAL"
+	default:
+		query = "SELECT 1"
+	}
+
+	var result int
+	err := db.QueryRow(query).Scan(&result)
+	if err != nil {
+		return fmt.Errorf("test query failed: %v", err)
+	}
+
+	if result != 1 {
+		return fmt.Errorf("unexpected test result: %d", result)
+	}
+
+	return nil
+}