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 remote-tracking branch 'origin/tuoyun' into tuoyun

Browse Source
This commit is contained in:
wenxu12345 2022-04-26 18:26:48 +08:00
commit 6db8d9a38a
14 changed files with 736 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmd/rpc/open_im_cache/Makefile Normal file
View File

@ -0,0 +1,24 @@
.PHONY: all build run gotool install clean help
BINARY_NAME=open_im_cache
BIN_DIR=../../../bin/
all: gotool build
build:
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
run:
@go run ./
gotool:
go fmt ./
go vet ./
install:
make build
mv ${BINARY_NAME} ${BIN_DIR}
clean:
@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

16
cmd/rpc/open_im_cache/main.go Normal file
View File

@ -0,0 +1,16 @@
package main
import (
rpcCache "Open_IM/internal/rpc/cache"
"flag"
"fmt"
)
func main() {
rpcPort := flag.Int("port", 10600, "RpcToken default listen port 10800")
flag.Parse()
fmt.Println("start auth rpc server, port: ", *rpcPort)
rpcServer := rpcCache.NewCacheServer(*rpcPort)
rpcServer.Run()
}

1
config/config.yaml
View File

@ -124,6 +124,7 @@ rpcport: #rpc服务端口 默认即可
openImOfficePort: [ 10210 ] openImOfficePort: [ 10210 ]
openImOrganizationPort: [ 10220 ] openImOrganizationPort: [ 10220 ]
openImConversationPort: [ 10230 ] openImConversationPort: [ 10230 ]
openImCachePort: [10240]
c2c: c2c:
callbackBeforeSendMsg: callbackBeforeSendMsg:
switch: false switch: false

261
internal/api/user/user.go
View File

