Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun

config/config.yaml

@@ -113,8 +113,8 @@ credential: #腾讯cos，发送图片、视频、文件时需要，请自行申
 rpcport: #rpc服务端口 默认即可
   openImUserPort: [ 10100 ]
   openImFriendPort: [ 10200 ]
-  openImOfflineMessagePort: [ 10300 ]
-  openImOnlineRelayPort: [ 10400 ]
+  openImMessagePort: [ 10300 ]
+  openImMessageGatewayPort: [ 10400 ]
   openImGroupPort: [ 10500 ]
   openImAuthPort: [ 10600 ]
   openImPushPort: [ 10700 ]

script/check_all.sh

@@ -8,8 +8,8 @@ service_port_name=(
   openImApiPort
   openImUserPort
   openImFriendPort
-  openImOfflineMessagePort
-  openImOnlineRelayPort
+  openImMessagePort
+  openImMessageGatewayPort
   openImGroupPort
   openImAuthPort
   openImPushPort

script/msg_gateway_start.sh

@@ -5,7 +5,7 @@ source ./path_info.cfg
 source ./function.sh
 ulimit -n 200000
 
-list1=$(cat $config_path | grep openImOnlineRelayPort | awk -F '[:]' '{print $NF}')
+list1=$(cat $config_path | grep openImMessageGatewayPort | awk -F '[:]' '{print $NF}')
 list2=$(cat $config_path | grep openImWsPort | awk -F '[:]' '{print $NF}')
 list_to_string $list1
 rpc_ports=($ports_array)

script/start_rpc_service.sh

@@ -36,7 +36,7 @@ service_port_name=(
   openImAdminCmsPort
   openImMessageCmsPort
   openImStatisticsPort
-  openImOfflineMessagePort
+  openImMessagePort
   openImOfficePort
   openImOrganizationPort
   openImConversationPort