自动建立表通过

bootstraps/bootstrap.go

@@ -0,0 +1,189 @@
+package bootstraps
+
+import (
+	"log"
+
+	"git.x2erp.com/qdy/go-base/config"
+	"git.x2erp.com/qdy/go-base/logger"
+	"git.x2erp.com/qdy/go-base/myservice"
+	"git.x2erp.com/qdy/go-db/factory/database"
+	"go-micro.dev/v4/web"
+)
+
+// ServiceBootstrapper 服务启动器
+type ServiceBootstrapper struct {
+	serviceName    string
+	serviceVersion string
+	Cfg            config.IConfig
+	DbFactory      *database.DBFactory
+	WebService     web.Service
+}
+
+// NewServiceBootstrapper 创建服务启动器
+func NewServiceBootstrapper(name, version string) *ServiceBootstrapper {
+	return &ServiceBootstrapper{
+		serviceName:    name,
+		serviceVersion: version,
+	}
+}
+
+// 初始化配置
+func (b *ServiceBootstrapper) InitConfig() {
+	// 1. 初始化启动日志
+	b.initBootLogger()
+	defer b.closeBootLogger()
+
+	// 2. 加载配置
+	b.loadConfig()
+
+	// 3. 初始化数据库
+	//b.initDatabase()
+	//defer b.cleanupDatabase()
+
+	// 4. 初始化运行时日志
+	b.initRuntimeLogger()
+
+	// 5. 设置优雅关闭
+	b.setupGracefulShutdown()
+
+}
+
+// Run 启动服务
+func (b *ServiceBootstrapper) Run(routeRegistrar func(web.Service, *database.DBFactory)) {
+
+	if b.DbFactory == nil {
+		log.Fatal("数据库工厂未初始化，请先调用InitDatabase()")
+	}
+
+	// 6. 启动微服务
+	b.startWebService()
+
+	// 7. 注册路由
+	routeRegistrar(b.WebService, b.DbFactory)
+
+	// 8. 记录服务启动信息
+	b.logServiceInfo()
+
+	// 9. 运行服务
+	b.runWebService()
+}
+
+// initBootLogger 初始化启动日志
+func (b *ServiceBootstrapper) initBootLogger() {
+	if err := logger.InitBootLog(b.serviceName); err != nil {
+		log.Fatal("无法初始化启动日志: ", err)
+	}
+}
+
+// closeBootLogger 关闭启动日志
+func (b *ServiceBootstrapper) closeBootLogger() {
+	logger.CloseBootLogger()
+}
+
+// loadConfig 加载配置
+func (b *ServiceBootstrapper) loadConfig() {
+
+	log.Printf("开始加载配置...")
+
+	cfg, err := config.GetConfig()
+	if err != nil {
+		log.Fatalf("加载配置文件错误: %v", err)
+	}
+
+	// 设置版本
+	cfg.SetServiceName(b.serviceName)
+	cfg.SetServiceVersion(b.serviceVersion)
+
+	b.Cfg = cfg
+}
+
+// initDatabase 初始化数据库
+func (b *ServiceBootstrapper) InitDatabase() {
+
+	// 记录配置信息
+	//serviceCfg := cfg.GetService()
+	//microCfg := cfg.GetMicro()
+	dbCfg := b.Cfg.GetDatabase()
+
+	//log.Printf("服务名称: %s", serviceCfg.ServiceName)
+	//log.Printf("服务端口: %d", serviceCfg.Port)
+	//log.Printf("注册中心: %s", microCfg.RegistryAddress)
+	log.Printf("数据库: %s:%d/%s", dbCfg.Host, dbCfg.Port, dbCfg.Database)
+
+	log.Printf("初始化数据库连接...")
+
+	dbFactory, err := database.GetDBFactory()
+	if err != nil {
+		log.Fatalf("数据库连接失败: %v", err)
+	}
+	b.DbFactory = dbFactory
+
+	log.Printf("数据库连接测试通过!")
+
+}
+
+// cleanupDatabase 清理数据库资源
+func (b *ServiceBootstrapper) CleanupDatabase() {
+	if b.DbFactory != nil {
+		if err := b.DbFactory.Close(); err != nil {
+			logger.Error("数据库关闭错误: %v", err)
+		}
+	}
+}
+
+// initRuntimeLogger 初始化运行时日志
+func (b *ServiceBootstrapper) initRuntimeLogger() {
+	logger.InitRuntimeLogger(b.serviceName, b.serviceVersion, b.Cfg.GetLog())
+	log.Printf("运行时日志系统初始化完成")
+	log.Printf("开始启动微服务...")
+
+	// 记录服务模式
+	mode := "独立模式"
+	if b.Cfg.GetMicro().RegistryAddress != "" {
+		mode = "使用服务发现 (注册中心)"
+	}
+	log.Printf("服务模式: %s", mode)
+}
+
+// setupGracefulShutdown 设置优雅关闭
+func (b *ServiceBootstrapper) setupGracefulShutdown() {
+	setupGracefulShutdown(b.DbFactory, logger.StopESWriter)
+}
+
+// startWebService 启动Web服务
+func (b *ServiceBootstrapper) startWebService() {
+	microCfg := b.Cfg.GetMicro()
+	serviceCfg := b.Cfg.GetService()
+
+	var svc web.Service
+	if microCfg.RegistryAddress != "" {
+		svc = myservice.Start(b.Cfg)
+	} else {
+		svc = myservice.StartStandalone(b.Cfg)
+	}
+
+	b.WebService = svc
+	log.Printf("Web服务实例创建完成 (端口: %d)", serviceCfg.Port)
+}
+
+// logServiceInfo 记录服务启动信息
+func (b *ServiceBootstrapper) logServiceInfo() {
+	serviceCfg := b.Cfg.GetService()
+
+	log.Printf("服务启动成功")
+
+	if serviceCfg.TrustedProxies != "" {
+		log.Printf("   • 受信代理: %s", serviceCfg.TrustedProxies)
+	}
+}
+
+// runWebService 运行Web服务
+func (b *ServiceBootstrapper) runWebService() {
+	// 测试日志
+	logger.Debug("测试日志是否写入ES.")
+
+	log.Printf("服务开始运行...")
+	if err := b.WebService.Run(); err != nil {
+		log.Fatal("服务运行失败:", err)
+	}
+}

