Merge branch 'tuoyun'

# Conflicts:
#	cmd/open_im_api/main.go
#	config/config.yaml
#	go.sum
#	pkg/common/config/config.go
#	pkg/common/db/model.go

script/check_all.sh

@@ -19,6 +19,7 @@ service_port_name=(
   openImAdminCmsPort
   openImMessageCmsPort
   openImStatisticsPort
+  openImOfficePort
 )
 switch=$(cat $config_path | grep demoswitch |awk -F '[:]' '{print $NF}')
 for i in ${service_port_name[*]}; do

script/function.sh

@@ -8,4 +8,8 @@ sub_s2=${sub_s1//,/ }
 sub_s3=${sub_s2#*[}
 sub_s4=${sub_s3%]*}
 ports_array=$sub_s4
+}
+remove_space(){
+  value=$*
+  result=`echo $value | sed 's/ //g'`
 }

script/path_info.cfg

@@ -48,6 +48,7 @@ service_source_root=(
   ../cmd/rpc/open_im_admin_cms/
   ../cmd/rpc/open_im_message_cms/
   ../cmd/rpc/open_im_statistics/
+  ../cmd/rpc/open_im_office/
   ${msg_gateway_source_root}
   ${msg_transfer_source_root}
   ${msg_source_root}
@@ -68,6 +69,7 @@ service_names=(
   open_im_admin_cms
   open_im_message_cms
   open_im_statistics
+  open_im_office
   ${msg_gateway_name}
   ${msg_transfer_name}
   ${msg_name}

script/start_rpc_service.sh

@@ -18,6 +18,7 @@ service_filename=(
   open_im_message_cms
   open_im_statistics
   ${msg_name}
+  open_im_office
 )
 
 #service config port name
@@ -34,6 +35,7 @@ service_port_name=(
   openImMessageCmsPort
   openImStatisticsPort
   openImOfflineMessagePort
+  openImOfficePort
 )
 
 for ((i = 0; i < ${#service_filename[*]}; i++)); do