replace log

This commit is contained in:
Gordon 2022-04-06 14:41:36 +08:00
parent f64c40e91f
commit 59cc45eaab

View File

@ -2,7 +2,7 @@ package db
import ( import (
"Open_IM/pkg/common/config" "Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"fmt" "fmt"
"sync" "sync"
"time" "time"
@ -24,13 +24,13 @@ func initMysqlDB() {
var err1 error var err1 error
db, err := gorm.Open("mysql", dsn) db, err := gorm.Open("mysql", dsn)
if err != nil { if err != nil {
log.NewError("0", "Open failed ", err.Error(), dsn) fmt.Println("0", "Open failed ", err.Error(), dsn)
} }
if err != nil { if err != nil {
time.Sleep(time.Duration(30) * time.Second) time.Sleep(time.Duration(30) * time.Second)
db, err1 = gorm.Open("mysql", dsn) db, err1 = gorm.Open("mysql", dsn)
if err1 != nil { if err1 != nil {
log.NewError("0", "Open failed ", err1.Error(), dsn) fmt.Println("0", "Open failed ", err1.Error(), dsn)
panic(err1.Error()) panic(err1.Error())
} }
} }
@ -39,7 +39,7 @@ func initMysqlDB() {
sql := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s default charset utf8 COLLATE utf8_general_ci;", config.Config.Mysql.DBDatabaseName) sql := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s default charset utf8 COLLATE utf8_general_ci;", config.Config.Mysql.DBDatabaseName)
err = db.Exec(sql).Error err = db.Exec(sql).Error
if err != nil { if err != nil {
log.NewError("0", "Exec failed ", err.Error(), sql) fmt.Println("0", "Exec failed ", err.Error(), sql)
panic(err.Error()) panic(err.Error())
} }
db.Close() db.Close()
@ -48,11 +48,11 @@ func initMysqlDB() {
config.Config.Mysql.DBUserName, config.Config.Mysql.DBPassword, config.Config.Mysql.DBAddress[0], config.Config.Mysql.DBDatabaseName) config.Config.Mysql.DBUserName, config.Config.Mysql.DBPassword, config.Config.Mysql.DBAddress[0], config.Config.Mysql.DBDatabaseName)
db, err = gorm.Open("mysql", dsn) db, err = gorm.Open("mysql", dsn)
if err != nil { if err != nil {
log.NewError("0", "Open failed ", err.Error(), dsn) fmt.Println("0", "Open failed ", err.Error(), dsn)
panic(err.Error()) panic(err.Error())
} }
log.NewInfo("open db ok ", dsn) fmt.Println("open db ok ", dsn)
db.AutoMigrate(&Friend{}, db.AutoMigrate(&Friend{},
&FriendRequest{}, &FriendRequest{},
&Group{}, &Group{},
@ -64,49 +64,49 @@ func initMysqlDB() {
db.Set("gorm:table_options", "collation=utf8_unicode_ci") db.Set("gorm:table_options", "collation=utf8_unicode_ci")
if !db.HasTable(&Friend{}) { if !db.HasTable(&Friend{}) {
log.NewInfo("CreateTable Friend") fmt.Println("CreateTable Friend")
db.CreateTable(&Friend{}) db.CreateTable(&Friend{})
} }
if !db.HasTable(&FriendRequest{}) { if !db.HasTable(&FriendRequest{}) {
log.NewInfo("CreateTable FriendRequest") fmt.Println("CreateTable FriendRequest")
db.CreateTable(&FriendRequest{}) db.CreateTable(&FriendRequest{})
} }
if !db.HasTable(&Group{}) { if !db.HasTable(&Group{}) {
log.NewInfo("CreateTable Group") fmt.Println("CreateTable Group")
db.CreateTable(&Group{}) db.CreateTable(&Group{})
} }
if !db.HasTable(&GroupMember{}) { if !db.HasTable(&GroupMember{}) {
log.NewInfo("CreateTable GroupMember") fmt.Println("CreateTable GroupMember")
db.CreateTable(&GroupMember{}) db.CreateTable(&GroupMember{})
} }
if !db.HasTable(&GroupRequest{}) { if !db.HasTable(&GroupRequest{}) {
log.NewInfo("CreateTable GroupRequest") fmt.Println("CreateTable GroupRequest")
db.CreateTable(&GroupRequest{}) db.CreateTable(&GroupRequest{})
} }
if !db.HasTable(&User{}) { if !db.HasTable(&User{}) {
log.NewInfo("CreateTable User") fmt.Println("CreateTable User")
db.CreateTable(&User{}) db.CreateTable(&User{})
} }
if !db.HasTable(&Black{}) { if !db.HasTable(&Black{}) {
log.NewInfo("CreateTable Black") fmt.Println("CreateTable Black")
db.CreateTable(&Black{}) db.CreateTable(&Black{})
} }
if !db.HasTable(&ChatLog{}) { if !db.HasTable(&ChatLog{}) {
log.NewInfo("CreateTable Black") fmt.Println("CreateTable Black")
db.CreateTable(&ChatLog{}) db.CreateTable(&ChatLog{})
} }
if !db.HasTable(&Register{}) { if !db.HasTable(&Register{}) {
log.NewInfo("CreateTable Black") fmt.Println("CreateTable Black")
db.CreateTable(&Register{}) db.CreateTable(&Register{})
} }
if !db.HasTable(&Conversation{}) { if !db.HasTable(&Conversation{}) {
log.NewInfo("CreateTable Black") fmt.Println("CreateTable Black")
db.CreateTable(&Conversation{}) db.CreateTable(&Conversation{})
} }