Merge remote-tracking branch 'origin/main'

script/check_all.sh

@@ -4,23 +4,25 @@ source ./style_info.cfg
 source ./path_info.cfg
 source ./function.sh
 service_port_name=(
-  openImCmsApiPort
+  openImWsPort
   openImApiPort
+  openImSdkWsPort
+  openImDemoPort
+  openImCmsApiPort
   openImUserPort
   openImFriendPort
-  openImOfflineMessagePort
-  openImOnlineRelayPort
+  openImMessagePort
+  openImMessageGatewayPort
   openImGroupPort
   openImAuthPort
   openImPushPort
-  openImWsPort
-  openImSdkWsPort
-  openImDemoPort
-  openImAdminCmsPort
-  openImMessageCmsPort
   openImStatisticsPort
+  openImMessageCmsPort
+  openImAdminCmsPort
   openImOfficePort
   openImOrganizationPort
+  openImConversationPort
+  openImCachePort
 )
 switch=$(cat $config_path | grep demoswitch |awk -F '[:]' '{print $NF}')
 for i in ${service_port_name[*]}; do

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/path_info.cfg

@@ -50,6 +50,8 @@ service_source_root=(
   ../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/
   ${msg_gateway_source_root}
   ${msg_transfer_source_root}
   ${msg_source_root}
@@ -71,7 +73,9 @@ service_names=(
   open_im_message_cms
   open_im_statistics
   open_im_office
-  open_im_organization	
+  open_im_organization
+  open_im_conversation
+  open_im_cache
   ${msg_gateway_name}
   ${msg_transfer_name}
   ${msg_name}

script/start_rpc_service.sh

@@ -20,6 +20,8 @@ service_filename=(
   ${msg_name}
   open_im_office
   open_im_organization
+  open_im_conversation
+  open_im_cache
 )
 
 #service config port name
@@ -35,9 +37,11 @@ service_port_name=(
   openImAdminCmsPort
   openImMessageCmsPort
   openImStatisticsPort
-  openImOfflineMessagePort
+  openImMessagePort
   openImOfficePort
   openImOrganizationPort
+  openImConversationPort
+  openImCachePort
 )
 
 for ((i = 0; i < ${#service_filename[*]}; i++)); do