feat: add more deployment docs

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>

.env

@@ -0,0 +1,4 @@
+USER=root
+PASSWORD=openIM123
+MINIO_ENDPOINT=http://127.0.0.1:10005
+DATA_DIR=./

.gitignore

@@ -1,22 +1,403 @@
-bin
+# Copyright © 2023 OpenIMSDK.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# ==============================================================================
+# For the entire design of.gitignore, ignore git commits and ignore files
+#===============================================================================
+#
+
+### OpenIM developer supplement ###
 logs
 .devcontainer
 components
-logs
 out-test
-.github
+Dockerfile.cross
-.idea
 
+### Makefile ###
+tmp/
+bin/
+output/
+_output/
 
-deploy/open_im_demo
+### OpenIM Config ###
-deploy/open_im_api
+config/config.yaml
-deploy/open_im_msg_gateway
+./config/config.yaml
-deploy/open_im_msg_transfer
+.env
-deploy/open_im_push
+./.env
-deploy/open_im_timer_task
+
-deploy/open_im_rpc_user
+### OpenIM deploy ###
-deploy/open_im_rpc_friend
+deploy/openim_demo
-deploy/open_im_rpc_group
+deploy/openim-api
-deploy/open_im_rpc_msg
+deploy/openim-rpc-msg_gateway
-deploy/open_im_rpc_auth
+deploy/openim-msgtransfer
+deploy/openim-push
+deploy/openim_timer_task
+deploy/openim-rpc-user
+deploy/openim-rpc-friend
+deploy/openim-rpc-group
+deploy/openim-rpc-msg
+deploy/openim-rpc-auth
 deploy/Open-IM-SDK-Core
+
+# files used by the developer
+.idea.md
+.todo.md
+.note.md
+
+# ==============================================================================
+# Created by https://www.toptal.com/developers/gitignore/api/go,git,vim,tags,test,emacs,backup,jetbrains
+# Edit at https://www.toptal.com/developers/gitignore?templates=go,git,vim,tags,test,emacs,backup,jetbrains
+
+### Backup ###
+*.bak
+*.gho
+*.ori
+*.orig
+*.tmp
+
+### Emacs ###
+# -*- mode: gitignore; -*-
+*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+*.elc
+auto-save-list
+tramp
+.\#*
+
+# Org-mode
+.org-id-locations
+*_archive
+
+# flymake-mode
+*_flymake.*
+
+# eshell files
+/eshell/history
+/eshell/lastdir
+
+# elpa packages
+/elpa/
+
+# reftex files
+*.rel
+
+# AUCTeX auto folder
+/auto/
+
+# cask packages
+.cask/
+dist/
+
+# Flycheck
+flycheck_*.el
+
+# server auth directory
+/server/
+
+# projectiles files
+.projectile
+
+# directory configuration
+.dir-locals.el
+
+# network security
+/network-security.data
+
+### vscode ###
+.vscode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# End of https://www.toptal.com/developers/gitignore/api/vim,jetbrains,vscode,git,go,tags,backup,test
+
+### Git ###
+# Created by git for backups. To disable backups in Git:
+# $ git config --global mergetool.keepBackup false
+
+# Created by git when using merge tools for conflicts
+*.BACKUP.*
+*.BASE.*
+*.LOCAL.*
+*.REMOTE.*
+*_BACKUP_*.txt
+*_BASE_*.txt
+*_LOCAL_*.txt
+*_REMOTE_*.txt
+
+### Go ###
+# If you prefer the allow list template instead of the deny list, see community template:
+# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
+#
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+
+# Test binary, built with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Dependency directories (remove the comment below to include it)
+vendor/
+
+# Go workspace file
+# go.work
+go.work.sum
+
+### JetBrains ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### JetBrains Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+# https://plugins.jetbrains.com/plugin/7973-sonarlint
+.idea/**/sonarlint/
+
+# SonarQube Plugin
+# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
+.idea/**/sonarIssues.xml
+
+# Markdown Navigator plugin
+# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
+.idea/**/markdown-navigator.xml
+.idea/**/markdown-navigator-enh.xml
+.idea/**/markdown-navigator/
+
+# Cache file creation bug
+# See https://youtrack.jetbrains.com/issue/JBR-2257
+.idea/$CACHE_FILE$
+
+# CodeStream plugin
+# https://plugins.jetbrains.com/plugin/12206-codestream
+.idea/codestream.xml
+
+# Azure Toolkit for IntelliJ plugin
+# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij
+.idea/**/azureSettings.xml
+
+### Tags ###
+# Ignore tags created by etags, ctags, gtags (GNU global) and cscope
+TAGS
+.TAGS
+!TAGS/
+tags
+.tags
+!tags/
+gtags.files
+GTAGS
+GRTAGS
+GPATH
+GSYMS
+cscope.files
+cscope.out
+cscope.in.out
+cscope.po.out
+
+
+### Test ###
+### Ignore all files that could be used to test your code and
+### you wouldn't want to push
+
+# Reference https://en.wikipedia.org/wiki/Metasyntactic_variable
+
+# Most common
+*foo
+*bar
+*fubar
+*foobar
+*baz
+
+# Less common
+*qux
+*quux
+*bongo
+*bazola
+*ztesch
+
+# UK, Australia
+*wibble
+*wobble
+*wubble
+*flob
+*blep
+*blah
+*boop
+*beep
+
+# Japanese
+*hoge
+*piyo
+*fuga
+*hogera
+*hogehoge
+
+# Portugal, Spain
+*fulano
+*sicrano
+*beltrano
+*mengano
+*perengano
+*zutano
+
+# France, Italy, the Netherlands
+*toto
+*titi
+*tata
+*tutu
+*pipppo
+*pluto
+*paperino
+*aap
+*noot
+*mies
+
+# Other names that would make sense
+*tests
+*testsdir
+*testsfile
+*testsfiles
+*testdir
+*testfile
+*testfiles
+*testing
+*testingdir
+*testingfile
+*testingfiles
+*temp
+*tempdir
+*tempfile
+*tempfiles
+*tmp
+*tmpdir
+*tmpfile
+*tmpfiles
+*lol
+
+### Vim ###
+# Swap
+[._]*.s[a-v][a-z]
+!*.svg  # comment out if you don't need vector files
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
+
+# Session
+Session.vim
+Sessionx.vim
+
+# Temporary
+.netrwhist
+# Auto-generated tag files
+# Persistent undo
+[._]*.un~
+
+# End of https://www.toptal.com/developers/gitignore/api/go,git,vim,tags,test,emacs,backup,jetbrains
+.idea
+dist/
+.env
+config/config.yaml

README.md

@@ -26,8 +26,6 @@ By deployment of the Open-IM-Server on the customer's server, developers can int
 - Supports multiple protocols
 
 ## Community
