From 708873087f53da957f82cdb8234a03167efc1068 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Tue, 13 Jun 2023 11:26:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3log=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E8=87=AA=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/model/adminRole.go | 24 +++++-------------------
 api/model/model.go     |  7 +++++++
 core/mysql.go          | 42 ++++++++++++------------------------------
 3 files changed, 24 insertions(+), 49 deletions(-)

diff --git a/api/model/adminRole.go b/api/model/adminRole.go
index b5c1e58..06f7b64 100644
--- a/api/model/adminRole.go
+++ b/api/model/adminRole.go
@@ -1,28 +1,14 @@
 package model
 
-import (
-	"fmt"
-	"gorm.io/gorm"
-	"time"
-)
-
 // AdminRole 后台-角色表
 type AdminRole struct {
-	// Model
-	RoleId     int64     `gorm:"column:role_id;type:bigint(19);primary_key;comment:主键id" json:"role_id"`
-	RoleName   string    `gorm:"column:role_name;type:varchar(100);comment:角色名称" json:"role_name"`
-	RoleStatus int       `gorm:"column:role_status;type:tinyint(1);default:1;comment:角色状态（1:正常 2:禁用）" json:"role_status"`
-	IsAdmin    int       `gorm:"column:is_admin;type:tinyint(1);default:0;comment:是否管理员（0:否 1:是）" json:"is_admin"`
-	CreatedAt  time.Time `gorm:"column:created_at;type:datetime;comment:创建时间" json:"created_at"`
-	UpdatedAt  time.Time `gorm:"column:updated_at;type:datetime;comment:修改时间" json:"updated_at"`
+	Model
+	RoleId     int64  `gorm:"column:role_id;type:bigint(19);primary_key;comment:主键id" json:"role_id"`
+	RoleName   string `gorm:"column:role_name;type:varchar(100);comment:角色名称" json:"role_name"`
+	RoleStatus int    `gorm:"column:role_status;type:tinyint(1);default:1;comment:角色状态（1:正常 2:禁用）" json:"role_status"`
+	IsAdmin    int    `gorm:"column:is_admin;type:tinyint(1);default:0;comment:是否管理员（0:否 1:是）" json:"is_admin"`
 }
 
 func (m *AdminRole) TableName() string {
 	return "gdxz_admin_role"
 }
-
-func (m *AdminRole) BeforeUpdate(tx *gorm.DB) (err error) {
-	fmt.Println(111111)
-	m.UpdatedAt = time.Now()
-	return nil
-}
diff --git a/api/model/model.go b/api/model/model.go
index 09dd158..95c2dbb 100644
--- a/api/model/model.go
+++ b/api/model/model.go
@@ -79,3 +79,10 @@ func (m *Model) BeforeCreate(tx *gorm.DB) (err error) {
 
 	return nil
 }
+
+func (m *Model) BeforeUpdate(tx *gorm.DB) (err error) {
+	m.UpdatedAt = LocalTime(time.Now())
+	tx.Statement.SetColumn("UpdatedAt", m.UpdatedAt)
+
+	return nil
+}
diff --git a/core/mysql.go b/core/mysql.go
index 0a032a9..84002f7 100644
--- a/core/mysql.go
+++ b/core/mysql.go
@@ -10,24 +10,6 @@ import (
 	"time"
 )
 
-// // 定义自己的Writer
-// type MyWriter struct {
-// 	logger *logrus.Logger
-// }
-//
-// // 实现gorm/logger.Writer接口
-// func (m *MyWriter) Printf(format string, v ...interface{}) {
-// 	logstr := fmt.Sprintf(format, v...)
-// 	// 利用loggus记录日志
-// 	m.logger.Info(logstr)
-// }
-//
-// func NewMyWriter() *MyWriter {
-// 	l := Logrus()
-//
-// 	return &MyWriter{logger: l}
-// }
-
 func Mysql() {
 	var err error
 
@@ -35,20 +17,20 @@ func Mysql() {
 	dsn := fmt.Sprintf("%s:%s@(%s:%d)/%s?charset=utf8mb4&parseTime=True&loc=Local&timeout=%s", m.Username,
 		m.Password, m.Host, m.Port, m.DbName, "10s")
 
-	newLogger := logger.New(
-		global.Logger,
-		logger.Config{
-			SlowThreshold:             time.Second, // Slow SQL threshold
-			LogLevel:                  logger.Info, // Log level
-			IgnoreRecordNotFoundError: true,        // Ignore ErrRecordNotFound error for logger
-			ParameterizedQueries:      true,        // Don't include params in the SQL log
-			Colorful:                  false,       // Disable color
-		},
-	)
+	// newLogger := logger.New(
+	// 	global.Logger,
+	// 	logger.Config{
+	// 		SlowThreshold:             time.Second, // Slow SQL threshold
+	// 		LogLevel:                  logger.Info, // Log level
+	// 		IgnoreRecordNotFoundError: true,        // Ignore ErrRecordNotFound error for logger
+	// 		ParameterizedQueries:      false,       // Don't include params in the SQL log
+	// 		Colorful:                  false,       // Disable color
+	// 	},
+	// )
 
 	global.Db, err = gorm.Open(mysql.Open(dsn), &gorm.Config{
-		// Logger: logger.Default.LogMode(logger.Info),
-		Logger: newLogger,
+		Logger: logger.Default.LogMode(logger.Info),
+		// Logger: newLogger,
 	})
 
 	if err != nil {