From 0b8737756925331d159df7ce859e17c34ab8c7b8 Mon Sep 17 00:00:00 2001 From: bugtower100 <2889352839@qq.com> Date: Wed, 8 Jan 2025 16:34:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3PostgreSQL?= =?UTF-8?q?=E5=92=8CMySQL=E7=9A=84=E6=97=A5=E5=BF=97=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E6=89=93=E5=8D=B0=E5=88=B0database.log?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dice/model/database/mysql.go | 15 +++------------ dice/model/database/pgsql.go | 14 ++------------ 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/dice/model/database/mysql.go b/dice/model/database/mysql.go index c7310bcd..f4035690 100644 --- a/dice/model/database/mysql.go +++ b/dice/model/database/mysql.go @@ -1,10 +1,6 @@ package database import ( - "log" - "os" - "time" - "gorm.io/driver/mysql" "gorm.io/gorm" "gorm.io/gorm/logger" @@ -15,14 +11,9 @@ import ( func MySQLDBInit(dsn string) (*gorm.DB, error) { // 构建 MySQL DSN (Data Source Name) // 使用 GORM 连接 MySQL - db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{Logger: logger.New( - log.New(os.Stdout, "\r\n", log.LstdFlags), // io writer - logger.Config{ - SlowThreshold: time.Second, // 慢 SQL 阈值 - LogLevel: logger.Info, // 记录所有SQL操作 - Colorful: true, // 是否启用彩色打印 - }, - )}) + db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{ + // 注意，这里虽然是Info,但实际上打印就变成了Debug. + Logger: logger.Default.LogMode(logger.Info)}) if err != nil { return nil, err } diff --git a/dice/model/database/pgsql.go b/dice/model/database/pgsql.go index 1f74cb05..aa24e54a 100644 --- a/dice/model/database/pgsql.go +++ b/dice/model/database/pgsql.go @@ -1,10 +1,6 @@ package database import ( - "log" - "os" - "time" - "gorm.io/driver/postgres" "gorm.io/gorm" "gorm.io/gorm/logger" @@ -17,14 +13,8 @@ func PostgresDBInit(dsn string) (*gorm.DB, error) { // 使用 GORM 连接 PostgreSQL db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{ - Logger: logger.New( - log.New(os.Stdout, "\r\n", log.LstdFlags), // io writer - logger.Config{ - SlowThreshold: time.Second, // 慢 SQL 阈值 - LogLevel: logger.Info, // 记录所有SQL操作 - Colorful: true, // 是否启用彩色打印 - }, - ), + // 注意，这里虽然是Info,但实际上打印就变成了Debug. + Logger: logger.Default.LogMode(logger.Info), }) if err != nil { return nil, err From a3c8d52c44c1e5726b88e039b796b3bd43a91db0 Mon Sep 17 00:00:00 2001 From: bugtower100 <2889352839@qq.com> Date: Thu, 9 Jan 2025 16:48:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3.nn=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=87=8D=E5=90=AF=E5=90=8E=E6=95=B0=E6=8D=AE=E6=B6=88?= =?UTF-8?q?=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dice/model/group_info.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dice/model/group_info.go b/dice/model/group_info.go index 1c7320e0..42e0b9fa 100644 --- a/dice/model/group_info.go +++ b/dice/model/group_info.go @@ -132,19 +132,18 @@ func GroupPlayerInfoGet(db *gorm.DB, groupID string, playerID string) *GroupPlay // 使用 GORM 查询数据并绑定到结构体中 // db.Table("表名").Where("条件").First(&ret) 查询一条数据并映射到结构体 - err := db.Model(&GroupPlayerInfoBase{}). + result := db.Model(&GroupPlayerInfoBase{}). Where("group_id = ? AND user_id = ?", groupID, playerID). Select("name, last_command_time, auto_set_name_template, dice_side_num"). - Scan(&ret).Error - + First(&ret) + err := result.Error // 如果查询发生错误，打印错误并返回 nil if err != nil { log.Errorf("error getting group player info: %s", err.Error()) return nil } - // 如果查询到的数据为空，返回 nil - if db.RowsAffected == 0 { + if result.RowsAffected == 0 { return nil }