-
-- Join the Telegram-OpenIM group: https://t.me/joinchat/zSJLPaHBNLZmODI1
 - 中文官网访问这里：[Open-IM中文开发文档](https://doc.rentsoft.cn/)
 
 ## Quick start
@@ -36,75 +34,69 @@ By deployment of the Open-IM-Server on the customer's server, developers can int
 
 > Open-IM relies on five open source high-performance components: ETCD, MySQL, MongoDB, Redis, and Kafka. Privatization deployment Before Open-IM-Server, please make sure that the above five components have been installed. If your server does not have the above components, you must first install Missing components. If you have the above components, it is recommended to use them directly. If not, it is recommended to use Docker-compose, no To install dependencies, one-click deployment, faster and more convenient.
 
-#### Source code deployment
+#### Deploy using Docker
 
-1. Install [Go environment](https://golang.org/doc/install). Make sure Go version is at least 1.15.
+1. Install [Go environment](https://golang.org/doc/install). Make sure Go version is at least 1.17
 
-2. Clone the Open-IM project to your server.
+2. Clone the Open-IM project to your server
 
    ```
    git clone https://github.com/OpenIMSDK/Open-IM-Server.git --recursive
    ```
 
-3. Build and start Service.
+3. Deploy
 
-    1. Shell authorization
+    1. Modify env
 
        ```
-       #cd Open-IM-server/script
+       #cd Open-IM-server
-       
+       USER=root  
-       chmod +x *.sh
+       PASSWORD=openIM123    #Password with more than 8 digits, excluding special characters
+       ENDPOINT=http://127.0.0.1:10005 #Replace 127.0.0.1 with Internet IP
+       DATA_DIR=./ 
        ```
 
-    2. Execute the build shell
+    2. Deploy && Start
     
        ```
-       ./build_all_service.sh
+       chmod +x install_im_server.sh;
-       ```
+       ./install_im_server.sh;
-
-    3. Start service
-
-       ```
-       ./start_all.sh
        ```
     
     4. Check service
     
        ```
-       ./check_all.sh
+       cd script;
+       ./docker_check_service.sh./check_all.sh
        ```
        
        ![OpenIMServersonSystempng](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/Open-IM-Servers-on-System.png)
 
-#### Docker deployment
+#### Deploy using source code
 
-All images are available at https://hub.docker.com/r/lyt1123/open_im_server
+1. Go 1.17 or above。
+2. Clone
 
-1. [Install Docker](https://docs.docker.com/install/) 1.13 or above.
+```shell
+git clone https://github.com/OpenIMSDK/Open-IM-Server.git --recursive 
+cd cmd/Open-IM-SDK-Core
+git checkout main
+```
 
-2. [Install Docker Compose](https://docs.docker.com/compose/install/) 1.22 or above.
+1. Set executable permissions
 
-3. Clone the Open-IM project to your server.
+```shell
+cd ../../script/
+chmod +x *.sh
+```
 
-   ```
+1. build
-   git clone https://github.com/OpenIMSDK/Open-IM-Server.git --recursive
-   ```
 
-4. Start docker-compose with one click(Docker automatically pulls all images)
+```shell
+./batch_build_all_service.sh
+```
 
-   ```
+all services build success
-   cd Open-IM-Server
-   docker-compose up -d
-   ```
-
-5. Check service
-
-   ```
-   ./docker_check_service.sh 
-   ./check_all.sh
-   ```
-
-   ![OpenIMServersondockerpng](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/Open-IM-Servers-on-docker.png)
 
 ### CONFIGURATION INSTRUCTIONS
 

cmd/open_im_api/Makefile

@@ -1,13 +1,24 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_api
+NAME=open_im_api
 BIN_DIR=../../bin/
 
-
+OS:= $(or $(os),linux)
+ARCH:=$(or $(arch),amd64)
 all: gotool build
 
+ifeq ($(OS),windows)
+
+BINARY_NAME=${NAME}.exe
+
+else
+
+BINARY_NAME=${NAME}
+
+endif
+
 build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
+	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} go build -ldflags="-w -s"
 
 run:
 	@go run ./
@@ -16,8 +27,7 @@ gotool:
 	go fmt ./
 	go vet ./
 
-install:
+install:build
-	make build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/open_im_api/main.go

@@ -1,51 +1,79 @@
 package main
 
 import (
+	_ "Open_IM/cmd/open_im_api/docs"
 	apiAuth "Open_IM/internal/api/auth"
-	apiChat "Open_IM/internal/api/chat"
+	clientInit "Open_IM/internal/api/client_init"
 	"Open_IM/internal/api/conversation"
 	"Open_IM/internal/api/friend"
 	"Open_IM/internal/api/group"
 	"Open_IM/internal/api/manage"
+	apiChat "Open_IM/internal/api/msg"
 	"Open_IM/internal/api/office"
 	"Open_IM/internal/api/organization"
 	apiThird "Open_IM/internal/api/third"
 	"Open_IM/internal/api/user"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
+	"Open_IM/pkg/grpc-etcdv3/getcdv3"
 	"Open_IM/pkg/utils"
 	"flag"
 	"fmt"
+
+	//_ "github.com/razeencheng/demo-go/swaggo-gin/docs"
 	"io"
 	"os"
 	"strconv"
 
+	swaggerFiles "github.com/swaggo/files"
+	ginSwagger "github.com/swaggo/gin-swagger"
+
 	"github.com/gin-gonic/gin"
 	//"syscall"
 	"Open_IM/pkg/common/constant"
+	promePkg "Open_IM/pkg/common/prometheus"
 )
 
+// @title open-IM-Server API
+// @version 1.0
+// @description  open-IM-Server 的API服务器文档, 文档中所有请求都有一个operationID字段用于链路追踪
+
+// @license.name Apache 2.0
+// @license.url http://www.apache.org/licenses/LICENSE-2.0.html
+// @BasePath /
 func main() {
 	log.NewPrivateLog(constant.LogFileName)
 	gin.SetMode(gin.ReleaseMode)
 	f, _ := os.Create("../logs/api.log")
 	gin.DefaultWriter = io.MultiWriter(f)
-	gin.SetMode(gin.DebugMode)
+	//	gin.SetMode(gin.DebugMode)
-	r := gin.Default()
+	r := gin.New()
+	r.Use(gin.Recovery())
 	r.Use(utils.CorsHandler())
-
+	log.Info("load config: ", config.Config)
-	log.Info("load  config: ", config.Config)
+	r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
+	if config.Config.Prometheus.Enable {
+		promePkg.NewApiRequestCounter()
+		promePkg.NewApiRequestFailedCounter()
+		promePkg.NewApiRequestSuccessCounter()
+		r.Use(promePkg.PromeTheusMiddleware)
+		r.GET("/metrics", promePkg.PrometheusHandler())
+	}
 	// user routing group, which handles user registration and login services
 	userRouterGroup := r.Group("/user")
 	{
 		userRouterGroup.POST("/update_user_info", user.UpdateUserInfo) //1
 		userRouterGroup.POST("/set_global_msg_recv_opt", user.SetGlobalRecvMessageOpt)
-		userRouterGroup.POST("/get_users_info", user.GetUsersInfo)                  //1
+		userRouterGroup.POST("/get_users_info", user.GetUsersPublicInfo)            //1
 		userRouterGroup.POST("/get_self_user_info", user.GetSelfUserInfo)           //1
 		userRouterGroup.POST("/get_users_online_status", user.GetUsersOnlineStatus) //1
 		userRouterGroup.POST("/get_users_info_from_cache", user.GetUsersInfoFromCache)
 		userRouterGroup.POST("/get_user_friend_from_cache", user.GetFriendIDListFromCache)
 		userRouterGroup.POST("/get_black_list_from_cache", user.GetBlackIDListFromCache)
+		userRouterGroup.POST("/get_all_users_uid", manage.GetAllUsersUid) //1
+		userRouterGroup.POST("/account_check", manage.AccountCheck)       //1
+		//	userRouterGroup.POST("/get_users_online_status", manage.GetUsersOnlineStatus) //1
+		userRouterGroup.POST("/get_users", user.GetUsers)
 	}
 	//friend routing group
 	friendRouterGroup := r.Group("/friend")
@@ -77,12 +105,14 @@ func main() {
 		groupRouterGroup.POST("/transfer_group", group.TransferGroupOwner)                          //1
 		groupRouterGroup.POST("/get_recv_group_applicationList", group.GetRecvGroupApplicationList) //1
 		groupRouterGroup.POST("/get_user_req_group_applicationList", group.GetUserReqGroupApplicationList)
-		groupRouterGroup.POST("/get_groups_info", group.GetGroupsInfo)                   //1
+		groupRouterGroup.POST("/get_groups_info", group.GetGroupsInfo) //1
-		groupRouterGroup.POST("/kick_group", group.KickGroupMember)                      //1
+		groupRouterGroup.POST("/kick_group", group.KickGroupMember)    //1
-		groupRouterGroup.POST("/get_group_member_list", group.GetGroupMemberList)        //no use
+		//	groupRouterGroup.POST("/get_group_member_list", group.GetGroupMemberList)        //no use
 		groupRouterGroup.POST("/get_group_all_member_list", group.GetGroupAllMemberList) //1
 		groupRouterGroup.POST("/get_group_members_info", group.GetGroupMembersInfo)      //1
 		groupRouterGroup.POST("/invite_user_to_group", group.InviteUserToGroup)          //1
+		//only for supergroup
+		groupRouterGroup.POST("/invite_user_to_groups", group.InviteUserToGroups)
 		groupRouterGroup.POST("/get_joined_group_list", group.GetJoinedGroupList)
 		groupRouterGroup.POST("/dismiss_group", group.DismissGroup) //
 		groupRouterGroup.POST("/mute_group_member", group.MuteGroupMember)
@@ -91,6 +121,8 @@ func main() {
 		groupRouterGroup.POST("/cancel_mute_group", group.CancelMuteGroup)
 		groupRouterGroup.POST("/set_group_member_nickname", group.SetGroupMemberNickname)
 		groupRouterGroup.POST("/set_group_member_info", group.SetGroupMemberInfo)
+		groupRouterGroup.POST("/get_group_abstract_info", group.GetGroupAbstractInfo)
+		//groupRouterGroup.POST("/get_group_all_member_list_by_split", group.GetGroupAllMemberListBySplit)
 	}
 	superGroupRouterGroup := r.Group("/super_group")
 	{
@@ -116,6 +148,9 @@ func main() {
 		thirdGroup.POST("/get_download_url", apiThird.GetDownloadURL)
 		thirdGroup.POST("/get_rtc_invitation_info", apiThird.GetRTCInvitationInfo)
 		thirdGroup.POST("/get_rtc_invitation_start_app", apiThird.GetRTCInvitationInfoStartApp)
+		thirdGroup.POST("/fcm_update_token", apiThird.FcmUpdateToken)
+		thirdGroup.POST("/aws_storage_credential", apiThird.AwsStorageCredential)
+		thirdGroup.POST("/set_app_badge", apiThird.SetAppBadge)
 	}
 	//Message
 	chatGroup := r.Group("/msg")
@@ -124,17 +159,17 @@ func main() {
 		chatGroup.POST("/send_msg", apiChat.SendMsg)
 		chatGroup.POST("/pull_msg_by_seq", apiChat.PullMsgBySeqList)
 		chatGroup.POST("/del_msg", apiChat.DelMsg)
+		chatGroup.POST("/del_super_group_msg", apiChat.DelSuperGroupMsg)
 		chatGroup.POST("/clear_msg", apiChat.ClearMsg)
-	}
+		chatGroup.POST("/manage_send_msg", manage.ManagementSendMsg)
-	//Manager
+		chatGroup.POST("/batch_send_msg", manage.ManagementBatchSendMsg)
-	managementGroup := r.Group("/manager")
+		chatGroup.POST("/check_msg_is_send_success", manage.CheckMsgIsSendSuccess)
-	{
+		chatGroup.POST("/set_msg_min_seq", apiChat.SetMsgMinSeq)
-		managementGroup.POST("/delete_user", manage.DeleteUser) //1
+
-		managementGroup.POST("/send_msg", manage.ManagementSendMsg)
+		chatGroup.POST("/set_message_reaction_extensions", apiChat.SetMessageReactionExtensions)
-		managementGroup.POST("/batch_send_msg", manage.ManagementBatchSendMsg)
+		chatGroup.POST("/get_message_list_reaction_extensions", apiChat.GetMessageListReactionExtensions)
-		managementGroup.POST("/get_all_users_uid", manage.GetAllUsersUid)             //1
+		chatGroup.POST("/add_message_reaction_extensions", apiChat.AddMessageReactionExtensions)
-		managementGroup.POST("/account_check", manage.AccountCheck)                   //1
+		chatGroup.POST("/delete_message_reaction_extensions", apiChat.DeleteMessageReactionExtensions)
-		managementGroup.POST("/get_users_online_status", manage.GetUsersOnlineStatus) //1
 	}
 	//Conversation
 	conversationGroup := r.Group("/conversation")
@@ -142,8 +177,10 @@ func main() {
 		conversationGroup.POST("/get_all_conversations", conversation.GetAllConversations)
 		conversationGroup.POST("/get_conversation", conversation.GetConversation)
 		conversationGroup.POST("/get_conversations", conversation.GetConversations)
+		//deprecated
 		conversationGroup.POST("/set_conversation", conversation.SetConversation)
 		conversationGroup.POST("/batch_set_conversation", conversation.BatchSetConversations)
+		//deprecated
 		conversationGroup.POST("/set_recv_msg_opt", conversation.SetRecvMsgOpt)
 		conversationGroup.POST("/modify_conversation_field", conversation.ModifyConversationField)
 	}
@@ -187,9 +224,15 @@ func main() {
 
 		organizationGroup.POST("/get_department_member", organization.GetDepartmentMember)
 		organizationGroup.POST("/delete_user_in_department", organization.DeleteUserInDepartment)
-
+		organizationGroup.POST("/get_user_in_organization", organization.GetUserInOrganization)
 	}
 
+	initGroup := r.Group("/init")
+	{
+		initGroup.POST("/set_client_config", clientInit.SetClientInitConfig)
+		initGroup.POST("/get_client_config", clientInit.GetClientInitConfig)
+	}
+	go getcdv3.RegisterConf()
 	go apiThird.MinioInit()
 	defaultPorts := config.Config.Api.GinPort
 	ginPort := flag.Int("port", defaultPorts[0], "get ginServerPort from cmd,default 10002 as port")
@@ -198,10 +241,10 @@ func main() {
 	if config.Config.Api.ListenIP != "" {
 		address = config.Config.Api.ListenIP + ":" + strconv.Itoa(*ginPort)
 	}
-	address = config.Config.Api.ListenIP + ":" + strconv.Itoa(*ginPort)
+	fmt.Println("start api server, address: ", address, ", OpenIM version: ", constant.CurrentVersion)
-	fmt.Println("start api server, address: ", address)
 	err := r.Run(address)
 	if err != nil {
-		log.Error("", "run failed ", *ginPort, err.Error())
+		log.Error("", "api run failed ", address, err.Error())
+		panic("api start failed " + err.Error())
 	}
 }

cmd/open_im_cms_api/Makefile

@@ -1,13 +1,25 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_cms_api
+NAME=open_im_cms_api
 BIN_DIR=../../bin/
 
 
+OS:= $(or $(os),linux)
+ARCH:=$(or $(arch),amd64)
 all: gotool build
 
+ifeq ($(OS),windows)
+
+BINARY_NAME=${NAME}.exe
+
+else
+
+BINARY_NAME=${NAME}
+
+endif
+
 build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
+	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} go build -ldflags="-w -s"
 
 run:
 	@go run ./
@@ -16,8 +28,7 @@ gotool:
 	go fmt ./
 	go vet ./
 
-install:
+install:build
-	make build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/open_im_cms_api/main.go

@@ -2,12 +2,14 @@ package main
 
 import (
 	"Open_IM/internal/cms_api"
+	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/utils"
 	"flag"
 	"fmt"
 	"strconv"
 
 	"Open_IM/pkg/common/config"
+
 	"github.com/gin-gonic/gin"
 )
 
@@ -23,6 +25,6 @@ func main() {
 		address = config.Config.Api.ListenIP + ":" + strconv.Itoa(*ginPort)
 	}
 	address = config.Config.CmsApi.ListenIP + ":" + strconv.Itoa(*ginPort)
-	fmt.Println("start cms api server, address: ", address)
+	fmt.Println("start cms api server, address: ", address, ", OpenIM version: ", constant.CurrentVersion, "\n")
 	router.Run(address)
 }

cmd/open_im_cron_task/Makefile

@@ -0,0 +1,34 @@
+.PHONY: all build run gotool install clean help
+
+NAME=open_im_cron_task
+BIN_DIR=../../bin/
+
+OS:= $(or $(os),linux)
+ARCH:=$(or $(arch),amd64)
+all: gotool build
+
+ifeq ($(OS),windows)
+
+BINARY_NAME=${NAME}.exe
+
+else
+
+BINARY_NAME=${NAME}
+
+endif
+
+build:
+	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} go build -ldflags="-w -s"
+
+run:
+	@go run ./
+
+gotool:
+	go fmt ./
+	go vet ./
+
+install:build
+	mv ${BINARY_NAME} ${BIN_DIR}
+
+clean:
+	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/open_im_cron_task/main.go

@@ -0,0 +1,16 @@
+package main
+
+import (
+	"Open_IM/internal/cron_task"
+	"flag"
+	"fmt"
+	"time"
+)
+
+func main() {
+	var userID = flag.String("userID", "", "userID to clear msg and reset seq")
+	var workingGroupID = flag.String("workingGroupID", "", "workingGroupID to clear msg and reset seq")
+	flag.Parse()
+	fmt.Println(time.Now(), "start cronTask", *userID, *workingGroupID)
+	cronTask.StartCronTask(*userID, *workingGroupID)
+}

cmd/open_im_demo/Makefile

@@ -1,13 +1,25 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_demo
+NAME=open_im_demo
 BIN_DIR=../../bin/
 
 
+OS:= $(or $(os),linux)
+ARCH:=$(or $(arch),amd64)
 all: gotool build
 
+ifeq ($(OS),windows)
+
+BINARY_NAME=${NAME}.exe
+
+else
+
+BINARY_NAME=${NAME}
+
+endif
+
 build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
+	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} go build -ldflags="-w -s"
 
 run:
 	@go run ./
@@ -16,8 +28,7 @@ gotool:
 	go fmt ./
 	go vet ./
 
-install:
+install:build
-	make build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/open_im_demo/main.go

@@ -12,6 +12,9 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
+
+	promePkg "Open_IM/pkg/common/prometheus"
+
 	"github.com/gin-gonic/gin"
 )
 
@@ -20,10 +23,11 @@ func main() {
 	gin.SetMode(gin.ReleaseMode)
 	f, _ := os.Create("../logs/api.log")
 	gin.DefaultWriter = io.MultiWriter(f)
-
 	r := gin.Default()
 	r.Use(utils.CorsHandler())
-
+	if config.Config.Prometheus.Enable {
+		r.GET("/metrics", promePkg.PrometheusHandler())
+	}
 	authRouterGroup := r.Group("/demo")
 	{
 		authRouterGroup.POST("/code", register.SendVerificationCode)
@@ -31,17 +35,44 @@ func main() {
 		authRouterGroup.POST("/password", register.SetPassword)
 		authRouterGroup.POST("/login", register.Login)
 		authRouterGroup.POST("/reset_password", register.ResetPassword)
+		authRouterGroup.POST("/check_login", register.CheckLoginLimit)
+	}
+	demoRouterGroup := r.Group("/auth")
+	{
+		demoRouterGroup.POST("/code", register.SendVerificationCode)
+		demoRouterGroup.POST("/verify", register.Verify)
+		demoRouterGroup.POST("/password", register.SetPassword)
+		demoRouterGroup.POST("/login", register.Login)
+		demoRouterGroup.POST("/reset_password", register.ResetPassword)
+		demoRouterGroup.POST("/check_login", register.CheckLoginLimit)
+	}
+
+	//deprecated
+	cmsRouterGroup := r.Group("/cms_admin")
+	{
+		cmsRouterGroup.POST("/generate_invitation_code", register.GenerateInvitationCode)
+		cmsRouterGroup.POST("/query_invitation_code", register.QueryInvitationCode)
+		cmsRouterGroup.POST("/get_invitation_codes", register.GetInvitationCodes)
+
+		cmsRouterGroup.POST("/query_user_ip_limit_login", register.QueryUserIDLimitLogin)
+		cmsRouterGroup.POST("/add_user_ip_limit_login", register.AddUserIPLimitLogin)
+		cmsRouterGroup.POST("/remove_user_ip_limit_login", register.RemoveUserIPLimitLogin)
+
+		cmsRouterGroup.POST("/query_ip_register", register.QueryIPRegister)
+		cmsRouterGroup.POST("/add_ip_limit", register.AddIPLimit)
+		cmsRouterGroup.POST("/remove_ip_Limit", register.RemoveIPLimit)
 	}
 	defaultPorts := config.Config.Demo.Port
-	ginPort := flag.Int("port", defaultPorts[0], "get ginServerPort from cmd,default 42233 as port")
+	ginPort := flag.Int("port", defaultPorts[0], "get ginServerPort from cmd,default 10004 as port")
 	flag.Parse()
-	fmt.Println("start demo api server, port: ", *ginPort)
 	address := "0.0.0.0:" + strconv.Itoa(*ginPort)
 	if config.Config.Api.ListenIP != "" {
 		address = config.Config.Api.ListenIP + ":" + strconv.Itoa(*ginPort)
 	}
 	address = config.Config.CmsApi.ListenIP + ":" + strconv.Itoa(*ginPort)
-	fmt.Println("start demo api server address: ", address)
+	fmt.Println("start demo api server address: ", address, ", OpenIM version: ", constant.CurrentVersion, "\n")
+	go register.OnboardingProcessRoutine()
+	go register.ImportFriendRoutine()
 	err := r.Run(address)
 	if err != nil {
 		log.Error("", "run failed ", *ginPort, err.Error())

cmd/open_im_msg_gateway/Makefile

@@ -1,12 +1,24 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_msg_gateway
+NAME=open_im_msg_gateway
 BIN_DIR=../../bin/
 
+OS:= $(or $(os),linux)
+ARCH:=$(or $(arch),amd64)
 all: gotool build
 
+ifeq ($(OS),windows)
+
+BINARY_NAME=${NAME}.exe
+
+else
+
+BINARY_NAME=${NAME}
+
+endif
+
 build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
+	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} go build -ldflags="-w -s"
 
 run:
 	@go run ./
@@ -15,8 +27,7 @@ gotool:
 	go fmt ./
 	go vet ./
 
-install:
+install:build
-	make build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/open_im_msg_gateway/main.go

@@ -14,13 +14,15 @@ func main() {
 	log.NewPrivateLog(constant.LogFileName)
 	defaultRpcPorts := config.Config.RpcPort.OpenImMessageGatewayPort
 	defaultWsPorts := config.Config.LongConnSvr.WebsocketPort
+	defaultPromePorts := config.Config.Prometheus.MessageGatewayPrometheusPort
 	rpcPort := flag.Int("rpc_port", defaultRpcPorts[0], "rpc listening port")
 	wsPort := flag.Int("ws_port", defaultWsPorts[0], "ws listening port")
+	prometheusPort := flag.Int("prometheus_port", defaultPromePorts[0], "PushrometheusPort default listen port")
 	flag.Parse()
 	var wg sync.WaitGroup
 	wg.Add(1)
-	fmt.Println("start rpc/msg_gateway server, port: ", *rpcPort, *wsPort)
+	fmt.Println("start rpc/msg_gateway server, port: ", *rpcPort, *wsPort, *prometheusPort, ", OpenIM version: ", constant.CurrentVersion, "\n")
 	gate.Init(*rpcPort, *wsPort)
-	gate.Run()
+	gate.Run(*prometheusPort)
 	wg.Wait()
 }

cmd/open_im_msg_transfer/Makefile

@@ -1,13 +1,25 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_msg_transfer
+NAME=open_im_msg_transfer
 BIN_DIR=../../bin/
 
 
+OS:= $(or $(os),linux)
+ARCH:=$(or $(arch),amd64)
 all: gotool build
 
+ifeq ($(OS),windows)
+
+BINARY_NAME=${NAME}.exe
+
+else
+
+BINARY_NAME=${NAME}
+
+endif
+
 build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
+	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} go build -ldflags="-w -s"
 
 run:
 	@go run ./
@@ -16,8 +28,7 @@ gotool:
 	go fmt ./
 	go vet ./
 
-install:
+install:build
-	make build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/open_im_msg_transfer/main.go

@@ -2,8 +2,10 @@ package main
 
 import (
 	"Open_IM/internal/msg_transfer/logic"
+	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
+	"flag"
 	"fmt"
 	"sync"
 )
@@ -11,9 +13,11 @@ import (
 func main() {
 	var wg sync.WaitGroup
 	wg.Add(1)
+	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.MessageTransferPrometheusPort[0], "MessageTransferPrometheusPort default listen port")
+	flag.Parse()
 	log.NewPrivateLog(constant.LogFileName)
 	logic.Init()
-	fmt.Println("start msg_transfer server")
+	fmt.Println("start msg_transfer server ", ", OpenIM version: ", constant.CurrentVersion, "\n")
-	logic.Run()
+	logic.Run(*prometheusPort)
 	wg.Wait()
 }

cmd/open_im_push/Makefile

@@ -1,12 +1,24 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_push
+NAME=open_im_push
 BIN_DIR=../../bin/
 
+OS:= $(or $(os),linux)
+ARCH:=$(or $(arch),amd64)
 all: gotool build
 
+ifeq ($(OS),windows)
+
+BINARY_NAME=${NAME}.exe
+
+else
+
+BINARY_NAME=${NAME}
+
+endif
+
 build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
+	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} go build -ldflags="-w -s"
 
 run:
 	@go run ./
@@ -15,8 +27,7 @@ gotool:
 	go fmt ./
 	go vet ./
 
-install:
+install:build
-	make build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/open_im_push/main.go

@@ -13,12 +13,13 @@ import (
 func main() {
 	defaultPorts := config.Config.RpcPort.OpenImPushPort
 	rpcPort := flag.Int("port", defaultPorts[0], "rpc listening port")
+	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.MessageTransferPrometheusPort[0], "PushrometheusPort default listen port")
 	flag.Parse()
 	var wg sync.WaitGroup
 	wg.Add(1)
 	log.NewPrivateLog(constant.LogFileName)
-	fmt.Println("start push rpc server, port: ", *rpcPort)
+	fmt.Println("start push rpc server, port: ", *rpcPort, ", OpenIM version: ", constant.CurrentVersion, "\n")
 	logic.Init(*rpcPort)
-	logic.Run()
+	logic.Run(*prometheusPort)
 	wg.Wait()
 }

cmd/rpc/open_im_admin_cms/Makefile

@@ -1,12 +1,24 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_admin_cms
+NAME=open_im_admin_cms
 BIN_DIR=../../../bin/
 
+OS:= $(or $(os),linux)
+ARCH:=$(or $(arch),amd64)
 all: gotool build
 
+ifeq ($(OS),windows)
+
+BINARY_NAME=${NAME}.exe
+
+else
+
+BINARY_NAME=${NAME}
+
+endif
+
 build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
+	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} go build -ldflags="-w -s"
 
 run:
 	@go run ./
@@ -15,8 +27,7 @@ gotool:
 	go fmt ./
 	go vet ./
 
-install:
+install:build
-	make build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/rpc/open_im_admin_cms/main.go

@@ -3,6 +3,8 @@ package main
 import (
 	rpcMessageCMS "Open_IM/internal/rpc/admin_cms"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
+	promePkg "Open_IM/pkg/common/prometheus"
 	"flag"
 	"fmt"
 )
@@ -10,8 +12,15 @@ import (
 func main() {
 	defaultPorts := config.Config.RpcPort.OpenImAdminCmsPort
 	rpcPort := flag.Int("port", defaultPorts[0], "rpc listening port")
+	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.AdminCmsPrometheusPort[0], "adminCMSPrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start cms rpc server, port: ", *rpcPort)
+	fmt.Println("start cms rpc server, port: ", *rpcPort, ", OpenIM version: ", constant.CurrentVersion, "\n")
 	rpcServer := rpcMessageCMS.NewAdminCMSServer(*rpcPort)
+	go func() {
+		err := promePkg.StartPromeSrv(*prometheusPort)
+		if err != nil {
+			panic(err)
+		}
+	}()
 	rpcServer.Run()
 }

cmd/rpc/open_im_auth/Makefile

@@ -1,12 +1,24 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_auth
+NAME=open_im_auth
 BIN_DIR=../../../bin/
 
+OS:= $(or $(os),linux)
+ARCH:=$(or $(arch),amd64)
 all: gotool build
 
+ifeq ($(OS),windows)
+
+BINARY_NAME=${NAME}.exe
+
+else
+
+BINARY_NAME=${NAME}
+
+endif
+
 build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
+	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} go build -ldflags="-w -s"
 
 run:
 	@go run ./
