Merge remote-tracking branch 'origin/tuoyun' into tuoyun

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

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
 }
 

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"`
 	}

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)
 
 
 

script/start_rpc_service.sh

@@ -29,7 +29,7 @@ service_port_name=(
   openImUserPort
   openImFriendPort
   openImGroupPort
-  openImAuthPort
+
   openImAdminCmsPort
   openImMessageCmsPort
   openImStatisticsPort