From 6ea6a61e9067e3cb146a6158dfb5b838bb9271c5 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 17 May 2022 17:44:08 +0800 Subject: [PATCH] organization --- deploy_k8s/dockerfiles/admin_cms.Dockerfile | 0 deploy_k8s/dockerfiles/api.Dockerfile | 15 ++++++++++ deploy_k8s/dockerfiles/auth.Dockerfile | 0 deploy_k8s/dockerfiles/cache.Dockerfile | 0 deploy_k8s/dockerfiles/cms_api.Dockerfile | 0 .../dockerfiles/conversation.Dockerfile | 0 deploy_k8s/dockerfiles/demo.Dockerfile | 0 deploy_k8s/dockerfiles/friend.Dockerfile | 0 deploy_k8s/dockerfiles/group.Dockerfile | 0 deploy_k8s/dockerfiles/message_cms.Dockerfile | 0 deploy_k8s/dockerfiles/msg.Dockerfile | 0 deploy_k8s/dockerfiles/msg_gateway.Dockerfile | 0 deploy_k8s/dockerfiles/office.Dockerfile | 0 .../dockerfiles/organization.Dockerfile | 0 deploy_k8s/dockerfiles/push.Dockerfile | 0 deploy_k8s/dockerfiles/sdk_server.Dockerfile | 0 deploy_k8s/dockerfiles/statistics.Dockerfile | 0 deploy_k8s/dockerfiles/transfer.Dockerfile | 0 deploy_k8s/dockerfiles/user.Dockerfile | 0 deploy_k8s/script/build_push_all_images.sh | 28 +++++++++++++++++++ internal/rpc/user/user.go | 17 +++++++++-- 21 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 deploy_k8s/dockerfiles/admin_cms.Dockerfile create mode 100644 deploy_k8s/dockerfiles/api.Dockerfile create mode 100644 deploy_k8s/dockerfiles/auth.Dockerfile create mode 100644 deploy_k8s/dockerfiles/cache.Dockerfile create mode 100644 deploy_k8s/dockerfiles/cms_api.Dockerfile create mode 100644 deploy_k8s/dockerfiles/conversation.Dockerfile create mode 100644 deploy_k8s/dockerfiles/demo.Dockerfile create mode 100644 deploy_k8s/dockerfiles/friend.Dockerfile create mode 100644 deploy_k8s/dockerfiles/group.Dockerfile create mode 100644 deploy_k8s/dockerfiles/message_cms.Dockerfile create mode 100644 deploy_k8s/dockerfiles/msg.Dockerfile create mode 100644 deploy_k8s/dockerfiles/msg_gateway.Dockerfile create mode 100644 deploy_k8s/dockerfiles/office.Dockerfile create mode 100644 deploy_k8s/dockerfiles/organization.Dockerfile create mode 100644 deploy_k8s/dockerfiles/push.Dockerfile create mode 100644 deploy_k8s/dockerfiles/sdk_server.Dockerfile create mode 100644 deploy_k8s/dockerfiles/statistics.Dockerfile create mode 100644 deploy_k8s/dockerfiles/transfer.Dockerfile create mode 100644 deploy_k8s/dockerfiles/user.Dockerfile create mode 100644 deploy_k8s/script/build_push_all_images.sh diff --git a/deploy_k8s/dockerfiles/admin_cms.Dockerfile b/deploy_k8s/dockerfiles/admin_cms.Dockerfile new file mode 100644 index 000000000..e69de29bb diff --git a/deploy_k8s/dockerfiles/api.Dockerfile b/deploy_k8s/dockerfiles/api.Dockerfile new file mode 100644 index 000000000..51d0e1971 --- /dev/null +++ b/deploy_k8s/dockerfiles/api.Dockerfile @@ -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 diff --git a/deploy_k8s/dockerfiles/auth.Dockerfile b/deploy_k8s/dockerfiles/auth.Dockerfile new file mode 100644 index 000000000..e69de29bb diff --git a/deploy_k8s/dockerfiles/cache.Dockerfile b/deploy_k8s/dockerfiles/cache.Dockerfile new file mode 100644 index 000000000..e69de29bb diff --git a/deploy_k8s/dockerfiles/cms_api.Dockerfile b/deploy_k8s/dockerfiles/cms_api.Dockerfile new file mode 100644 index 000000000..e69de29bb diff --git a/deploy_k8s/dockerfiles/conversation.Dockerfile b/deploy_k8s/dockerfiles/conversation.Dockerfile new file mode 100644 index 000000000..e69de29bb diff --git a/deploy_k8s/dockerfiles/demo.Dockerfile b/deploy_k8s/dockerfiles/demo.Dockerfile new file mode 100644 index 000000000..e69de29bb diff --git a/deploy_k8s/dockerfiles/friend.Dockerfile b/deploy_k8s/dockerfiles/friend.Dockerfile new file mode 100644 index 000000000..e69de29bb diff --git a/deploy_k8s/dockerfiles/group.Dockerfile b/deploy_k8s/dockerfiles/group.Dockerfile new file mode 100644 index 000000000..e69de29bb diff --git a/deploy_k8s/dockerfiles/message_cms.Dockerfile b/deploy_k8s/dockerfiles/message_cms.Dockerfile new file mode 100644 index 000000000..e69de29bb diff --git a/deploy_k8s/dockerfiles/msg.Dockerfile b/deploy_k8s/dockerfiles/msg.Dockerfile new file mode 100644 index 000000000..e69de29bb diff --git a/deploy_k8s/dockerfiles/msg_gateway.Dockerfile b/deploy_k8s/dockerfiles/msg_gateway.Dockerfile new file mode 100644 index 000000000..e69de29bb diff --git a/deploy_k8s/dockerfiles/office.Dockerfile b/deploy_k8s/dockerfiles/office.Dockerfile new file mode 100644 index 000000000..e69de29bb diff --git a/deploy_k8s/dockerfiles/organization.Dockerfile b/deploy_k8s/dockerfiles/organization.Dockerfile new file mode 100644 index 000000000..e69de29bb diff --git a/deploy_k8s/dockerfiles/push.Dockerfile b/deploy_k8s/dockerfiles/push.Dockerfile new file mode 100644 index 000000000..e69de29bb diff --git a/deploy_k8s/dockerfiles/sdk_server.Dockerfile b/deploy_k8s/dockerfiles/sdk_server.Dockerfile new file mode 100644 index 000000000..e69de29bb diff --git a/deploy_k8s/dockerfiles/statistics.Dockerfile b/deploy_k8s/dockerfiles/statistics.Dockerfile new file mode 100644 index 000000000..e69de29bb diff --git a/deploy_k8s/dockerfiles/transfer.Dockerfile b/deploy_k8s/dockerfiles/transfer.Dockerfile new file mode 100644 index 000000000..e69de29bb diff --git a/deploy_k8s/dockerfiles/user.Dockerfile b/deploy_k8s/dockerfiles/user.Dockerfile new file mode 100644 index 000000000..e69de29bb diff --git a/deploy_k8s/script/build_push_all_images.sh b/deploy_k8s/script/build_push_all_images.sh new file mode 100644 index 000000000..5efab73e9 --- /dev/null +++ b/deploy_k8s/script/build_push_all_images.sh @@ -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 diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index 90f983a05..bacd88c9c 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -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 }