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

Merge branch 'errcode' of https://github.com/OpenIMSDK/Open-IM-Server into errcode

Browse Source 
# Conflicts:
#	internal/rpc/friend/friend.go
This commit is contained in:
withchao 2023-03-17 11:33:40 +08:00
commit 26341a5187
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/common/config/config.go
View File

@ -2,13 +2,15 @@ package config
import ( import (
"fmt" "fmt"
"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"runtime" "runtime"
"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
_ "embed" _ "embed"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )
@ -189,6 +191,7 @@ type config struct {
ElasticSearchAddr []string `yaml:"elasticSearchAddr"` ElasticSearchAddr []string `yaml:"elasticSearchAddr"`
ElasticSearchUser string `yaml:"elasticSearchUser"` ElasticSearchUser string `yaml:"elasticSearchUser"`
ElasticSearchPassword string `yaml:"elasticSearchPassword"` ElasticSearchPassword string `yaml:"elasticSearchPassword"`
isJson bool `yaml:"isJson"`
} }
ModuleName struct { ModuleName struct {
LongConnSvrName string `yaml:"longConnSvrName"` LongConnSvrName string `yaml:"longConnSvrName"`

8
pkg/common/db/relation/friend_request_model.go
View File

@ -43,14 +43,14 @@ func (f *FriendRequestGorm) Update(ctx context.Context, friendRequests []*relati
// 获取来指定用户的好友申请 未找到 不返回错误 // 获取来指定用户的好友申请 未找到 不返回错误
func (f *FriendRequestGorm) Find(ctx context.Context, fromUserID, toUserID string) (friendRequest *relation.FriendRequestModel, err error) { func (f *FriendRequestGorm) Find(ctx context.Context, fromUserID, toUserID string) (friendRequest *relation.FriendRequestModel, err error) {
friendRequest = &relation.FriendRequestModel{} friendRequest = &relation.FriendRequestModel{}
utils.Wrap(f.db(ctx).Where("from_user_id = ? and to_user_id = ?", fromUserID, toUserID).Find(friendRequest).Error, "") err = utils.Wrap(f.db(ctx).Where("from_user_id = ? and to_user_id = ?", fromUserID, toUserID).Find(friendRequest).Error, "")
return return friendRequest, err
} }
func (f *FriendRequestGorm) Take(ctx context.Context, fromUserID, toUserID string) (friendRequest *relation.FriendRequestModel, err error) { func (f *FriendRequestGorm) Take(ctx context.Context, fromUserID, toUserID string) (friendRequest *relation.FriendRequestModel, err error) {
friendRequest = &relation.FriendRequestModel{} friendRequest = &relation.FriendRequestModel{}
utils.Wrap(f.db(ctx).Where("from_user_id = ? and to_user_id = ?", fromUserID, toUserID).Take(friendRequest).Error, "") err = utils.Wrap(f.db(ctx).Where("from_user_id = ? and to_user_id = ?", fromUserID, toUserID).Take(friendRequest).Error, "")
return return friendRequest, err
} }
// 获取toUserID收到的好友申请列表 // 获取toUserID收到的好友申请列表