IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-10 03:56:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge code

Browse Source
This commit is contained in:
wangchuxiao
2022-02-14 10:46:32 +08:00
parent 7797e47561 6bfbf37749
commit 22bfb6be4b
46 changed files with 2201 additions and 1780 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/common/db/mysql.go
+45 -37
View File
@@ -36,7 +36,7 @@ func initMysqlDB() {
}
//Check the database and table during initialization
sql := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s ;", config.Config.Mysql.DBDatabaseName+"test1")
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
if err != nil {
log.NewError("0", "Exec failed ", err.Error(), sql)
@@ -59,44 +59,52 @@ func initMysqlDB() {
&GroupMember{},
&GroupRequest{},
&User{},
&Black{}, &ChatLog{})
&Black{}, &ChatLog{}, &Register{})
db.Set("gorm:table_options", "CHARSET=utf8")
db.Set("gorm:table_options", "collation=utf8_unicode_ci")
//
//if !db.HasTable(&Friend{}) {
// log.NewInfo("CreateTable Friend")
// db.CreateTable(&Friend{})
//}
//
//if !db.HasTable(&FriendRequest{}) {
// log.NewInfo("CreateTable FriendRequest")
// db.CreateTable(&FriendRequest{})
//}
//
//if !db.HasTable(&Group{}) {
// log.NewInfo("CreateTable Group")
// db.CreateTable(&Group{})
//}
//
//if !db.HasTable(&GroupMember{}) {
// log.NewInfo("CreateTable GroupMember")
// db.CreateTable(&GroupMember{})
//}
//
//if !db.HasTable(&GroupRequest{}) {
// log.NewInfo("CreateTable GroupRequest")
// db.CreateTable(&GroupRequest{})
//}
//
//if !db.HasTable(&User{}) {
// log.NewInfo("CreateTable User")
// db.CreateTable(&User{})
//}
//
//if !db.HasTable(&Black{}) {
// log.NewInfo("CreateTable Black")
// db.CreateTable(&Black{})
//}
if !db.HasTable(&Friend{}) {
log.NewInfo("CreateTable Friend")
db.CreateTable(&Friend{})
}
if !db.HasTable(&FriendRequest{}) {
log.NewInfo("CreateTable FriendRequest")
db.CreateTable(&FriendRequest{})
}
if !db.HasTable(&Group{}) {
log.NewInfo("CreateTable Group")
db.CreateTable(&Group{})
}
if !db.HasTable(&GroupMember{}) {
log.NewInfo("CreateTable GroupMember")
db.CreateTable(&GroupMember{})
}
if !db.HasTable(&GroupRequest{}) {
log.NewInfo("CreateTable GroupRequest")
db.CreateTable(&GroupRequest{})
}
if !db.HasTable(&User{}) {
log.NewInfo("CreateTable User")
db.CreateTable(&User{})
}
if !db.HasTable(&Black{}) {
log.NewInfo("CreateTable Black")
db.CreateTable(&Black{})
}
if !db.HasTable(&ChatLog{}) {
log.NewInfo("CreateTable Black")
db.CreateTable(&ChatLog{})
}
if !db.HasTable(&Register{}) {
log.NewInfo("CreateTable Black")
db.CreateTable(&Register{})
}
return