@@ -15,8 +27,7 @@ gotool:
 	go fmt ./
 	go vet ./
 
-install:
+install:build
-	make build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/rpc/open_im_auth/main.go

@@ -3,6 +3,8 @@ package main
 import (
 	rpcAuth "Open_IM/internal/rpc/auth"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
+	promePkg "Open_IM/pkg/common/prometheus"
 	"flag"
 	"fmt"
 )
@@ -10,9 +12,15 @@ import (
 func main() {
 	defaultPorts := config.Config.RpcPort.OpenImAuthPort
 	rpcPort := flag.Int("port", defaultPorts[0], "RpcToken default listen port 10800")
+	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.AuthPrometheusPort[0], "authPrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start auth rpc server, port: ", *rpcPort)
+	fmt.Println("start auth rpc server, port: ", *rpcPort, ", OpenIM version: ", constant.CurrentVersion, "\n")
 	rpcServer := rpcAuth.NewRpcAuthServer(*rpcPort)
+	go func() {
+		err := promePkg.StartPromeSrv(*prometheusPort)
+		if err != nil {
+			panic(err)
+		}
+	}()
 	rpcServer.Run()
-
 }

cmd/rpc/open_im_cache/Makefile

@@ -1,12 +1,24 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_cache
+NAME=open_im_cache
 BIN_DIR=../../../bin/
 
+OS:= $(or $(os),linux)
+ARCH:=$(or $(arch),amd64)
 all: gotool build
 
+ifeq ($(OS),windows)
+
+BINARY_NAME=${NAME}.exe
+
+else
+
+BINARY_NAME=${NAME}
+
+endif
+
 build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
+	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} go build -ldflags="-w -s"
 
 run:
 	@go run ./
@@ -15,8 +27,7 @@ gotool:
 	go fmt ./
 	go vet ./
 
-install:
+install:build
-	make build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/rpc/open_im_cache/main.go

@@ -3,6 +3,9 @@ package main
 import (
 	rpcCache "Open_IM/internal/rpc/cache"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
+	promePkg "Open_IM/pkg/common/prometheus"
+
 	"flag"
 	"fmt"
 )
@@ -10,9 +13,15 @@ import (
 func main() {
 	defaultPorts := config.Config.RpcPort.OpenImCachePort
 	rpcPort := flag.Int("port", defaultPorts[0], "RpcToken default listen port 10800")
+	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.CachePrometheusPort[0], "cachePrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start auth rpc server, port: ", *rpcPort)
+	fmt.Println("start cache rpc server, port: ", *rpcPort, ", OpenIM version: ", constant.CurrentVersion, "\n")
 	rpcServer := rpcCache.NewCacheServer(*rpcPort)
+	go func() {
+		err := promePkg.StartPromeSrv(*prometheusPort)
+		if err != nil {
+			panic(err)
+		}
+	}()
 	rpcServer.Run()
-
 }

cmd/rpc/open_im_conversation/Makefile

@@ -1,12 +1,24 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_conversation
+NAME=open_im_conversation
 BIN_DIR=../../../bin/
 
+OS:= $(or $(os),linux)
+ARCH:=$(or $(arch),amd64)
 all: gotool build
 
+ifeq ($(OS),windows)
+
+BINARY_NAME=${NAME}.exe
+
+else
+
+BINARY_NAME=${NAME}
+
+endif
+
 build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
+	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} go build -ldflags="-w -s"
 
 run:
 	@go run ./
@@ -15,8 +27,7 @@ gotool:
 	go fmt ./
 	go vet ./
 
-install:
+install:build
-	make build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/rpc/open_im_conversation/main.go

@@ -3,6 +3,8 @@ package main
 import (
 	rpcConversation "Open_IM/internal/rpc/conversation"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
+	promePkg "Open_IM/pkg/common/prometheus"
 	"flag"
 	"fmt"
 )
@@ -10,9 +12,16 @@ import (
 func main() {
 	defaultPorts := config.Config.RpcPort.OpenImConversationPort
 	rpcPort := flag.Int("port", defaultPorts[0], "RpcConversation default listen port 11300")
+	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.ConversationPrometheusPort[0], "conversationPrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start conversation rpc server, port: ", *rpcPort)
+	fmt.Println("start conversation rpc server, port: ", *rpcPort, ", OpenIM version: ", constant.CurrentVersion)
 	rpcServer := rpcConversation.NewRpcConversationServer(*rpcPort)
+	go func() {
+		err := promePkg.StartPromeSrv(*prometheusPort)
+		if err != nil {
+			panic(err)
+		}
+	}()
 	rpcServer.Run()
 
 }

cmd/rpc/open_im_friend/Makefile

@@ -1,12 +1,25 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_friend
+NAME=open_im_friend
 BIN_DIR=../../../bin/
 
+OS:= $(or $(os),linux)
+ARCH:=$(or $(arch),amd64)
 all: gotool build
 
+ifeq ($(OS),windows)
+
+BINARY_NAME=${NAME}.exe
+
+else
+
+BINARY_NAME=${NAME}
+
+
+endif
+
 build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
+	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} go build -ldflags="-w -s"
 
 run:
 	@go run ./
@@ -15,8 +28,7 @@ gotool:
 	go fmt ./
 	go vet ./
 
-install:
+install:build
-	make build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/rpc/open_im_friend/main.go

@@ -3,6 +3,8 @@ package main
 import (
 	"Open_IM/internal/rpc/friend"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
+	promePkg "Open_IM/pkg/common/prometheus"
 	"flag"
 	"fmt"
 )
@@ -10,8 +12,15 @@ import (
 func main() {
 	defaultPorts := config.Config.RpcPort.OpenImFriendPort
 	rpcPort := flag.Int("port", defaultPorts[0], "get RpcFriendPort from cmd,default 12000 as port")
+	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.FriendPrometheusPort[0], "friendPrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start friend rpc server, port: ", *rpcPort)
+	fmt.Println("start friend rpc server, port: ", *rpcPort, ", OpenIM version: ", constant.CurrentVersion, "\n")
 	rpcServer := friend.NewFriendServer(*rpcPort)
+	go func() {
+		err := promePkg.StartPromeSrv(*prometheusPort)
+		if err != nil {
+			panic(err)
+		}
+	}()
 	rpcServer.Run()
 }

cmd/rpc/open_im_group/Makefile

@@ -1,12 +1,25 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_group
+NAME=open_im_group
 BIN_DIR=../../../bin/
 
+OS:= $(or $(os),linux)
+ARCH:=$(or $(arch),amd64)
 all: gotool build
 
+ifeq ($(OS),windows)
+
+BINARY_NAME=${NAME}.exe
+
+else
+
+BINARY_NAME=${NAME}
+
+
+endif
+
 build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
+	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} go build -ldflags="-w -s"
 
 run:
 	@go run ./
@@ -15,8 +28,7 @@ gotool:
 	go fmt ./
 	go vet ./
 
-install:
+install:build
-	make build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/rpc/open_im_group/main.go

@@ -3,6 +3,8 @@ package main
 import (
 	"Open_IM/internal/rpc/group"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
+	promePkg "Open_IM/pkg/common/prometheus"
 	"flag"
 	"fmt"
 )
@@ -10,8 +12,15 @@ import (
 func main() {
 	defaultPorts := config.Config.RpcPort.OpenImGroupPort
 	rpcPort := flag.Int("port", defaultPorts[0], "get RpcGroupPort from cmd,default 16000 as port")
+	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.GroupPrometheusPort[0], "groupPrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start group rpc server, port: ", *rpcPort)
+	fmt.Println("start group rpc server, port: ", *rpcPort, ", OpenIM version: ", constant.CurrentVersion, "\n")
 	rpcServer := group.NewGroupServer(*rpcPort)
+	go func() {
+		err := promePkg.StartPromeSrv(*prometheusPort)
+		if err != nil {
+			panic(err)
+		}
+	}()
 	rpcServer.Run()
 }

cmd/rpc/open_im_message_cms/Makefile

@@ -1,23 +0,0 @@
-.PHONY: all build run gotool install clean help
-
-BINARY_NAME=open_im_message_cms
-BIN_DIR=../../../bin/
-
-all: gotool build
-
-build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
-
-run:
-	@go run ./
-
-gotool:
-	go fmt ./
-	go vet ./
-
-install:
-	make build
-	mv ${BINARY_NAME} ${BIN_DIR}
-
-clean:
-	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/rpc/open_im_message_cms/main.go

@@ -1,17 +0,0 @@
-package main
-
-import (
-	rpcMessageCMS "Open_IM/internal/rpc/message_cms"
-	"Open_IM/pkg/common/config"
-	"flag"
-	"fmt"
-)
-
-func main() {
-	defaultPorts := config.Config.RpcPort.OpenImMessageCmsPort[0]
-	rpcPort := flag.Int("port", defaultPorts, "rpc listening port")
-	flag.Parse()
-	fmt.Println("start msg cms rpc server, port: ", *rpcPort)
-	rpcServer := rpcMessageCMS.NewMessageCMSServer(*rpcPort)
-	rpcServer.Run()
-}

cmd/rpc/open_im_msg/Makefile

@@ -1,12 +1,24 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_msg
+NAME=open_im_msg
 BIN_DIR=../../../bin/
 
+OS:= $(or $(os),linux)
+ARCH:=$(or $(arch),amd64)
 all: gotool build
 
+ifeq ($(OS),windows)
+
+BINARY_NAME=${NAME}.exe
+
+else
+
+BINARY_NAME=${NAME}
+
+endif
+
 build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
+	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} go build -ldflags="-w -s"
 
 run:
 	@go run ./
@@ -15,8 +27,7 @@ gotool:
 	go fmt ./
 	go vet ./
 
-install:
+install:build
-	make build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/rpc/open_im_msg/main.go

@@ -1,8 +1,10 @@
 package main
 
 import (
-	rpcChat "Open_IM/internal/rpc/msg"
+	"Open_IM/internal/rpc/msg"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
+	promePkg "Open_IM/pkg/common/prometheus"
 	"flag"
 	"fmt"
 )
@@ -10,8 +12,15 @@ import (
 func main() {
 	defaultPorts := config.Config.RpcPort.OpenImMessagePort
 	rpcPort := flag.Int("port", defaultPorts[0], "rpc listening port")
+	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.MessagePrometheusPort[0], "msgPrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start msg rpc server, port: ", *rpcPort)
+	fmt.Println("start msg rpc server, port: ", *rpcPort, ", OpenIM version: ", constant.CurrentVersion, "\n")
-	rpcServer := rpcChat.NewRpcChatServer(*rpcPort)
+	rpcServer := msg.NewRpcChatServer(*rpcPort)
+	go func() {
+		err := promePkg.StartPromeSrv(*prometheusPort)
+		if err != nil {
+			panic(err)
+		}
+	}()
 	rpcServer.Run()
 }

cmd/rpc/open_im_office/Makefile

@@ -1,12 +1,24 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_office
+NAME=open_im_office
 BIN_DIR=../../../bin/
 
+OS:= $(or $(os),linux)
+ARCH:=$(or $(arch),amd64)
 all: gotool build
 
+ifeq ($(OS),windows)
+
+BINARY_NAME=${NAME}.exe
+
+else
+
+BINARY_NAME=${NAME}
+
+endif
+
 build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
+	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} go build -ldflags="-w -s"
 
 run:
 	@go run ./
@@ -15,8 +27,7 @@ gotool:
 	go fmt ./
 	go vet ./
 
-install:
+install:build
-	make build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/rpc/open_im_office/main.go

@@ -3,6 +3,8 @@ package main
 import (
 	rpc "Open_IM/internal/rpc/office"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
+	promePkg "Open_IM/pkg/common/prometheus"
 	"flag"
 	"fmt"
 )
@@ -10,8 +12,15 @@ import (
 func main() {
 	defaultPorts := config.Config.RpcPort.OpenImOfficePort
 	rpcPort := flag.Int("port", defaultPorts[0], "rpc listening port")
+	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.OfficePrometheusPort[0], "officePrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start office rpc server, port: ", *rpcPort)
+	fmt.Println("start office rpc server, port: ", *rpcPort, ", OpenIM version: ", constant.CurrentVersion, "\n")
 	rpcServer := rpc.NewOfficeServer(*rpcPort)
+	go func() {
+		err := promePkg.StartPromeSrv(*prometheusPort)
+		if err != nil {
+			panic(err)
+		}
+	}()
 	rpcServer.Run()
 }

cmd/rpc/open_im_organization/Makefile

@@ -1,12 +1,24 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_organization
+NAME=open_im_organization
 BIN_DIR=../../../bin/
 
+OS:= $(or $(os),linux)
+ARCH:=$(or $(arch),amd64)
 all: gotool build
 
+ifeq ($(OS),windows)
+
+BINARY_NAME=${NAME}.exe
+
+else
+
+BINARY_NAME=${NAME}
+
+endif
+
 build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
+	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} go build -ldflags="-w -s"
 
 run:
 	@go run ./
@@ -15,8 +27,7 @@ gotool:
 	go fmt ./
 	go vet ./
 
-install:
+install:build
-	make build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/rpc/open_im_organization/main.go

@@ -3,6 +3,8 @@ package main
 import (
 	"Open_IM/internal/rpc/organization"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
+	promePkg "Open_IM/pkg/common/prometheus"
 	"flag"
 	"fmt"
 )
@@ -10,8 +12,15 @@ import (
 func main() {
 	defaultPorts := config.Config.RpcPort.OpenImOrganizationPort
 	rpcPort := flag.Int("port", defaultPorts[0], "get RpcOrganizationPort from cmd,default 11200 as port")
+	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.OrganizationPrometheusPort[0], "organizationPrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start organization rpc server, port: ", *rpcPort)
+	fmt.Println("start organization rpc server, port: ", *rpcPort, ", OpenIM version: ", constant.CurrentVersion, "\n")
 	rpcServer := organization.NewServer(*rpcPort)
+	go func() {
+		err := promePkg.StartPromeSrv(*prometheusPort)
+		if err != nil {
+			panic(err)
+		}
+	}()
 	rpcServer.Run()
 }

cmd/rpc/open_im_statistics/Makefile

@@ -1,23 +0,0 @@
-.PHONY: all build run gotool install clean help
-
-BINARY_NAME=open_im_statistics
-BIN_DIR=../../../bin/
-
-all: gotool build
-
-build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
-
-run:
-	@go run ./
-
-gotool:
-	go fmt ./
-	go vet ./
-
-install:
-	make build
-	mv ${BINARY_NAME} ${BIN_DIR}
-
-clean:
-	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/rpc/open_im_statistics/main.go

