Release v0.2.132

main.go

@@ -1,17 +1,19 @@
 package main
 
 import (
+	"log"
+
 	"git.x2erp.com/qdy/go-db/factory/database"
+	"git.x2erp.com/qdy/go-db/sqldef"
 
 	"git.x2erp.com/qdy/go-base/config"
-	"git.x2erp.com/qdy/go-base/consul"
 	"git.x2erp.com/qdy/go-base/container"
 	"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/health"
-	"git.x2erp.com/qdy/go-base/webx/router"
+
+	_ "git.x2erp.com/qdy/go-svc-mercury/internal/tables" // 导入表定义包，触发 init() 函数
 )
 
 var (
@@ -19,46 +21,32 @@ var (
 	appVersion = "1"
 )
 
-// 定义结构体
-type CreateUserRequest struct {
-	Name  string `json:"name"`
-	Email string `json:"email"`
-	Age   int    `json:"age"`
-}
-
-type UserResponse struct {
-	ID    string `json:"id"`
-	Name  string `json:"name"`
-	Email string `json:"email"`
-	Data  []map[string]interface{}
-}
-
 func main() {
 
-	//0.日志
-	//logger.InitBootLog()
+	// 0. 初始化日志
 	logBootFactory := logger.InitBootLog()
 
-	//1.获取配置文件
+	// 1. 获取配置文件
 	cfg := config.GetConfig()
 	cfg.SetAppName(appName)
 	cfg.SetAppVersion(appVersion)
 
-	//2.创建关闭容器
+	// 2. 创建关闭容器
 	ctr := container.NewContainer(cfg)
 
-	//注册日志，实现自动关闭
+	// 注册日志，实现自动关闭
 	container.Reg(ctr, logBootFactory)
 
-	//3.创建数据库工厂--如果需求
+	// 3. 创建数据库工厂
 	dbFactory := container.Create(ctr, database.CreateDBFactory)
-
-	// 赋值认证中间件参数
-	//middleware.JWTAuthMiddlewareInit(cfg)
-
-	//测试数据库连接
 	dbFactory.TestConnection()
+	// 创建表
+	creteTabel(dbFactory)
+
+	//启用运行日志
+	container.Create(ctr, logger.InitRuntimeLogger)
 
+	//建立httpservice
 	//得到webservice服务工厂
 	webxFactory := webx.GetWebServiceFactory()
 
@@ -66,29 +54,38 @@ func main() {
 	webServcie, _ := webxFactory.CreateService(cfg.GetServiceConfig())
 
 	//建立路由-api
-	routerService := router.NewWebService(webServcie.GetRouter())
-
+	//routerService := router.NewWebService(webServcie.GetRouter())
 	//注册路由--api
-	//registerDorisRouter(routerService, dbFactory)
+	//registerRoutes(routerService, dbFactory)
 
-	// 注册健康检查-api
-	health.RegisterConsulHealthCheck(routerService)
+	// 注册前端静态文件服务
+	//frontendHandler := ServeFrontend()
+	//webServcie.GetRouter().Handle("/", frontendHandler)
 
 	//启动服务
 	webServcie.Run()
 
-	//启用运行日志
-	container.Create(ctr, logger.InitRuntimeLogger)
-
-	//注册到注册中心
-	container.Create(ctr, consul.Register)
 	//等待关闭
-	//webServcie.WaitForServiceShutdown(ctr)
+	graceful.WaitForShutdown(cfg.GetServiceConfig().ServiceName, ctr, webServcie.GetServer())
 
-	//启动服务
-	webServcie.Run()
+}
 
-	//等待关闭
-	graceful.WaitForShutdown(cfg.GetServiceConfig().ServiceName, ctr, webServcie.GetServer())
+func creteTabel(factory *database.DBFactory) {
+
+	// 获取数据库连接和类型
+	db := factory.GetDB()
+	dbType := factory.GetDBType()
+
+	// 创建表同步器
+	syncer, err := sqldef.NewTableSyncer(db, dbType)
+	if err != nil {
+		log.Printf("创建 - 建立器失败: %v", err)
+	}
+
+	// 创建表
+	if err := syncer.CreateTables(); err != nil {
+		log.Printf("建表失败: %v", err)
+	}
 
+	log.Println("数据库表建立完成！")
 }