@ -8,7 +8,6 @@ import (
"Open_IM/pkg/common/log" "Open_IM/pkg/common/log"
"Open_IM/pkg/common/token_verify" "Open_IM/pkg/common/token_verify"
"Open_IM/pkg/grpc-etcdv3/getcdv3" "Open_IM/pkg/grpc-etcdv3/getcdv3"
"Open_IM/pkg/proto/cache"
pbRelay "Open_IM/pkg/proto/relay" pbRelay "Open_IM/pkg/proto/relay"
open_im_sdk "Open_IM/pkg/proto/sdk_ws" open_im_sdk "Open_IM/pkg/proto/sdk_ws"
rpc "Open_IM/pkg/proto/user" rpc "Open_IM/pkg/proto/user"
@ -19,7 +18,110 @@ import (
"strings" "strings"
) )
//todo //func GetUsersInfoFromCache(c *gin.Context) {
// params := api.GetUsersInfoReq{}
// if err := c.BindJSON(&params); err != nil {
// log.NewError("0", "BindJSON failed ", err.Error())
// c.JSON(http.StatusBadRequest, gin.H{"errCode": http.StatusBadRequest, "errMsg": err.Error()})
// return
// }
// getUserInfoReq := &rpc.GetUserInfoReq{}
// getUserInfoReq.OperationID = params.OperationID
// var ok bool
// ok, getUserInfoReq.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), getUserInfoReq.OperationID)
// if !ok {
// log.NewError(getUserInfoReq.OperationID, "GetUserIDFromToken false ", c.Request.Header.Get("token"))
// c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "GetUserIDFromToken failed"})
// return
// }
// log.NewInfo(params.OperationID, "GetUserInfo args ", getUserInfoReq.String())
// reqCacheGetUserInfo := &cacheRpc.GetUserInfoReq{}
// utils.CopyStructFields(reqCacheGetUserInfo, &params)
// var userInfoList []*open_im_sdk.UserInfo
// var publicUserInfoList []*open_im_sdk.PublicUserInfo
// etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName)
// cacheClient := cacheRpc.NewCacheClient(etcdConn)
// cacheResp, err := cacheClient.GetUserInfo(context.Background(), reqCacheGetUserInfo)
// if err != nil {
// log.NewError(getUserInfoReq.OperationID, utils.GetSelfFuncName(), "GetUserInfo failed", err.Error())
// c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call rpc server failed: " + err.Error()})
// return
// }
// if cacheResp.CommonResp.ErrCode != 0 {
// log.NewError(getUserInfoReq.OperationID, utils.GetSelfFuncName(), "GetUserInfo failed", cacheResp.CommonResp)
// resp := api.GetUsersInfoResp{CommResp: api.CommResp{ErrCode: cacheResp.CommonResp.ErrCode, ErrMsg: cacheResp.CommonResp.ErrMsg}}
// resp.Data = []map[string]interface{}{}
// log.NewInfo(getUserInfoReq.OperationID, "GetUserInfo api return ", resp)
// c.JSON(http.StatusOK, resp)
// return
// }
// log.NewInfo(getUserInfoReq.OperationID, utils.GetSelfFuncName(), "cacheResp:", cacheResp.String())
// userInfoList = cacheResp.UserInfoList
// var needCacheUserIDList []string
// for _, userID := range reqCacheGetUserInfo.UserIDList {
// isGetUserInfoFromCache := false
// for _, cacheUser := range userInfoList {
// if cacheUser.UserID == userID {
// isGetUserInfoFromCache = true
// }
// }
// if !isGetUserInfoFromCache {
// needCacheUserIDList = append(needCacheUserIDList, userID)
// }
// }
// if len(needCacheUserIDList) == 0 {
// log.NewInfo(getUserInfoReq.OperationID, utils.GetSelfFuncName(), "get all userInfo from cache success")
// for _, v := range userInfoList {
// publicUserInfoList = append(publicUserInfoList,
// &open_im_sdk.PublicUserInfo{UserID: v.UserID, Nickname: v.Nickname, FaceURL: v.FaceURL, Gender: v.Gender, Ex: v.Ex})
// }
// resp := api.GetUsersInfoResp{CommResp: api.CommResp{ErrCode: cacheResp.CommonResp.ErrCode, ErrMsg: cacheResp.CommonResp.ErrMsg}, UserInfoList: publicUserInfoList}
// resp.Data = jsonData.JsonDataList(resp.UserInfoList)
// log.NewInfo(getUserInfoReq.OperationID, "GetUserInfo api return ", resp)
// c.JSON(http.StatusOK, resp)
// return
// }
//
// log.NewDebug(getUserInfoReq.OperationID, utils.GetSelfFuncName(), "need cache user list", needCacheUserIDList)
// getUserInfoReq.UserIDList = needCacheUserIDList
// etcdConn = getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName)
// client := rpc.NewUserClient(etcdConn)
// rpcResp, err := client.GetUserInfo(context.Background(), getUserInfoReq)
// if err != nil {
// log.NewError(getUserInfoReq.OperationID, "GetUserInfo failed ", err.Error(), getUserInfoReq.String())
// c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call rpc server failed" + err.Error()})
// return
// }
// if rpcResp.CommonResp.ErrCode != 0 {
// log.NewError(getUserInfoReq.OperationID, utils.GetSelfFuncName(), "GetUserInfo failed", cacheResp.CommonResp)
// resp := api.GetUsersInfoResp{CommResp: api.CommResp{ErrCode: cacheResp.CommonResp.ErrCode, ErrMsg: cacheResp.CommonResp.ErrMsg}}
// resp.Data = []map[string]interface{}{}
// log.NewInfo(getUserInfoReq.OperationID, "GetUserInfo api return ", resp)
// c.JSON(http.StatusOK, resp)
// return
// }
// userInfoList = append(userInfoList, rpcResp.UserInfoList...)
// cacheUpdateUserInfoReq := &cacheRpc.UpdateUserInfoReq{
// UserInfoList: rpcResp.UserInfoList,
// OperationID: getUserInfoReq.OperationID,
// }
// _, err = cacheClient.UpdateUserInfo(context.Background(), cacheUpdateUserInfoReq)
// if err != nil {
// log.NewError(getUserInfoReq.OperationID, "GetUserInfo failed ", err.Error())
// c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call rpc server failed:" + err.Error()})
// return
// }
// userInfoList = rpcResp.UserInfoList
// for _, v := range userInfoList {
// publicUserInfoList = append(publicUserInfoList,
// &open_im_sdk.PublicUserInfo{UserID: v.UserID, Nickname: v.Nickname, FaceURL: v.FaceURL, Gender: v.Gender, Ex: v.Ex})
// }
// resp := api.GetUsersInfoResp{CommResp: api.CommResp{ErrCode: rpcResp.CommonResp.ErrCode, ErrMsg: rpcResp.CommonResp.ErrMsg}, UserInfoList: publicUserInfoList}
// resp.Data = jsonData.JsonDataList(resp.UserInfoList)
// log.NewInfo(getUserInfoReq.OperationID, "GetUserInfo api return ", resp)
// c.JSON(http.StatusOK, resp)
//}
func GetUsersInfoFromCache(c *gin.Context) { func GetUsersInfoFromCache(c *gin.Context) {
params := api.GetUsersInfoReq{} params := api.GetUsersInfoReq{}
if err := c.BindJSON(&params); err != nil { if err := c.BindJSON(&params); err != nil {
@ -58,6 +160,14 @@ func GetUsersInfoFromCache(c *gin.Context) {
c.JSON(http.StatusOK, resp) c.JSON(http.StatusOK, resp)
} }
func GetUserFriendFromCache(c *gin.Context) {
}
func GetBlackListFromCache(c *gin.Context) {
}
func GetUsersInfo(c *gin.Context) { func GetUsersInfo(c *gin.Context) {
params := api.GetUsersInfoReq{} params := api.GetUsersInfoReq{}
if err := c.BindJSON(&params); err != nil { if err := c.BindJSON(&params); err != nil {
@ -65,100 +175,34 @@ func GetUsersInfo(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"errCode": http.StatusBadRequest, "errMsg": err.Error()}) c.JSON(http.StatusBadRequest, gin.H{"errCode": http.StatusBadRequest, "errMsg": err.Error()})
return return
} }
getUserInfoReq := &rpc.GetUserInfoReq{} req := &rpc.GetUserInfoReq{}
getUserInfoReq.OperationID = params.OperationID utils.CopyStructFields(req, &params)
var ok bool var ok bool
ok, getUserInfoReq.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), getUserInfoReq.OperationID) ok, req.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
if !ok { if !ok {
log.NewError(getUserInfoReq.OperationID, "GetUserIDFromToken false ", c.Request.Header.Get("token")) log.NewError(req.OperationID, "GetUserIDFromToken false ", c.Request.Header.Get("token"))
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "GetUserIDFromToken failed"}) c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "GetUserIDFromToken failed"})
return return
} }
log.NewInfo(params.OperationID, "GetUserInfo args ", getUserInfoReq.String()) log.NewInfo(params.OperationID, "GetUserInfo args ", req.String())
reqCacheGetUserInfo := &cache.GetUserInfoReq{}
utils.CopyStructFields(reqCacheGetUserInfo, &params)
var userInfoList []*open_im_sdk.UserInfo
var publicUserInfoList []*open_im_sdk.PublicUserInfo
etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName)
cacheClient := cache.NewCacheClient(etcdConn)
cacheResp, err := cacheClient.GetUserInfo(context.Background(), reqCacheGetUserInfo)
if err != nil {
log.NewError(getUserInfoReq.OperationID, utils.GetSelfFuncName(), "GetUserInfo failed", err.Error())
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call rpc server failed: " + err.Error()})
return
}
if cacheResp.CommonResp.ErrCode != 0 {
log.NewError(getUserInfoReq.OperationID, utils.GetSelfFuncName(), "GetUserInfo failed", cacheResp.CommonResp)
resp := api.GetUsersInfoResp{CommResp: api.CommResp{ErrCode: cacheResp.CommonResp.ErrCode, ErrMsg: cacheResp.CommonResp.ErrMsg}}
resp.Data = []map[string]interface{}{}
log.NewInfo(getUserInfoReq.OperationID, "GetUserInfo api return ", resp)
c.JSON(http.StatusOK, resp)
return
}
log.NewInfo(getUserInfoReq.OperationID, utils.GetSelfFuncName(), "cacheResp:", cacheResp.String())
userInfoList = cacheResp.UserInfoList
var needCacheUserIDList []string
for _, userID := range reqCacheGetUserInfo.UserIDList {
isGetUserInfoFromCache := false
for _, cacheUser := range userInfoList {
if cacheUser.UserID == userID {
isGetUserInfoFromCache = true
}
}
if !isGetUserInfoFromCache {
needCacheUserIDList = append(needCacheUserIDList, userID)
}
}
if len(needCacheUserIDList) == 0 {
log.NewInfo(getUserInfoReq.OperationID, utils.GetSelfFuncName(), "get all userInfo from cache success")
for _, v := range userInfoList {
publicUserInfoList = append(publicUserInfoList,
&open_im_sdk.PublicUserInfo{UserID: v.UserID, Nickname: v.Nickname, FaceURL: v.FaceURL, Gender: v.Gender, Ex: v.Ex})
}
resp := api.GetUsersInfoResp{CommResp: api.CommResp{ErrCode: cacheResp.CommonResp.ErrCode, ErrMsg: cacheResp.CommonResp.ErrMsg}, UserInfoList: publicUserInfoList}
resp.Data = jsonData.JsonDataList(resp.UserInfoList)
log.NewInfo(getUserInfoReq.OperationID, "GetUserInfo api return ", resp)
c.JSON(http.StatusOK, resp)
return
}
log.NewDebug(getUserInfoReq.OperationID, utils.GetSelfFuncName(), "need cache user list", needCacheUserIDList) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName)
getUserInfoReq.UserIDList = needCacheUserIDList
etcdConn = getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName)
client := rpc.NewUserClient(etcdConn) client := rpc.NewUserClient(etcdConn)
rpcResp, err := client.GetUserInfo(context.Background(), getUserInfoReq) RpcResp, err := client.GetUserInfo(context.Background(), req)
if err != nil { if err != nil {
log.NewError(getUserInfoReq.OperationID, "GetUserInfo failed ", err.Error(), getUserInfoReq.String()) log.NewError(req.OperationID, "GetUserInfo failed ", err.Error(), req.String())
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call rpc server failed" + err.Error()})
return
}
if rpcResp.CommonResp.ErrCode != 0 {
log.NewError(getUserInfoReq.OperationID, utils.GetSelfFuncName(), "GetUserInfo failed", cacheResp.CommonResp)
resp := api.GetUsersInfoResp{CommResp: api.CommResp{ErrCode: cacheResp.CommonResp.ErrCode, ErrMsg: cacheResp.CommonResp.ErrMsg}}
resp.Data = []map[string]interface{}{}
log.NewInfo(getUserInfoReq.OperationID, "GetUserInfo api return ", resp)
c.JSON(http.StatusOK, resp)
return
}
userInfoList = append(userInfoList, rpcResp.UserInfoList...)
cacheUpdateUserInfoReq := &cache.UpdateUserInfoReq{
UserInfoList: rpcResp.UserInfoList,
OperationID: getUserInfoReq.OperationID,
}
_, err = cacheClient.UpdateUserInfo(context.Background(), cacheUpdateUserInfoReq)
if err != nil {
log.NewError(getUserInfoReq.OperationID, "GetUserInfo failed ", err.Error())
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call rpc server failed"}) c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call rpc server failed"})
return return
} }
userInfoList = rpcResp.UserInfoList var publicUserInfoList []*open_im_sdk.PublicUserInfo
for _, v := range userInfoList { for _, v := range RpcResp.UserInfoList {
publicUserInfoList = append(publicUserInfoList, publicUserInfoList = append(publicUserInfoList,
&open_im_sdk.PublicUserInfo{UserID: v.UserID, Nickname: v.Nickname, FaceURL: v.FaceURL, Gender: v.Gender, Ex: v.Ex}) &open_im_sdk.PublicUserInfo{UserID: v.UserID, Nickname: v.Nickname, FaceURL: v.FaceURL, Gender: v.Gender, Ex: v.Ex})
} }
resp := api.GetUsersInfoResp{CommResp: api.CommResp{ErrCode: rpcResp.CommonResp.ErrCode, ErrMsg: rpcResp.CommonResp.ErrMsg}, UserInfoList: publicUserInfoList}
resp := api.GetUsersInfoResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}, UserInfoList: publicUserInfoList}
resp.Data = jsonData.JsonDataList(resp.UserInfoList) resp.Data = jsonData.JsonDataList(resp.UserInfoList)
log.NewInfo(getUserInfoReq.OperationID, "GetUserInfo api return ", resp) log.NewInfo(req.OperationID, "GetUserInfo api return ", resp)
c.JSON(http.StatusOK, resp) c.JSON(http.StatusOK, resp)
} }
@ -181,34 +225,18 @@ func UpdateUserInfo(c *gin.Context) {
return return
} }
log.NewInfo(params.OperationID, "UpdateUserInfo args ", req.String()) log.NewInfo(params.OperationID, "UpdateUserInfo args ", req.String())
etcdConnUser := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName)
client := rpc.NewUserClient(etcdConnUser) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName)
rpcResp, err := client.UpdateUserInfo(context.Background(), req) client := rpc.NewUserClient(etcdConn)
RpcResp, err := client.UpdateUserInfo(context.Background(), req)
if err != nil { if err != nil {
log.NewError(req.OperationID, "UpdateUserInfo failed ", err.Error(), req.String()) log.NewError(req.OperationID, "UpdateUserInfo failed ", err.Error(), req.String())
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call rpc server failed"}) c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call rpc server failed"})
return return
} }
if rpcResp.CommonResp.ErrCode != 0 { resp := api.UpdateUserInfoResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}}
log.NewError(req.OperationID, utils.GetSelfFuncName(), rpcResp.CommonResp.String()) log.NewInfo(req.OperationID, "UpdateUserInfo api return ", resp)
resp := api.UpdateUserInfoResp{CommResp: api.CommResp{ErrCode: rpcResp.CommonResp.ErrCode, ErrMsg: rpcResp.CommonResp.ErrMsg}} c.JSON(http.StatusOK, resp)
c.JSON(http.StatusOK, resp)
return
} else {
updateUserInfoReq := &cache.UpdateUserInfoReq{UserInfoList: []*open_im_sdk.UserInfo{req.UserInfo}}
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), updateUserInfoReq.String())
etcdConnCache := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName)
cacheClient := cache.NewCacheClient(etcdConnCache)
cacheResp, err := cacheClient.UpdateUserInfo(context.Background(), updateUserInfoReq)
if err != nil {
log.NewError(req.OperationID, "UpdateUserInfo cache failed ", err.Error(), req.String())
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call rpc server failed: " + err.Error()})
return
}
resp := api.UpdateUserInfoResp{CommResp: api.CommResp{ErrCode: cacheResp.CommonResp.ErrCode, ErrMsg: cacheResp.CommonResp.ErrMsg}}
log.NewInfo(req.OperationID, "UpdateUserInfo api return ", resp)
c.JSON(http.StatusOK, resp)
}
} }
func GetSelfUserInfo(c *gin.Context) { func GetSelfUserInfo(c *gin.Context) {
@ -240,31 +268,16 @@ func GetSelfUserInfo(c *gin.Context) {
return return
} }
if len(RpcResp.UserInfoList) == 1 { if len(RpcResp.UserInfoList) == 1 {
updateUserInfoReq := &cache.UpdateUserInfoReq{UserInfoList: []*open_im_sdk.UserInfo{RpcResp.UserInfoList[0]}} resp := api.GetSelfUserInfoResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}, UserInfo: RpcResp.UserInfoList[0]}
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), updateUserInfoReq.String()) resp.Data = jsonData.JsonDataOne(resp.UserInfo)
etcdConnCache := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName) log.NewInfo(req.OperationID, "GetUserInfo api return ", resp)
cacheClient := cache.NewCacheClient(etcdConnCache) c.JSON(http.StatusOK, resp)
cacheClient.UpdateUserInfo(context.Background(), updateUserInfoReq)
//if err != nil {
// log.NewError(req.OperationID, "UpdateUserInfo cache failed ", err.Error(), req.String())
// c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call rpc server failed: " + err.Error()})
// return
//}
//if cacheResp.CommonResp.ErrCode != 0 {
// log.NewError(req.OperationID, utils.GetSelfFuncName(), cacheResp.CommonResp.String())
// resp := api.UpdateUserInfoResp{CommResp: api.CommResp{ErrCode: cacheResp.CommonResp.ErrCode, ErrMsg: cacheResp.CommonResp.ErrMsg}}
// c.JSON(http.StatusOK, resp)
// return
//}
//resp := api.GetSelfUserInfoResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}, UserInfo: RpcResp.UserInfoList[0]}
//resp.Data = jsonData.JsonDataOne(resp.UserInfo)
//log.NewInfo(req.OperationID, "GetUserInfo api return ", resp)
//c.JSON(http.StatusOK, resp)
} else { } else {
resp := api.GetSelfUserInfoResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}} resp := api.GetSelfUserInfoResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}}
log.NewInfo(req.OperationID, "GetUserInfo api return ", resp) log.NewInfo(req.OperationID, "GetUserInfo api return ", resp)
c.JSON(http.StatusOK, resp) c.JSON(http.StatusOK, resp)
} }
} }
func GetUsersOnlineStatus(c *gin.Context) { func GetUsersOnlineStatus(c *gin.Context) {

27
internal/rpc/cache/cache.go vendored
View File

@ -23,11 +23,11 @@ type cacheServer struct {
etcdAddr []string etcdAddr []string
} }
func NewOfficeServer(port int) *cacheServer { func NewCacheServer(port int) *cacheServer {
log.NewPrivateLog(constant.LogFileName) log.NewPrivateLog(constant.LogFileName)
return &cacheServer{ return &cacheServer{
rpcPort: port, rpcPort: port,
rpcRegisterName: config.Config.RpcRegisterName.OpenImOfficeName, rpcRegisterName: config.Config.RpcRegisterName.OpenImCacheName,
etcdSchema: config.Config.Etcd.EtcdSchema, etcdSchema: config.Config.Etcd.EtcdSchema,
etcdAddr: config.Config.Etcd.EtcdAddr, etcdAddr: config.Config.Etcd.EtcdAddr,
} }
@ -95,9 +95,24 @@ func (s *cacheServer) UpdateUserInfo(_ context.Context, req *pbCache.UpdateUserI
return resp, nil return resp, nil
} }
func (s *cacheServer) UpdateAllUserToCache(_ context.Context, req *pbCache.UpdateAllUserToCacheReq) (resp *pbCache.UpdateAllUserToCacheResp, err error) { func (s *cacheServer) GetBlackList(_ context.Context, req *pbCache.GetBlackListReq) (resp *pbCache.GetBlackListResp, err error) {
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
resp = &pbCache.UpdateAllUserToCacheResp{CommonResp: &pbCache.CommonResp{}}
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String()) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
return resp, nil return nil, nil
}
func (s *cacheServer) UpdateBlackList(_ context.Context, req *pbCache.UpdateBlackListReq) (resp *pbCache.UpdateBlackListResp, err error) {
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
return nil, nil
}
func (s *cacheServer) GetFriendInfo(_ context.Context, req *pbCache.GetFriendInfoReq) (resp *pbCache.GetFriendInfoResp, err error) {
return nil, nil
}
func (s *cacheServer) UpdateFriendInfo(_ context.Context, req *pbCache.UpdateFriendInfoReq) (resp *pbCache.UpdateFriendInfoResp, err error) {
return nil, nil
} }

9
internal/rpc/msg/work_moments_notification.go
View File

@ -10,12 +10,9 @@ import (
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
) )
func WorkMomentSendNotification(operationID, sendID, recvID string, notificationMsg *pbOffice.WorkMomentNotificationMsg) { func WorkMomentSendNotification(operationID, recvID string, notificationMsg *pbOffice.WorkMomentNotificationMsg) {
log.NewInfo(operationID, utils.GetSelfFuncName(), sendID, recvID, notificationMsg) log.NewInfo(operationID, utils.GetSelfFuncName(), recvID, notificationMsg)
//if sendID == recvID { WorkMomentNotification(operationID, recvID, recvID, notificationMsg)
// return
//}
WorkMomentNotification(operationID, sendID, recvID, notificationMsg)
} }
func WorkMomentNotification(operationID, sendID, recvID string, m proto.Message) { func WorkMomentNotification(operationID, sendID, recvID string, m proto.Message) {

20
internal/rpc/office/office.go
View File

@ -305,7 +305,7 @@ func (s *officeServer) CreateOneWorkMoment(_ context.Context, req *pbOffice.Crea
UserName: createUser.Nickname, UserName: createUser.Nickname,
CreateTime: workMoment.CreateTime, CreateTime: workMoment.CreateTime,
} }
msg.WorkMomentSendNotification(req.OperationID, workMoment.UserID, atUser.UserID, workMomentNotificationMsg) msg.WorkMomentSendNotification(req.OperationID, atUser.UserID, workMomentNotificationMsg)
} }
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String()) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
return resp, nil return resp, nil
@ -398,8 +398,8 @@ func (s *officeServer) LikeOneWorkMoment(_ context.Context, req *pbOffice.LikeOn
CreateTime: int32(time.Now().Unix()), CreateTime: int32(time.Now().Unix()),
} }
// send notification // send notification
if like { if like && workMoment.UserID != req.UserID {
msg.WorkMomentSendNotification(req.OperationID, req.UserID, workMoment.UserID, workMomentNotificationMsg) msg.WorkMomentSendNotification(req.OperationID, workMoment.UserID, workMomentNotificationMsg)
} }
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String()) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
return resp, nil return resp, nil
@ -441,18 +441,20 @@ func (s *officeServer) CommentOneWorkMoment(_ context.Context, req *pbOffice.Com
NotificationMsgType: constant.WorkMomentCommentNotification, NotificationMsgType: constant.WorkMomentCommentNotification,
WorkMomentID: workMoment.WorkMomentID, WorkMomentID: workMoment.WorkMomentID,
WorkMomentContent: workMoment.Content, WorkMomentContent: workMoment.Content,
UserID: workMoment.UserID, UserID: commentUser.UserID,
FaceURL: workMoment.FaceURL, FaceURL: commentUser.FaceURL,
UserName: workMoment.UserName, UserName: commentUser.Nickname,
ReplyUserID: comment.ReplyUserID, ReplyUserID: comment.ReplyUserID,
ReplyUserName: comment.ReplyUserName, ReplyUserName: comment.ReplyUserName,
ContentID: comment.ContentID, ContentID: comment.ContentID,
Content: comment.Content, Content: comment.Content,
CreateTime: comment.CreateTime, CreateTime: comment.CreateTime,
} }
msg.WorkMomentSendNotification(req.OperationID, req.UserID, workMoment.UserID, workMomentNotificationMsg) if req.UserID != workMoment.UserID {
if req.ReplyUserID != "" { msg.WorkMomentSendNotification(req.OperationID, workMoment.UserID, workMomentNotificationMsg)
msg.WorkMomentSendNotification(req.OperationID, req.UserID, req.ReplyUserID, workMomentNotificationMsg) }
if req.ReplyUserID != "" && req.ReplyUserID != workMoment.UserID && req.ReplyUserID != req.UserID {
msg.WorkMomentSendNotification(req.OperationID, req.ReplyUserID, workMomentNotificationMsg)
} }
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String()) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
return resp, nil return resp, nil