@@ -1,17 +0,0 @@
-package main
-
-import (
-	"Open_IM/internal/rpc/statistics"
-	"Open_IM/pkg/common/config"
-	"flag"
-	"fmt"
-)
-
-func main() {
-	defaultPorts := config.Config.RpcPort.OpenImStatisticsPort
-	rpcPort := flag.Int("port", defaultPorts[0], "rpc listening port")
-	flag.Parse()
-	fmt.Println("start statistics rpc server, port: ", *rpcPort)
-	rpcServer := statistics.NewStatisticsServer(*rpcPort)
-	rpcServer.Run()
-}

cmd/rpc/open_im_user/Makefile

@@ -1,12 +1,24 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_user
+NAME=open_im_user
 BIN_DIR=../../../bin/
 
+OS:= $(or $(os),linux)
+ARCH:=$(or $(arch),amd64)
 all: gotool build
 
+ifeq ($(OS),windows)
+
+BINARY_NAME=${NAME}.exe
+
+else
+
+BINARY_NAME=${NAME}
+
+endif
+
 build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
+	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} go build -ldflags="-w -s"
 
 run:
 	@go run ./
@@ -15,8 +27,7 @@ gotool:
 	go fmt ./
 	go vet ./
 
-install:
+install:build
-	make build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/rpc/open_im_user/main.go

@@ -3,6 +3,8 @@ package main
 import (
 	"Open_IM/internal/rpc/user"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
+	promePkg "Open_IM/pkg/common/prometheus"
 	"flag"
 	"fmt"
 )
@@ -10,8 +12,15 @@ import (
 func main() {
 	defaultPorts := config.Config.RpcPort.OpenImUserPort
 	rpcPort := flag.Int("port", defaultPorts[0], "rpc listening port")
+	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.UserPrometheusPort[0], "userPrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start user rpc server, port: ", *rpcPort)
+	fmt.Println("start user rpc server, port: ", *rpcPort, ", OpenIM version: ", constant.CurrentVersion, "\n")
 	rpcServer := user.NewUserServer(*rpcPort)
+	go func() {
+		err := promePkg.StartPromeSrv(*prometheusPort)
+		if err != nil {
+			panic(err)
+		}
+	}()
 	rpcServer.Run()
 }

config/config.yaml

@@ -2,64 +2,75 @@
 # The class cannot be named by Pascal or camel case.
 # If it is not used, the corresponding structure will not be set,
 # and it will not be read naturally.
-serverversion: 2.0.0
+serverversion: 2.3.1
 #---------------Infrastructure configuration---------------------#
 etcd:
   etcdSchema: openim  #默认即可
   etcdAddr: [ 127.0.0.1:2379 ] #单机部署时，默认即可
-
+  userName:
-k8sMod: false #开启k8s模式 使用pod里面环境变量请求services调用服务 而并非etcd
+  password:
+  secret:
 
 mysql:
   dbMysqlAddress: [ 127.0.0.1:13306 ] #mysql地址 目前仅支持单机，默认即可
-  dbMysqlUserName: root #mysql用户名，建议修改
+  dbMysqlUserName:  #mysql用户名，建议修改
-  dbMysqlPassword: openIM # mysql密码，建议修改
+  dbMysqlPassword:  # mysql密码，建议修改
   dbMysqlDatabaseName: openIM_v2 #默认即可
   dbTableName: eMsg #默认即可
   dbMsgTableNum: 1
-  dbMaxOpenConns: 20
+  dbMaxOpenConns: 100
   dbMaxIdleConns: 10
-  dbMaxLifeTime: 120
+  dbMaxLifeTime: 5
+  logLevel: 1 #1=slient 2=error 3=warn 4=info
+  slowThreshold: 500
 
 mongo:
   dbUri: ""#当dbUri值不为空则直接使用该值
-  dbAddress: 127.0.0.1:37017  #单机时为mongo地址，使用分片集群时，为mongos地址 默认即可
+  #dbAddress: 127.0.0.1:37017  #单机时为mongo地址，使用分片集群时，为mongos地址 默认即可
+  dbAddress: [ 127.0.0.1:37017 ]  #单机时为mongo地址，使用分片集群时，为mongos地址 默认即可
   dbDirect: false
   dbTimeout: 60
   dbDatabase: openIM  #mongo db 默认即可
   dbSource: admin
-  dbUserName: #mongo用户名，建议先不设置
+  dbUserName:  #mongo用户名，建议先不设置
-  dbPassword: #mongo密码，建议先不设置
+  dbPassword:   #mongo密码，建议先不设置
   dbMaxPoolSize: 100
   dbRetainChatRecords: 3650 #mongo保存离线消息时间（天），根据需求修改
+  chatRecordsClearTime: "0 3 * * *" # 每天凌晨3点清除消息，该配置和linux定时任务一样， 清理操作建议设置在用户活跃少的时候 # 0 3 * * *
 
 redis:
   dbAddress: [ 127.0.0.1:16379 ] #redis地址 单机时，填写一个地址即可，使用redis集群时候，填写集群中多个节点地址（主从地址都可以填写，增加容灾能力），默认即可
   dbMaxIdle: 128
   dbMaxActive: 0
   dbIdleTimeout: 120
-  dbPassWord: openIM #redis密码 建议修改
+  dbUserName:     #only redis version 6.0+ need username
+  dbPassWord:  #redis密码 建议修改
   enableCluster: false #如果外部redis以集群方式启动，需要打开此开关
 
 kafka:
+  SASLUserName: 
+  SASLPassword:
   ws2mschat:
     addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可
-    topic: "ws2ms_chat"
+    topic: "ws2ms_chat" #用于mongo和mysql保存消息
-  ws2mschatoffline:
+#  ws2mschatoffline:
-    addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可
+#    addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可
-    topic: "ws2ms_chat_offline"
+#    topic: "ws2ms_chat_offline" #原为离线用户消息处理，目前暂时弃用
   msgtomongo:
     addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可
     topic: "msg_to_mongo"
   ms2pschat:
     addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可
-    topic: "ms2ps_chat"
+    topic: "ms2ps_chat" #消息push
+  msgtomodify:
+    addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可
+    topic: "msg_to_modify"
   consumergroupid:
     msgToTransfer: mongo
     msgToMongo: mongo_ex
     msgToMySql: mysql
     msgToPush: push
-
+    msgToModify: modify
 
 
 #---------------Internal service configuration---------------------#
@@ -70,11 +81,11 @@ kafka:
 #如果是单机模式，用0.0.0.0或者不填，默认即可
 serverip: 0.0.0.0
 
-rpcRegisterIP: 127.0.0.1
+#作为rpc时，注册到etcd的地址，单机默认即可，如果是集群部署，需要修改（具体使用内网地址还是外网地址，要依情况而定，目的是api/gateway能访问到）
+rpcRegisterIP:
+#默认即可
 listenIP: 0.0.0.0
 
-
-
 # endpoints 内部组件间访问的端点host名称，访问时，可以内部直接访问 host:port 来访问
 endpoints:
   api: openim_api
@@ -86,9 +97,7 @@ endpoints:
   rpc_group: openim_rpc_group
   rpc_msg: openim_rpc_msg
   rpc_user: openim_rpc_user
-  rpc_statistic: openim_rpc_statistic
   rpc_admin_cms: openim_rpc_admin_cms
-  rpc_message_cms: openim_rpc_admin_cms
   rpc_office: openim_rpc_office
 
 api:
@@ -100,34 +109,47 @@ cmsapi:
 sdk:
   openImSdkWsPort: [ 10003 ] #jssdk服务端口，默认即可，项目中使用jssdk才需开放此端口或做nginx转发
   dataDir: [ ../db/sdk/ ]
+  openImWsAddress: ws://127.0.0.1:10001
+  openImApiAddress: http://127.0.0.1:10002
+
 #对象存储服务，以下配置二选一，目前支持两种，腾讯云和minio，二者配置好其中一种即可（如果使用minio参考https://doc.rentsoft.cn/#/qa/minio搭建minio服务器）
 credential: #腾讯cos，发送图片、视频、文件时需要，请自行申请后替换，必须修改
   tencent:
-    appID: 1302656840
+    appID:
-    region: ap-chengdu
+    region:
-    bucket: echat-1302656840
+    bucket:
-    secretID: AKIDGNYVChzIQinu7QEgtNp0hnNgqcV8vZTC1
+    secretID:
-    secretKey: kz15vW83qM6dBUWIq681eBZA0c0vlIbe1
+    secretKey:
   minio: #MinIO 发送图片、视频、文件时需要，请自行申请后替换，必须修改。 客户端初始化InitSDK，中 object_storage参数为minio
     bucket: openim # 存储内容桶
     appBucket: app # 存储app的桶
     location: us-east-1
-    endpoint: http://127.0.0.1:10005 #minio外网ip 这个ip是给客户端访问的
+    endpoint:  #minio外网ip 这个ip是给客户端访问的
-    endpointInner: http://127.0.0.1:10005 #minio内网地址 如果im server 可以通过内网访问到 minio就可以填写
+    endpointInner: http://127.0.0.1:10005 #minio内网地址 如果im server 可以通过内网访问到 minio就可以
     endpointInnerEnable: true #是否启用minio内网地址 启用可以让桶初始化，IM server连接minio走内网地址访问
-    accessKeyID: user12345
+    accessKeyID:
-    secretAccessKey: key12345
+    secretAccessKey:
+    storageTime: 50 #文件在minio中保存的时间
+    isDistributedMod: false # 是否分布式多硬盘部署 默认docker-compose中为false
   ali: # ali oss
-    regionID: "oss-cn-beijing"
+    regionID:
-    accessKeyID: ""
+    accessKeyID:
-    accessKeySecret: ""
+    accessKeySecret:
-    stsEndpoint: "sts.cn-beijing.aliyun.com"
+    stsEndpoint:
-    ossEndpoint: "oss-cn-beijing.aliyuncs.com"
+    ossEndpoint:
-    bucket: "bucket1"
+    bucket:
-    finalHost: "http://bucket1.oss-cn-beijing.aliyuncs.com"
+    finalHost:
-    stsDurationSeconds: 3600
+    stsDurationSeconds:
-    OssRoleArn: "acs:ram::xxx:role/xxx"
+    OssRoleArn:
-
+  aws:
+    accessKeyID:                            #AssumeRole用户关联的accessKeyID
+    accessKeySecret:                        #AssumeRole用户关联的accessKeySecrect
+    region:                                 #分区
+    bucket:                                 #桶
+    finalHost:                              #对外Host
+    roleArn:                                #RoleArn
+    externalId:                             #角色扩展Id
+    roleSessionName:                        #角色SESSION名称
 
 
 rpcport: #rpc服务端口 默认即可
@@ -138,13 +160,12 @@ rpcport: #rpc服务端口 默认即可
   openImGroupPort: [ 10150 ]
   openImAuthPort: [ 10160 ]
   openImPushPort: [ 10170 ]
-  openImStatisticsPort: [ 10180 ]
-  openImMessageCmsPort: [ 10190 ]
   openImAdminCmsPort: [ 10200 ]
   openImOfficePort: [ 10210 ]
   openImOrganizationPort: [ 10220 ]
   openImConversationPort: [ 10230 ]
-  openImCachePort: [10240]
+  openImCachePort: [ 10240 ]
+  openImRealTimeCommPort: [ 11300 ]
   c2c:
     callbackBeforeSendMsg:
       switch: false
@@ -158,13 +179,11 @@ rpcport: #rpc服务端口 默认即可
 rpcregistername: #rpc注册服务名，默认即可
   openImUserName: User
   openImFriendName: Friend
-  openImOfflineMessageName: OfflineMessage
+  openImMsgName: Msg
   openImPushName: Push
-  openImOnlineMessageRelayName: OnlineMessageRelay
+  openImRelayName: Relay
   openImGroupName: Group
   openImAuthName: Auth
-  openImStatisticsName: Statistics
-  openImMessageCMSName: MessageCMS
   openImAdminCMSName: AdminCMS
   openImOfficeName: Office
   openImOrganizationName: Organization
@@ -174,7 +193,7 @@ rpcregistername: #rpc注册服务名，默认即可
 log:
   storageLocation: ../logs/
   rotationTime: 24
-  remainRotationCount: 3 #日志数量
+  remainRotationCount: 2 #日志数量
   #日志级别 6表示全都打印，测试阶段建议设置为6
   remainLogLevel: 6
   elasticSearchSwitch: false
@@ -197,23 +216,41 @@ longconnsvr:
 push:
   tpns: #腾讯推送，暂未测试 暂不要使用
     ios:
-      accessID: 1600018281
+      accessID:
-      secretKey: 3cd68a77a95b89e5089a1aca523f318f
+      secretKey:
     android:
-      accessID: 111
+      accessID:
-      secretKey: 111
+      secretKey:
-    enable: false
+    enable: false # true or false (bool)
   jpns: #极光推送 在极光后台申请后，修改以下四项，必须修改
-    appKey: cf47465a368f24c659608e7e
+    appKey:
-    masterSecret: 02204efe3f3832947a236ee5
+    masterSecret:
-    pushUrl: "https://api.jpush.cn/v3/push"
+    pushUrl:
-    pushIntent: "intent:#Intent;component=io.openim.app.enterprisechat/io.openim.app.enterprisechat.MainActivity;end"
+    pushIntent:
-    enable: true
+    enable: false # true or false (bool)
-  getui:  #个推推送，暂未测试 暂不要使用
+  getui:  #个推推送
-    pushUrl: "https://restapi.getui.com/v2/$appId"
+    pushUrl: 
     masterSecret: ""
     appKey: ""
     intent: ""
+    enable: # true or false (bool)
+    channelID: ""
+    channelName: ""
+    channel:
+      HW:
+        category: 
+      XM:
+        channelID: 
+      OPPO:
+        channelID:  
+  fcm:  #firebase cloud message 消息推送
+    serviceAccount:   #帐号文件，此处需要改修配置，并且这个文件放在 config目录下
+    enable: false
+  mob:  #袤博推送
+    appKey:   #帐号文件，此处需要改修配置，并且这个文件放在 config目录下
+    pushUrl:
+    scheme:
+    appSecret:
     enable: false
 
 
@@ -224,12 +261,12 @@ manager:
   secrets: [ "openIM1","openIM2", "openIM333", "openIMAdmin"]
   appSysNotificationName: "系统通知"
 
-secret: tuoyun
+secret:
 # 多端互踢策略
 # 1：多平台登录：Android、iOS、Windows、Mac 每种平台只能一个在线，web端可以多个同时在线
 multiloginpolicy: 1
 
-#chat log insert to db
+#msg log insert to db
 chatpersistencemysql: true
 #可靠性存储
 reliablestorage: false
@@ -242,11 +279,11 @@ singleMessageHasReadReceiptEnable: true
 
 #token config
 tokenpolicy:
-  accessSecret: "open_im_server" #token生成相关，默认即可
+  accessSecret:  #token生成相关，默认即可
   # Token effective time day as a unit
-  accessExpire: 3650 #token过期时间（天） 默认即可
+  accessExpire:  #token过期时间（天） 默认即可
 messageverify:
-  friendVerify: false
+  friendVerify:
 
 #  c2c:
 #    callbackBeforeSendMsg:
@@ -261,6 +298,7 @@ messageverify:
 iospush:
   pushSound: "xxx"
   badgeCount: true
+  production: false
 
 callback:
   # callback url 需要自行更换callback url
@@ -280,7 +318,10 @@ callback:
   callbackAfterSendGroupMsg:
     enable: false
     callbackTimeOut: 2
-  callbackWordFilter:
+  callbackAfterConsumeGroupMsg:
+    enable: false
+    callbackTimeOut: 2
+  callbackMsgModify:
     enable: false
     callbackTimeOut: 2
     callbackFailedContinue: true
@@ -290,10 +331,42 @@ callback:
   callbackUserOffline:
     enable: false
     callbackTimeOut: 2
+  callbackUserKickOff:
+    enable: false
+    callbackTimeOut: 2
   callbackOfflinePush:
     enable: false
     callbackTimeOut: 2
     callbackFailedContinue: true # 回调超时是否继续离线推送
+  callbackOnlinePush:
+    enable: false
+    callbackTimeOut: 2
+    callbackFailedContinue: true # 回调超时是否继续离线推送
+  callbackSuperGroupOnlinePush:
+    enable: false
+    callbackTimeOut: 2
+    callbackFailedContinue: true # 回调超时是否继续离线推送
+  callbackBeforeAddFriend:
+    enable: false
+    callbackTimeOut: 2
+    callbackFailedContinue: true # 回调超时是否继续
+  callbackBeforeCreateGroup:
+    enable: false
+    callbackTimeOut: 2
+    callbackFailedContinue: true # 回调超时是否继续
+  callbackBeforeMemberJoinGroup:
+    enable: false
+    callbackTimeOut: 2
+    callbackFailedContinue: true # 回调超时是否继续
+  callbackBeforeSetGroupMemberInfo:
+    enable: false
+    callbackTimeOut: 2
+    callbackFailedContinue: true # 回调超时是否继续
+  callbackSetMessageReactionExtensions:
+    enable: false
+    callbackTimeOut: 2
+    callbackFailedContinue: true # 回调超时是否继续
+
 
 notification:
   groupCreated:
