🎨 更新项目版本

initialize/internal/gorm.go

@@ -1,12 +1,12 @@
 package internal
 
 import (
+	"time"
+
 	"git.echol.cn/loser/lckt/config"
-	"git.echol.cn/loser/lckt/global"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
-	"time"
 )
 
 var Gorm = new(_gorm)
@@ -15,22 +15,7 @@ type _gorm struct{}
 
 // Config gorm 自定义配置
 // Author [SliverHorn](https://github.com/SliverHorn)
-func (g *_gorm) Config(prefix string, singular bool) *gorm.Config {
-	var general config.GeneralDB
-	switch global.GVA_CONFIG.System.DbType {
-	case "mysql":
-		general = global.GVA_CONFIG.Mysql.GeneralDB
-	case "pgsql":
-		general = global.GVA_CONFIG.Pgsql.GeneralDB
-	case "oracle":
-		general = global.GVA_CONFIG.Oracle.GeneralDB
-	case "sqlite":
-		general = global.GVA_CONFIG.Sqlite.GeneralDB
-	case "mssql":
-		general = global.GVA_CONFIG.Mssql.GeneralDB
-	default:
-		general = global.GVA_CONFIG.Mysql.GeneralDB
-	}
+func (g *_gorm) Config(general config.GeneralDB) *gorm.Config {
 	return &gorm.Config{
 		Logger: logger.New(NewWriter(general), logger.Config{
 			SlowThreshold: 200 * time.Millisecond,
@@ -38,8 +23,8 @@ func (g *_gorm) Config(prefix string, singular bool) *gorm.Config {
 			Colorful:      true,
 		}),
 		NamingStrategy: schema.NamingStrategy{
-			TablePrefix:   prefix,
-			SingularTable: singular,
+			TablePrefix:   general.Prefix,
+			SingularTable: general.Singular,
 		},
 		DisableForeignKeyConstraintWhenMigrating: true,
 	}