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

organization

Browse Source
This commit is contained in:
wangchuxiao 2022-05-17 17:44:08 +08:00
parent 424f854145
commit 6ea6a61e90
21 changed files with 58 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
deploy_k8s/dockerfiles/admin_cms.Dockerfile Normal file
View File

15
deploy_k8s/dockerfiles/api.Dockerfile Normal file
View File

@ -0,0 +1,15 @@
FROM ubuntu
# 设置固定的项目路径
ENV WORKDIR /bin
ENV CONFIG_NAME $WORKDIR/config/config.yaml
# 将可执行文件复制到目标目录
ADD ../cmd/bin/open_im_api $WORKDIR/main
# 创建用于挂载的几个目录，添加可执行权限
RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \
chmod +x $WORKDIR/main
WORKDIR $WORKDIR
CMD ./main

0
deploy_k8s/dockerfiles/auth.Dockerfile Normal file
View File

0
deploy_k8s/dockerfiles/cache.Dockerfile Normal file
View File

0
deploy_k8s/dockerfiles/cms_api.Dockerfile Normal file
View File

0
deploy_k8s/dockerfiles/conversation.Dockerfile Normal file
View File

0
deploy_k8s/dockerfiles/demo.Dockerfile Normal file
View File

0
deploy_k8s/dockerfiles/friend.Dockerfile Normal file
View File

0
deploy_k8s/dockerfiles/group.Dockerfile Normal file
View File

0
deploy_k8s/dockerfiles/message_cms.Dockerfile Normal file
View File

0
deploy_k8s/dockerfiles/msg.Dockerfile Normal file
View File

0
deploy_k8s/dockerfiles/msg_gateway.Dockerfile Normal file
View File

0
deploy_k8s/dockerfiles/office.Dockerfile Normal file
View File

0
deploy_k8s/dockerfiles/organization.Dockerfile Normal file
View File

0
deploy_k8s/dockerfiles/push.Dockerfile Normal file
View File

0
deploy_k8s/dockerfiles/sdk_server.Dockerfile Normal file
View File

0
deploy_k8s/dockerfiles/statistics.Dockerfile Normal file
View File

0
deploy_k8s/dockerfiles/transfer.Dockerfile Normal file
View File

0
deploy_k8s/dockerfiles/user.Dockerfile Normal file
View File

28
deploy_k8s/script/build_push_all_images.sh Normal file
View File

@ -0,0 +1,28 @@
#/bin/sh
#service_source_root=(
# #api service file
# ../cmd/open_im_api/
# ../cmd/open_im_cms_api/
# #rpc service file
# ../cmd/rpc/open_im_user/
# ../cmd/rpc/open_im_friend/
# ../cmd/rpc/open_im_group/
# ../cmd/rpc/open_im_auth/
# ../cmd/rpc/open_im_admin_cms/
# ../cmd/rpc/open_im_message_cms/
# ../cmd/rpc/open_im_statistics/
# ../cmd/rpc/open_im_office/
# ../cmd/rpc/open_im_organization/
# ../cmd/rpc/open_im_conversation/
# ../cmd/rpc/open_im_cache/
# ../cmd/open_im_msg_gateway/
# ../cmd/open_im_msg_transfer/
# ../cmd/rpc/open_im_msg/
# ../cmd/open_im_push/
# ../cmd/Open-IM-SDK-Core/
# ../cmd/open_im_demo/
#)
#
dockerfile_list=pwd
docker build -t $image . -f deploy.Dockerfile

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

@ -7,7 +7,6 @@ import (
"Open_IM/pkg/common/db"
imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
errors "Open_IM/pkg/common/http"
"Open_IM/pkg/common/log"
"Open_IM/pkg/common/token_verify"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
@ -410,7 +409,21 @@ func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbUser.UpdateUserI
if req.UserInfo.FaceURL != "" {
go s.SyncJoinedGroupMemberFaceURL(req.UserInfo.UserID, req.UserInfo.FaceURL, req.OperationID, req.OpUserID)
}
//updateUserInfoToCacheReq := &cache.UpdateUserInfoToCacheReq{
// OperationID: req.OperationID,
// UserInfoList: []*sdkws.UserInfo{req.UserInfo},
//}
//cacheEtcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName)
//cacheClient := cache.NewCacheClient(cacheEtcdConn)
//resp, err := cacheClient.UpdateUserInfoToCache(context.Background(), updateUserInfoToCacheReq)
//if err != nil {
// log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), updateUserInfoToCacheReq.String())
// return &pbUser.UpdateUserInfoResp{CommonResp: &pbUser.CommonResp{ErrCode: constant.ErrServer.ErrCode, ErrMsg: err.Error()}}, nil
//}
//if resp.CommonResp.ErrCode != 0 {
// log.NewError(req.OperationID, utils.GetSelfFuncName(), resp.String())
// return &pbUser.UpdateUserInfoResp{CommonResp: &pbUser.CommonResp{ErrCode: constant.ErrServer.ErrCode, ErrMsg: resp.CommonResp.ErrMsg}}, nil
//}
return &pbUser.UpdateUserInfoResp{CommonResp: &pbUser.CommonResp{}}, nil
}