@@ -342,7 +415,7 @@ notification:
       desc: "memberQuit desc"
       ext: "memberQuit ext"
     defaultTips:
-      tips: "quit group chat"  # group info changed by xx
+      tips: "quit group msg"  # group info changed by xx
 
   groupApplicationAccepted:
     conversation:
@@ -614,6 +687,19 @@ notification:
     defaultTips:
       tips: "Remove a blocked user"
 
+  friendInfoUpdated:
+    conversation:
+      reliabilityLevel: 2
+      unreadCount: false
+    offlinePush:
+      switch: true
+      title: "friend info updated"
+      desc: "friend info updated"
+      ext: "friend info updated"
+    defaultTips:
+      tips: "friend info updated"
+
+
   #####################user#########################
   userInfoUpdated:
     conversation:
@@ -630,7 +716,7 @@ notification:
   #####################conversation#########################
   conversationOptUpdate:
     conversation:
-      reliabilityLevel: 2
+      reliabilityLevel: 1
       unreadCount: false
       offlinePush:
         switch: true
@@ -688,22 +774,60 @@ demo:
   listenIP: 0.0.0.0
   #demo对外服务端口，默认即可，需要开放此端口或做nginx转发
   openImDemoPort: [ 10004 ]
-  alismsverify: #阿里云短信配置，在阿里云申请成功后修改以下四项，必须修改
+  alismsverify: #阿里云短信配置，在阿里云申请成功后修改以下四项，enable为true则必须修改，阿里云为默认短信验证方式
-    accessKeyId: LTAI5tJPkn4HuuePdiLdGqe7
+    accessKeyId:
-    accessKeySecret: 4n9OJ7ZCVN1U6KeHDAtOyNeVZcjOuV
+    accessKeySecret:
-    signName: 托云信息技术
+    signName:
-    verificationCodeTemplateCode: SMS_226810164
+    verificationCodeTemplateCode:
+    enable: false
+  tencentsms: #腾讯云短信配置，在腾讯云申请成功后，修改以下选项，enable为true则必须修改
+    appID:
+    region:
+    secretID:
+    secretKey:
+    signName:
+    verificationCodeTemplateCode:
+    enable: true
   superCode: 666666 #超级验证码，建议修改掉，收不到短信验证码时可以用此替代
+  needInvitationCode: false
   #  second
-  codeTTL: 300
+  codeTTL: 60
+  useSuperCode: true
   mail: #仅支持qq邮箱，具体操作参考 https://service.mail.qq.com/cgi-bin/help?subtype=1&id=28&no=1001256 必须修改
-    title: "openIM"
+    title:
-    senderMail: "765567899@qq.com"
+    senderMail:
-    senderAuthorizationCode: "gxyausfoevlzbfag"
+    senderAuthorizationCode:
-    smtpAddr: "smtp.qq.com"
+    smtpAddr:
-    smtpPort: 25   #需开放此端口 出口方向
+    smtpPort:     #需开放此端口 出口方向
   testDepartMentID: 001
   imAPIURL: http://127.0.0.1:10002
+  onboardProcess: false # 是否开启注册流程
+  createOrganizationUserAndJoinDepartment: false
+  joinDepartmentIDList: [] # 用户注册进来默认加的部门ID列表 不填就随机
+  joinDepartmentGroups: false # 注册是否加部门群
+  oaNotification: false # 注册是否发送OA通知
+
+workMoment:
+  onlyFriendCanSee: false
+
 
 rtc:
   signalTimeout: 35
+
+# prometheus每个服务监听的端口数量需要和rpc port保持一致
+prometheus:
+  enable: false
+  userPrometheusPort: [ 20110 ]
+  friendPrometheusPort: [ 20120 ]
+  messagePrometheusPort: [ 20130 ]
+  messageGatewayPrometheusPort: [ 20140 ]
+  groupPrometheusPort: [ 20150 ]
+  authPrometheusPort: [ 20160 ]
+  pushPrometheusPort: [ 20170 ]
+  adminCmsPrometheusPort: [ 20200 ]
+  officePrometheusPort: [ 20210 ]
+  organizationPrometheusPort: [ 20220 ]
+  conversationPrometheusPort: [ 20230 ]
+  cachePrometheusPort: [ 20240 ]
+  realTimeCommPrometheusPort: [ 21300 ]
+  messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ] # 端口数量和 script/path_info.cfg  msg_transfer_service_num保持一致

config/open-im-ng-example.conf

@@ -0,0 +1,205 @@
+upstream im_msg_gateway{
+            server 127.0.0.1:10001;        #IM消息服务器地址 根据部署情况可指定多台
+            }
+upstream im_api{
+            server 127.0.0.1:10002;        #IM群组用户api服务器地址 根据部署情况可指定多台
+            }
+upstream im_jssdk_gateway{
+            server 127.0.0.1:10003;        #IM jssdk服务器地址 根据部署情况可指定多台
+            }
+upstream im_demo{
+            server 127.0.0.1:10004;        #IM demo登录注册服务器地址 根据部署情况可指定多台
+            }
+upstream storage {
+            server 127.0.0.1:10005;                #MinIO服务器地址 暂时支持1台
+            }
+upstream im_admin{
+            server 127.0.0.1:10006;        #IM admin服务器地址 根据部署情况可指定多台
+            }
+upstream im_grafana{
+            server 127.0.0.1:10007;        #IM 统计服务器地址 docker-compose启动所在机器
+            }
+upstream im_chat{
+            server 127.0.0.1:10008;        #IM 商业版登录注册服务器地址 根据部署情况可指定多台
+            }
+upstream im_complete_admin{
+            server 127.0.0.1:10009;         #IM 商业版admin地址 根据部署情况可指定多台
+            }
+upstream im_organization{
+            server 127.0.0.1:10010;        #IM 商业版组织架构服务器地址 根据部署情况可指定多台
+            }
+upstream im_open_rtc{
+            server 127.0.0.1:7880;        #rtc 音视频通话 服务器地址 根据部署情况可指定多台
+            }
+
+server {
+        listen 443;
+        server_name web.rentsoft.cn;   #1 web im 端 域名
+
+        ssl on;
+        ssl_certificate /etc/nginx/conf.d/ssl/web.rentsoft.cn.crt; #2 证书
+        ssl_certificate_key /etc/nginx/conf.d/ssl/web.rentsoft.cn.key; #3 证书
+        ssl_session_timeout 5m;
+		gzip on;
+		gzip_min_length 1k;
+		gzip_buffers 4 16k;
+		gzip_comp_level 2;
+		gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png application/wasm;
+		gzip_vary off;
+		gzip_disable "MSIE [1-6]\.";
+        error_page 405 =200 $uri;
+
+	default_type application/wasm;
+        location /{ #web demo
+                proxy_set_header Host $host;
+                proxy_set_header X-Real-Ip $remote_addr;
+                proxy_set_header X-Forwarded-For $remote_addr;
+                proxy_set_header X-NginX-Proxy true;
+                root /data1/online/Pc-Web-Demo/build/; # web im静态资源存放路径
+                index index.html;
+                try_files $uri $uri/ /index.html;
+        }
+        location /msg_gateway { #10001 ws
+                proxy_http_version 1.1;
+                proxy_set_header Upgrade $http_upgrade;
+                proxy_set_header Connection "Upgrade";
+                proxy_set_header X-real-ip $remote_addr;
+                proxy_set_header X-Forwarded-For $remote_addr;
+                proxy_pass http://im_msg_gateway/;
+        }
+        location ^~/api/ { #10002 api
+                proxy_http_version 1.1;
+                proxy_set_header Upgrade $http_upgrade;
+                proxy_set_header Connection "Upgrade";
+                proxy_set_header X-real-ip $remote_addr;
+                proxy_set_header X-Forwarded-For $remote_addr;
+                proxy_pass http://im_api/;
+               }
+        location /jssdk_gateway { #10003 jssdk
+                proxy_http_version 1.1;
+                proxy_set_header Upgrade $http_upgrade;
+                proxy_set_header Connection "Upgrade";
+                proxy_set_header X-real-ip $remote_addr;
+                proxy_set_header X-Forwarded-For $remote_addr;
+                proxy_pass http://im_jssdk_gateway/;
+               }
+        location ^~/demo/ { # 10004 demo
+                proxy_http_version 1.1;
+                proxy_set_header Upgrade $http_upgrade;
+                proxy_set_header Connection "Upgrade";
+                proxy_set_header X-real-ip $remote_addr;
+                proxy_set_header X-Forwarded-For $remote_addr;
+                proxy_pass http://im_demo/;
+               }
+        location ^~/admin/ { #10006 admin
+                proxy_http_version 1.1;
+                proxy_set_header Upgrade $http_upgrade;
+                proxy_set_header Connection "Upgrade";
+                proxy_set_header X-real-ip $remote_addr;
+                proxy_set_header X-Forwarded-For $remote_addr;
+                proxy_pass http://im_admin/;
+               }
+        location ^~/grafana/ { #10007  prometheus
+                proxy_http_version 1.1;
+                proxy_set_header Upgrade $http_upgrade;
+                proxy_set_header Connection "Upgrade";
+                proxy_set_header X-real-ip $remote_addr;
+                proxy_set_header X-Forwarded-For $remote_addr;
+                proxy_pass http://im_grafana/;
+               }
+        location ^~/chat/ { #10008 chat login
+                proxy_http_version 1.1;
+                proxy_set_header Upgrade $http_upgrade;
+                proxy_set_header Connection "Upgrade";
+                proxy_set_header X-real-ip $remote_addr;
+                proxy_set_header X-Forwarded-For $remote_addr;
+                proxy_pass http://im_chat/;
+               }
+        location ^~/complete_admin/ { #10009  admin
+                proxy_http_version 1.1;
+                proxy_set_header Upgrade $http_upgrade;
+                proxy_set_header Connection "Upgrade";
+                proxy_set_header X-real-ip $remote_addr;
+                proxy_set_header X-Forwarded-For $remote_addr;
+                proxy_pass http://im_complete_admin/;
+               }
+        location ^~/organization/ { #10010 organization
+                proxy_http_version 1.1;
+                proxy_set_header Upgrade $http_upgrade;
+                proxy_set_header Connection "Upgrade";
+                proxy_set_header X-real-ip $remote_addr;
+                proxy_set_header X-Forwarded-For $remote_addr;
+                proxy_pass http://im_organization/;
+               }
+        location ^~/open_rtc/ {  #7880 rtc
+                proxy_http_version 1.1;
+                proxy_set_header Upgrade $http_upgrade;
+                proxy_set_header Connection "Upgrade";
+                proxy_set_header X-real-ip $remote_addr;
+                proxy_set_header X-Forwarded-For $remote_addr;
+                proxy_pass http://im_open_rtc/;
+              }
+}
+
+server {
+        listen 80;
+        server_name web.rentsoft.cn ; #1 web im 端 域名
+        rewrite ^(.*)$ https://${server_name}$1 permanent;
+}
+
+server {
+        ssl_session_timeout 5m;
+	listen 443;
+        server_name storage.rentsoft.cn; #1 MinIO存储域名
+        ssl on;
+        ssl_certificate /etc/nginx/conf.d/ssl/storage.rentsoft.cn.crt; #证书
+        ssl_certificate_key /etc/nginx/conf.d/ssl/storage.rentsoft.cn.key;    #证书
+        gzip on;
+        gzip_min_length 1k;
+        gzip_buffers 4 16k;
+        gzip_comp_level 2;
+        gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
+        gzip_vary off;
+        gzip_disable "MSIE [1-6]\.";
+    location / {
+            proxy_pass http://storage;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header Host $http_host;
+            proxy_http_version 1.1;
+            client_max_body_size 8000M;
+    }
+}
+
+
+server {
+        listen 443;
+        server_name admin.rentsoft.cn; #后台管理域名
+        ssl on;
+        ssl_certificate /etc/nginx/conf.d/ssl/admin.rentsoft.cn.crt; # 证书
+        ssl_certificate_key /etc/nginx/conf.d/ssl/admin.rentsoft.cn.key; #证书
+        ssl_session_timeout 5m;
+        gzip on;
+        gzip_min_length 1k;
+        gzip_buffers 4 16k;
+        gzip_comp_level 2;
+        gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
+        gzip_vary off;
+        gzip_disable "MSIE [1-6]\.";
+        location / {
+                proxy_set_header Host $host;
+                proxy_set_header X-Real-Ip $remote_addr;
+                proxy_set_header X-Forwarded-For $remote_addr;
+                proxy_set_header X-NginX-Proxy true;
+                root /data1/online/Open-IM-Admin/dist/; #管理后台web静态资源存放路径
+                index index.html;
+                try_files $uri $uri/ /index.html;
+        }
+}
+
+server {
+        listen 80;
+        server_name admin.rentsoft.cn; #管理后台 域名
+        rewrite ^(.*)$ https://${server_name}$1 permanent;
+}

config/usualConfig.yaml

@@ -0,0 +1,43 @@
+etcd:
+  userName:
+  password:
+  secret: openIM123 # etcd 配置密钥
+
+mysql:
+  dbMysqlUserName: root #mysql用户名
+  dbMysqlPassword: openIM123 # mysql密码
+
+mongo:
+  dbUserName: root #mongo用户名
+  dbPassword: openIM123  #mongo密码
+
+redis:
+  dbUserName:
+  dbPassWord: openIM123 #redis密码
+
+kafka:
+  SASLUserName:
+  SASLPassword:
+
+credential:
+  minio:
+    endpoint: http://127.0.0.1:10005 #发图片视频文件需要填写
+    accessKeyID: root
+    secretAccessKey: openIM123
+
+secret: tuoyun #建议修改
+
+tokenpolicy:
+  accessSecret: "open_im_server" #token生成相关 建议修改
+  accessExpire: 90 #token过期时间（天） 默认即可
+
+messageverify:
+  friendVerify: false #发送消息是否验证好友关系 false表示不验证好友关系
+
+push:
+  getui:
+    pushUrl: "https://restapi.getui.com/v2/$appId"
+    masterSecret: ""  #需添加
+    appKey: ""  #需添加
+    enable: false  #true启动个推推送
+

deploy/config.example.yaml

@@ -79,11 +79,11 @@ cmsapi:
 
 credential:
   tencent:
-    appID: 1302656840
+    appID:  
-    region: ap-chengdu
+    region:    
-    bucket: echat-1302656840
+    bucket:  
-    secretID: AKIDGNYVChzIQinu7QEgtNp0hnNgqcV8vZTC
+    secretID:  
-    secretKey: kz15vW83qM6dBUWIq681eBZA0c0vlIbe
+    secretKey:  
 
 
 rpcport:
@@ -131,16 +131,16 @@ longconnsvr:
 push:
   tpns:
     ios:
-      accessID: 1600018281
+      accessID:  
-      secretKey: 3cd68a77a95b89e5089a1aca523f318f
+      secretKey:  
     android:
-      accessID: 111
+      accessID:  
-      secretKey: 111
+      secretKey:  
   jpns:
-    appKey: cf47465a368f24c659608e7e
+    appKey:  
-    masterSecret: 02204efe3f3832947a236ee5
+    masterSecret:  
-    pushUrl: "https://api.jpush.cn/v3/push"
+    pushUrl:  
-    pushIntent: "intent:#Intent;component=io.openim.app.enterprisechat/io.openim.app.enterprisechat.MainActivity;end"
+    pushIntent:  
 manager:
   appManagerUid: ["openIM123456","openIM654321"]
   secrets: ["openIM1","openIM2"]
@@ -168,16 +168,16 @@ demoswitch: true
 demo:
   openImDemoPort: [ 42233 ]
   alismsverify:
-    accessKeyId: LTAI5tJPkn4HuuePdiLdGqe71
+    accessKeyId:  
-    accessKeySecret: 4n9OJ7ZCVN1U6KeHDAtOyNeVZcjOuV1
+    accessKeySecret:  
-    signName: OpenIM Corporation
+    signName:    
-    verificationCodeTemplateCode: SMS_2268101641
+    verificationCodeTemplateCode:  
   superCode: 666666
   mail:
-    title: "openIM"
+    title:  
-    senderMail: "1765567899@qq.com"
+    senderMail:  
-    senderAuthorizationCode: "1gxyausfoevlzbfag"
+    senderAuthorizationCode: 
-    smtpAddr: "smtp.qq.com"
+    smtpAddr:  
-    smtpPort: 25
+    smtpPort:  
 
 

