From d20acf38c36c11ee4428c3e74a17f5870dc61b51 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 16 十一月 2023 09:51:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/SRM
---
initialize/internal/gorm.go | 38 ++++----------------------------------
1 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/initialize/internal/gorm.go b/initialize/internal/gorm.go
index 095c11c..0be474f 100644
--- a/initialize/internal/gorm.go
+++ b/initialize/internal/gorm.go
@@ -1,13 +1,10 @@
package internal
import (
- "gorm.io/gorm/schema"
- "log"
- "os"
- "time"
-
"gorm.io/gorm"
"gorm.io/gorm/logger"
+ "gorm.io/gorm/schema"
+ "moul.io/zapgorm2"
"srm/global"
)
@@ -29,34 +26,7 @@
},
DisableForeignKeyConstraintWhenMigrating: true,
}
- _default := logger.New(log.New(os.Stdout, "\r\n", log.LstdFlags), logger.Config{
- SlowThreshold: 200 * time.Millisecond,
- LogLevel: logger.Warn,
- Colorful: true,
- })
- var logMode DBBASE
- switch global.GVA_CONFIG.System.DbType {
- case "mysql":
- logMode = &global.GVA_CONFIG.Mysql
- case "pgsql":
- logMode = &global.GVA_CONFIG.Pgsql
- case "oracle":
- logMode = &global.GVA_CONFIG.Oracle
- default:
- logMode = &global.GVA_CONFIG.Mysql
- }
-
- switch logMode.GetLogMode() {
- case "silent", "Silent":
- config.Logger = _default.LogMode(logger.Silent)
- case "error", "Error":
- config.Logger = _default.LogMode(logger.Error)
- case "warn", "Warn":
- config.Logger = _default.LogMode(logger.Warn)
- case "info", "Info":
- config.Logger = _default.LogMode(logger.Info)
- default:
- config.Logger = _default.LogMode(logger.Info)
- }
+ dbLogger := zapgorm2.New(global.GVA_LOG).LogMode(logger.Info)
+ config.Logger = dbLogger
return config
}
--
Gitblit v1.8.0