bootstraps/shutdown.go

@@ -0,0 +1,39 @@
+package bootstraps
+
+import (
+	"os"
+	"os/signal"
+	"syscall"
+	"time"
+
+	"git.x2erp.com/qdy/go-base/logger"
+	"git.x2erp.com/qdy/go-db/factory/database"
+)
+
+// setupGracefulShutdown 设置优雅关闭
+func setupGracefulShutdown(dbFactory *database.DBFactory, cleanupFuncs ...func()) {
+	signalCh := make(chan os.Signal, 1)
+	signal.Notify(signalCh, os.Interrupt, syscall.SIGTERM)
+
+	go func() {
+		<-signalCh
+		logger.Info("\n接收到关闭信号，正在优雅关闭...")
+
+		// 关闭数据库连接
+		if dbFactory != nil {
+			if err := dbFactory.Close(); err != nil {
+				logger.Error("关闭数据库错误: %v", err)
+			}
+			logger.Info("数据库连接已关闭")
+		}
+
+		// 执行其他清理函数
+		for _, cleanup := range cleanupFuncs {
+			cleanup()
+		}
+
+		// 等待日志写入完成
+		time.Sleep(100 * time.Millisecond)
+		os.Exit(0)
+	}()
+}

config/config.go

@@ -21,6 +21,22 @@ type IConfig interface {
 	IsDatabaseConfigured() bool
 	IsDorisConfigured() bool
 	IsRedisConfigured() bool
+	SetServiceName(name string)
+	SetServiceVersion(version string)
+}
+
+// 设置微服务名称。。如果配置文件设置了，就按配置文件
+func (c *Config) SetServiceName(name string) {
+	if c.GetService().ServiceName == "" {
+		c.GetService().ServiceName = name
+	}
+
+}
+
+// 设置微服务版本号
+func (c *Config) SetServiceVersion(version string) {
+
+	c.GetService().ServiceVersion = version
 }
 
 // Config 主配置结构体 - 访问门面

config/loader.go

@@ -91,5 +91,20 @@ func findConfigFile() (string, error) {
 		}
 	}
 