deploy_k8s/admin_cms/admin_cms.Dockerfile

@@ -12,7 +12,8 @@ ADD ./open_im_admin_cms $WORKDIR/cmd/main
 # 创建用于挂载的几个目录，添加可执行权限
 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
   chmod +x $WORKDIR/cmd/main
-
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config", "/Open-IM-Server/script"]
 
 

deploy_k8s/admin_cms/deployment.yaml

@@ -7,7 +7,7 @@ spec:
   selector:
     matchLabels:
       app: admin-cms # 选择这个指定标签执行
-  replicas: 2 # 运行pod数量
+  replicas: 1 # 运行pod数量
   template:
     metadata:
       labels:
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: admin-cms
-          image: openim/admin_cms:v2.0.10k
+          image: openim/admin_cms:v2.3.8
           # imagePullPolicy: Always #每次启动都重新拉取镜像
           ports:
             - containerPort: 10200
@@ -23,10 +23,20 @@ spec:
             - name: config
               mountPath: /Open-IM-Server/config
               readOnly: true
+          env:
+            - name: CONFIG_NAME
+              value: "/Open-IM-Server"
+            - name: USUAL_CONFIG_NAME
+              value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
+          projected:
-            name: config
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
+
   strategy: #更新策略
     type: RollingUpdate # 滚动更新
 

deploy_k8s/api/api.Dockerfile

@@ -11,7 +11,8 @@ ADD ./open_im_api $WORKDIR/cmd/main
 # 创建用于挂载的几个目录，添加可执行权限
 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
   chmod +x $WORKDIR/cmd/main
-
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
 
 

deploy_k8s/api/deployment.yaml

@@ -7,7 +7,7 @@ spec:
   selector:
     matchLabels:
       app: api # 选择这个指定标签执行
-  replicas: 2 # 运行pod数量
+  replicas: 1 # 运行pod数量
   template:
     metadata:
       labels:
@@ -15,18 +15,27 @@ spec:
     spec:
       containers:
       - name: api
-        image: openim/api:v2.0.10k
+        image: openim/api:v2.3.8
-        imagePullPolicy: Always
+        # imagePullPolicy: Always
         ports:
         - containerPort: 10002
         volumeMounts:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
+          projected:
-            name: config
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新
 ---

deploy_k8s/auth/auth.Dockerfile

@@ -2,6 +2,7 @@ FROM ubuntu
 
 # 设置固定的项目路径
 ENV WORKDIR /Open-IM-Server
+ENV CMDDIR $WORKDIR/cmd
 ENV CONFIG_NAME $WORKDIR/config/config.yaml
 
 # 将可执行文件复制到目标目录
@@ -10,9 +11,10 @@ ADD ./open_im_auth $WORKDIR/cmd/main
 # 创建用于挂载的几个目录，添加可执行权限
 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
   chmod +x $WORKDIR/cmd/main
-
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
 
 
-WORKDIR $WORKDIR
+WORKDIR $CMDDIR
-CMD ./cmd/main
+CMD ./main

deploy_k8s/auth/deployment.yaml

@@ -7,7 +7,7 @@ spec:
   selector:
     matchLabels:
       app: auth # 选择这个指定标签执行
-  replicas: 2 # 运行pod数量
+  replicas: 1 # 运行pod数量
   template:
     metadata:
       labels:
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: auth
-        image: openim/auth:v2.0.10k
+        image: openim/auth:v2.3.8
         # imagePullPolicy: Always
         ports:
         - containerPort: 10160
@@ -23,9 +23,18 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
+          projected:
-            name: config
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新

deploy_k8s/build_push_all_images.sh

@@ -2,7 +2,7 @@
 source ./path_info.cfg
 
 # images version
-version=v2.0.10k
+version=v2.3.8
 git pull
 cd ../script/; ./build_all_service.sh
 cd ../deploy_k8s/

deploy_k8s/cache/cache.Dockerfile

@@ -2,6 +2,7 @@ FROM ubuntu
 
 # 设置固定的项目路径
 ENV WORKDIR /Open-IM-Server
+ENV CMDDIR $WORKDIR/cmd
 ENV CONFIG_NAME $WORKDIR/config/config.yaml
 
 
@@ -11,8 +12,9 @@ ADD ./open_im_cache $WORKDIR/cmd/main
 # 创建用于挂载的几个目录，添加可执行权限
 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
   chmod +x $WORKDIR/cmd/main
-
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
 
-WORKDIR $WORKDIR
+WORKDIR $CMDDIR
-CMD ./cmd/main
+CMD ./main

deploy_k8s/cache/deployment.yaml

@@ -7,7 +7,7 @@ spec:
   selector:
     matchLabels:
       app: cache # 选择这个指定标签执行
-  replicas: 2 # 运行pod数量
+  replicas: 1 # 运行pod数量
   template:
     metadata:
       labels:
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: cache
-        image: openim/cache:v2.0.10k
+        image: openim/cache:v2.3.8
         # imagePullPolicy: Always
         ports:
         - containerPort: 10240
@@ -23,9 +23,18 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
+          projected:
-            name: config
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新

deploy_k8s/cms_api/cms_api.Dockerfile

@@ -2,6 +2,7 @@ FROM ubuntu
 
 # 设置固定的项目路径
 ENV WORKDIR /Open-IM-Server
+ENV CMDDIR $WORKDIR/cmd
 ENV CONFIG_NAME $WORKDIR/config/config.yaml
 
 # 将可执行文件复制到目标目录
@@ -10,8 +11,9 @@ ADD ./open_im_cms_api $WORKDIR/cmd/main
 # 创建用于挂载的几个目录，添加可执行权限
 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
   chmod +x $WORKDIR/cmd/main
-
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
 
-WORKDIR $WORKDIR
+WORKDIR $CMDDIR
-CMD ./cmd/main
+CMD ./main

deploy_k8s/cms_api/deployment.yaml

@@ -7,7 +7,7 @@ spec:
   selector:
     matchLabels:
       app: cms-api # 选择这个指定标签执行
-  replicas: 2 # 运行pod数量
+  replicas: 1 # 运行pod数量
   template:
     metadata:
       labels:
@@ -15,18 +15,27 @@ spec:
     spec:
       containers:
       - name: cms-api
-        image: openim/cms_api:v2.0.10k
+        image: openim/cms_api:v2.3.8
-        # imagePullPolicy: Always
+        imagePullPolicy: Always
         ports:
         - containerPort: 10006
         volumeMounts:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
+          projected:
-            name: config
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新
 ---

deploy_k8s/conversation/conversation.Dockerfile

@@ -2,6 +2,7 @@ FROM ubuntu
 
 # 设置固定的项目路径
 ENV WORKDIR /Open-IM-Server
+ENV CMDDIR $WORKDIR/cmd
 ENV CONFIG_NAME $WORKDIR/config/config.yaml
 
 # 将可执行文件复制到目标目录
@@ -10,8 +11,9 @@ ADD ./open_im_conversation $WORKDIR/cmd/main
 # 创建用于挂载的几个目录，添加可执行权限
 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
   chmod +x $WORKDIR/cmd/main
-
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
 
-WORKDIR $WORKDIR
+WORKDIR $CMDDIR
-CMD ./cmd/main
+CMD ./main

deploy_k8s/conversation/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: conversation
-          image: openim/conversation:v2.0.10k
+          image: openim/conversation:v2.3.8
           # imagePullPolicy: Always
           ports:
             - containerPort: 10230
@@ -23,10 +23,20 @@ spec:
             - name: config
               mountPath: /Open-IM-Server/config
               readOnly: true
+          env:
+            - name: CONFIG_NAME
+              value: "/Open-IM-Server"
+            - name: USUAL_CONFIG_NAME
+              value: "/Open-IM-Server"
+          
       volumes:
         - name: config
-          configMap:
+          projected:
-            name: config
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新
 

deploy_k8s/demo/demo.Dockerfile

@@ -2,6 +2,7 @@ FROM ubuntu
 
 # 设置固定的项目路径
 ENV WORKDIR /Open-IM-Server
+ENV CMDDIR $WORKDIR/cmd
 ENV CONFIG_NAME $WORKDIR/config/config.yaml
 
 # 将可执行文件复制到目标目录
@@ -10,9 +11,10 @@ ADD ./open_im_demo $WORKDIR/cmd/main
 # 创建用于挂载的几个目录，添加可执行权限
 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
   chmod +x $WORKDIR/cmd/main
-
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
 
 
-WORKDIR $WORKDIR
+WORKDIR $CMDDIR
-CMD ./cmd/main
+CMD ./main

deploy_k8s/demo/deployment.yaml

@@ -7,7 +7,7 @@ spec:
   selector:
     matchLabels:
       app: demo # 选择这个指定标签执行
-  replicas: 2 # 运行pod数量
+  replicas: 1 # 运行pod数量
   template:
     metadata:
       labels:
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: demo
-        image: openim/demo:v2.0.10k
+        image: openim/demo:v2.3.8
         imagePullPolicy: Always
         ports:
         - containerPort: 10004
@@ -23,10 +23,19 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
+          projected:
-            name: config
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新
 ---

deploy_k8s/friend/deployment.yaml

@@ -7,7 +7,7 @@ spec:
   selector:
     matchLabels:
       app: friend # 选择这个指定标签执行
-  replicas: 2 # 运行pod数量
+  replicas: 1 # 运行pod数量
   template:
     metadata:
       labels:
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: friend
-        image: openim/friend:v2.0.10k
+        image: openim/friend:v2.3.8
         # imagePullPolicy: Always
         ports:
         - containerPort: 10120
@@ -23,10 +23,19 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
+          projected:
-            name: config
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新
 

deploy_k8s/friend/friend.Dockerfile

@@ -2,6 +2,7 @@ FROM ubuntu
 
 # 设置固定的项目路径
 ENV WORKDIR /Open-IM-Server
+ENV CMDDIR $WORKDIR/cmd
 ENV CONFIG_NAME $WORKDIR/config/config.yaml
 
 
@@ -11,8 +12,9 @@ ADD ./open_im_friend $WORKDIR/cmd/main
 # 创建用于挂载的几个目录，添加可执行权限
 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
   chmod +x $WORKDIR/cmd/main
-
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
 
-WORKDIR $WORKDIR
+WORKDIR $CMDDIR
-CMD ./cmd/main
+CMD ./main

deploy_k8s/group/deployment.yaml

@@ -7,7 +7,7 @@ spec:
   selector:
     matchLabels:
       app: group # 选择这个指定标签执行
-  replicas: 2 # 运行pod数量
+  replicas: 1 # 运行pod数量
   template:
     metadata:
       labels:
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: group
-        image: openim/group:v2.0.10k
+        image: openim/group:v2.3.8
         # imagePullPolicy: Always
         ports:
         - containerPort: 10150
@@ -23,9 +23,18 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
+          projected:
-            name: config
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新

deploy_k8s/group/group.Dockerfile

@@ -2,6 +2,7 @@ FROM ubuntu
 
 # 设置固定的项目路径
 ENV WORKDIR /Open-IM-Server
+ENV CMDDIR $WORKDIR/cmd
 ENV CONFIG_NAME $WORKDIR/config/config.yaml
 
 # 将可执行文件复制到目标目录
@@ -10,9 +11,10 @@ ADD ./open_im_group $WORKDIR/cmd/main
 # 创建用于挂载的几个目录，添加可执行权限
 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
   chmod +x $WORKDIR/cmd/main
-
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
 
 
-WORKDIR $WORKDIR
+WORKDIR $CMDDIR
-CMD ./cmd/main
+CMD ./main

deploy_k8s/ingress.yaml

@@ -48,6 +48,12 @@ kind: Ingress
 metadata:
   annotations:
     kubernetes.io/ingress.class: "nginx"
+    nginx.ingress.kubernetes.io/Access-Control-Allow-Origin: '*'
+    nginx.ingress.kubernetes.io/cors-allow-headers: DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization,x-auth-token,Pagination
+    nginx.ingress.kubernetes.io/cors-allow-methods: 'PUT, GET, POST, OPTIONS'
+    nginx.ingress.kubernetes.io/cors-allow-origin: '*'
+    nginx.ingress.kubernetes.io/enable-cors: 'true'
+    nginx.ingress.kubernetes.io/service-weight: ''
   name: api-ingress
 spec:
   rules:
@@ -67,6 +73,12 @@ kind: Ingress
 metadata:
   annotations:
     kubernetes.io/ingress.class: "nginx"
+    nginx.ingress.kubernetes.io/Access-Control-Allow-Origin: '*'
+    nginx.ingress.kubernetes.io/cors-allow-headers: DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization,x-auth-token,Pagination
+    nginx.ingress.kubernetes.io/cors-allow-methods: 'PUT, GET, POST, OPTIONS'
+    nginx.ingress.kubernetes.io/cors-allow-origin: '*'
+    nginx.ingress.kubernetes.io/enable-cors: 'true'
+    nginx.ingress.kubernetes.io/service-weight: ''
   name: demo-ingress
 spec:
   rules:
@@ -86,6 +98,12 @@ kind: Ingress
 metadata:
   annotations:
     kubernetes.io/ingress.class: "nginx"
+    nginx.ingress.kubernetes.io/Access-Control-Allow-Origin: '*'
+    nginx.ingress.kubernetes.io/cors-allow-headers: DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization,x-auth-token,Pagination
+    nginx.ingress.kubernetes.io/cors-allow-methods: 'PUT, GET, POST, OPTIONS'
+    nginx.ingress.kubernetes.io/cors-allow-origin: '*'
+    nginx.ingress.kubernetes.io/enable-cors: 'true'
+    nginx.ingress.kubernetes.io/service-weight: ''
   name: cms-api-ingress
 spec:
   rules:

deploy_k8s/k8s_openim_deploy.md

@@ -1,38 +1,99 @@
 #### openIM k8s部署文档
 ### 1. 修改配置文件
-在Open-IM-SERVER目录下修改config/config.yaml配置文件, 将MySQL, Kafka, MongoDB等配置修改。
+在Open-IM-SERVER根目录下修改config/config.yaml配置文件, 请确保以下修改的所有地址必须保证k8s pod能够访问
-使用demo需要修改demo/imAPIURL地址 让demo能请求到im的api
+1. 修改ETCD配置为自己的ETCD ip地址, 最好和k8s本身使用的ETCD分开
+2. 修改MySQL配置
+3. 修改Mongo配置
+4. 修改Redis配置
+5. 修改Kafka配置
+6. 将rpcRegisterIP修改为空, 此地址为每个rpc注册到ETCD的地址, 置空每个rpc将会将pod地址注册到ETCD, 才能正确rpc请求(重要)
+7. 如果使用minio作为对象存储, 还需要修改minio的地址
+8. 其他如果使用离线推送,需要修改push离线推送配置
+
 
 ### 2. 项目根目录创建im configMap到k8s openim namespace
-kubectl create namespace openim
+1. 为open-IM项目创建单独命名空间
-kubectl -n openim create configmap config --from-file=config/config.yaml
+ ```  
-openim 为im项目的namespace, 可选
+    kubectl create namespace openim
-查看configmap
+ ```  
-kubectl -n openim get configmap
+2. 修改config.yaml后在项目根目录创建configmap, config/usualConfig.yaml只需要挂载不需要修改配置
+ ```  
+    kubectl -n openim create configmap openim-config --from-file=config/config.yaml
+    kubectl -n openim create configmap openim-usualconfig --from-file=config/usualConfig.yaml
+ ```
+    查看configmap
+ ```
+   kubectl -n openim get configmap
+ ``` 
 
 ### 3(可选). 修改每个deployment.yml
-kubectl get nodes
+  每个rpc的deployment在Open-IM-SERVER根目录deploy_k8s下
-kubectl label node k8s-node1 role=kube-Node
+  给需要调度的node打上标签
-应需要调度的node打上标签
+ ```
-nodeSelector:
+    kubectl get nodes
-  node: kube-Node
+        kubectl label node k8s-node1 role=openIMworker
-创建资源清单时添加上nodeSelector属性对应即可
+ ```
-修改每种服务数量，建议至少每种2个rpc。
+  在deployment的spec.template.spec加上
-如果修改了config/config.yaml某些配置比如端口，同时需要修改对应deployment端口和ingress端口
+ ```
+    nodeSelector:
+     role: openIMworker
+ ``` 
+   创建资源清单时添加上nodeSelector属性对应即可,
+   修改每种服务数量，建议至少每种2个rpc。
+   如果修改了config/config.yaml某些配置比如端口，同时需要修改对应deployment端口和ingress端口
 
 
 ### 4. 修改ingress.yaml配置文件
