errcode

script/check_all.sh

@@ -7,7 +7,6 @@ service_port_name=(
   openImWsPort
   openImApiPort
   openImSdkWsPort
-  openImDemoPort
   openImCmsApiPort
   openImUserPort
   openImFriendPort
@@ -18,9 +17,7 @@ service_port_name=(
   openImPushPort
   openImAdminCmsPort
   openImOfficePort
-  openImOrganizationPort
   openImConversationPort
-  openImCachePort
 )
 switch=$(cat $config_path | grep demoswitch |awk -F '[:]' '{print $NF}')
 for i in ${service_port_name[*]}; do

script/demo_svr_start.sh

@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-#Include shell font styles and some basic information
-source ./style_info.cfg
-source ./path_info.cfg
-source ./function.sh
-switch=$(cat $config_path | grep demoswitch |awk -F '[:]' '{print $NF}')
-if [ ${switch} != "true" ]; then
-      echo -e ${YELLOW_PREFIX}" demo service switch is false not start demo "${COLOR_SUFFIX}
-      exit 0
-fi
-list1=$(cat $config_path | grep openImDemoPort | awk -F '[:]' '{print $NF}')
-list_to_string $list1
-api_ports=($ports_array)
-
-#Check if the service exists
-#If it is exists,kill this process
-check=$(ps aux | grep -w ./${demo_server_name} | grep -v grep | wc -l)
-if [ $check -ge 1 ]; then
-  oldPid=$(ps aux | grep -w ./${demo_server_name} | grep -v grep | awk '{print $2}')
-  kill -9 $oldPid
-fi
-#Waiting port recycling
-sleep 1
-cd ${demo_server_binary_root}
-
-for ((i = 0; i < ${#api_ports[@]}; i++)); do
-  nohup ./${demo_server_name} -port ${api_ports[$i]} >>../logs/openIM.log 2>&1 &
-done
-
-sleep 3
-#Check launched service process
-check=$(ps aux | grep -w ./${demo_server_name} | grep -v grep | wc -l)
-if [ $check -ge 1 ]; then
-  newPid=$(ps aux | grep -w ./${demo_server_name} | grep -v grep | awk '{print $2}')
-  ports=$(netstat -netulp | grep -w ${newPid} | awk '{print $4}' | awk -F '[:]' '{print $NF}')
-  allPorts=""
-
-  for i in $ports; do
-    allPorts=${allPorts}"$i "
-  done
-  echo -e ${SKY_BLUE_PREFIX}"SERVICE START SUCCESS "${COLOR_SUFFIX}
-  echo -e ${SKY_BLUE_PREFIX}"SERVICE_NAME: "${COLOR_SUFFIX}${YELLOW_PREFIX}${demo_server_name}${COLOR_SUFFIX}
-  echo -e ${SKY_BLUE_PREFIX}"PID: "${COLOR_SUFFIX}${YELLOW_PREFIX}${newPid}${COLOR_SUFFIX}
-  echo -e ${SKY_BLUE_PREFIX}"LISTENING_PORT: "${COLOR_SUFFIX}${YELLOW_PREFIX}${allPorts}${COLOR_SUFFIX}
-else
-  echo -e ${YELLOW_PREFIX}${demo_server_name}${COLOR_SUFFIX}${RED_PREFIX}"SERVICE START ERROR, PLEASE CHECK openIM.log"${COLOR_SUFFIX}
-fi

script/path_info.cfg

@@ -47,7 +47,6 @@ service_source_root=(
   ../cmd/rpc/open_im_auth/
   ../cmd/rpc/open_im_admin_cms/
   ../cmd/rpc/open_im_office/ 
-  ../cmd/rpc/open_im_organization/
   ../cmd/rpc/open_im_conversation/
   ../cmd/rpc/open_im_cache/
   ../cmd/open_im_cron_task
@@ -70,9 +69,7 @@ service_names=(
   open_im_auth
   open_im_admin_cms
   open_im_office
-  open_im_organization
   open_im_conversation
-  open_im_cache
   open_im_cron_task
   ${msg_gateway_name}
   ${msg_transfer_name}

script/sdk_svr_start.sh

@@ -10,7 +10,7 @@ api_address=$(cat $config_path | grep openImApiAddress | awk -F '[ ]' '{print $N
 list3=$(cat $config_path | grep openImSdkWsPort | awk -F '[:]' '{print $NF}')
 logLevel=$(cat $config_path | grep remainLogLevel | awk -F '[:]' '{print $NF}')
 list_to_string $list3
-sdk_ws_ports=($ports_array)
+sdkws_ports=($ports_array)
 
 
 
@@ -24,7 +24,7 @@ fi
 #Waiting port recycling
 sleep 1
 cd ${sdk_server_binary_root}
-  nohup ./${sdk_server_name}  -openIM_ws_address ${ws_address}  -sdk_ws_port ${sdk_ws_ports[0]} -openIM_api_address ${api_address} -openIM_log_level ${logLevel} >>../logs/openIM.log 2>&1 &
+  nohup ./${sdk_server_name}  -openIM_ws_address ${ws_address}  -sdkws_port ${sdkws_ports[0]} -openIM_api_address ${api_address} -openIM_log_level ${logLevel} >>../logs/openIM.log 2>&1 &
 
 #Check launched service process
 sleep 3

script/start_rpc_service.sh

@@ -17,9 +17,7 @@ service_filename=(
   open_im_admin_cms
   ${msg_name}
   open_im_office
-  open_im_organization
   open_im_conversation
-  open_im_cache
 )
 
 #service config port name
@@ -35,9 +33,7 @@ service_port_name=(
   openImAdminCmsPort
   openImMessagePort
   openImOfficePort
-  openImOrganizationPort
   openImConversationPort
-  openImCachePort
 )
 
 service_prometheus_port_name=(
@@ -52,9 +48,7 @@ service_prometheus_port_name=(
   adminCmsPrometheusPort
   messagePrometheusPort
   officePrometheusPort
-  organizationPrometheusPort
   conversationPrometheusPort
-  cachePrometheusPort
 )
 
 for ((i = 0; i < ${#service_filename[*]}; i++)); do

script/win_start_all_service.cmd

@@ -16,7 +16,7 @@ start cmd /C .\open_im_conversation.exe -port 10230
 start cmd /C .\open_im_cache.exe -port 10240
 start cmd /C .\open_im_push.exe -port 10170
 start cmd /C .\open_im_msg_transfer.exe
-start cmd /C .\open_im_sdk_server.exe -openIM_api_port 10002 -openIM_ws_port 10001 -sdk_ws_port 10003 -openIM_log_level 6
+start cmd /C .\open_im_sdk_server.exe -openIM_api_port 10002 -openIM_ws_port 10001 -sdkws_port 10003 -openIM_log_level 6
 start cmd /C .\open_im_msg_gateway.exe -rpc_port 10140 -ws_port 10001
 start cmd /C .\open_im_demo.exe -port 10004
 cd %ROOT%