4
internal/rpc/user/user.go
View File

@ -389,6 +389,10 @@ func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbUser.UpdateUserI
log.Info(req.OperationID, "UserInfoUpdatedNotification ", req.UserInfo.UserID, v.FriendUser.UserID) log.Info(req.OperationID, "UserInfoUpdatedNotification ", req.UserInfo.UserID, v.FriendUser.UserID)
chat.UserInfoUpdatedNotification(req.OperationID, req.UserInfo.UserID, v.FriendUser.UserID) chat.UserInfoUpdatedNotification(req.OperationID, req.UserInfo.UserID, v.FriendUser.UserID)
} }
//etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName)
//client := pbFriend.NewFriendClient(etcdConn)
chat.UserInfoUpdatedNotification(req.OperationID, req.UserInfo.UserID, req.OpUserID) chat.UserInfoUpdatedNotification(req.OperationID, req.UserInfo.UserID, req.OpUserID)
log.Info(req.OperationID, "UserInfoUpdatedNotification ", req.UserInfo.UserID, req.OpUserID) log.Info(req.OperationID, "UserInfoUpdatedNotification ", req.UserInfo.UserID, req.OpUserID)
return &pbUser.UpdateUserInfoResp{CommonResp: &pbUser.CommonResp{}}, nil return &pbUser.UpdateUserInfoResp{CommonResp: &pbUser.CommonResp{}}, nil

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