-需要安装ingress controller 这里使用的是ingress-nginx 其他ingress需要修改配置文件
+1. 需要安装ingress controller, 这里使用的是ingress-nginx, 使用其他类型的ingress controller需要更改ingress.class, 将host改为自己部署服务的host
-进行域名修改等操作
 
 ### 5. 执行./kubectl_start.sh脚本
-chmod +x ./kubectl_start.sh ./kubectl_stop.sh
+1. 脚本给予可执行权限
-./kubectl_start.sh
+ ```
-kubectl -n openim apply -f ingress.yaml
+    chmod +x ./kubectl_start.sh ./kubectl_stop.sh
-kubectl 启动所有deployment，services，ingress
+ ```
+2. 启动k8s service和deployment 
+ ```
+    ./kubectl_start.sh
+ ``` 
+3. 启动k8s ingress
+ ```
+    kubectl -n openim apply -f ingress.yaml
+ ```
+kubectl 启动所有deployment, services, ingress
 
 ### 6. 查看k8s deployment service ingress状态
-kubectl -n openim get services
+
-kubectl -n openim get deployment
+ ```
-kubectl -n openim get ingress
+    kubectl -n openim get services
-kubectl -n openim get pods
+    kubectl -n openim get deployment
+    kubectl -n openim get ingress
+    kubectl -n openim get pods
+ ```
+ 检测服务可达
+ ```
+    telnet msg-gateway.openim.xxx.com {{your_ingress_port}}
+    telnet sdk-server.openim.xxx.com {{your_ingress_port}}
+    telnet api.openim.xxx.com {{your_ingress_port}}
+    telnet cms-api.openim.xxx.com {{your_ingress_port}}
+    telnet demo.openim.xxx.com {{your_ingress_port}}
+ ```
+
+#### openIM k8s更新
+1. 暂存配置文件，拉取代码
+ ```
+    git stash push config/config.yaml
+    git pull
+ ```
+2. 合并配置文件, 解决冲突
+ ```
+    git stash pop
+ ```
+3. 重新生成configmap
+ ```
+    kubectl -n openim create configmap config --from-file=config/config.yaml
+ ```
+4.修改所有deployment文件的spec.template.spec.image 改为新版本后在/deploy_k8s下重新执行
+ ```
+    ./kubectl_stop.sh
+    ./kubectl_start.sh
+ ```

deploy_k8s/kubectl_stop_all.sh

