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
This commit is contained in:
Gordon
2022-03-29 10:58:01 +08:00
75 changed files with 10892 additions and 5192 deletions
+2
View File
@@ -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}