@ -71,24 +71,14 @@ func init() {
opts := options.CreateIndexes().SetMaxTime(10 * time.Second) opts := options.CreateIndexes().SetMaxTime(10 * time.Second)
dataBase := mongoClient.Database(config.Config.Mongo.DBDatabase) dataBase := mongoClient.Database(config.Config.Mongo.DBDatabase)
cCommentMsgModels := []mongo.IndexModel{
{
Keys: bson.A{bson.D{{"create_time", -1}, {"user_id", -1}}},
},
}
result, err := dataBase.Collection(cCommentMsg).Indexes().CreateMany(context.Background(), cCommentMsgModels, opts)
if err != nil {
fmt.Println("mongodb create cCommentMsgModels failed", result, err.Error())
}
cSendLogModels := []mongo.IndexModel{ cSendLogModels := []mongo.IndexModel{
{ {
Keys: bson.M{"user_id": -1, "send_time": -1}, Keys: bson.M{"user_id": -1},
}, },
} }
result, err = dataBase.Collection(cSendLog).Indexes().CreateMany(context.Background(), cSendLogModels, opts) result, err := dataBase.Collection(cSendLog).Indexes().CreateMany(context.Background(), cSendLogModels, opts)
if err != nil { if err != nil {
fmt.Println("mongodb create cSendLogModels failed", result, err.Error()) //fmt.Println("mongodb create cSendLogModels failed", result, err.Error())
} }
cChatModels := []mongo.IndexModel{ cChatModels := []mongo.IndexModel{
@ -106,12 +96,12 @@ func init() {
Keys: bson.M{"work_moment_id": -1}, Keys: bson.M{"work_moment_id": -1},
}, },
{ {
Keys: bson.M{"user_id": -1, "create_time": -1}, Keys: bson.M{"user_id": -1},
}, },
} }
result, err = dataBase.Collection(cWorkMoment).Indexes().CreateMany(context.Background(), cWorkMomentModels, opts) result, err = dataBase.Collection(cWorkMoment).Indexes().CreateMany(context.Background(), cWorkMomentModels, opts)
if err != nil { if err != nil {
fmt.Println("mongodb create cWorkMomentModels failed", result, err.Error()) //fmt.Println("mongodb create cWorkMomentModels failed", result, err.Error())
} }
cTagModels := []mongo.IndexModel{ cTagModels := []mongo.IndexModel{
@ -119,12 +109,12 @@ func init() {
Keys: bson.M{"tag_id": -1}, Keys: bson.M{"tag_id": -1},
}, },
{ {
Keys: bson.M{"user_id": -1, "tag_id": -1}, Keys: bson.M{"user_id": -1},
}, },
} }
result, err = dataBase.Collection(cTag).Indexes().CreateMany(context.Background(), cTagModels, opts) result, err = dataBase.Collection(cTag).Indexes().CreateMany(context.Background(), cTagModels, opts)
if err != nil { if err != nil {
fmt.Println("mongodb create cTagModels failed", result, err.Error()) //fmt.Println("mongodb create cTagModels failed", result, err.Error())
} }
DB.mongoClient = mongoClient DB.mongoClient = mongoClient

552
pkg/proto/cache/cache.pb.go vendored
View File