@@ -10,8 +10,6 @@ service=(
   group
   auth
   admin-cms
-  message-cms
-  statistics
   office
   organization
   conversation

deploy_k8s/message_cms/deployment.yaml

@@ -1,31 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: message-cms-deployment
-spec:
-  selector:
-    matchLabels:
-      app: message-cms # 选择这个指定标签执行
-  replicas: 2 # 运行pod数量
-  template:
-    metadata:
-      labels:
-        app: message-cms # 标签
-    spec:
-      containers:
-      - name: message-cms
-        image: openim/message_cms:v2.0.10k
-        # imagePullPolicy: Always
-        ports:
-        - containerPort: 10190
-        volumeMounts:
-          - name: config
-            mountPath: /Open-IM-Server/config
-            readOnly: true
-      volumes:
-        - name: config
-          configMap:
-            name: config
-  strategy: #更新策略
-    type: RollingUpdate # 滚动更新

deploy_k8s/message_cms/message_cms.Dockerfile

@@ -1,18 +0,0 @@
-FROM ubuntu
-
-# 设置固定的项目路径
-ENV WORKDIR /Open-IM-Server
-ENV CONFIG_NAME $WORKDIR/config/config.yaml
-
-# 将可执行文件复制到目标目录
-ADD ./open_im_message_cms $WORKDIR/cmd/main
-
-# 创建用于挂载的几个目录，添加可执行权限
-RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
-  chmod +x $WORKDIR/cmd/main
-
-VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
-
-
-WORKDIR $WORKDIR
-CMD ./cmd/main

deploy_k8s/msg/deployment.yaml

@@ -7,7 +7,7 @@ spec:
   selector:
     matchLabels:
       app: msg # 选择这个指定标签执行
-  replicas: 2 # 运行pod数量
+  replicas: 1 # 运行pod数量
   template:
     metadata:
       labels:
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: msg
-        image: openim/msg:v2.0.10k
+        image: openim/msg:v2.3.8
         # imagePullPolicy: Always
         ports:
         - containerPort: 10130
@@ -23,9 +23,18 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
+          projected:
-            name: config
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新

deploy_k8s/msg/msg.Dockerfile

@@ -2,6 +2,7 @@ FROM ubuntu
 
 # 设置固定的项目路径
 ENV WORKDIR /Open-IM-Server
+ENV CMDDIR $WORKDIR/cmd
 ENV CONFIG_NAME $WORKDIR/config/config.yaml
 
 
@@ -11,9 +12,10 @@ ADD ./open_im_msg $WORKDIR/cmd/main
 # 创建用于挂载的几个目录，添加可执行权限
 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
   chmod +x $WORKDIR/cmd/main
-
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
 
 
-WORKDIR $WORKDIR
+WORKDIR $CMDDIR
-CMD ./cmd/main
+CMD ./main

deploy_k8s/msg_gateway/deployment.yaml

@@ -7,7 +7,7 @@ spec:
   selector:
     matchLabels:
       app: msg-gateway # 选择这个指定标签执行
-  replicas: 2 # 运行pod数量
+  replicas: 1 # 运行pod数量
   template:
     metadata:
       labels:
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: msg-gateway
-        image: openim/msg_gateway:v2.0.10k
+        image: openim/msg_gateway:v2.3.8
         # imagePullPolicy: Always
         ports:
         - name: rpc-port
@@ -26,10 +26,19 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
+          projected:
-            name: config
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新
 ---

deploy_k8s/msg_gateway/msg_gateway.Dockerfile

@@ -2,6 +2,7 @@ FROM ubuntu
 
 # 设置固定的项目路径
 ENV WORKDIR /Open-IM-Server
+ENV CMDDIR $WORKDIR/cmd
 ENV CONFIG_NAME $WORKDIR/config/config.yaml
 
 # 将可执行文件复制到目标目录
@@ -10,9 +11,10 @@ ADD ./open_im_msg_gateway $WORKDIR/cmd/main
 # 创建用于挂载的几个目录，添加可执行权限
 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
   chmod +x $WORKDIR/cmd/main
-
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
 
 
-WORKDIR $WORKDIR
+WORKDIR $CMDDIR
-CMD ./cmd/main
+CMD ./main

deploy_k8s/msg_transfer/deployment.yaml

@@ -7,7 +7,7 @@ spec:
   selector:
     matchLabels:
       app: msg-transfer # 选择这个指定标签执行
-  replicas: 2 # 运行pod数量
+  replicas: 1 # 运行pod数量
   template:
     metadata:
       labels:
@@ -15,15 +15,24 @@ spec:
     spec:
       containers:
       - name: msg-transfer
-        image: openim/msg_transfer:v2.0.10k
+        image: openim/msg_transfer:v2.3.8
         # imagePullPolicy: Always
         volumeMounts:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
+          projected:
-            name: config
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新

deploy_k8s/msg_transfer/msg_transfer.Dockerfile

@@ -2,6 +2,7 @@ FROM ubuntu
 
 # 设置固定的项目路径
 ENV WORKDIR /Open-IM-Server
+ENV CMDDIR $WORKDIR/cmd
 ENV CONFIG_NAME $WORKDIR/config/config.yaml
 
 # 将可执行文件复制到目标目录
@@ -10,9 +11,10 @@ ADD ./open_im_msg_transfer $WORKDIR/cmd/main
 # 创建用于挂载的几个目录，添加可执行权限
 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
   chmod +x $WORKDIR/cmd/main
-
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
 
 
-WORKDIR $WORKDIR
+WORKDIR $CMDDIR
-CMD ./cmd/main
+CMD ./main

deploy_k8s/office/deployment.yaml

@@ -7,7 +7,7 @@ spec:
   selector:
     matchLabels:
       app: office # 选择这个指定标签执行
-  replicas: 2 # 运行pod数量
+  replicas: 1 # 运行pod数量
   template:
     metadata:
       labels:
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: office
-        image: openim/office:v2.0.10k
+        image: openim/office:v2.3.8
         # imagePullPolicy: Always
         ports:
         - containerPort: 10210
@@ -23,9 +23,18 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
+          projected:
-            name: config
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新

deploy_k8s/office/office.Dockerfile

@@ -2,17 +2,20 @@ FROM ubuntu
 
 # 设置固定的项目路径
 ENV WORKDIR /Open-IM-Server
+ENV CMDDIR $WORKDIR/cmd
 ENV CONFIG_NAME $WORKDIR/config/config.yaml
 
+
 # 将可执行文件复制到目标目录
 ADD ./open_im_office $WORKDIR/cmd/main
 
 # 创建用于挂载的几个目录，添加可执行权限
 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
   chmod +x $WORKDIR/cmd/main
-
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
 
 
-WORKDIR $WORKDIR
+WORKDIR $CMDDIR
-CMD ./cmd/main
+CMD ./main

deploy_k8s/organization/deployment.yaml

@@ -7,7 +7,7 @@ spec:
   selector:
     matchLabels:
       app: organization # 选择这个指定标签执行
-  replicas: 2 # 运行pod数量
+  replicas: 1 # 运行pod数量
   template:
     metadata:
       labels:
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: organization
-        image: openim/organization:v2.0.10k
+        image: openim/organization:v2.3.8
         # imagePullPolicy: Always
         ports:
         - containerPort: 10220
@@ -23,9 +23,18 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
+          projected:
-            name: config
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新

deploy_k8s/organization/organization.Dockerfile

@@ -2,6 +2,7 @@ FROM ubuntu
 
 # 设置固定的项目路径
 ENV WORKDIR /Open-IM-Server
+ENV CMDDIR $WORKDIR/cmd
 ENV CONFIG_NAME $WORKDIR/config/config.yaml
 
 # 将可执行文件复制到目标目录
@@ -11,9 +12,10 @@ ADD ./open_im_organization $WORKDIR/cmd/main
 # 创建用于挂载的几个目录，添加可执行权限
 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
   chmod +x $WORKDIR/cmd/main
-
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
 
 
-WORKDIR $WORKDIR
+WORKDIR $CMDDIR
-CMD ./cmd/main
+CMD ./main

deploy_k8s/path_info.cfg

@@ -9,8 +9,6 @@ service=(
   group
   auth
   admin_cms
-  message_cms
-  statistics
   office
   organization
   conversation

deploy_k8s/push/deployment.yaml

@@ -7,7 +7,7 @@ spec:
   selector:
     matchLabels:
       app: push # 选择这个指定标签执行
-  replicas: 2 # 运行pod数量
+  replicas: 1 # 运行pod数量
   template:
     metadata:
       labels:
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: push
-        image: openim/push:v2.0.10k
+        image: openim/push:v2.3.8
         # imagePullPolicy: Always
         ports:
         - containerPort: 10170
@@ -23,9 +23,18 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
+          projected:
-            name: config
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新

deploy_k8s/push/push.Dockerfile

@@ -2,6 +2,7 @@ FROM ubuntu
 
 # 设置固定的项目路径
 ENV WORKDIR /Open-IM-Server
+ENV CMDDIR $WORKDIR/cmd
 ENV CONFIG_NAME $WORKDIR/config/config.yaml
 
 
@@ -11,9 +12,10 @@ ADD ./open_im_push $WORKDIR/cmd/main
 # 创建用于挂载的几个目录，添加可执行权限
 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
   chmod +x $WORKDIR/cmd/main
-
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
 
 
-WORKDIR $WORKDIR
+WORKDIR $CMDDIR
-CMD ./cmd/main
+CMD ./main

deploy_k8s/sdk_server/deployment.yaml

@@ -7,7 +7,7 @@ spec:
   selector:
     matchLabels:
       app: sdk-server # 选择这个指定标签执行
-  replicas: 2 # 运行pod数量
+  replicas: 1 # 运行pod数量
   template:
     metadata:
       labels:
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: sdk-server
-        image: openim/sdk_server:v2.0.10k
+        image: openim/sdk_server:v2.3.8
         # imagePullPolicy: Always
         ports:
         - containerPort: 10003
@@ -25,12 +25,15 @@ spec:
             readOnly: true
           - name: local-db
             mountPath: /db/sdk
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"         
         command: ["/Open-IM-Server/main"]
-        args: ["-openIM_api_port", "10002", "-openIM_ws_port", "10001", "-sdk_ws_port", "10003", "-openIM_log_level", "6"]
+        args: ["-openIM_ws_address", "ws_addr", "-sdk_ws_port", "10003", "-openIM_api_address", "api_address", "-openIM_log_level", "6"]
       volumes:
         - name: config
           configMap:
-            name: config
+            name: openim-config
         - name: local-db
           hostPath:
             path: /db/sdk

deploy_k8s/sdk_server/sdk_server.Dockerfile

@@ -2,6 +2,7 @@ FROM ubuntu
 
 # 设置固定的项目路径
 ENV WORKDIR /Open-IM-Server
+ENV CMDDIR $WORKDIR/cmd
 ENV CONFIG_NAME $WORKDIR/config/config.yaml
 
 # 将可执行文件复制到目标目录
@@ -10,8 +11,9 @@ ADD ./open_im_sdk_server $WORKDIR/main
 # 创建用于挂载的几个目录，添加可执行权限
 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \
   chmod +x $WORKDIR/main
-
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"]
 
-WORKDIR $WORKDIR
+WORKDIR $CMDDIR
 CMD ./main

deploy_k8s/statistics/deployment.yaml

@@ -1,31 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: statistics-deployment
-spec:
-  selector:
-    matchLabels:
-      app: statistics # 选择这个指定标签执行
-  replicas: 2 # 运行pod数量
-  template:
-    metadata:
-      labels:
-        app: statistics # 标签
-    spec:
-      containers:
-      - name: statistics
-        image: openim/statistics:v2.0.10k
-        # imagePullPolicy: Always
-        ports:
-        - containerPort: 10180
-        volumeMounts:
-          - name: config
-            mountPath: /Open-IM-Server/config
-            readOnly: true
-      volumes:
-        - name: config
-          configMap:
-            name: config
-  strategy: #更新策略
-    type: RollingUpdate # 滚动更新

deploy_k8s/statistics/statistics.Dockerfile

@@ -1,18 +0,0 @@
-FROM ubuntu
-
-# 设置固定的项目路径
-ENV WORKDIR /Open-IM-Server
-ENV CONFIG_NAME $WORKDIR/config/config.yaml
-
-# 将可执行文件复制到目标目录
-ADD ./open_im_statistics $WORKDIR/cmd/main
-
-# 创建用于挂载的几个目录，添加可执行权限
-RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
-  chmod +x $WORKDIR/cmd/main
-
-VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
-
-
-WORKDIR $WORKDIR
-CMD ./cmd/main

deploy_k8s/user/deployment.yaml

@@ -7,7 +7,7 @@ spec:
   selector:
     matchLabels:
       app: user # 选择这个指定标签执行
-  replicas: 2 # 运行pod数量
+  replicas: 1 # 运行pod数量
   template:
     metadata:
       labels:
@@ -15,15 +15,24 @@ spec:
     spec:
       containers:
       - name: user
-        image: openim/user:v2.0.10k
+        image: openim/user:v2.3.8
         # imagePullPolicy: Always
         volumeMounts:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
+          projected:
-            name: config
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新

deploy_k8s/user/user.Dockerfile

@@ -2,6 +2,7 @@ FROM ubuntu
 
 # 设置固定的项目路径
 ENV WORKDIR /Open-IM-Server
+ENV CMDDIR $WORKDIR/cmd
 ENV CONFIG_NAME $WORKDIR/config/config.yaml
 
 # 将可执行文件复制到目标目录
@@ -10,9 +11,10 @@ ADD ./open_im_user $WORKDIR/cmd/main
 # 创建用于挂载的几个目录，添加可执行权限
 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
   chmod +x $WORKDIR/cmd/main
-
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
 
 
-WORKDIR $WORKDIR
+WORKDIR $CMDDIR
-CMD ./cmd/main
+CMD ./main

docker-compose-mongos.yaml

@@ -0,0 +1,139 @@
+version: "3"
+#fixme  Clone openIM Server project before using docker-compose,project address：https://github.com/OpenIMSDK/Open-IM-Server.git
+
+services:
+  mysql:
+    image: mysql:5.7
+    ports:
+      - 13306:3306
+      - 23306:33060
+    container_name: mysql
+    volumes:
+      - ./components/mysql/data:/var/lib/mysql
+      - /etc/localtime:/etc/localtime
+    environment:
+      MYSQL_ROOT_PASSWORD: openIM
+    restart: always
+
+  mongos:
+    image: mongo:latest
+    ports:
+      - 37017:27017
+    container_name: mongos
+    command: mongos --configdb config/103.116.45.174:27019 --bind_ip_all
+    volumes:
+      - ./components/mongos_mongodb/data/db:/data/db
+      - ./components/mongos_mongodb/data/logs:/data/logs
+      - ./components/mongos_mongodb/data/conf:/etc/mongo
+      - ./components/mongos_mongodb/data/configdb:/data/configdb
+    environment:
+      - TZ=Asia/Shanghai
+      # cache
+      - wiredTigerCacheSizeGB=1
+      #    environment:
+      #      - MONGO_INITDB_ROOT_USERNAME=openIM
+      #      - MONGO_INITDB_ROOT_PASSWORD=openIM
+
+
+      #TZ: Asia/Shanghai
+    restart: always
+
+
+  redis:
+    image: redis
+    ports:
+      - 16379:6379
+    container_name: redis
+    volumes:
+      - ./components/redis/data:/data
+      #redis config file
+      - ./components/redis/config/redis.conf:/usr/local/redis/config/redis.conf
+    environment:
+      TZ: Asia/Shanghai
+    restart: always
+    sysctls:
+      net.core.somaxconn: 1024
+    command: redis-server --requirepass openIM --appendonly yes
+
+
+  zookeeper:
+    image: wurstmeister/zookeeper
+    ports:
+      - 2181:2181
+    container_name: zookeeper
+    volumes:
+      - /etc/localtime:/etc/localtime
+    environment:
+      TZ: Asia/Shanghai
+    restart: always
+
+
+  kafka:
+    image: wurstmeister/kafka
+    container_name: kafka
+    restart: always
+    ports:
+      - 9092:9092
+    environment:
+      TZ: Asia/Shanghai
+      KAFKA_BROKER_ID: 0
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_CREATE_TOPICS: "ws2ms_chat:8:1,ms2ps_chat:8:1,msg_to_mongo:8:1"
+      KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9092
+      KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT"
+      KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE
+    depends_on:
+      - zookeeper
+
+  etcd:
+    image: quay.io/coreos/etcd
+    ports:
+      - 2379:2379
+      - 2380:2380
+    container_name: etcd
+    volumes:
+      - /etc/timezone:/etc/timezone
+      - /etc/localtime:/etc/localtime
+    environment:
+      ETCDCTL_API: 3
+    restart: always
+    command: /usr/local/bin/etcd --name etcd0 --data-dir /etcd-data --listen-client-urls http://0.0.0.0:2379 --advertise-client-urls http://0.0.0.0:2379 --listen-peer-urls http://0.0.0.0:2380 --initial-advertise-peer-urls http://0.0.0.0:2380 --initial-cluster etcd0=http://0.0.0.0:2380 --initial-cluster-token tkn --initial-cluster-state new
+
+  minio:
+    image: minio/minio
+    ports:
+      - 10005:9000
+      - 9090:9090
+    container_name: minio
+    volumes:
+      - /mnt/data:/data
+      - /mnt/config:/root/.minio
+    environment:
+      MINIO_ROOT_USER: user12345
+      MINIO_ROOT_PASSWORD: key12345
+    restart: always
+    command: minio server /data --console-address ':9090'
+
+  open_im_server:
+    image: openim/open_im_server:v2.3.0-rc1
+    container_name: open_im_server
+    volumes:
+      - ./logs:/Open-IM-Server/logs
+      - ./config/config.yaml:/Open-IM-Server/config/config.yaml
+      - ./db/sdk:/Open-IM-Server/db/sdk
+      - ./script:/Open-IM-Server/script
+    restart: always
+    depends_on:
+      - kafka
+      - mysql
+      - mongos
+      - redis
+      - etcd
+      - minio
+    network_mode: "host"
+    logging:
+      driver: json-file
+      options:
+        max-size: "1g"
+        max-file: "2"

docker-compose-shard-cluster.yaml

@@ -0,0 +1,113 @@
+version: '3'
+networks:
+  mongo-network:
+    external: false
+services:
+  # 配置服务器configsvr
+  config:
+    image: mongo:latest
+    networks:
+      - mongo-network
+    container_name: config
+    restart: always
+    ports:
+      - 27019:27019
+    command: --configsvr --replSet "config" --bind_ip_all
+    volumes:
+      - ./components/config_mongodb/data/db:/data/db
+      - ./components/config_mongodb/data/logs:/data/logs
+      - ./components/config_mongodb/data/conf:/etc/mongo
+      - ./components/config_mongodb/data/configdb:/data/configdb
+    environment:
+      - TZ=Asia/Shanghai
+      # cache
+      - wiredTigerCacheSizeGB=1
+
+  # shard分片1
+  shard1:
+    image: mongo:latest
+    networks:
+      - mongo-network
+    container_name: shard1
+    restart: always
+    ports:
+      - 27118:27018
+    command: --shardsvr --replSet "shard1" --bind_ip_all
+    volumes:
+      - /data01/mongo/shard1/db:/data/db
+      - /data01/mongo/shard1/configdb:/data/configdb
+    environment:
+      - TZ=Asia/Shanghai
+      # cache
+      - wiredTigerCacheSizeGB=1
+
+  # shard分片2
+  shard2:
+    image: mongo:latest
+    networks:
+      - mongo-network
+    container_name: shard2
+    restart: always
+    ports:
+      - 27218:27018
+    command: --shardsvr --replSet "shard2" --bind_ip_all
+    volumes:
+      - /data02/mongo/shard2/db:/data/db
+      - /data02/mongo/shard2/configdb:/data/configdb
+    environment:
+      - TZ=Asia/Shanghai
+      # cache
+      - wiredTigerCacheSizeGB=1
+  #      - ${PWD}/key.file:/data/mongodb/key.file
+
+  # shard分片3
+  shard3:
+    image: mongo:latest
+    networks:
+      - mongo-network
+    container_name: shard3
+    restart: always
+    ports:
+      - 27318:27018
+    command: --shardsvr --replSet "shard3" --bind_ip_all
+    volumes:
+      - /data03/mongo/shard3/db:/data/db
+      - /data03/mongo/shard3/configdb:/data/configdb
+    environment:
+      - TZ=Asia/Shanghai
+      # cache
+      - wiredTigerCacheSizeGB=1
+  # shard分片4
+  shard4:
+    image: mongo:latest
+    networks:
+      - mongo-network
+    container_name: shard4
+    restart: always
+    ports:
+      - 27418:27018
+    command: --shardsvr --replSet "shard4" --bind_ip_all
+    volumes:
+      - /data04/mongo/shard4/db:/data/db
+      - /data04/mongo/shard4/configdb:/data/configdb
+    environment:
+      - TZ=Asia/Shanghai
+      # cache
+      - wiredTigerCacheSizeGB=1
+  # shard分片5
+  shard5:
+    image: mongo:latest
+    networks:
+      - mongo-network
+    container_name: shard5
+    restart: always
+    ports:
+      - 27518:27018
+    command: --shardsvr --replSet "shard5" --bind_ip_all
+    volumes:
+      - /data05/mongo/shard5/db:/data/db
+      - /data05/mongo/shard5/configdb:/data/configdb
+    environment:
+      - TZ=Asia/Shanghai
+      # cache
+      - wiredTigerCacheSizeGB=1

docker-compose.yaml

@@ -1,6 +1,5 @@
-version: "3"
 #fixme  Clone openIM Server project before using docker-compose,project address：https://github.com/OpenIMSDK/Open-IM-Server.git
-
+version: "3"
 services:
   mysql:
     image: mysql:5.7
@@ -9,10 +8,10 @@ services:
       - 23306:33060
     container_name: mysql
     volumes:
-      - ./components/mysql/data:/var/lib/mysql
+      - ${DATA_DIR}/components/mysql/data:/var/lib/mysql
       - /etc/localtime:/etc/localtime
     environment:
-      MYSQL_ROOT_PASSWORD: openIM
+      MYSQL_ROOT_PASSWORD: ${PASSWORD}
     restart: always
 
   mongodb:
@@ -20,20 +19,22 @@ services:
     ports:
       - 37017:27017
     container_name: mongo
+    command: --wiredTigerCacheSizeGB 1 --auth
     volumes:
-      - ./components/mongodb/data/db:/data/db
+      - ${DATA_DIR}/components/mongodb/data/db:/data/db
-      - ./components/mongodb/data/logs:/data/logs
+      - ${DATA_DIR}/components/mongodb/data/logs:/data/logs
-      - ./components/mongodb/data/conf:/etc/mongo
+      - ${DATA_DIR}/components/mongodb/data/conf:/etc/mongo
+      - ./script/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh:ro 
     environment:
       - TZ=Asia/Shanghai
       # cache
       - wiredTigerCacheSizeGB=1
-#    environment:
+      - MONGO_INITDB_ROOT_USERNAME=${USER}
-#      - MONGO_INITDB_ROOT_USERNAME=openIM
+      - MONGO_INITDB_ROOT_PASSWORD=${PASSWORD}
-#      - MONGO_INITDB_ROOT_PASSWORD=openIM
+      - MONGO_INITDB_DATABASE=openIM
-
+      - MONGO_USERNAME=${USER}
-
+      - MONGO_PASSWORD=${PASSWORD}
-      #TZ: Asia/Shanghai
+    #
     restart: always
 
   redis:
@@ -42,15 +43,15 @@ services:
       - 16379:6379
     container_name: redis
     volumes:
-      - ./components/redis/data:/data
+      - ${DATA_DIR}/components/redis/data:/data
       #redis config file
-      #- ./components/redis/config/redis.conf:/usr/local/redis/config/redis.conf
+      - ${DATA_DIR}/components/redis/config/redis.conf:/usr/local/redis/config/redis.conf
     environment:
       TZ: Asia/Shanghai
     restart: always
     sysctls:
       net.core.somaxconn: 1024
-    command: redis-server --requirepass openIM --appendonly yes
+    command: redis-server --requirepass ${PASSWORD} --appendonly yes
 
 
   zookeeper:
@@ -70,17 +71,16 @@ services:
     container_name: kafka
     restart: always
     ports:
-     - 9093:9093
+      - 9092:9092
     environment:
       TZ: Asia/Shanghai
       KAFKA_BROKER_ID: 0
-      KAFKA_ZOOKEEPER_CONNECT: 127.0.0.1:2181
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
       KAFKA_CREATE_TOPICS: "ws2ms_chat:8:1,ms2ps_chat:8:1,msg_to_mongo:8:1"
-      KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9093
+      KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9092
       KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093
       KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT"
       KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE
-    network_mode: "host"
     depends_on:
       - zookeeper
 
@@ -98,13 +98,30 @@ services:
     restart: always
     command: /usr/local/bin/etcd --name etcd0 --data-dir /etcd-data --listen-client-urls http://0.0.0.0:2379 --advertise-client-urls http://0.0.0.0:2379 --listen-peer-urls http://0.0.0.0:2380 --initial-advertise-peer-urls http://0.0.0.0:2380 --initial-cluster etcd0=http://0.0.0.0:2380 --initial-cluster-token tkn --initial-cluster-state new
 
+  minio:
+    image: minio/minio
+    ports:
+      - 10005:9000
+      - 9090:9090
+    container_name: minio
+    volumes:
+      - /mnt/data:/data
+      - /mnt/config:/root/.minio
+    environment:
+      MINIO_ROOT_USER: ${USER}
+      MINIO_ROOT_PASSWORD: ${PASSWORD}
+    restart: always
+    command: minio server /data --console-address ':9090'
+
+
   open_im_server:
-    image: openim/open_im_server:v2.1.0
+    image: openim/open_im_server:v2.3.8
     container_name: open_im_server
     volumes:
       - ./logs:/Open-IM-Server/logs
       - ./config/config.yaml:/Open-IM-Server/config/config.yaml
-      - ./db/sdk:/Open-IM-Server/db/sdk
+      - ./config/usualConfig.yaml:/Open-IM-Server/config/usualConfig.yaml
+      - ${DATA_DIR}/db/sdk:/Open-IM-Server/db/sdk
       - ./script:/Open-IM-Server/script
     restart: always
     depends_on:
@@ -113,9 +130,67 @@ services:
       - mongodb
       - redis
       - etcd
+      - minio
     network_mode: "host"
     logging:
       driver: json-file
       options:
         max-size: "1g"
         max-file: "2"
+
+  open_im_enterprise:
+    image: openim/open_im_enterprise:v1.0.3
+    container_name: open_im_enterprise
+    volumes:
+      - ./logs:/Open-IM-Enterprise/logs
+      - ./docker-compose_cfg/config.yaml:/Open-IM-Enterprise/config/config.yaml
+    restart: always
+    depends_on:
+      - mysql
+      - mongodb
+      - redis
+      - etcd
+      - minio
+      - open_im_server
+    network_mode: "host"
+    logging:
+      driver: json-file
+      options:
+        max-size: "1g"
+        max-file: "2"
+    environment:
+      CONFIG_NAME: "/Open-IM-Enterprise"
+
+  prometheus:
+    image: prom/prometheus
+    volumes:
+      - ./docker-compose_cfg/prometheus-compose.yml:/etc/prometheus/prometheus.yml
+    container_name: prometheus
+    #    ports:
+    #    - 9091:9091
+    depends_on:
+    - open_im_server
+    command: --web.listen-address=:9091 --config.file="/etc/prometheus/prometheus.yml"
+    network_mode: "host" 
+
+  grafana:
+    image: grafana/grafana
+    volumes:
+    # - ./grafana/dashboards/dashboard.json:/var/lib/grafana/dashboards/dashboard.json
+    # - ./grafana/provisioning/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml
+    - ./docker-compose_cfg/datasource-compose.yaml:/etc/grafana/provisioning/datasources/datasource.yaml
+    - ./docker-compose_cfg/grafana.ini:/etc/grafana/grafana.ini
+    - ./docker-compose_cfg/node-exporter-full_rev1.json:/var/lib/grafana/dashboards/node-exporter-full_rev1.json
+    container_name: grafana
+    #    ports:
+    #    - 10007:10007
+    depends_on:
+    - prometheus
+    network_mode: "host" 
+
+  node-exporter:
+    image: quay.io/prometheus/node-exporter
+    container_name: node-exporter
+    restart: always
+    ports:
+      - "9100:9100"

docker-compose_cfg/config.yaml

@@ -0,0 +1,65 @@
+#---------------Infrastructure configuration---------------------#
+etcd:
+  etcdSchema: openim  #默认即可
+  etcdAddr: [ 127.0.0.1:2379 ] #单机部署时，默认即可
+  userName:
+  password:
+  secret: openIM123
+
+mysql:
+  dbMysqlDatabaseName: admin_chat # 数据库名字 默认即可
+
+# 默认管理员账号
+admin:
+  defaultAccount:
+    account: [ "admin1", "admin2" ]
+    defaultPassword: [ "password1", "password2" ]
+    openIMUserID: [ "openIM123456", "openIMAdmin" ]
+    faceURL: [ "", "" ]
+    nickname: [ "admin1", "admin2" ]
+    level: [ 1, 100 ]
+
+
+adminapi:
+  openImAdminApiPort: [ 10009 ] #管理后台api服务端口，默认即可，需要开放此端口或做nginx转发
+  listenIP: 0.0.0.0
+
+chatapi:
+  openImChatApiPort: [ 10008 ] #登录注册，默认即可，需要开放此端口或做nginx转发
+  listenIP: 0.0.0.0
+
+rpcport: # rpc服务端口 默认即可
+  openImAdminPort: [ 30200 ]
+  openImChatPort: [ 30300 ]
+
+
+rpcregistername: #rpc注册服务名，默认即可
+  openImChatName: Chat
+  openImAdminCMSName: Admin
+
+chat:
+  codeTTL: 300 #短信验证码有效时间(秒)
+  superVerificationCode: 666666 # 超级验证码
+  alismsverify: #阿里云短信配置，在阿里云申请成功后修改以下四项
+    accessKeyId:
+    accessKeySecret:
+    signName:
+    verificationCodeTemplateCode:
+
+
+oss:
+  tempDir: enterprise-temp # 临时密钥上传的目录
+  dataDir: enterprise-data # 最终存放目录
+  aliyun:
+    endpoint: https://oss-cn-chengdu.aliyuncs.com
+    accessKeyID: ""
+    accessKeySecret: ""
+    bucket: ""
+  tencent:
+    BucketURL: ""
+    serviceURL: https://cos.COS_REGION.myqcloud.com
+    secretID: ""
+    secretKey: ""
+    sessionToken: ""
+    bucket: ""
+  use: "minio"

docker-compose_cfg/datasource-compose.yaml

@@ -0,0 +1,13 @@
+#more datasource-compose.yaml 
+apiVersion: 1
+
+datasources:
+- name: Prometheus
+  type: prometheus
+  access: proxy
+  orgId: 1
+  url: http://127.0.0.1:9091
+  basicAuth: false
+  isDefault: true
+  version: 1
+  editable: true