-	return "", fmt.Errorf("no configuration file found")
+	//return "", fmt.Errorf("no configuration file found")
+
+	return "", fmt.Errorf(`no configuration file found
+
+Searched locations:
+1. %s
+2. %s
+3. ./db.yaml
+4. ./config/db.yaml
+5. DB_CONFIG_PATH环境变量指定的路径
+
+请确保配置文件存在，或通过环境变量指定：
+export DB_CONFIG_PATH=/your/config/path/db.yaml
+set DB_CONFIG_PATH=C:\your\config\path\db.yaml (Windows)`,
+		filepath.Join(exeDir, "db.yaml"),
+		filepath.Join(exeDir, "config", "db.yaml"))
 }

config/subconfigs/micro_config.go

@@ -34,7 +34,7 @@ func NewMicroConfig() *MicroConfig {
 }
 
 func (c *MicroConfig) SetDefaults() {
-	c.RegistryAddress = "localhost:8500"
+	//c.RegistryAddress = "localhost:8500"
 	c.RegistryType = "consul"
 	c.RegistryTimeout = 10
 	c.LBStrategy = "roundrobin"

handlers/base.go

@@ -0,0 +1,68 @@
+package handlers
+
+import (
+	"encoding/json"
+	"net/http"
+	"time"
+
+	"git.x2erp.com/qdy/go-base/logger"
+	"git.x2erp.com/qdy/go-db/factory/database"
+)
+
+type BaseHandlers struct {
+	ServiceName    string
+	ServiceVersion string
+}
+
+func NewBaseHandlers(name, version string) *BaseHandlers {
+	return &BaseHandlers{
+		ServiceName:    name,
+		ServiceVersion: version,
+	}
+}
+
+// RootHandler 根处理器
+func (h *BaseHandlers) RootHandler() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		logger.Debug("接收到根路径请求")
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(`{"service": "` + h.ServiceName + `", "version": "` + h.ServiceVersion + `", "status": "running"}`))
+	}
+}
+
+// HealthHandler 健康检查处理器
+func (h *BaseHandlers) HealthHandler(dbFactory *database.DBFactory) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		logger.Debug("接收到健康检查请求")
+		w.Header().Set("Content-Type", "application/json")
+
+		if dbFactory == nil {
+			w.WriteHeader(http.StatusServiceUnavailable)
+			w.Write([]byte(`{"status": "unhealthy", "error": "database not initialized"}`))
+			return
+		}
+
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(`{"status": "healthy", "service": "` + h.ServiceName + `"}`))
+	}
+}
+
+// InfoHandler 信息处理器
+func (h *BaseHandlers) InfoHandler() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		logger.Debug("接收到信息查询请求")
+		w.Header().Set("Content-Type", "application/json")
+
+		info := map[string]interface{}{
+			"service":   h.ServiceName,
+			"version":   h.ServiceVersion,
+			"status":    "running",
+			"timestamp": time.Now().Format(time.RFC3339),
+		}
+
+		jsonData, _ := json.Marshal(info)
+		w.WriteHeader(http.StatusOK)
+		w.Write(jsonData)
+	}
+}

handlers/routes.go

@@ -0,0 +1,26 @@
+package handlers
+
+import (
+	"git.x2erp.com/qdy/go-base/logger"
+	"git.x2erp.com/qdy/go-db/factory/database"
+	"go-micro.dev/v4/web"
+)
+
+// RouteConfig 路由配置
+type RouteConfig struct {
+	ServiceName    string
+	ServiceVersion string
+	DBFactory      *database.DBFactory
+}
+
+// RegisterBaseRoutes 注册基本路由
+func RegisterBaseRoutes(webService web.Service, cfg *RouteConfig) {
+	// 创建基础处理器
+	baseHandlers := NewBaseHandlers(cfg.ServiceName, cfg.ServiceVersion)
+
+	webService.Handle("/", baseHandlers.RootHandler())
+	webService.Handle("/health", baseHandlers.HealthHandler(cfg.DBFactory))
+	webService.Handle("/info", baseHandlers.InfoHandler())
+
+	logger.Info("HTTP路由注册完成")
+}

logger/boot_logger.go