@ -36,7 +36,7 @@ func (m *CommonResp) Reset() { *m = CommonResp{} }
func (m *CommonResp) String() string { return proto.CompactTextString(m) } func (m *CommonResp) String() string { return proto.CompactTextString(m) }
func (*CommonResp) ProtoMessage() {} func (*CommonResp) ProtoMessage() {}
func (*CommonResp) Descriptor() ([]byte, []int) { func (*CommonResp) Descriptor() ([]byte, []int) {
return fileDescriptor_cache_613af94c3da056d4, []int{0} return fileDescriptor_cache_c95b22de9c135769, []int{0}
} }
func (m *CommonResp) XXX_Unmarshal(b []byte) error { func (m *CommonResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_CommonResp.Unmarshal(m, b) return xxx_messageInfo_CommonResp.Unmarshal(m, b)
@ -82,7 +82,7 @@ func (m *GetUserInfoReq) Reset() { *m = GetUserInfoReq{} }
func (m *GetUserInfoReq) String() string { return proto.CompactTextString(m) } func (m *GetUserInfoReq) String() string { return proto.CompactTextString(m) }
func (*GetUserInfoReq) ProtoMessage() {} func (*GetUserInfoReq) ProtoMessage() {}
func (*GetUserInfoReq) Descriptor() ([]byte, []int) { func (*GetUserInfoReq) Descriptor() ([]byte, []int) {
return fileDescriptor_cache_613af94c3da056d4, []int{1} return fileDescriptor_cache_c95b22de9c135769, []int{1}
} }
func (m *GetUserInfoReq) XXX_Unmarshal(b []byte) error { func (m *GetUserInfoReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GetUserInfoReq.Unmarshal(m, b) return xxx_messageInfo_GetUserInfoReq.Unmarshal(m, b)
@ -118,7 +118,7 @@ func (m *GetUserInfoReq) GetOperationID() string {
type GetUserInfoResp struct { type GetUserInfoResp struct {
CommonResp *CommonResp `protobuf:"bytes,1,opt,name=commonResp" json:"commonResp,omitempty"` CommonResp *CommonResp `protobuf:"bytes,1,opt,name=commonResp" json:"commonResp,omitempty"`
UserInfoList []*sdk_ws.UserInfo `protobuf:"bytes,2,rep,name=UserInfoList" json:"UserInfoList,omitempty"` UserInfoList []*sdk_ws.UserInfo `protobuf:"bytes,2,rep,name=userInfoList" json:"userInfoList,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
@ -128,7 +128,7 @@ func (m *GetUserInfoResp) Reset() { *m = GetUserInfoResp{} }
func (m *GetUserInfoResp) String() string { return proto.CompactTextString(m) } func (m *GetUserInfoResp) String() string { return proto.CompactTextString(m) }
func (*GetUserInfoResp) ProtoMessage() {} func (*GetUserInfoResp) ProtoMessage() {}
func (*GetUserInfoResp) Descriptor() ([]byte, []int) { func (*GetUserInfoResp) Descriptor() ([]byte, []int) {
return fileDescriptor_cache_613af94c3da056d4, []int{2} return fileDescriptor_cache_c95b22de9c135769, []int{2}
} }
func (m *GetUserInfoResp) XXX_Unmarshal(b []byte) error { func (m *GetUserInfoResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GetUserInfoResp.Unmarshal(m, b) return xxx_messageInfo_GetUserInfoResp.Unmarshal(m, b)
@ -163,7 +163,7 @@ func (m *GetUserInfoResp) GetUserInfoList() []*sdk_ws.UserInfo {
} }
type UpdateUserInfoReq struct { type UpdateUserInfoReq struct {
UserInfoList []*sdk_ws.UserInfo `protobuf:"bytes,1,rep,name=UserInfoList" json:"UserInfoList,omitempty"` UserInfoList []*sdk_ws.UserInfo `protobuf:"bytes,1,rep,name=userInfoList" json:"userInfoList,omitempty"`
OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
@ -174,7 +174,7 @@ func (m *UpdateUserInfoReq) Reset() { *m = UpdateUserInfoReq{} }
func (m *UpdateUserInfoReq) String() string { return proto.CompactTextString(m) } func (m *UpdateUserInfoReq) String() string { return proto.CompactTextString(m) }
func (*UpdateUserInfoReq) ProtoMessage() {} func (*UpdateUserInfoReq) ProtoMessage() {}
func (*UpdateUserInfoReq) Descriptor() ([]byte, []int) { func (*UpdateUserInfoReq) Descriptor() ([]byte, []int) {
return fileDescriptor_cache_613af94c3da056d4, []int{3} return fileDescriptor_cache_c95b22de9c135769, []int{3}
} }
func (m *UpdateUserInfoReq) XXX_Unmarshal(b []byte) error { func (m *UpdateUserInfoReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_UpdateUserInfoReq.Unmarshal(m, b) return xxx_messageInfo_UpdateUserInfoReq.Unmarshal(m, b)
@ -219,7 +219,7 @@ func (m *UpdateUserInfoResp) Reset() { *m = UpdateUserInfoResp{} }
func (m *UpdateUserInfoResp) String() string { return proto.CompactTextString(m) } func (m *UpdateUserInfoResp) String() string { return proto.CompactTextString(m) }
func (*UpdateUserInfoResp) ProtoMessage() {} func (*UpdateUserInfoResp) ProtoMessage() {}
func (*UpdateUserInfoResp) Descriptor() ([]byte, []int) { func (*UpdateUserInfoResp) Descriptor() ([]byte, []int) {
return fileDescriptor_cache_613af94c3da056d4, []int{4} return fileDescriptor_cache_c95b22de9c135769, []int{4}
} }
func (m *UpdateUserInfoResp) XXX_Unmarshal(b []byte) error { func (m *UpdateUserInfoResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_UpdateUserInfoResp.Unmarshal(m, b) return xxx_messageInfo_UpdateUserInfoResp.Unmarshal(m, b)
@ -246,76 +246,344 @@ func (m *UpdateUserInfoResp) GetCommonResp() *CommonResp {
return nil return nil
} }
type UpdateAllUserToCacheReq struct { type GetFriendInfoReq struct {
OperationID string `protobuf:"bytes,1,opt,name=operationID" json:"operationID,omitempty"` UserID string `protobuf:"bytes,1,opt,name=userID" json:"userID,omitempty"`
OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
} }
func (m *UpdateAllUserToCacheReq) Reset() { *m = UpdateAllUserToCacheReq{} } func (m *GetFriendInfoReq) Reset() { *m = GetFriendInfoReq{} }
func (m *UpdateAllUserToCacheReq) String() string { return proto.CompactTextString(m) } func (m *GetFriendInfoReq) String() string { return proto.CompactTextString(m) }
func (*UpdateAllUserToCacheReq) ProtoMessage() {} func (*GetFriendInfoReq) ProtoMessage() {}
func (*UpdateAllUserToCacheReq) Descriptor() ([]byte, []int) { func (*GetFriendInfoReq) Descriptor() ([]byte, []int) {
return fileDescriptor_cache_613af94c3da056d4, []int{5} return fileDescriptor_cache_c95b22de9c135769, []int{5}
} }
func (m *UpdateAllUserToCacheReq) XXX_Unmarshal(b []byte) error { func (m *GetFriendInfoReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_UpdateAllUserToCacheReq.Unmarshal(m, b) return xxx_messageInfo_GetFriendInfoReq.Unmarshal(m, b)
} }
func (m *UpdateAllUserToCacheReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { func (m *GetFriendInfoReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_UpdateAllUserToCacheReq.Marshal(b, m, deterministic) return xxx_messageInfo_GetFriendInfoReq.Marshal(b, m, deterministic)
} }
func (dst *UpdateAllUserToCacheReq) XXX_Merge(src proto.Message) { func (dst *GetFriendInfoReq) XXX_Merge(src proto.Message) {
xxx_messageInfo_UpdateAllUserToCacheReq.Merge(dst, src) xxx_messageInfo_GetFriendInfoReq.Merge(dst, src)
} }
func (m *UpdateAllUserToCacheReq) XXX_Size() int { func (m *GetFriendInfoReq) XXX_Size() int {
return xxx_messageInfo_UpdateAllUserToCacheReq.Size(m) return xxx_messageInfo_GetFriendInfoReq.Size(m)
} }
func (m *UpdateAllUserToCacheReq) XXX_DiscardUnknown() { func (m *GetFriendInfoReq) XXX_DiscardUnknown() {
xxx_messageInfo_UpdateAllUserToCacheReq.DiscardUnknown(m) xxx_messageInfo_GetFriendInfoReq.DiscardUnknown(m)
} }
var xxx_messageInfo_UpdateAllUserToCacheReq proto.InternalMessageInfo var xxx_messageInfo_GetFriendInfoReq proto.InternalMessageInfo
func (m *UpdateAllUserToCacheReq) GetOperationID() string { func (m *GetFriendInfoReq) GetUserID() string {
if m != nil {
return m.UserID
}
return ""
}
func (m *GetFriendInfoReq) GetOperationID() string {
if m != nil { if m != nil {
return m.OperationID return m.OperationID
} }
return "" return ""
} }
type UpdateAllUserToCacheResp struct { type GetFriendInfoResp struct {
FriendInfoList []*sdk_ws.FriendInfo `protobuf:"bytes,1,rep,name=friendInfoList" json:"friendInfoList,omitempty"`
CommonResp *CommonResp `protobuf:"bytes,2,opt,name=commonResp" json:"commonResp,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GetFriendInfoResp) Reset() { *m = GetFriendInfoResp{} }
func (m *GetFriendInfoResp) String() string { return proto.CompactTextString(m) }
func (*GetFriendInfoResp) ProtoMessage() {}
func (*GetFriendInfoResp) Descriptor() ([]byte, []int) {
return fileDescriptor_cache_c95b22de9c135769, []int{6}
}
func (m *GetFriendInfoResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GetFriendInfoResp.Unmarshal(m, b)
}
func (m *GetFriendInfoResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GetFriendInfoResp.Marshal(b, m, deterministic)
}
func (dst *GetFriendInfoResp) XXX_Merge(src proto.Message) {
xxx_messageInfo_GetFriendInfoResp.Merge(dst, src)
}
func (m *GetFriendInfoResp) XXX_Size() int {
return xxx_messageInfo_GetFriendInfoResp.Size(m)
}
func (m *GetFriendInfoResp) XXX_DiscardUnknown() {
xxx_messageInfo_GetFriendInfoResp.DiscardUnknown(m)
}
var xxx_messageInfo_GetFriendInfoResp proto.InternalMessageInfo
func (m *GetFriendInfoResp) GetFriendInfoList() []*sdk_ws.FriendInfo {
if m != nil {
return m.FriendInfoList
}
return nil
}
func (m *GetFriendInfoResp) GetCommonResp() *CommonResp {
if m != nil {
return m.CommonResp
}
return nil
}
type UpdateBlackListReq struct {
BlackList []*sdk_ws.BlackInfo `protobuf:"bytes,1,rep,name=blackList" json:"blackList,omitempty"`
OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *UpdateBlackListReq) Reset() { *m = UpdateBlackListReq{} }
func (m *UpdateBlackListReq) String() string { return proto.CompactTextString(m) }
func (*UpdateBlackListReq) ProtoMessage() {}
func (*UpdateBlackListReq) Descriptor() ([]byte, []int) {
return fileDescriptor_cache_c95b22de9c135769, []int{7}
}
func (m *UpdateBlackListReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_UpdateBlackListReq.Unmarshal(m, b)
}
func (m *UpdateBlackListReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_UpdateBlackListReq.Marshal(b, m, deterministic)
}
func (dst *UpdateBlackListReq) XXX_Merge(src proto.Message) {
xxx_messageInfo_UpdateBlackListReq.Merge(dst, src)
}
func (m *UpdateBlackListReq) XXX_Size() int {
return xxx_messageInfo_UpdateBlackListReq.Size(m)
}
func (m *UpdateBlackListReq) XXX_DiscardUnknown() {
xxx_messageInfo_UpdateBlackListReq.DiscardUnknown(m)
}
var xxx_messageInfo_UpdateBlackListReq proto.InternalMessageInfo
func (m *UpdateBlackListReq) GetBlackList() []*sdk_ws.BlackInfo {
if m != nil {
return m.BlackList
}
return nil
}
func (m *UpdateBlackListReq) GetOperationID() string {
if m != nil {
return m.OperationID
}
return ""
}
type UpdateBlackListResp struct {
CommonResp *CommonResp `protobuf:"bytes,1,opt,name=commonResp" json:"commonResp,omitempty"` CommonResp *CommonResp `protobuf:"bytes,1,opt,name=commonResp" json:"commonResp,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
} }
func (m *UpdateAllUserToCacheResp) Reset() { *m = UpdateAllUserToCacheResp{} } func (m *UpdateBlackListResp) Reset() { *m = UpdateBlackListResp{} }
func (m *UpdateAllUserToCacheResp) String() string { return proto.CompactTextString(m) } func (m *UpdateBlackListResp) String() string { return proto.CompactTextString(m) }
func (*UpdateAllUserToCacheResp) ProtoMessage() {} func (*UpdateBlackListResp) ProtoMessage() {}
func (*UpdateAllUserToCacheResp) Descriptor() ([]byte, []int) { func (*UpdateBlackListResp) Descriptor() ([]byte, []int) {
return fileDescriptor_cache_613af94c3da056d4, []int{6} return fileDescriptor_cache_c95b22de9c135769, []int{8}
} }
func (m *UpdateAllUserToCacheResp) XXX_Unmarshal(b []byte) error { func (m *UpdateBlackListResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_UpdateAllUserToCacheResp.Unmarshal(m, b) return xxx_messageInfo_UpdateBlackListResp.Unmarshal(m, b)
} }
func (m *UpdateAllUserToCacheResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { func (m *UpdateBlackListResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_UpdateAllUserToCacheResp.Marshal(b, m, deterministic) return xxx_messageInfo_UpdateBlackListResp.Marshal(b, m, deterministic)
} }
func (dst *UpdateAllUserToCacheResp) XXX_Merge(src proto.Message) { func (dst *UpdateBlackListResp) XXX_Merge(src proto.Message) {
xxx_messageInfo_UpdateAllUserToCacheResp.Merge(dst, src) xxx_messageInfo_UpdateBlackListResp.Merge(dst, src)
} }
func (m *UpdateAllUserToCacheResp) XXX_Size() int { func (m *UpdateBlackListResp) XXX_Size() int {
return xxx_messageInfo_UpdateAllUserToCacheResp.Size(m) return xxx_messageInfo_UpdateBlackListResp.Size(m)
} }
func (m *UpdateAllUserToCacheResp) XXX_DiscardUnknown() { func (m *UpdateBlackListResp) XXX_DiscardUnknown() {
xxx_messageInfo_UpdateAllUserToCacheResp.DiscardUnknown(m) xxx_messageInfo_UpdateBlackListResp.DiscardUnknown(m)
} }
var xxx_messageInfo_UpdateAllUserToCacheResp proto.InternalMessageInfo var xxx_messageInfo_UpdateBlackListResp proto.InternalMessageInfo
func (m *UpdateAllUserToCacheResp) GetCommonResp() *CommonResp { func (m *UpdateBlackListResp) GetCommonResp() *CommonResp {
if m != nil {
return m.CommonResp
}
return nil
}
type GetBlackListReq struct {
UserID string `protobuf:"bytes,1,opt,name=userID" json:"userID,omitempty"`
OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GetBlackListReq) Reset() { *m = GetBlackListReq{} }
func (m *GetBlackListReq) String() string { return proto.CompactTextString(m) }
func (*GetBlackListReq) ProtoMessage() {}
func (*GetBlackListReq) Descriptor() ([]byte, []int) {
return fileDescriptor_cache_c95b22de9c135769, []int{9}
}
func (m *GetBlackListReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GetBlackListReq.Unmarshal(m, b)
}
func (m *GetBlackListReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GetBlackListReq.Marshal(b, m, deterministic)
}
func (dst *GetBlackListReq) XXX_Merge(src proto.Message) {
xxx_messageInfo_GetBlackListReq.Merge(dst, src)
}
func (m *GetBlackListReq) XXX_Size() int {
return xxx_messageInfo_GetBlackListReq.Size(m)
}
func (m *GetBlackListReq) XXX_DiscardUnknown() {
xxx_messageInfo_GetBlackListReq.DiscardUnknown(m)
}
var xxx_messageInfo_GetBlackListReq proto.InternalMessageInfo
func (m *GetBlackListReq) GetUserID() string {
if m != nil {
return m.UserID
}
return ""
}
func (m *GetBlackListReq) GetOperationID() string {
if m != nil {
return m.OperationID
}
return ""
}
type GetBlackListResp struct {
BlackList []*sdk_ws.BlackInfo `protobuf:"bytes,1,rep,name=blackList" json:"blackList,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GetBlackListResp) Reset() { *m = GetBlackListResp{} }
func (m *GetBlackListResp) String() string { return proto.CompactTextString(m) }
func (*GetBlackListResp) ProtoMessage() {}
func (*GetBlackListResp) Descriptor() ([]byte, []int) {
return fileDescriptor_cache_c95b22de9c135769, []int{10}
}
func (m *GetBlackListResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GetBlackListResp.Unmarshal(m, b)
}
func (m *GetBlackListResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GetBlackListResp.Marshal(b, m, deterministic)
}
func (dst *GetBlackListResp) XXX_Merge(src proto.Message) {
xxx_messageInfo_GetBlackListResp.Merge(dst, src)
}
func (m *GetBlackListResp) XXX_Size() int {
return xxx_messageInfo_GetBlackListResp.Size(m)
}
func (m *GetBlackListResp) XXX_DiscardUnknown() {
xxx_messageInfo_GetBlackListResp.DiscardUnknown(m)
}
var xxx_messageInfo_GetBlackListResp proto.InternalMessageInfo
func (m *GetBlackListResp) GetBlackList() []*sdk_ws.BlackInfo {
if m != nil {
return m.BlackList
}
return nil
}
type UpdateFriendInfoReq struct {
FriendInfoList []*sdk_ws.FriendInfo `protobuf:"bytes,1,rep,name=friendInfoList" json:"friendInfoList,omitempty"`
OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *UpdateFriendInfoReq) Reset() { *m = UpdateFriendInfoReq{} }
func (m *UpdateFriendInfoReq) String() string { return proto.CompactTextString(m) }
func (*UpdateFriendInfoReq) ProtoMessage() {}
func (*UpdateFriendInfoReq) Descriptor() ([]byte, []int) {
return fileDescriptor_cache_c95b22de9c135769, []int{11}
}
func (m *UpdateFriendInfoReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_UpdateFriendInfoReq.Unmarshal(m, b)
}
func (m *UpdateFriendInfoReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_UpdateFriendInfoReq.Marshal(b, m, deterministic)
}
func (dst *UpdateFriendInfoReq) XXX_Merge(src proto.Message) {
xxx_messageInfo_UpdateFriendInfoReq.Merge(dst, src)
}
func (m *UpdateFriendInfoReq) XXX_Size() int {
return xxx_messageInfo_UpdateFriendInfoReq.Size(m)
}
func (m *UpdateFriendInfoReq) XXX_DiscardUnknown() {
xxx_messageInfo_UpdateFriendInfoReq.DiscardUnknown(m)
}
var xxx_messageInfo_UpdateFriendInfoReq proto.InternalMessageInfo
func (m *UpdateFriendInfoReq) GetFriendInfoList() []*sdk_ws.FriendInfo {
if m != nil {
return m.FriendInfoList
}
return nil
}
func (m *UpdateFriendInfoReq) GetOperationID() string {
if m != nil {
return m.OperationID
}
return ""
}
type UpdateFriendInfoResp struct {
CommonResp *CommonResp `protobuf:"bytes,1,opt,name=commonResp" json:"commonResp,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *UpdateFriendInfoResp) Reset() { *m = UpdateFriendInfoResp{} }
func (m *UpdateFriendInfoResp) String() string { return proto.CompactTextString(m) }
func (*UpdateFriendInfoResp) ProtoMessage() {}
func (*UpdateFriendInfoResp) Descriptor() ([]byte, []int) {
return fileDescriptor_cache_c95b22de9c135769, []int{12}
}
func (m *UpdateFriendInfoResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_UpdateFriendInfoResp.Unmarshal(m, b)
}
func (m *UpdateFriendInfoResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_UpdateFriendInfoResp.Marshal(b, m, deterministic)
}
func (dst *UpdateFriendInfoResp) XXX_Merge(src proto.Message) {
xxx_messageInfo_UpdateFriendInfoResp.Merge(dst, src)
}
func (m *UpdateFriendInfoResp) XXX_Size() int {
return xxx_messageInfo_UpdateFriendInfoResp.Size(m)
}
func (m *UpdateFriendInfoResp) XXX_DiscardUnknown() {
xxx_messageInfo_UpdateFriendInfoResp.DiscardUnknown(m)
}
var xxx_messageInfo_UpdateFriendInfoResp proto.InternalMessageInfo
func (m *UpdateFriendInfoResp) GetCommonResp() *CommonResp {
if m != nil { if m != nil {
return m.CommonResp return m.CommonResp
} }
@ -328,8 +596,14 @@ func init() {
proto.RegisterType((*GetUserInfoResp)(nil), "cache.GetUserInfoResp") proto.RegisterType((*GetUserInfoResp)(nil), "cache.GetUserInfoResp")
proto.RegisterType((*UpdateUserInfoReq)(nil), "cache.UpdateUserInfoReq") proto.RegisterType((*UpdateUserInfoReq)(nil), "cache.UpdateUserInfoReq")
proto.RegisterType((*UpdateUserInfoResp)(nil), "cache.UpdateUserInfoResp") proto.RegisterType((*UpdateUserInfoResp)(nil), "cache.UpdateUserInfoResp")
proto.RegisterType((*UpdateAllUserToCacheReq)(nil), "cache.UpdateAllUserToCacheReq") proto.RegisterType((*GetFriendInfoReq)(nil), "cache.GetFriendInfoReq")
proto.RegisterType((*UpdateAllUserToCacheResp)(nil), "cache.UpdateAllUserToCacheResp") proto.RegisterType((*GetFriendInfoResp)(nil), "cache.GetFriendInfoResp")
proto.RegisterType((*UpdateBlackListReq)(nil), "cache.UpdateBlackListReq")
proto.RegisterType((*UpdateBlackListResp)(nil), "cache.UpdateBlackListResp")
proto.RegisterType((*GetBlackListReq)(nil), "cache.GetBlackListReq")
proto.RegisterType((*GetBlackListResp)(nil), "cache.GetBlackListResp")
proto.RegisterType((*UpdateFriendInfoReq)(nil), "cache.UpdateFriendInfoReq")
proto.RegisterType((*UpdateFriendInfoResp)(nil), "cache.UpdateFriendInfoResp")
} }
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.
@ -345,7 +619,10 @@ const _ = grpc.SupportPackageIsVersion4
type CacheClient interface { type CacheClient interface {
GetUserInfo(ctx context.Context, in *GetUserInfoReq, opts ...grpc.CallOption) (*GetUserInfoResp, error) GetUserInfo(ctx context.Context, in *GetUserInfoReq, opts ...grpc.CallOption) (*GetUserInfoResp, error)
UpdateUserInfo(ctx context.Context, in *UpdateUserInfoReq, opts ...grpc.CallOption) (*UpdateUserInfoResp, error) UpdateUserInfo(ctx context.Context, in *UpdateUserInfoReq, opts ...grpc.CallOption) (*UpdateUserInfoResp, error)
UpdateAllUserToCache(ctx context.Context, in *UpdateAllUserToCacheReq, opts ...grpc.CallOption) (*UpdateAllUserToCacheResp, error) GetFriendInfo(ctx context.Context, in *GetFriendInfoReq, opts ...grpc.CallOption) (*GetFriendInfoResp, error)
UpdateFriendInfo(ctx context.Context, in *UpdateFriendInfoReq, opts ...grpc.CallOption) (*UpdateFriendInfoResp, error)
UpdateBlackList(ctx context.Context, in *UpdateBlackListReq, opts ...grpc.CallOption) (*UpdateBlackListResp, error)
GetBlackList(ctx context.Context, in *GetBlackListReq, opts ...grpc.CallOption) (*GetBlackListResp, error)
} }
type cacheClient struct { type cacheClient struct {
@ -374,9 +651,36 @@ func (c *cacheClient) UpdateUserInfo(ctx context.Context, in *UpdateUserInfoReq,
return out, nil return out, nil
} }
func (c *cacheClient) UpdateAllUserToCache(ctx context.Context, in *UpdateAllUserToCacheReq, opts ...grpc.CallOption) (*UpdateAllUserToCacheResp, error) { func (c *cacheClient) GetFriendInfo(ctx context.Context, in *GetFriendInfoReq, opts ...grpc.CallOption) (*GetFriendInfoResp, error) {
out := new(UpdateAllUserToCacheResp) out := new(GetFriendInfoResp)
err := grpc.Invoke(ctx, "/cache.cache/UpdateAllUserToCache", in, out, c.cc, opts...) err := grpc.Invoke(ctx, "/cache.cache/GetFriendInfo", in, out, c.cc, opts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *cacheClient) UpdateFriendInfo(ctx context.Context, in *UpdateFriendInfoReq, opts ...grpc.CallOption) (*UpdateFriendInfoResp, error) {
out := new(UpdateFriendInfoResp)
err := grpc.Invoke(ctx, "/cache.cache/UpdateFriendInfo", in, out, c.cc, opts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *cacheClient) UpdateBlackList(ctx context.Context, in *UpdateBlackListReq, opts ...grpc.CallOption) (*UpdateBlackListResp, error) {
out := new(UpdateBlackListResp)
err := grpc.Invoke(ctx, "/cache.cache/UpdateBlackList", in, out, c.cc, opts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *cacheClient) GetBlackList(ctx context.Context, in *GetBlackListReq, opts ...grpc.CallOption) (*GetBlackListResp, error) {
out := new(GetBlackListResp)
err := grpc.Invoke(ctx, "/cache.cache/GetBlackList", in, out, c.cc, opts...)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -388,7 +692,10 @@ func (c *cacheClient) UpdateAllUserToCache(ctx context.Context, in *UpdateAllUse
type CacheServer interface { type CacheServer interface {
GetUserInfo(context.Context, *GetUserInfoReq) (*GetUserInfoResp, error) GetUserInfo(context.Context, *GetUserInfoReq) (*GetUserInfoResp, error)
UpdateUserInfo(context.Context, *UpdateUserInfoReq) (*UpdateUserInfoResp, error) UpdateUserInfo(context.Context, *UpdateUserInfoReq) (*UpdateUserInfoResp, error)
UpdateAllUserToCache(context.Context, *UpdateAllUserToCacheReq) (*UpdateAllUserToCacheResp, error) GetFriendInfo(context.Context, *GetFriendInfoReq) (*GetFriendInfoResp, error)
UpdateFriendInfo(context.Context, *UpdateFriendInfoReq) (*UpdateFriendInfoResp, error)
UpdateBlackList(context.Context, *UpdateBlackListReq) (*UpdateBlackListResp, error)
GetBlackList(context.Context, *GetBlackListReq) (*GetBlackListResp, error)
} }
func RegisterCacheServer(s *grpc.Server, srv CacheServer) { func RegisterCacheServer(s *grpc.Server, srv CacheServer) {
@ -431,20 +738,74 @@ func _Cache_UpdateUserInfo_Handler(srv interface{}, ctx context.Context, dec fun
return interceptor(ctx, in, info, handler) return interceptor(ctx, in, info, handler)
} }
func _Cache_UpdateAllUserToCache_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { func _Cache_GetFriendInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(UpdateAllUserToCacheReq) in := new(GetFriendInfoReq)
if err := dec(in); err != nil { if err := dec(in); err != nil {
return nil, err return nil, err
} }
if interceptor == nil { if interceptor == nil {
return srv.(CacheServer).UpdateAllUserToCache(ctx, in) return srv.(CacheServer).GetFriendInfo(ctx, in)
} }
info := &grpc.UnaryServerInfo{ info := &grpc.UnaryServerInfo{
Server: srv, Server: srv,
FullMethod: "/cache.cache/UpdateAllUserToCache", FullMethod: "/cache.cache/GetFriendInfo",
} }
handler := func(ctx context.Context, req interface{}) (interface{}, error) { handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(CacheServer).UpdateAllUserToCache(ctx, req.(*UpdateAllUserToCacheReq)) return srv.(CacheServer).GetFriendInfo(ctx, req.(*GetFriendInfoReq))
}
return interceptor(ctx, in, info, handler)
}
func _Cache_UpdateFriendInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(UpdateFriendInfoReq)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(CacheServer).UpdateFriendInfo(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: "/cache.cache/UpdateFriendInfo",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(CacheServer).UpdateFriendInfo(ctx, req.(*UpdateFriendInfoReq))
}
return interceptor(ctx, in, info, handler)
}
func _Cache_UpdateBlackList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(UpdateBlackListReq)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(CacheServer).UpdateBlackList(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: "/cache.cache/UpdateBlackList",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(CacheServer).UpdateBlackList(ctx, req.(*UpdateBlackListReq))
}
return interceptor(ctx, in, info, handler)
}
func _Cache_GetBlackList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(GetBlackListReq)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(CacheServer).GetBlackList(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: "/cache.cache/GetBlackList",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(CacheServer).GetBlackList(ctx, req.(*GetBlackListReq))
} }
return interceptor(ctx, in, info, handler) return interceptor(ctx, in, info, handler)
} }
@ -462,40 +823,61 @@ var _Cache_serviceDesc = grpc.ServiceDesc{
Handler: _Cache_UpdateUserInfo_Handler, Handler: _Cache_UpdateUserInfo_Handler,
}, },
{ {
MethodName: "UpdateAllUserToCache", MethodName: "GetFriendInfo",
Handler: _Cache_UpdateAllUserToCache_Handler, Handler: _Cache_GetFriendInfo_Handler,
},
{
MethodName: "UpdateFriendInfo",
Handler: _Cache_UpdateFriendInfo_Handler,
},
{
MethodName: "UpdateBlackList",
Handler: _Cache_UpdateBlackList_Handler,
},
{
MethodName: "GetBlackList",
Handler: _Cache_GetBlackList_Handler,
}, },
}, },
Streams: []grpc.StreamDesc{}, Streams: []grpc.StreamDesc{},
Metadata: "cache/cache.proto", Metadata: "cache/cache.proto",
} }
func init() { proto.RegisterFile("cache/cache.proto", fileDescriptor_cache_613af94c3da056d4) } func init() { proto.RegisterFile("cache/cache.proto", fileDescriptor_cache_c95b22de9c135769) }
var fileDescriptor_cache_613af94c3da056d4 = []byte{ var fileDescriptor_cache_c95b22de9c135769 = []byte{
// 383 bytes of a gzipped FileDescriptorProto // 527 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0x5d, 0x4f, 0xe2, 0x40, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x4d, 0x6f, 0xd3, 0x40,
0x14, 0xcd, 0x40, 0x60, 0xc3, 0xed, 0x2e, 0x84, 0xc9, 0x2e, 0x5b, 0x6b, 0x82, 0xb5, 0x4f, 0x7d, 0x10, 0x95, 0x13, 0x35, 0x28, 0x13, 0xda, 0x34, 0x03, 0xa4, 0xc6, 0x05, 0x64, 0x7c, 0xca, 0xc9,
0x6a, 0x23, 0x3e, 0x62, 0x34, 0x0a, 0x86, 0x90, 0x48, 0x4c, 0x26, 0x12, 0x13, 0x5f, 0x9a, 0x0a, 0x16, 0xe1, 0x06, 0x08, 0xa4, 0xb4, 0x90, 0x46, 0x6d, 0x41, 0x5a, 0xa9, 0x17, 0x2e, 0x91, 0x9b,
0x23, 0x12, 0xa0, 0x33, 0xce, 0x54, 0xf8, 0x05, 0xfe, 0x54, 0xff, 0x87, 0xe9, 0x14, 0xb0, 0x1f, 0x6c, 0x4b, 0x14, 0xe2, 0x5d, 0x76, 0xdd, 0xf6, 0xc6, 0x8d, 0x23, 0xff, 0x83, 0x9f, 0x89, 0xb2,
0x68, 0x22, 0x2f, 0x93, 0xdc, 0x8f, 0x73, 0xe6, 0x9c, 0x3b, 0x73, 0xa1, 0x3e, 0xf2, 0x47, 0xcf, 0xb6, 0x93, 0xdd, 0x8d, 0x23, 0x42, 0xe0, 0x62, 0x69, 0xf6, 0xe3, 0xcd, 0x7b, 0x6f, 0xc6, 0xb3,
0xd4, 0x55, 0xa7, 0xc3, 0x05, 0x0b, 0x19, 0x2e, 0xa9, 0xc0, 0x38, 0xbe, 0xe5, 0x34, 0xf0, 0xfa, 0xd0, 0x1a, 0xc5, 0xa3, 0x2f, 0x34, 0x52, 0xdf, 0x90, 0x0b, 0x96, 0x32, 0xdc, 0x51, 0x81, 0xf7,
0x03, 0x97, 0xcf, 0x26, 0xae, 0xaa, 0xb8, 0x72, 0x3c, 0xf3, 0x56, 0xd2, 0x5d, 0xc9, 0xb8, 0xd3, 0xfc, 0x13, 0xa7, 0xc9, 0x70, 0x70, 0x1e, 0xf1, 0xe9, 0x75, 0xa4, 0x76, 0x22, 0x39, 0x9e, 0x0e,
0x3a, 0x07, 0xe8, 0xb0, 0xc5, 0x82, 0x05, 0x84, 0x4a, 0x8e, 0x75, 0xf8, 0x45, 0x85, 0xe8, 0xb0, 0xef, 0x64, 0x74, 0x27, 0xb3, 0x93, 0xc1, 0x5b, 0x80, 0x23, 0x36, 0x9b, 0xb1, 0x84, 0x50, 0xc9,
0x31, 0xd5, 0x91, 0x89, 0xec, 0x12, 0xd9, 0x84, 0xb8, 0x01, 0x65, 0x2a, 0xc4, 0x40, 0x4e, 0xf4, 0xd1, 0x85, 0x7b, 0x54, 0x88, 0x23, 0x36, 0xa6, 0xae, 0xe3, 0x3b, 0x9d, 0x1d, 0x52, 0x84, 0xd8,
0x82, 0x89, 0xec, 0x0a, 0x59, 0x47, 0x16, 0x81, 0x6a, 0x8f, 0x86, 0x43, 0x49, 0x45, 0x3f, 0x78, 0x86, 0x1a, 0x15, 0xe2, 0x5c, 0x5e, 0xbb, 0x15, 0xdf, 0xe9, 0xd4, 0x49, 0x1e, 0x05, 0x04, 0xf6,
0x62, 0x84, 0xbe, 0xe0, 0x26, 0xc0, 0x6b, 0x14, 0x76, 0x6f, 0xa6, 0x32, 0xd4, 0x91, 0x59, 0xb4, 0xfa, 0x34, 0xbd, 0x90, 0x54, 0x0c, 0x92, 0x2b, 0x46, 0xe8, 0x37, 0x7c, 0x06, 0x70, 0x33, 0x0f,
0x2b, 0x24, 0x91, 0xc1, 0x26, 0x68, 0x8c, 0x53, 0xe1, 0x87, 0x53, 0x16, 0xf4, 0xbb, 0x7a, 0x51, 0x8f, 0xcf, 0x26, 0x32, 0x75, 0x1d, 0xbf, 0xda, 0xa9, 0x13, 0x6d, 0x05, 0x7d, 0x68, 0x30, 0x4e,
0xd1, 0x25, 0x53, 0xd6, 0x1b, 0x82, 0x5a, 0x8a, 0x54, 0x72, 0x7c, 0x02, 0x30, 0xda, 0xea, 0x54, 0x45, 0x9c, 0x4e, 0x58, 0x32, 0x38, 0x76, 0xab, 0x0a, 0x4e, 0x5f, 0x0a, 0x7e, 0x38, 0xd0, 0x34,
0xe2, 0xb4, 0x56, 0xdd, 0x89, 0x3d, 0x7f, 0x1a, 0x20, 0x89, 0x26, 0x7c, 0x01, 0xbf, 0x37, 0x14, 0x40, 0x25, 0xc7, 0x17, 0x00, 0xa3, 0x05, 0x4f, 0x45, 0xae, 0xd1, 0x6d, 0x85, 0x99, 0xe6, 0xa5,
0x4a, 0x4a, 0xc1, 0x2c, 0xda, 0x5a, 0xeb, 0xd0, 0x91, 0x54, 0x2c, 0xa9, 0xf0, 0x7c, 0x3e, 0xf5, 0x00, 0xa2, 0x1d, 0xc2, 0x77, 0x70, 0xff, 0x26, 0x87, 0x50, 0x54, 0x2a, 0x7e, 0xb5, 0xd3, 0xe8,
0xb8, 0x2f, 0xfc, 0x85, 0x74, 0xb6, 0x37, 0xa5, 0x00, 0xd6, 0x12, 0xea, 0x43, 0x3e, 0xf6, 0x43, 0x1e, 0x86, 0x92, 0x8a, 0x5b, 0x2a, 0x86, 0x31, 0x9f, 0x0c, 0x79, 0x2c, 0xe2, 0x99, 0x0c, 0x17,
0x9a, 0xb4, 0x97, 0x65, 0x45, 0x3f, 0x64, 0xcd, 0xfa, 0x2f, 0xe4, 0xfd, 0xf7, 0x00, 0x67, 0xef, 0x99, 0x8c, 0x0b, 0xc1, 0x2d, 0xb4, 0x2e, 0xf8, 0x38, 0x4e, 0xa9, 0x2e, 0xcf, 0x46, 0x75, 0xfe,
0xdd, 0x6b, 0x02, 0x56, 0x1b, 0xfe, 0xc7, 0x44, 0x97, 0xf3, 0x79, 0xc4, 0x75, 0xc7, 0x3a, 0x51, 0x12, 0xd5, 0xd6, 0x5f, 0x59, 0xd5, 0xdf, 0x07, 0xb4, 0xf3, 0x6e, 0xe5, 0x40, 0x70, 0x06, 0xfb,
0x7b, 0x64, 0x23, 0xa3, 0x02, 0xe5, 0x55, 0x0c, 0x40, 0xdf, 0x0d, 0xde, 0x4b, 0x4b, 0xeb, 0x1d, 0x7d, 0x9a, 0x7e, 0x10, 0x13, 0x9a, 0x8c, 0x0b, 0xfe, 0x6d, 0xa8, 0x65, 0xc5, 0x50, 0x10, 0x75,
0x41, 0xfc, 0x2b, 0xf1, 0x19, 0x68, 0x89, 0xd7, 0xc5, 0xff, 0xd6, 0xb8, 0xf4, 0x37, 0x32, 0x1a, 0x92, 0x47, 0x1b, 0xd0, 0xfa, 0xe9, 0x40, 0xcb, 0x82, 0x93, 0x1c, 0xdf, 0xc3, 0xde, 0xd5, 0x62,
0xbb, 0xd2, 0x92, 0xe3, 0x6b, 0xa8, 0xa6, 0x87, 0x83, 0xf5, 0x75, 0x67, 0xee, 0xad, 0x8c, 0x83, 0x45, 0x73, 0xe4, 0x69, 0x89, 0x23, 0xda, 0x55, 0xeb, 0x92, 0xa5, 0xae, 0xb2, 0x89, 0x3a, 0x51,
0x2f, 0x2a, 0x92, 0xe3, 0x7b, 0xf8, 0xbb, 0xcb, 0x1d, 0x6e, 0xa6, 0x20, 0xb9, 0xb9, 0x19, 0x47, 0xd8, 0xd4, 0xfb, 0x1a, 0x8f, 0xa6, 0x73, 0x94, 0xb9, 0xbe, 0x57, 0x50, 0xbf, 0x2c, 0xe2, 0x9c,
0xdf, 0xd6, 0x25, 0xbf, 0xaa, 0x3d, 0xfc, 0x71, 0xe2, 0x5d, 0x6c, 0xab, 0xf3, 0xb1, 0xac, 0x16, 0xca, 0x93, 0x12, 0x2a, 0xea, 0x8e, 0x62, 0xb2, 0x3c, 0xbe, 0x81, 0x07, 0x27, 0xf0, 0x60, 0x25,
0xed, 0xf4, 0x23, 0x00, 0x00, 0xff, 0xff, 0x14, 0x24, 0x83, 0x9c, 0xa7, 0x03, 0x00, 0x00, 0xe7, 0x76, 0xb5, 0x39, 0x55, 0x3d, 0x6e, 0x50, 0xdf, 0xbe, 0x34, 0x1f, 0x55, 0xa1, 0x4d, 0x4e,
0xff, 0x60, 0x44, 0xf0, 0xbd, 0x90, 0x69, 0xf6, 0xce, 0x7f, 0xaa, 0xf5, 0x9f, 0xf5, 0x0c, 0xe0,
0xe1, 0x6a, 0xfe, 0xad, 0x7c, 0xee, 0xfe, 0xaa, 0x42, 0x36, 0x0d, 0xf1, 0x0d, 0x34, 0xb4, 0xa9,
0x82, 0x8f, 0xf2, 0x7b, 0xe6, 0xf8, 0xf2, 0xda, 0x65, 0xcb, 0x59, 0x9f, 0x9b, 0x3f, 0x25, 0xba,
0xf9, 0xc9, 0x95, 0x19, 0xe1, 0x3d, 0x5e, 0xb3, 0x23, 0x39, 0xf6, 0x60, 0xd7, 0xf8, 0x87, 0xf0,
0x60, 0x99, 0xcf, 0x30, 0xdb, 0x73, 0xcb, 0x37, 0x24, 0xc7, 0x53, 0xd8, 0xb7, 0xdd, 0x41, 0xcf,
0x48, 0x69, 0x22, 0x1d, 0xae, 0xdd, 0x93, 0x1c, 0x4f, 0xa0, 0x69, 0x75, 0x34, 0x9a, 0xf4, 0xf5,
0x16, 0xf5, 0xbc, 0x75, 0x5b, 0xd9, 0xbc, 0xd5, 0x9b, 0x10, 0x35, 0x27, 0x0d, 0x8c, 0x83, 0xd2,
0x75, 0xc9, 0x7b, 0xcd, 0xcf, 0xbb, 0x61, 0xf6, 0x8c, 0xbd, 0x56, 0xdf, 0xcb, 0x9a, 0x7a, 0xa3,
0x5e, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xb4, 0x17, 0x6d, 0x42, 0xe2, 0x06, 0x00, 0x00,
} }

46
pkg/proto/cache/cache.proto vendored
View File

@ -15,12 +15,12 @@ message GetUserInfoReq{
message GetUserInfoResp{ message GetUserInfoResp{
CommonResp commonResp = 1; CommonResp commonResp = 1;
repeated server_api_params.UserInfo UserInfoList = 2; repeated server_api_params.UserInfo userInfoList = 2;
} }
message UpdateUserInfoReq{ message UpdateUserInfoReq{
repeated server_api_params.UserInfo UserInfoList = 1; repeated server_api_params.UserInfo userInfoList = 1;
string operationID = 2; string operationID = 2;
} }
@ -28,17 +28,51 @@ message UpdateUserInfoResp{
CommonResp commonResp = 1; CommonResp commonResp = 1;
} }
message UpdateAllUserToCacheReq{ message GetFriendInfoReq {
string operationID = 1; string userID = 1;
string operationID = 2;
} }
message UpdateAllUserToCacheResp{ message GetFriendInfoResp {
repeated server_api_params.FriendInfo friendInfoList = 1;
CommonResp commonResp = 2;
}
message UpdateBlackListReq {
repeated server_api_params.BlackInfo blackList = 1;
string operationID = 2;
}
message UpdateBlackListResp {
CommonResp commonResp = 1; CommonResp commonResp = 1;
} }
message GetBlackListReq {
string userID = 1;
string operationID = 2;
}
message GetBlackListResp {
repeated server_api_params.BlackInfo blackList = 1;
}
message UpdateFriendInfoReq{
repeated server_api_params.FriendInfo friendInfoList = 1;
string operationID = 2;
}
message UpdateFriendInfoResp{
CommonResp commonResp = 1;
}
service cache{ service cache{
rpc GetUserInfo(GetUserInfoReq) returns(GetUserInfoResp); rpc GetUserInfo(GetUserInfoReq) returns(GetUserInfoResp);
rpc UpdateUserInfo(UpdateUserInfoReq) returns(UpdateUserInfoResp); rpc UpdateUserInfo(UpdateUserInfoReq) returns(UpdateUserInfoResp);
rpc UpdateAllUserToCache(UpdateAllUserToCacheReq) returns(UpdateAllUserToCacheResp); rpc GetFriendInfo(GetFriendInfoReq) returns(GetFriendInfoResp);
rpc UpdateFriendInfo(UpdateFriendInfoReq) returns(UpdateFriendInfoResp);
rpc UpdateBlackList(UpdateBlackListReq) returns(UpdateBlackListResp);
rpc GetBlackList(GetBlackListReq) returns(GetBlackListResp);
} }

1
script/check_all.sh
View File

@ -22,6 +22,7 @@ service_port_name=(
openImOfficePort openImOfficePort
openImOrganizationPort openImOrganizationPort
openImConversationPort openImConversationPort
openImCachePort
) )
switch=$(cat $config_path | grep demoswitch |awk -F '[:]' '{print $NF}') switch=$(cat $config_path | grep demoswitch |awk -F '[:]' '{print $NF}')
for i in ${service_port_name[*]}; do for i in ${service_port_name[*]}; do

2
script/path_info.cfg
View File

@ -51,6 +51,7 @@ service_source_root=(
../cmd/rpc/open_im_office/ ../cmd/rpc/open_im_office/
../cmd/rpc/open_im_organization/ ../cmd/rpc/open_im_organization/
../cmd/rpc/open_im_conversation/ ../cmd/rpc/open_im_conversation/
../cmd/rpc/open_im_cache/
${msg_gateway_source_root} ${msg_gateway_source_root}
${msg_transfer_source_root} ${msg_transfer_source_root}
${msg_source_root} ${msg_source_root}
@ -74,6 +75,7 @@ service_names=(
open_im_office open_im_office
open_im_organization open_im_organization
open_im_conversation open_im_conversation
open_im_cache
${msg_gateway_name} ${msg_gateway_name}
${msg_transfer_name} ${msg_transfer_name}
${msg_name} ${msg_name}

2
script/start_rpc_service.sh
View File

@ -21,6 +21,7 @@ service_filename=(
open_im_office open_im_office
open_im_organization open_im_organization
open_im_conversation open_im_conversation
open_im_cache
) )
#service config port name #service config port name
@ -40,6 +41,7 @@ service_port_name=(
openImOfficePort openImOfficePort
openImOrganizationPort openImOrganizationPort
openImConversationPort openImConversationPort
openImCachePort
) )
for ((i = 0; i < ${#service_filename[*]}; i++)); do for ((i = 0; i < ${#service_filename[*]}; i++)); do