blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge newest branch

Browse Source
This commit is contained in:
Gordon 2021-11-11 19:04:35 +08:00
parent 6158ea436d
commit 46deb5a099
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/friend/add_friend.go
View File

@ -41,9 +41,7 @@ func ImportFriend(c *gin.Context) {
OwnerUid: params.OwnerUid, OwnerUid: params.OwnerUid,
Token: c.Request.Header.Get("token"), Token: c.Request.Header.Get("token"),
} }
log.ErrorByKv("ImportFriend Test start", params.OperationID)
RpcResp, err := client.ImportFriend(context.Background(), req) RpcResp, err := client.ImportFriend(context.Background(), req)
//log.ErrorByKv("ImportFriend Test end", params.OperationID, "resp", RpcResp, "err", err.Error())
if err != nil { if err != nil {
log.Error(req.Token, req.OperationID, "err=%s,ImportFriend failed", err) log.Error(req.Token, req.OperationID, "err=%s,ImportFriend failed", err)
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "cImportFriend failed" + err.Error()}) c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "cImportFriend failed" + err.Error()})

1
pkg/common/db/model.go
View File

@ -22,6 +22,7 @@ func key(dbAddress, dbName string) string {
func init() { func init() {
//mysql init //mysql init
initMysqlDB() initMysqlDB()
// mongo init
mgoDailInfo := &mgo.DialInfo{ mgoDailInfo := &mgo.DialInfo{
Addrs: config.Config.Mongo.DBAddress, Addrs: config.Config.Mongo.DBAddress,
Direct: config.Config.Mongo.DBDirect, Direct: config.Config.Mongo.DBDirect,