This commit is contained in:
2023-04-21 18:18:58 +08:00
parent 4c6d505685
commit aa0fb37da2
2 changed files with 11 additions and 11 deletions

View File

@@ -53,11 +53,11 @@ func Instance(key ...string) *gorm.DB {
return instance
}
func NewDefault(config *Config) (*gorm.DB, error) {
return New(DefaultKey, config)
func InitDefault(config *Config) error {
return Init(DefaultKey, config)
}
func New(key string, config *Config) (*gorm.DB, error) {
func Init(key string, config *Config) error {
var (
maxLifeTime, _ = time.ParseDuration(DefaultConfig.MaxLifeTime)
maxIdleTime, _ = time.ParseDuration(DefaultConfig.MaxIdleTime)
@@ -75,7 +75,7 @@ func New(key string, config *Config) (*gorm.DB, error) {
if config.MaxLifeTime != "" {
t, err := time.ParseDuration(config.MaxLifeTime)
if err != nil {
return nil, fmt.Errorf("parse MaxLifeTime err: %s\n", err)
return fmt.Errorf("parse MaxLifeTime err: %s\n", err)
}
maxLifeTime = t
@@ -84,7 +84,7 @@ func New(key string, config *Config) (*gorm.DB, error) {
if config.MaxIdleTime != "" {
t, err := time.ParseDuration(config.MaxIdleTime)
if err != nil {
return nil, fmt.Errorf("parse MaxIdleTime err: %s\n", err)
return fmt.Errorf("parse MaxIdleTime err: %s\n", err)
}
maxIdleTime = t
}
@@ -103,7 +103,7 @@ func New(key string, config *Config) (*gorm.DB, error) {
})
if err != nil {
return nil, fmt.Errorf("connect mysql err: %s", err)
return fmt.Errorf("connect mysql err: %s", err)
}
sqlDb, _ := db.DB()
@@ -113,7 +113,7 @@ func New(key string, config *Config) (*gorm.DB, error) {
sqlDb.SetConnMaxIdleTime(maxIdleTime)
instanceMap[key] = db
return db, nil
return nil
}
func DefaultGormLogger(level gormLogger.LogLevel) gormLogger.Interface {