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

Merge remote-tracking branch 'origin/tuoyun' into tuoyun

Browse Source
This commit is contained in:
wenxu12345
2022-01-18 15:30:37 +08:00
parent da5e60a009 896a69086b
commit f3507569b5
5 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/common/db/mysql.go
+1 -1
View File
@@ -35,7 +35,7 @@ func initMysqlDB() {
}
//Check the database and table during initialization
sql := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s ;", config.Config.Mysql.DBDatabaseName)
sql := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s ;", config.Config.Mysql.DBDatabaseName+"test1")
err = db.Exec(sql).Error
if err != nil {
log.NewError("0", "Exec failed ", err.Error(), sql)
pkg/proto/sdk_ws/ws.proto
+3 -3
View File
@@ -193,12 +193,12 @@ message MsgData {
int32 msgFrom = 10;
int32 contentType = 11;
bytes content = 12;
repeated string forceList = 13;
int64 seq = 14;
int64 sendTime = 15;
int64 createTime = 16;
map<string, bool> options = 17;
OfflinePushInfo offlinePushInfo = 18;
int32 status = 17;
map<string, bool> options = 18;
OfflinePushInfo offlinePushInfo = 19;
}
message OfflinePushInfo{