@@ -17,8 +17,13 @@ var (
 
 // InitBootLogger 初始化启动日志（只在启动阶段使用）
 func InitBootLog(serviceName string) error {
+
+	if logToFile := os.Getenv("LOG_TO_FILE"); logToFile == "false" {
+		return nil
+	}
+
 	// 1. 确保日志目录存在
-	logDir := "logs/boot"
+	logDir := "logs"
 	if err := os.MkdirAll(logDir, 0755); err != nil {
 		return fmt.Errorf("创建日志目录失败: %v", err)
 	}

logger/runtime_logger.go

@@ -2,6 +2,7 @@
 package logger
 
 import (
+	"fmt"
 	"log"
 	"os"
 	"strings"
@@ -9,6 +10,7 @@ import (
 	"time"
 
 	"git.x2erp.com/qdy/go-base/config/subconfigs"
+	"git.x2erp.com/qdy/go-base/ctx"
 	"git.x2erp.com/qdy/go-base/logger/http"
 
 	"go.uber.org/zap"
@@ -20,28 +22,30 @@ var (
 	runtimeLogger  *zap.Logger
 	runtimeSugared *zap.SugaredLogger
 	serviceName    string
+	serviceVersion string
 	initOnce       sync.Once
 )
 
-// LogContext 日志上下文
-type LogContext struct {
-	TraceID      string
-	UserID       string
-	TenantID     string
-	InstanceName string
-}
+// // LogContext 日志上下文
+// type LogContext struct {
+// 	TraceID      string
+// 	UserID       string
+// 	TenantID     string
+// 	InstanceName string
+// }
 
 // InitRuntimeLogger 初始化
-func InitRuntimeLogger(svcName string, logConfig *subconfigs.LogConfig) {
+func InitRuntimeLogger(svcName, svcVersion string, logConfig *subconfigs.LogConfig) {
 	initOnce.Do(func() {
 		if logConfig == nil {
 			log.Fatal("错误: 日志配置不能为空")
 		}
 
-		//serviceName = svcName
+		serviceName = svcName
+		serviceVersion = svcVersion
 
 		// 创建logger
-		if err := createRuntimeLogger(svcName, logConfig); err != nil {
+		if err := createRuntimeLogger(svcName, svcVersion, logConfig); err != nil {
 			log.Fatal("创建运行时日志器失败: ", err)
 		}
 
@@ -52,7 +56,7 @@ func InitRuntimeLogger(svcName string, logConfig *subconfigs.LogConfig) {
 	})
 }
 
-func createRuntimeLogger(svcName string, cfg *subconfigs.LogConfig) error {
+func createRuntimeLogger(svcName, svcVersion string, cfg *subconfigs.LogConfig) error {
 	// 1. 设置日志级别
 	level := zap.InfoLevel
 	switch strings.ToLower(cfg.Level) {
@@ -75,28 +79,25 @@ func createRuntimeLogger(svcName string, cfg *subconfigs.LogConfig) error {
 	// 3. 根据JSONFormat决定编码器
 	var consoleEncoder, jsonEncoder zapcore.Encoder
 
-	if cfg.JSONFormat {
-		// JSON格式输出
-		consoleEncoder = zapcore.NewJSONEncoder(encoderConfig)
-	} else {
-		// 文本格式输出
-		consoleEncoder = zapcore.NewConsoleEncoder(zapcore.EncoderConfig{
-			TimeKey:        "T",
-			LevelKey:       "L",
-			NameKey:        "N",
-			CallerKey:      "C",
-			MessageKey:     "M",
-			StacktraceKey:  "S",
-			LineEnding:     zapcore.DefaultLineEnding,
-			EncodeLevel:    zapcore.CapitalColorLevelEncoder,
-			EncodeTime:     zapcore.TimeEncoderOfLayout("2006-01-02 15:04:05"),
-			EncodeDuration: zapcore.StringDurationEncoder,
-			EncodeCaller:   zapcore.ShortCallerEncoder,
-		})
-	}
-
+	// JSON格式输出
 	jsonEncoder = zapcore.NewJSONEncoder(encoderConfig)
 
+	// 文本格式输出
+	consoleEncoder = zapcore.NewConsoleEncoder(zapcore.EncoderConfig{
+		TimeKey:        "T",
+		LevelKey:       "L",
+		NameKey:        "N",
+		CallerKey:      "C",
+		MessageKey:     "M",
+		StacktraceKey:  "S",
+		LineEnding:     zapcore.DefaultLineEnding,
+		EncodeLevel:    zapcore.CapitalColorLevelEncoder,
+		EncodeTime:     zapcore.TimeEncoderOfLayout("2006-01-02 15:04:05"),
+		EncodeDuration: zapcore.StringDurationEncoder,
+		EncodeCaller:   zapcore.ShortCallerEncoder,
+		EncodeName:     nil,
+	})
+
 	// 4. 输出目标
 	cores := []zapcore.Core{}
 
@@ -191,11 +192,12 @@ func createRuntimeLogger(svcName string, cfg *subconfigs.LogConfig) error {
 	// 7. 创建logger
 	runtimeLogger = zap.New(core,
 		zap.AddCaller(),
-		zap.AddCallerSkip(1),
+		zap.AddCallerSkip(2),
 		zap.AddStacktrace(zap.ErrorLevel),
-		zap.Fields(
-			zap.String("service", svcName),
-		),
+		//zap.Fields(
+		//	zap.String("service", svcName),
+		//	zap.String("version", serviceVersion),
+		//),
 	)
 
 	runtimeSugared = runtimeLogger.Sugar()
@@ -220,10 +222,11 @@ func addDateToFilePath(filePath string) string {
 }
 
 // WithC 创建带有上下文的logger（C代表Context）
-func W(ctx LogContext) *zap.SugaredLogger {
+func W(ctx *ctx.RequestContext) *zap.SugaredLogger {
 	// 直接使用，不会为空
 	return runtimeLogger.With(
 		zap.String("service", serviceName),
+		zap.String("version", serviceVersion),
 		zap.String("trace_id", ctx.TraceID),
 		zap.String("user_id", ctx.UserID),
 		zap.String("tenant_id", ctx.TenantID),
@@ -234,27 +237,27 @@ func W(ctx LogContext) *zap.SugaredLogger {
 // ============ 上下文日志快捷方法 ============
 
 // InfoC 带上下文的Info日志
-func InfoC(ctx LogContext, format string, args ...interface{}) {
+func InfoC(ctx *ctx.RequestContext, format string, args ...interface{}) {
 	W(ctx).Infof(format, args...)
 }
 
 // ErrorC 带上下文的Error日志
-func ErrorC(ctx LogContext, format string, args ...interface{}) {
+func ErrorC(ctx *ctx.RequestContext, format string, args ...interface{}) {
 	W(ctx).Errorf(format, args...)
 }
 
 // DebugC 带上下文的Debug日志
-func DebugC(ctx LogContext, format string, args ...interface{}) {
+func DebugC(ctx *ctx.RequestContext, format string, args ...interface{}) {
 	W(ctx).Debugf(format, args...)
 }
 
 // WarnC 带上下文的Warn日志
-func WarnC(ctx LogContext, format string, args ...interface{}) {
+func WarnC(ctx *ctx.RequestContext, format string, args ...interface{}) {
 	W(ctx).Warnf(format, args...)
 }
 
 // FatalC 带上下文的Fatal日志
-func FatalC(ctx LogContext, format string, args ...interface{}) {
+func FatalC(ctx *ctx.RequestContext, format string, args ...interface{}) {
 	W(ctx).Fatalf(format, args...)
 }
 
@@ -285,6 +288,20 @@ func Fatal(format string, args ...interface{}) {
 	runtimeSugared.Fatalf(format, args...)
 }
 
+// Errorf 记录错误日志并返回格式化错误
+func Errorf(format string, args ...interface{}) error {
+	err := fmt.Errorf(format, args...)
+	runtimeSugared.Errorf(format, args...)
+	return err
+}
+
+// ErrorCf 带上下文的错误日志并返回格式化错误
+func ErrorCf(ctx *ctx.RequestContext, format string, args ...interface{}) error {
+	err := fmt.Errorf(format, args...)
+	ErrorC(ctx, format, args...)
+	return err
+}
+
 // ============ 其他方法 ============
 
 // GetZapLogger 获取原始zap.Logger

myservice/service.go

@@ -40,6 +40,9 @@ func StartWithRegistry(cfg config.IConfig) web.Service {
 	log.Printf("   • Version: %s", serviceConfig.ServiceVersion)
 	log.Printf("   • Port: %d", serviceConfig.Port)
 	log.Printf("   • Registry: %s", microConfig.RegistryAddress)
+	log.Printf("   • IdleTimeout: %d秒", serviceConfig.IdleTimeout)
+	log.Printf("   • ReadTimeout: %d秒", serviceConfig.ReadTimeout)
+	log.Printf("   • WriteTimeout: %d秒", serviceConfig.WriteTimeout)
 
 	// Run in background
 	go func() {