From 952ad0e162eb0950a0745131641152b19941cb19 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 22 Feb 2022 12:27:39 +0800 Subject: [PATCH] fix deploy --- deploy/config.example.yaml | 6 +++++- internal/rpc/group/group.go | 2 ++ pkg/common/config/config.go | 3 +++ script/sdk_svr_start.sh | 4 +++- script/start_rpc_service.sh | 2 +- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/deploy/config.example.yaml b/deploy/config.example.yaml index 9f14c96d4..f0ae8314e 100644 --- a/deploy/config.example.yaml +++ b/deploy/config.example.yaml @@ -73,6 +73,8 @@ api: openImApiPort: [ 10000 ] sdk: openImSdkWsPort: [ 30000 ] +cmsapi: + openImCmsApiPort: [ 8000 ] credential: tencent: @@ -91,7 +93,9 @@ rpcport: openImGroupPort: [ 10500 ] openImAuthPort: [ 10600 ] openImPushPort: [ 10700 ] - + openImStatisticsPort: [ 10800 ] + openImMessageCmsPort: [ 10900 ] + openImAdminCmsPort: [ 11000 ] rpcregistername: openImUserName: User diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 2ab59b6ca..6e39ab266 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -854,6 +854,8 @@ func (s *groupServer) RemoveGroupMembersCMS(_ context.Context, req *pbGroup.Remo OpUserID: req.OpUserId, } chat.MemberKickedNotification(reqKick, resp.Success) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "success: ", resp.Success) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "failed: ", resp.Failed) return resp, nil } diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index 8f89376cb..ae0d3cadc 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -25,6 +25,9 @@ type config struct { Api struct { GinPort []int `yaml:"openImApiPort"` } + CmsApi struct{ + GinPort []int `yaml:"openImCmsApiPort"` + } Sdk struct { WsPort []int `yaml:"openImSdkWsPort"` } diff --git a/script/sdk_svr_start.sh b/script/sdk_svr_start.sh index 97c694233..2ba1295cd 100644 --- a/script/sdk_svr_start.sh +++ b/script/sdk_svr_start.sh @@ -6,13 +6,15 @@ source ./function.sh list1=$(cat $config_path | grep openImApiPort | awk -F '[:]' '{print $NF}') list2=$(cat $config_path | grep openImWsPort | awk -F '[:]' '{print $NF}') list3=$(cat $config_path | grep openImSdkWsPort | awk -F '[:]' '{print $NF}') +list4=$(cat $config_path | grep openImCmsApiPort | awk - F '[:]' '{print $NF}') list_to_string $list1 api_ports=($ports_array) list_to_string $list2 ws_ports=($ports_array) list_to_string $list3 sdk_ws_ports=($ports_array) - +list_to_string $list4 +cms_api_ports=($ports_array) diff --git a/script/start_rpc_service.sh b/script/start_rpc_service.sh index bc5f41e3d..bbd7f3c5a 100644 --- a/script/start_rpc_service.sh +++ b/script/start_rpc_service.sh @@ -29,7 +29,7 @@ service_port_name=( openImUserPort openImFriendPort openImGroupPort - openImAuthPort + openImAdminCmsPort openImMessageCmsPort openImStatisticsPort