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
-.idea
+Dockerfile.cross
 
+### Makefile ###
+tmp/
+bin/
+output/
+_output/
 
-deploy/open_im_demo
-deploy/open_im_api
-deploy/open_im_msg_gateway
-deploy/open_im_msg_transfer
-deploy/open_im_push
-deploy/open_im_timer_task
-deploy/open_im_rpc_user
-deploy/open_im_rpc_friend
-deploy/open_im_rpc_group
-deploy/open_im_rpc_msg
-deploy/open_im_rpc_auth
+### OpenIM Config ###
+config/config.yaml
+./config/config.yaml
+.env
+./.env
+
+### OpenIM deploy ###
+deploy/openim_demo
+deploy/openim-api
+deploy/openim-rpc-msg_gateway
+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
-       
-       chmod +x *.sh
+       #cd Open-IM-server
+       USER=root  
+       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
+```
 
-   ```
-   git clone https://github.com/OpenIMSDK/Open-IM-Server.git --recursive
-   ```
+1. build
 
-4. Start docker-compose with one click(Docker automatically pulls all images)
+```shell
+./batch_build_all_service.sh
+```
 
-   ```
-   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)
+all services build success
 
 ### 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:
-	make build
+install:build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/open_im_api/main.go

@@ -15,6 +15,7 @@ import (
 	"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"
@@ -30,6 +31,7 @@ import (
 	"github.com/gin-gonic/gin"
 	//"syscall"
 	"Open_IM/pkg/common/constant"
+	promePkg "Open_IM/pkg/common/prometheus"
 )
 
 // @title open-IM-Server API
@@ -45,10 +47,18 @@ func main() {
 	f, _ := os.Create("../logs/api.log")
 	gin.DefaultWriter = io.MultiWriter(f)
 	//	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")
 	{
@@ -101,6 +111,8 @@ func main() {
 		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)
@@ -153,6 +165,11 @@ func main() {
 		chatGroup.POST("/batch_send_msg", manage.ManagementBatchSendMsg)
 		chatGroup.POST("/check_msg_is_send_success", manage.CheckMsgIsSendSuccess)
 		chatGroup.POST("/set_msg_min_seq", apiChat.SetMsgMinSeq)
+
+		chatGroup.POST("/set_message_reaction_extensions", apiChat.SetMessageReactionExtensions)
+		chatGroup.POST("/get_message_list_reaction_extensions", apiChat.GetMessageListReactionExtensions)
+		chatGroup.POST("/add_message_reaction_extensions", apiChat.AddMessageReactionExtensions)
+		chatGroup.POST("/delete_message_reaction_extensions", apiChat.DeleteMessageReactionExtensions)
 	}
 	//Conversation
 	conversationGroup := r.Group("/conversation")
@@ -160,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)
 	}
@@ -205,7 +224,7 @@ 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")
@@ -213,7 +232,7 @@ func main() {
 		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")
@@ -222,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)
+	fmt.Println("start api server, address: ", address, ", OpenIM version: ", constant.CurrentVersion)
 	err := r.Run(address)
 	if err != nil {
-		log.Error("", "api 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:
-	make build
+install:build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/open_im_cms_api/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"Open_IM/internal/cms_api"
+	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/utils"
 	"flag"
 	"fmt"
@@ -24,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

@@ -1,12 +1,24 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_cron_task
+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=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:
-	make build
+install:build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/open_im_cron_task/main.go

@@ -2,10 +2,15 @@ package main
 
 import (
 	"Open_IM/internal/cron_task"
+	"flag"
 	"fmt"
+	"time"
 )
 
 func main() {
-	fmt.Println("start cronTask")
-	cronTask.StartCronTask()
+	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:
-	make build
+install:build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/open_im_demo/main.go

@@ -13,6 +13,8 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 
+	promePkg "Open_IM/pkg/common/prometheus"
+
 	"github.com/gin-gonic/gin"
 )
 
@@ -21,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)
@@ -62,13 +65,12 @@ func main() {
 	defaultPorts := config.Config.Demo.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)

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:
-	make build
+install: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:
-	make build
+install:build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/open_im_msg_transfer/main.go

@@ -13,10 +13,11 @@ import (
 func main() {
 	var wg sync.WaitGroup
 	wg.Add(1)
-	rpcPort := flag.Int("port", config.Config.Prometheus.MessageTransferPrometheusPort[0], "MessageTransferPrometheusPort default listen port")
+	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")
-	logic.Run(*rpcPort)
+	fmt.Println("start msg_transfer server ", ", OpenIM version: ", constant.CurrentVersion, "\n")
+	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:
-	make build
+install: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:
-	make build
+install: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:
-	make build
+install: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:
-	make build
+install: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:
-	make build
+install: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:
-	make build
+install: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:
-	make build
+install: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_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:
-	make build
+install:build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:

cmd/rpc/open_im_msg/main.go

@@ -3,6 +3,8 @@ package main
 import (
 	"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 := 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:
-	make build
+install: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:
-	make build
+install: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_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:
-	make build
+install: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

@@ -7,32 +7,36 @@ serverversion: 2.3.1
 etcd:
   etcdSchema: openim  #默认即可
   etcdAddr: [ 127.0.0.1:2379 ] #单机部署时，默认即可
-
-k8sMod: false #开启k8s模式 使用pod里面环境变量请求services调用服务 而并非etcd
+  userName:
+  password:
+  secret:
 
 mysql:
   dbMysqlAddress: [ 127.0.0.1:13306 ] #mysql地址 目前仅支持单机，默认即可
-  dbMysqlUserName: root #mysql用户名，建议修改
-  dbMysqlPassword: openIM # mysql密码，建议修改
+  dbMysqlUserName:  #mysql用户名，建议修改
+  dbMysqlPassword:  # mysql密码，建议修改
   dbMysqlDatabaseName: openIM_v2 #默认即可
   dbTableName: eMsg #默认即可
   dbMsgTableNum: 1
   dbMaxOpenConns: 100
   dbMaxIdleConns: 10
   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用户名，建议先不设置
-  dbPassword:  #mongo密码，建议先不设置
+  dbPassword:   #mongo密码，建议先不设置
   dbMaxPoolSize: 100
   dbRetainChatRecords: 3650 #mongo保存离线消息时间（天），根据需求修改
-  chatRecordsClearTime: "* * * * *" # 每天凌晨3点清除消息，该配置和linux定时任务一样， 清理操作建议设置在用户活跃少的时候 # 0 3 * * *
+  chatRecordsClearTime: "0 3 * * *" # 每天凌晨3点清除消息，该配置和linux定时任务一样， 清理操作建议设置在用户活跃少的时候 # 0 3 * * *
 
 redis:
   dbAddress: [ 127.0.0.1:16379 ] #redis地址 单机时，填写一个地址即可，使用redis集群时候，填写集群中多个节点地址（主从地址都可以填写，增加容灾能力），默认即可
@@ -40,10 +44,12 @@ redis:
   dbMaxActive: 0
   dbIdleTimeout: 120
   dbUserName:     #only redis version 6.0+ need username
-  dbPassWord: openIM #redis密码 建议修改
+  dbPassWord:  #redis密码 建议修改
   enableCluster: false #如果外部redis以集群方式启动，需要打开此开关
 
 kafka:
+  SASLUserName: 
+  SASLPassword:
   ws2mschat:
     addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可
     topic: "ws2ms_chat" #用于mongo和mysql保存消息
@@ -56,12 +62,15 @@ kafka:
   ms2pschat:
     addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可
     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---------------------#
@@ -106,44 +115,42 @@ sdk:
 #对象存储服务，以下配置二选一，目前支持两种，腾讯云和minio，二者配置好其中一种即可（如果使用minio参考https://doc.rentsoft.cn/#/qa/minio搭建minio服务器）
 credential: #腾讯cos，发送图片、视频、文件时需要，请自行申请后替换，必须修改
   tencent:
-    appID: 1302656840
-    region: ap-chengdu
-    bucket: echat-1302656840
-    secretID: AKIDGNYVChzIQinu7QEgtNp0hnNgqcV8vZTC1
-    secretKey: kz15vW83qM6dBUWIq681eBZA0c0vlIbe1
+    appID:
+    region:
+    bucket:
+    secretID:
+    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是给客户端访问的
-    endpointInner: http://127.0.0.1:10005 #minio内网地址 如果im server 可以通过内网访问到 minio就可以填写
+    endpoint:  #minio外网ip 这个ip是给客户端访问的
+    endpointInner: http://127.0.0.1:10005 #minio内网地址 如果im server 可以通过内网访问到 minio就可以
     endpointInnerEnable: true #是否启用minio内网地址 启用可以让桶初始化，IM server连接minio走内网地址访问
-    accessKeyID: user12345
-    secretAccessKey: key12345
+    accessKeyID:
+    secretAccessKey:
     storageTime: 50 #文件在minio中保存的时间
     isDistributedMod: false # 是否分布式多硬盘部署 默认docker-compose中为false
   ali: # ali oss
-    regionID: "oss-cn-beijing"
-    accessKeyID: ""
-    accessKeySecret: ""
-    stsEndpoint: "sts.cn-beijing.aliyun.com"
-    ossEndpoint: "oss-cn-beijing.aliyuncs.com"
-    bucket: "bucket1"
-    finalHost: "http://bucket1.oss-cn-beijing.aliyuncs.com"
-    stsDurationSeconds: 3600
-    OssRoleArn: "acs:ram::xxx:role/xxx"
+    regionID:
+    accessKeyID:
+    accessKeySecret:
+    stsEndpoint:
+    ossEndpoint:
+    bucket:
+    finalHost:
+    stsDurationSeconds:
+    OssRoleArn:
   aws:
-    accessKeyID: 1                            #AssumeRole用户关联的accessKeyID
-    accessKeySecret: 2     #AssumeRole用户关联的accessKeySecrect
-    region: ap-southeast-1                                        #分区
-    bucket: ouyang                                                #桶
-    finalHost:  ouyang.s3.ap-southeast-1.amazonaws.com            #对外Host
-    roleArn: arn:aws:iam::192209831083:role/AWS_S3_FOR_OUYANG     #RoleArn
-    externalId: AssumeRoleExtend                                  #角色扩展Id
-    roleSessionName: Required-AWS-ID-OPENIM                       #角色SESSION名称
+    accessKeyID:                            #AssumeRole用户关联的accessKeyID
+    accessKeySecret:                        #AssumeRole用户关联的accessKeySecrect
+    region:                                 #分区
+    bucket:                                 #桶
+    finalHost:                              #对外Host
+    roleArn:                                #RoleArn
+    externalId:                             #角色扩展Id
+    roleSessionName:                        #角色SESSION名称
 
-dtm:
-  serverURL: 127.0.0.1:10007
 
 rpcport: #rpc服务端口 默认即可
   openImUserPort: [ 10110 ]
@@ -209,26 +216,41 @@ longconnsvr:
 push:
   tpns: #腾讯推送，暂未测试 暂不要使用
     ios:
-      accessID: 1600018281
-      secretKey: 3cd68a77a95b89e5089a1aca523f318f
+      accessID:
+      secretKey:
     android:
-      accessID: 111
-      secretKey: 111
-    enable: false
+      accessID:
+      secretKey:
+    enable: false # true or false (bool)
   jpns: #极光推送 在极光后台申请后，修改以下四项，必须修改
-    appKey: cf47465a368f24c659608e7e
-    masterSecret: 02204efe3f3832947a236ee5
-    pushUrl: "https://api.jpush.cn/v3/push"
-    pushIntent: "intent:#Intent;component=io.openim.app.enterprisechat/io.openim.app.enterprisechat.MainActivity;end"
-    enable: true
+    appKey:
+    masterSecret:
+    pushUrl:
+    pushIntent:
+    enable: false # true or false (bool)
   getui:  #个推推送
-    pushUrl: "https://restapi.getui.com/v2/$appId"
+    pushUrl: 
     masterSecret: ""
     appKey: ""
     intent: ""
-    enable: false
+    enable: # true or false (bool)
+    channelID: ""
+    channelName: ""
+    channel:
+      HW:
+        category: 
+      XM:
+        channelID: 
+      OPPO:
+        channelID:  
   fcm:  #firebase cloud message 消息推送
-    serviceAccount: "openim-5c6c0-firebase-adminsdk-ppwol-8765884a78.json" #帐号文件，此处需要改修配置，并且这个文件放在 config目录下
+    serviceAccount:   #帐号文件，此处需要改修配置，并且这个文件放在 config目录下
+    enable: false
+  mob:  #袤博推送
+    appKey:   #帐号文件，此处需要改修配置，并且这个文件放在 config目录下
+    pushUrl:
+    scheme:
+    appSecret:
     enable: false
 
 
@@ -239,7 +261,7 @@ manager:
   secrets: [ "openIM1","openIM2", "openIM333", "openIMAdmin"]
   appSysNotificationName: "系统通知"
 
-secret: tuoyun
+secret:
 # 多端互踢策略
 # 1：多平台登录：Android、iOS、Windows、Mac 每种平台只能一个在线，web端可以多个同时在线
 multiloginpolicy: 1
@@ -257,11 +279,11 @@ singleMessageHasReadReceiptEnable: true
 
 #token config
 tokenpolicy:
-  accessSecret: "open_im_server" #token生成相关，默认即可
+  accessSecret:  #token生成相关，默认即可
   # Token effective time day as a unit
-  accessExpire: 90 #token过期时间（天） 默认即可
+  accessExpire:  #token过期时间（天） 默认即可
 messageverify:
-  friendVerify: false
+  friendVerify:
 
 #  c2c:
 #    callbackBeforeSendMsg:
@@ -296,7 +318,10 @@ callback:
   callbackAfterSendGroupMsg:
     enable: false
     callbackTimeOut: 2
-  callbackWordFilter:
+  callbackAfterConsumeGroupMsg:
+    enable: false
+    callbackTimeOut: 2
+  callbackMsgModify:
     enable: false
     callbackTimeOut: 2
     callbackFailedContinue: true
@@ -321,6 +346,26 @@ callback:
     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:
@@ -642,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:
@@ -717,18 +775,18 @@ demo:
   #demo对外服务端口，默认即可，需要开放此端口或做nginx转发
   openImDemoPort: [ 10004 ]
   alismsverify: #阿里云短信配置，在阿里云申请成功后修改以下四项，enable为true则必须修改，阿里云为默认短信验证方式
-    accessKeyId: LTAI5tJPkn4HuuePdiLdGqe7
-    accessKeySecret: 4n9OJ7ZCVN1U6KeHDAtOyNeVZcjOuV
-    signName: 托云信息技术
-    verificationCodeTemplateCode: SMS_226810164
+    accessKeyId:
+    accessKeySecret:
+    signName:
+    verificationCodeTemplateCode:
     enable: false
   tencentsms: #腾讯云短信配置，在腾讯云申请成功后，修改以下选项，enable为true则必须修改
-    appID:  2400000648
-    region: "ap-singapore"
-    secretID: IKIDra4JPGsFMDwQedMq42lESQBgwwgBQQAe
-    secretKey: HI6fz4uUotjJdiX6QUIrAE2buxlKdgU2
-    signName: ""
-    verificationCodeTemplateCode: 2902877
+    appID:
+    region:
+    secretID:
+    secretKey:
+    signName:
+    verificationCodeTemplateCode:
     enable: true
   superCode: 666666 #超级验证码，建议修改掉，收不到短信验证码时可以用此替代
   needInvitationCode: false
@@ -736,11 +794,11 @@ demo:
   codeTTL: 60
   useSuperCode: true
   mail: #仅支持qq邮箱，具体操作参考 https://service.mail.qq.com/cgi-bin/help?subtype=1&id=28&no=1001256 必须修改
-    title: "openIM"
-    senderMail: "765567899@qq.com"
-    senderAuthorizationCode: "gxyausfoevlzbfag"
-    smtpAddr: "smtp.qq.com"
-    smtpPort: 25   #需开放此端口 出口方向
+    title:
+    senderMail:
+    senderAuthorizationCode:
+    smtpAddr:
+    smtpPort:     #需开放此端口 出口方向
   testDepartMentID: 001
   imAPIURL: http://127.0.0.1:10002
   onboardProcess: false # 是否开启注册流程
@@ -749,9 +807,14 @@ demo:
   joinDepartmentGroups: false # 注册是否加部门群
   oaNotification: false # 注册是否发送OA通知
 
+workMoment:
+  onlyFriendCanSee: false
+
+
 rtc:
   signalTimeout: 35
 
+# prometheus每个服务监听的端口数量需要和rpc port保持一致
 prometheus:
   enable: false
   userPrometheusPort: [ 20110 ]
@@ -767,4 +830,4 @@ prometheus:
   conversationPrometheusPort: [ 20230 ]
   cachePrometheusPort: [ 20240 ]
   realTimeCommPrometheusPort: [ 21300 ]
-  messageTransferPrometheusPort: [ 21400 ]
+  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
-    region: ap-chengdu
-    bucket: echat-1302656840
-    secretID: AKIDGNYVChzIQinu7QEgtNp0hnNgqcV8vZTC
-    secretKey: kz15vW83qM6dBUWIq681eBZA0c0vlIbe
+    appID:  
+    region:    
+    bucket:  
+    secretID:  
+    secretKey:  
 
 
 rpcport:
@@ -131,16 +131,16 @@ longconnsvr:
 push:
   tpns:
     ios:
-      accessID: 1600018281
-      secretKey: 3cd68a77a95b89e5089a1aca523f318f
+      accessID:  
+      secretKey:  
     android:
-      accessID: 111
-      secretKey: 111
+      accessID:  
+      secretKey:  
   jpns:
-    appKey: cf47465a368f24c659608e7e
-    masterSecret: 02204efe3f3832947a236ee5
-    pushUrl: "https://api.jpush.cn/v3/push"
-    pushIntent: "intent:#Intent;component=io.openim.app.enterprisechat/io.openim.app.enterprisechat.MainActivity;end"
+    appKey:  
+    masterSecret:  
+    pushUrl:  
+    pushIntent:  
 manager:
   appManagerUid: ["openIM123456","openIM654321"]
   secrets: ["openIM1","openIM2"]
@@ -168,16 +168,16 @@ demoswitch: true
 demo:
   openImDemoPort: [ 42233 ]
   alismsverify:
-    accessKeyId: LTAI5tJPkn4HuuePdiLdGqe71
-    accessKeySecret: 4n9OJ7ZCVN1U6KeHDAtOyNeVZcjOuV1
-    signName: OpenIM Corporation
-    verificationCodeTemplateCode: SMS_2268101641
+    accessKeyId:  
+    accessKeySecret:  
+    signName:    
+    verificationCodeTemplateCode:  
   superCode: 666666
   mail:
-    title: "openIM"
-    senderMail: "1765567899@qq.com"
-    senderAuthorizationCode: "1gxyausfoevlzbfag"
-    smtpAddr: "smtp.qq.com"
-    smtpPort: 25
+    title:  
+    senderMail:  
+    senderAuthorizationCode: 
+    smtpAddr:  
+    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

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: admin-cms
-          image: openim/admin_cms:v2.3.0release
+          image: openim/admin_cms:v2.3.8
           # imagePullPolicy: Always #每次启动都重新拉取镜像
           ports:
             - containerPort: 10200
@@ -25,11 +25,18 @@ spec:
               readOnly: true
           env:
             - name: CONFIG_NAME
-              value: "/Open-IM-Server"    
+              value: "/Open-IM-Server"
+            - name: USUAL_CONFIG_NAME
+              value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
-            name: openim-config
+          projected:
+            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

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: api
-        image: openim/api:v2.3.0release
+        image: openim/api:v2.3.8
         # imagePullPolicy: Always
         ports:
         - containerPort: 10002
@@ -25,11 +25,17 @@ spec:
             readOnly: true
         env:
           - name: CONFIG_NAME
-            value: "/Open-IM-Server"        
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
-            name: openim-config
+          projected:
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新
 ---

deploy_k8s/auth/auth.Dockerfile

@@ -11,7 +11,8 @@ 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"]
 
 

deploy_k8s/auth/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: auth
-        image: openim/auth:v2.3.0release
+        image: openim/auth:v2.3.8
         # imagePullPolicy: Always
         ports:
         - containerPort: 10160
@@ -25,10 +25,16 @@ spec:
             readOnly: true
         env:
           - name: CONFIG_NAME
-            value: "/Open-IM-Server"        
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
-            name: openim-config
+          projected:
+            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.2.0
+version=v2.3.8
 git pull
 cd ../script/; ./build_all_service.sh
 cd ../deploy_k8s/

deploy_k8s/cache/cache.Dockerfile

@@ -12,7 +12,8 @@ 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 $CMDDIR

deploy_k8s/cache/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: cache
-        image: openim/cache:v2.3.0release
+        image: openim/cache:v2.3.8
         # imagePullPolicy: Always
         ports:
         - containerPort: 10240
@@ -25,10 +25,16 @@ spec:
             readOnly: true
         env:
           - name: CONFIG_NAME
-            value: "/Open-IM-Server"     
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
-            name: openim-config
+          projected:
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新

deploy_k8s/cms_api/cms_api.Dockerfile

@@ -11,7 +11,8 @@ 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 $CMDDIR

deploy_k8s/cms_api/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: cms-api
-        image: openim/cms_api:v2.3.0release
+        image: openim/cms_api:v2.3.8
         imagePullPolicy: Always
         ports:
         - containerPort: 10006
@@ -25,11 +25,17 @@ spec:
             readOnly: true
         env:
           - name: CONFIG_NAME
-            value: "/Open-IM-Server"     
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
-            name: openim-config
+          projected:
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新
 ---

deploy_k8s/conversation/conversation.Dockerfile

@@ -11,7 +11,8 @@ 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 $CMDDIR

deploy_k8s/conversation/deployment.yaml

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

deploy_k8s/demo/demo.Dockerfile

@@ -11,7 +11,8 @@ 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"]
 
 

deploy_k8s/demo/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: demo
-        image: openim/demo:v2.3.0release
+        image: openim/demo:v2.3.8
         imagePullPolicy: Always
         ports:
         - containerPort: 10004
@@ -25,11 +25,17 @@ spec:
             readOnly: true
         env:
           - name: CONFIG_NAME
-            value: "/Open-IM-Server"     
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
-            name: openim-config
+          projected:
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新
 ---

deploy_k8s/friend/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: friend
-        image: openim/friend:v2.3.0release
+        image: openim/friend:v2.3.8
         # imagePullPolicy: Always
         ports:
         - containerPort: 10120
@@ -25,11 +25,17 @@ spec:
             readOnly: true
         env:
           - name: CONFIG_NAME
-            value: "/Open-IM-Server"     
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
-            name: openim-config
+          projected:
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新
 

deploy_k8s/friend/friend.Dockerfile

@@ -12,7 +12,8 @@ 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 $CMDDIR

deploy_k8s/group/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: group
-        image: openim/group:v2.3.0release
+        image: openim/group:v2.3.8
         # imagePullPolicy: Always
         ports:
         - containerPort: 10150
@@ -25,10 +25,16 @@ spec:
             readOnly: true
         env:
           - name: CONFIG_NAME
-            value: "/Open-IM-Server"     
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
-            name: openim-config
+          projected:
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新

deploy_k8s/group/group.Dockerfile

@@ -11,7 +11,8 @@ 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"]
 
 

deploy_k8s/k8s_openim_deploy.md

@@ -9,17 +9,17 @@
 6. 将rpcRegisterIP修改为空, 此地址为每个rpc注册到ETCD的地址, 置空每个rpc将会将pod地址注册到ETCD, 才能正确rpc请求(重要)
 7. 如果使用minio作为对象存储, 还需要修改minio的地址
 8. 其他如果使用离线推送,需要修改push离线推送配置
-9. 修改demo中的imAPIURL字段为openIM api的ingress或者service地址, 需要让demo的pod能正确请求到(重要)
-10. 其他非必须配置修改, 如短信,推送等
+
 
 ### 2. 项目根目录创建im configMap到k8s openim namespace
 1. 为open-IM项目创建单独命名空间
  ```  
     kubectl create namespace openim
  ```  
-2. 在项目根目录通过config/config.yaml  
+2. 修改config.yaml后在项目根目录创建configmap, config/usualConfig.yaml只需要挂载不需要修改配置
  ```  
-    kubectl -n openim create configmap config --from-file=config/config.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
  ```

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,34 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: message-cms-deployment
-spec:
-  selector:
-    matchLabels:
-      app: message-cms # 选择这个指定标签执行
-  replicas: 1 # 运行pod数量
-  template:
-    metadata:
-      labels:
-        app: message-cms # 标签
-    spec:
-      containers:
-      - name: message-cms
-        image: openim/message_cms:v2.3.0release
-        # imagePullPolicy: Always
-        ports:
-        - containerPort: 10190
-        volumeMounts:
-          - name: config
-            mountPath: /Open-IM-Server/config
-            readOnly: true
-        env:
-          - name: CONFIG_NAME
-            value: "/Open-IM-Server"     
-      volumes:
-        - name: config
-          configMap:
-            name: openim-config
-  strategy: #更新策略
-    type: RollingUpdate # 滚动更新

deploy_k8s/message_cms/message_cms.Dockerfile

@@ -1,19 +0,0 @@
-FROM ubuntu
-
-# 设置固定的项目路径
-ENV WORKDIR /Open-IM-Server
-ENV CMDDIR $WORKDIR/cmd
-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 $CMDDIR
-CMD ./main

deploy_k8s/msg/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: msg
-        image: openim/msg:v2.3.0release
+        image: openim/msg:v2.3.8
         # imagePullPolicy: Always
         ports:
         - containerPort: 10130
@@ -25,10 +25,16 @@ spec:
             readOnly: true
         env:
           - name: CONFIG_NAME
-            value: "/Open-IM-Server"         
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
-            name: openim-config
+          projected:
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新

deploy_k8s/msg/msg.Dockerfile

@@ -12,7 +12,8 @@ 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"]
 
 

deploy_k8s/msg_gateway/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: msg-gateway
-        image: openim/msg_gateway:v2.3.0release
+        image: openim/msg_gateway:v2.3.8
         # imagePullPolicy: Always
         ports:
         - name: rpc-port
@@ -28,11 +28,17 @@ spec:
             readOnly: true
         env:
           - name: CONFIG_NAME
-            value: "/Open-IM-Server"         
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
-            name: openim-config
+          projected:
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新
 ---

deploy_k8s/msg_gateway/msg_gateway.Dockerfile

@@ -11,7 +11,8 @@ 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"]
 
 

deploy_k8s/msg_transfer/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: msg-transfer
-        image: openim/msg_transfer:v2.3.0release
+        image: openim/msg_transfer:v2.3.8
         # imagePullPolicy: Always
         volumeMounts:
           - name: config
@@ -23,10 +23,16 @@ spec:
             readOnly: true
         env:
           - name: CONFIG_NAME
-            value: "/Open-IM-Server"         
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
-            name: openim-config
+          projected:
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新

deploy_k8s/msg_transfer/msg_transfer.Dockerfile

@@ -11,7 +11,8 @@ 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"]
 
 

deploy_k8s/office/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: office
-        image: openim/office:v2.3.0release
+        image: openim/office:v2.3.8
         # imagePullPolicy: Always
         ports:
         - containerPort: 10210
@@ -25,10 +25,16 @@ spec:
             readOnly: true
         env:
           - name: CONFIG_NAME
-            value: "/Open-IM-Server"         
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
-            name: openim-config
+          projected:
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新

deploy_k8s/office/office.Dockerfile

@@ -12,7 +12,8 @@ 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"]
 
 

deploy_k8s/organization/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: organization
-        image: openim/organization:v2.3.0release
+        image: openim/organization:v2.3.8
         # imagePullPolicy: Always
         ports:
         - containerPort: 10220
@@ -25,10 +25,16 @@ spec:
             readOnly: true
         env:
           - name: CONFIG_NAME
-            value: "/Open-IM-Server"         
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
-            name: openim-config
+          projected:
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新

deploy_k8s/organization/organization.Dockerfile

@@ -12,7 +12,8 @@ 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"]
 
 

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

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: push
-        image: openim/push:v2.3.0release
+        image: openim/push:v2.3.8
         # imagePullPolicy: Always
         ports:
         - containerPort: 10170
@@ -25,10 +25,16 @@ spec:
             readOnly: true
         env:
           - name: CONFIG_NAME
-            value: "/Open-IM-Server"         
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
-            name: openim-config
+          projected:
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新

deploy_k8s/push/push.Dockerfile

@@ -12,7 +12,8 @@ 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"]
 
 

deploy_k8s/sdk_server/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: sdk-server
-        image: openim/sdk_server:v2.3.0release
+        image: openim/sdk_server:v2.3.8
         # imagePullPolicy: Always
         ports:
         - containerPort: 10003
@@ -29,7 +29,7 @@ spec:
           - name: CONFIG_NAME
             value: "/Open-IM-Server"         
         command: ["/Open-IM-Server/main"]
-        args: ["-openIM_ws_address", "ws_addr", "-sdk_ws_port", "10001", "-openIM_api_address", "api_address", "-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:

deploy_k8s/sdk_server/sdk_server.Dockerfile

@@ -11,7 +11,8 @@ 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 $CMDDIR

deploy_k8s/statistics/deployment.yaml

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

deploy_k8s/statistics/statistics.Dockerfile

@@ -1,19 +0,0 @@
-FROM ubuntu
-
-# 设置固定的项目路径
-ENV WORKDIR /Open-IM-Server
-ENV CMDDIR $WORKDIR/cmd
-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 $CMDDIR
-CMD ./main

deploy_k8s/user/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: user
-        image: openim/user:v2.3.0release
+        image: openim/user:v2.3.8
         # imagePullPolicy: Always
         volumeMounts:
           - name: config
@@ -23,10 +23,16 @@ spec:
             readOnly: true
         env:
           - name: CONFIG_NAME
-            value: "/Open-IM-Server"         
+            value: "/Open-IM-Server"
+          - name: USUAL_CONFIG_NAME
+            value: "/Open-IM-Server"
       volumes:
         - name: config
-          configMap:
-            name: openim-config
+          projected:
+            sources:
+            - configMap:
+                name: openim-config
+            - configMap:
+                name: openim-usualconfig
   strategy: #更新策略
     type: RollingUpdate # 滚动更新

deploy_k8s/user/user.Dockerfile

@@ -11,7 +11,8 @@ 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"]
 
 

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,21 +19,22 @@ services:
     ports:
       - 37017:27017
     container_name: mongo
-    command: --wiredTigerCacheSizeGB 1
+    command: --wiredTigerCacheSizeGB 1 --auth
     volumes:
-      - ./components/mongodb/data/db:/data/db
-      - ./components/mongodb/data/logs:/data/logs
-      - ./components/mongodb/data/conf:/etc/mongo
-    #      - ./script/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh
+      - ${DATA_DIR}/components/mongodb/data/db:/data/db
+      - ${DATA_DIR}/components/mongodb/data/logs:/data/logs
+      - ${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
-    #      - MONGO_USERNAME=openIM
-    #      - MONGO_PASSWORD=openIM
-    #      - MONGO_INITDB_ROOT_USERNAME=root
-    #      - MONGO_INITDB_ROOT_PASSWORD=root
-    #      - MONGO_INITDB_DATABASE=openIM
+      - MONGO_INITDB_ROOT_USERNAME=${USER}
+      - MONGO_INITDB_ROOT_PASSWORD=${PASSWORD}
+      - MONGO_INITDB_DATABASE=openIM
+      - MONGO_USERNAME=${USER}
+      - MONGO_PASSWORD=${PASSWORD}
+    #
     restart: always
 
   redis:
@@ -43,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:
@@ -108,19 +108,20 @@ services:
       - /mnt/data:/data
       - /mnt/config:/root/.minio
     environment:
-      MINIO_ROOT_USER: user12345
-      MINIO_ROOT_PASSWORD: key12345
+      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.3.2
+    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:
@@ -137,14 +138,36 @@ services:
         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
-      # - ./components/prometheus_data:/prometheus
     container_name: prometheus
-    ports:
-    - 9091:9091
+    #    ports:
+    #    - 9091:9091
     depends_on:
     - open_im_server
     command: --web.listen-address=:9091 --config.file="/etc/prometheus/prometheus.yml"
@@ -159,8 +182,8 @@ services:
     - ./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
+    #    ports:
+    #    - 10007:10007
     depends_on:
     - prometheus
     network_mode: "host" 
@@ -171,4 +194,3 @@ services:
     restart: always
     ports:
       - "9100:9100"
-    # command: --collector.ENTER-THE-NAME-OF-COLLECTOR

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/grafana.ini

@@ -1105,7 +1105,7 @@ disable_sanitize_html = false
 enable_alpha = false
 app_tls_skip_verify_insecure = false
 # Enter a comma-separated list of plugin identifiers to identify plugins to load even if they are unsigned. Plugins with modified signatures are never loaded.
-allow_loading_unsigned_plugins =
+allow_loading_unsigned_plugins = grafana-simple-json-backend-datasource
 # Enable or disable installing / uninstalling / updating plugins directly from within Grafana.
 plugin_admin_enabled = true
 plugin_admin_external_manage_enabled = false

docker-compose_cfg/prometheus-compose.yml

@@ -13,14 +13,76 @@ scrape_configs:
     - job_name: 'openIM-server'
       metrics_path: /metrics
       static_configs:
+      - targets: ['localhost:10002']
+        labels:
+          group: 'api'
+
       - targets: ['localhost:10006']
         labels:
           group: 'cms-api'
-      - targets: ['localhost:21400']
+          
+
+      - targets: ['localhost:20110']
+        labels:
+          group: 'user'
+
+      - targets: ['localhost:20120']
+        labels:
+          group: 'friend'
+
+      - targets: ['localhost:20130']
+        labels:
+          group: 'message'
+
+      - targets: ['localhost:20140']
+        labels:
+          group: 'msg-gateway'    
+
+      - targets: ['localhost:20150']
+        labels:
+          group: 'group'
+
+      - targets: ['localhost:20160']
+        labels:
+          group: 'auth'
+
+      - targets: ['localhost:20170']
+        labels:
+          group: 'push'
+
+      - targets: ['localhost:20120']
+        labels:
+          group: 'friend'    
+
+      - targets: ['localhost:20200']
+        labels:
+          group: 'admin-cms' 
+      
+      - targets: ['localhost:20120']
+        labels:
+          group: 'office' 
+      
+      - targets: ['localhost:20220']
+        labels:
+          group: 'organization' 
+      
+      - targets: ['localhost:20230']
+        labels:
+          group: 'conversation' 
+      
+      - targets: ['localhost:20240']
+        labels:
+          group: 'cache' 
+      
+      - targets: ['localhost:21400', 'localhost:21401', 'localhost:21402', 'localhost:21403']
         labels:
           group: 'msg-transfer'
+       
+ 
 
 
+      
+
     - job_name: 'node'  
       scrape_interval: 8s
       static_configs:

go.mod

@@ -24,11 +24,11 @@ require (
 	github.com/go-playground/validator/v10 v10.11.0
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/gogo/protobuf v1.3.2
-	github.com/golang-jwt/jwt/v4 v4.1.0
+	github.com/golang-jwt/jwt/v4 v4.4.2
 	github.com/golang/protobuf v1.5.2
 	github.com/gorilla/websocket v1.4.2
+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/jinzhu/copier v0.3.4
-	github.com/jinzhu/gorm v1.9.16
 	github.com/jonboulle/clockwork v0.2.2 // indirect
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
 	github.com/lestrrat-go/strftime v1.0.4 // indirect
@@ -38,7 +38,7 @@ require (
 	github.com/olivere/elastic/v7 v7.0.23
 	github.com/pelletier/go-toml/v2 v2.0.2 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.13.0 // indirect
+	github.com/prometheus/client_golang v1.13.0
 	github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/sirupsen/logrus v1.8.1
@@ -49,7 +49,6 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.428
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms v1.0.428
 	github.com/tencentyun/qcloud-cos-sts-sdk v0.0.0-20210325043845-84a0811633ca
-	github.com/xuri/excelize/v2 v2.6.0
 	go.etcd.io/etcd/api/v3 v3.5.4
 	go.etcd.io/etcd/client/v3 v3.5.4
 	go.mongodb.org/mongo-driver v1.8.3

go.sum

@@ -156,6 +156,7 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM=
 github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
@@ -178,6 +179,7 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y=
 github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
@@ -247,8 +249,9 @@ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang-jwt/jwt/v4 v4.1.0 h1:XUgk2Ex5veyVFVeLm0xhusUTQybEbexJXrvPNOKkSY0=
-github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
+github.com/golang-jwt/jwt/v4 v4.4.2 h1:rcc4lwaZgFMCZ5jxF9ABolDcIHdBytAFgqFPbSJQAYs=
+github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -341,6 +344,7 @@ github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7Fsg
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
@@ -364,8 +368,6 @@ github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZ
 github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
 github.com/jinzhu/copier v0.3.4 h1:mfU6jI9PtCeUjkjQ322dlff9ELjGDu975C2p/nrubVI=
 github.com/jinzhu/copier v0.3.4/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
-github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o=
-github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
@@ -419,6 +421,7 @@ github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkL
 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
 github.com/lestrrat-go/strftime v1.0.4 h1:T1Rb9EPkAhgxKqbcMIPguPq8glqXTA1koF8n9BHElA8=
 github.com/lestrrat-go/strftime v1.0.4/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
+github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
 github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lithammer/shortuuid v3.0.0+incompatible h1:NcD0xWW/MZYXEHa6ITy6kaXN5nwm/V115vj2YXfhS0w=
 github.com/lithammer/shortuuid v3.0.0+incompatible/go.mod h1:FR74pbAuElzOUuenUHTK2Tciko1/vKuIKS9dSkDrA4w=
@@ -430,6 +433,7 @@ github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-sqlite3 v1.14.0 h1:mLyGNKR8+Vv9CAU7PphKa2hkEqxxhn8i32J6FPj1/QA=
 github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
@@ -450,8 +454,6 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
-github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -521,10 +523,6 @@ github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5
 github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM=
-github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
-github.com/richardlehane/msoleps v1.0.1 h1:RfrALnSNXzmXLbGct/P2b4xkFz4e8Gmj/0Vj9M9xC1o=
-github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo=
 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5/go.mod h1:GEXHk5HgEKCvEIIrSpFI3ozzG5xOKA2DVlEX/gGnewM=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
@@ -594,12 +592,6 @@ github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyh
 github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
 github.com/xdg/scram v1.0.3/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
 github.com/xdg/stringprep v1.0.3/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
-github.com/xuri/efp v0.0.0-20220407160117-ad0f7a785be8 h1:3X7aE0iLKJ5j+tz58BpvIZkXNV7Yq4jC93Z/rbN2Fxk=
-github.com/xuri/efp v0.0.0-20220407160117-ad0f7a785be8/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
-github.com/xuri/excelize/v2 v2.6.0 h1:m/aXAzSAqxgt74Nfd+sNzpzVKhTGl7+S9nbG4A57mF4=
-github.com/xuri/excelize/v2 v2.6.0/go.mod h1:Q1YetlHesXEKwGFfeJn7PfEZz2IvHb6wdOeYjBxVcVs=
-github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 h1:OAmKAfT06//esDdpi/DZ8Qsdt4+M5+ltca05dA5bG2M=
-github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -654,7 +646,6 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220408190544-5352b0902921/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM=
 golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -747,7 +738,6 @@ golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220622184535-263ec571b305 h1:dAgbJ2SP4jD6XYfMNLVj0BF21jo2PjChrtGaAvF5M3I=
 golang.org/x/net v0.0.0-20220622184535-263ec571b305/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
@@ -766,8 +756,8 @@ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1 h1:B333XXssMuKQeBwiNODx4TupZy7bf4sxFZnN2ZOcvUE=
 golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b h1:clP8eMhB30EHdc0bd2Twtq6kgU7yl5ub2cQLSdrv1Dg=
 golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -779,7 +769,6 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8=
 golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -1076,7 +1065,6 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=

init_docker.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+cd script ;
+chmod +x *.sh ;
+./env_check.sh;
+cd .. ;
+docker-compose up -d;
+cd script ;
+./docker_check_service.sh

install_im_server.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+internet_ip=`curl ifconfig.me -s`
+echo $internet_ip
+
+source .env
+echo $MINIO_ENDPOINT
+if [ $MINIO_ENDPOINT == "http://127.0.0.1:10005" ]; then
+	sed -i "s/127.0.0.1/${internet_ip}/" .env 
+
+fi
+	
+cd script ;
+chmod +x *.sh ;
+./init_pwd.sh
+./env_check.sh;
+cd .. ;
+docker-compose up -d;
+cd script ;
+./docker_check_service.sh

internal/api/auth/auth.go

@@ -107,7 +107,7 @@ func UserToken(c *gin.Context) {
 	params := api.UserTokenReq{}
 	if err := c.BindJSON(&params); err != nil {
 		errMsg := " BindJSON failed " + err.Error()
-		log.NewError("0", errMsg)
+		log.NewError(params.OperationID, errMsg)
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": errMsg})
 		return
 	}
@@ -199,7 +199,6 @@ func ForceLogout(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": errMsg})
 		return
 	}
-
 	req := &rpc.ForceLogoutReq{}
 	utils.CopyStructFields(req, &params)
 

internal/api/client_init/init_config.go

@@ -9,7 +9,6 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/jinzhu/gorm"
 )
 
 func SetClientInitConfig(c *gin.Context) {
@@ -62,11 +61,10 @@ func GetClientInitConfig(c *gin.Context) {
 	}
 	config, err := imdb.GetClientInitConfig()
 	if err != nil {
-		if !gorm.IsRecordNotFoundError(err) {
-			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
-			c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
-			return
-		}
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
+		return
+
 	}
 	resp.Data.DiscoverPageURL = config.DiscoverPageURL
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp ", resp)

internal/api/group/group.go

@@ -42,10 +42,14 @@ func KickGroupMember(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
-
+	if len(params.KickedUserIDList) > constant.MaxNotificationNum {
+		errMsg := params.OperationID + " too many members " + utils.Int32ToString(int32(len(params.KickedUserIDList)))
+		log.Error(params.OperationID, errMsg)
+		c.JSON(http.StatusOK, gin.H{"errCode": 400, "errMsg": errMsg})
+		return
+	}
 	req := &rpc.KickGroupMemberReq{}
 	utils.CopyStructFields(req, &params)
-
 	var ok bool
 	var errInfo string
 	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
@@ -318,6 +322,12 @@ func InviteUserToGroup(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
+	if len(params.InvitedUserIDList) > constant.MaxNotificationNum {
+		errMsg := params.OperationID + " too many members " + utils.Int32ToString(int32(len(params.InvitedUserIDList)))
+		log.Error(params.OperationID, errMsg)
+		c.JSON(http.StatusOK, gin.H{"errCode": 400, "errMsg": errMsg})
+		return
+	}
 	req := &rpc.InviteUserToGroupReq{}
 	utils.CopyStructFields(req, &params)
 
@@ -360,6 +370,47 @@ func InviteUserToGroup(c *gin.Context) {
 	log.NewInfo(req.OperationID, "InviteUserToGroup api return ", resp)
 	c.JSON(http.StatusOK, resp)
 }
+func InviteUserToGroups(c *gin.Context) {
+	params := api.InviteUserToGroupsReq{}
+	if err := c.BindJSON(&params); err != nil {
+		log.NewError("0", "BindJSON failed ", err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	req := &rpc.InviteUserToGroupsReq{}
+	utils.CopyStructFields(req, &params)
+
+	var ok bool
+	var errInfo string
+	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	if !ok {
+		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+
+	log.NewInfo(req.OperationID, "InviteUserToGroup args ", req.String())
+
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	if etcdConn == nil {
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	client := rpc.NewGroupClient(etcdConn)
+	RpcResp, err := client.InviteUserToGroups(context.Background(), req)
+	if err != nil {
+		log.NewError(req.OperationID, "InviteUserToGroup failed ", err.Error(), req.String())
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
+		return
+	}
+	resp := api.InviteUserToGroupResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}}
+
+	log.NewInfo(req.OperationID, "InviteUserToGroups api return ", resp)
+	c.JSON(http.StatusOK, resp)
+}
 
 // @Summary 创建群组
 // @Description 创建群组

internal/api/manage/management_chat.go

@@ -38,6 +38,7 @@ func SetOptions(options map[string]bool, value bool) {
 
 func newUserSendMsgReq(params *api.ManagementSendMsgReq) *pbChat.SendMsgReq {
 	var newContent string
+	options := make(map[string]bool, 5)
 	var err error
 	switch params.ContentType {
 	case constant.Text:
@@ -52,13 +53,20 @@ func newUserSendMsgReq(params *api.ManagementSendMsgReq) *pbChat.SendMsgReq {
 		fallthrough
 	case constant.File:
 		fallthrough
+	case constant.CustomNotTriggerConversation:
+		fallthrough
+	case constant.CustomOnlineOnly:
+		fallthrough
+	case constant.AtText:
+		fallthrough
 	case constant.AdvancedRevoke:
+		utils.SetSwitchFromOptions(options, constant.IsUnreadCount, false)
 		newContent = utils.StructToJsonString(params.Content)
 	case constant.Revoke:
+		utils.SetSwitchFromOptions(options, constant.IsUnreadCount, false)
 		newContent = params.Content["revokeMsgClientID"].(string)
 	default:
 	}
-	options := make(map[string]bool, 5)
 	if params.IsOnlineOnly {
 		SetOptions(options, false)
 	}
@@ -138,12 +146,6 @@ func ManagementSendMsg(c *gin.Context) {
 		data = VideoElem{}
 	case constant.File:
 		data = FileElem{}
-	//case constant.AtText:
-	//	data = AtElem{}
-	//case constant.Merger:
-	//	data =
-	//case constant.Card:
-	//case constant.Location:
 	case constant.Custom:
 		data = CustomElem{}
 	case constant.Revoke:
@@ -157,20 +159,22 @@ func ManagementSendMsg(c *gin.Context) {
 		data = CustomElem{}
 	case constant.CustomOnlineOnly:
 		data = CustomElem{}
+	case constant.AtText:
+		data = AtElem{}
 	//case constant.HasReadReceipt:
 	//case constant.Typing:
 	//case constant.Quote:
 	default:
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": 404, "errMsg": "contentType err"})
+		c.JSON(http.StatusOK, gin.H{"errCode": 404, "errMsg": "contentType err"})
 		log.Error(c.PostForm("operationID"), "contentType err", c.PostForm("content"))
 		return
 	}
 	if err := mapstructure.WeakDecode(params.Content, &data); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": 401, "errMsg": err.Error()})
+		c.JSON(http.StatusOK, gin.H{"errCode": 401, "errMsg": err.Error()})
 		log.Error(c.PostForm("operationID"), "content to Data struct  err", err.Error())
 		return
 	} else if err := validate.Struct(data); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": 403, "errMsg": err.Error()})
+		c.JSON(http.StatusOK, gin.H{"errCode": 403, "errMsg": err.Error()})
 		log.Error(c.PostForm("operationID"), "data args validate  err", err.Error())
 		return
 	}
@@ -178,12 +182,13 @@ func ManagementSendMsg(c *gin.Context) {
 	token := c.Request.Header.Get("token")
 	claims, err := token_verify.ParseToken(token, params.OperationID)
 	if err != nil {
-		log.NewError(params.OperationID, "parse token failed", err.Error())
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": "parse token failed", "sendTime": 0, "MsgID": ""})
+		log.NewError(params.OperationID, "parse token failed", err.Error(), token)
+		c.JSON(http.StatusOK, gin.H{"errCode": 400, "errMsg": "parse token failed", "sendTime": 0, "MsgID": ""})
 		return
 	}
 	if !utils.IsContain(claims.UID, config.Config.Manager.AppManagerUid) {
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": "not authorized", "sendTime": 0, "MsgID": ""})
+		log.NewError(params.OperationID, "not authorized", token)
+		c.JSON(http.StatusOK, gin.H{"errCode": 400, "errMsg": "not authorized", "sendTime": 0, "MsgID": ""})
 		return
 
 	}
@@ -191,13 +196,13 @@ func ManagementSendMsg(c *gin.Context) {
 	case constant.SingleChatType:
 		if len(params.RecvID) == 0 {
 			log.NewError(params.OperationID, "recvID is a null string")
-			c.JSON(http.StatusBadRequest, gin.H{"errCode": 405, "errMsg": "recvID is a null string", "sendTime": 0, "MsgID": ""})
+			c.JSON(http.StatusOK, gin.H{"errCode": 405, "errMsg": "recvID is a null string", "sendTime": 0, "MsgID": ""})
 			return
 		}
 	case constant.GroupChatType, constant.SuperGroupChatType:
 		if len(params.GroupID) == 0 {
 			log.NewError(params.OperationID, "groupID is a null string")
-			c.JSON(http.StatusBadRequest, gin.H{"errCode": 405, "errMsg": "groupID is a null string", "sendTime": 0, "MsgID": ""})
+			c.JSON(http.StatusOK, gin.H{"errCode": 405, "errMsg": "groupID is a null string", "sendTime": 0, "MsgID": ""})
 			return
 		}
 
@@ -468,9 +473,13 @@ type FileElem struct {
 	FileSize  int64  `mapstructure:"fileSize"`
 }
 type AtElem struct {
-	Text       string   `mapstructure:"text"`
-	AtUserList []string `mapstructure:"atUserList"`
-	IsAtSelf   bool     `mapstructure:"isAtSelf"`
+	Text        string   `mapstructure:"text"`
+	AtUserList  []string `mapstructure:"atUserList"`
+	AtUsersInfo []struct {
+		AtUserID      string `json:"atUserID,omitempty"`
+		GroupNickname string `json:"groupNickname,omitempty"`
+	} `json:"atUsersInfo,omitempty"`
+	IsAtSelf bool `mapstructure:"isAtSelf"`
 }
 type LocationElem struct {
 	Description string  `mapstructure:"description"`
@@ -503,9 +512,10 @@ type OANotificationElem struct {
 	Ex                  string      `mapstructure:"ex" json:"ex"`
 }
 type MessageRevoked struct {
-	RevokerID       string `mapstructure:"notificationName" json:"revokerID" validate:"required"`
-	RevokerRole     int32  `mapstructure:"notificationName" json:"revokerRole" validate:"required"`
-	ClientMsgID     string `mapstructure:"notificationName" json:"clientMsgID" validate:"required"`
-	RevokerNickname string `mapstructure:"notificationName" json:"revokerNickname"`
-	SessionType     int32  `mapstructure:"notificationName" json:"sessionType" validate:"required"`
+	RevokerID       string `mapstructure:"revokerID" json:"revokerID" validate:"required"`
+	RevokerRole     int32  `mapstructure:"revokerRole" json:"revokerRole" validate:"required"`
+	ClientMsgID     string `mapstructure:"clientMsgID" json:"clientMsgID" validate:"required"`
+	RevokerNickname string `mapstructure:"revokerNickname" json:"revokerNickname"`
+	SessionType     int32  `mapstructure:"sessionType" json:"sessionType" validate:"required"`
+	Seq             uint32 `mapstructure:"seq" json:"seq" validate:"required"`
 }

internal/api/msg/del_msg.go

@@ -80,7 +80,8 @@ func DelSuperGroupMsg(c *gin.Context) {
 	)
 	rpcReq := &rpc.DelSuperGroupMsgReq{}
 	if err := c.BindJSON(&req); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		log.NewError("", "args err:", err.Error())
+		c.JSON(http.StatusOK, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
 	utils.CopyStructFields(rpcReq, &req)
@@ -91,7 +92,7 @@ func DelSuperGroupMsg(c *gin.Context) {
 	if !ok {
 		errMsg := req.OperationID + " " + rpcReq.OpUserID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg})
+		c.JSON(http.StatusOK, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
 	options := make(map[string]bool, 5)

internal/api/msg/extend_msg.go

@@ -0,0 +1,207 @@
+package msg
+
+import (
+	api "Open_IM/pkg/base_info"
+	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
+	"Open_IM/pkg/common/log"
+	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	rpc "Open_IM/pkg/proto/msg"
+	"Open_IM/pkg/utils"
+	"context"
+	"github.com/gin-gonic/gin"
+	"net/http"
+	"strings"
+)
+
+func SetMessageReactionExtensions(c *gin.Context) {
+	var (
+		req   api.SetMessageReactionExtensionsReq
+		resp  api.SetMessageReactionExtensionsResp
+		reqPb rpc.SetMessageReactionExtensionsReq
+	)
+
+	if err := c.BindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req)
+
+	if err := utils.CopyStructFields(&reqPb, &req); err != nil {
+		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields", err.Error())
+	}
+	var ok bool
+	var errInfo string
+	ok, reqPb.OpUserID, errInfo, reqPb.OpUserIDPlatformID = token_verify.GetUserIDAndPlatformIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	if !ok {
+		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+
+	grpcConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
+	if grpcConn == nil {
+		errMsg := req.OperationID + " getcdv3.GetDefaultConn == nil"
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	msgClient := rpc.NewMsgClient(grpcConn)
+	respPb, err := msgClient.SetMessageReactionExtensions(context.Background(), &reqPb)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "DelMsgList failed", err.Error(), reqPb)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": constant.ErrServer.ErrCode, "errMsg": constant.ErrServer.ErrMsg + err.Error()})
+		return
+	}
+	resp.ErrCode = respPb.ErrCode
+	resp.ErrMsg = respPb.ErrMsg
+	resp.Data.ResultKeyValue = respPb.Result
+	resp.Data.MsgFirstModifyTime = reqPb.MsgFirstModifyTime
+	resp.Data.IsReact = reqPb.IsReact
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp)
+	c.JSON(http.StatusOK, resp)
+
+}
+
+func GetMessageListReactionExtensions(c *gin.Context) {
+	var (
+		req   api.GetMessageListReactionExtensionsReq
+		resp  api.GetMessageListReactionExtensionsResp
+		reqPb rpc.GetMessageListReactionExtensionsReq
+	)
+	if err := c.BindJSON(&req); err != nil {
+		c.JSON(http.StatusOK, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req)
+
+	if err := utils.CopyStructFields(&reqPb, &req); err != nil {
+		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields", err.Error())
+	}
+	var ok bool
+	var errInfo string
+	ok, reqPb.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	if !ok {
+		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusOK, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+
+	grpcConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
+	if grpcConn == nil {
+		errMsg := req.OperationID + " getcdv3.GetDefaultConn == nil"
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	msgClient := rpc.NewMsgClient(grpcConn)
+	respPb, err := msgClient.GetMessageListReactionExtensions(context.Background(), &reqPb)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "DelMsgList failed", err.Error(), reqPb)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": constant.ErrServer.ErrCode, "errMsg": constant.ErrServer.ErrMsg + err.Error()})
+		return
+	}
+	resp.ErrCode = respPb.ErrCode
+	resp.ErrMsg = respPb.ErrMsg
+	resp.Data = respPb.SingleMessageResult
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp)
+	c.JSON(http.StatusOK, resp)
+}
+
+func AddMessageReactionExtensions(c *gin.Context) {
+	var (
+		req   api.AddMessageReactionExtensionsReq
+		resp  api.AddMessageReactionExtensionsResp
+		reqPb rpc.AddMessageReactionExtensionsReq
+	)
+
+	if err := c.BindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req)
+
+	if err := utils.CopyStructFields(&reqPb, &req); err != nil {
+		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields", err.Error())
+	}
+	var ok bool
+	var errInfo string
+	ok, reqPb.OpUserID, errInfo, reqPb.OpUserIDPlatformID = token_verify.GetUserIDAndPlatformIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	if !ok {
+		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+
+	grpcConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
+	if grpcConn == nil {
+		errMsg := req.OperationID + " getcdv3.GetDefaultConn == nil"
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	msgClient := rpc.NewMsgClient(grpcConn)
+	respPb, err := msgClient.AddMessageReactionExtensions(context.Background(), &reqPb)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "DelMsgList failed", err.Error(), reqPb)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": constant.ErrServer.ErrCode, "errMsg": constant.ErrServer.ErrMsg + err.Error()})
+		return
+	}
+	resp.ErrCode = respPb.ErrCode
+	resp.ErrMsg = respPb.ErrMsg
+	resp.Data.ResultKeyValue = respPb.Result
+	resp.Data.MsgFirstModifyTime = respPb.MsgFirstModifyTime
+	resp.Data.IsReact = respPb.IsReact
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp)
+	c.JSON(http.StatusOK, resp)
+}
+
+func DeleteMessageReactionExtensions(c *gin.Context) {
+	var (
+		req   api.DeleteMessageReactionExtensionsReq
+		resp  api.DeleteMessageReactionExtensionsResp
+		reqPb rpc.DeleteMessageListReactionExtensionsReq
+	)
+	if err := c.BindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req)
+
+	if err := utils.CopyStructFields(&reqPb, &req); err != nil {
+		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields", err.Error())
+	}
+	var ok bool
+	var errInfo string
+	ok, reqPb.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	if !ok {
+		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+
+	grpcConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
+	if grpcConn == nil {
+		errMsg := req.OperationID + " getcdv3.GetDefaultConn == nil"
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	msgClient := rpc.NewMsgClient(grpcConn)
+	respPb, err := msgClient.DeleteMessageReactionExtensions(context.Background(), &reqPb)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "DelMsgList failed", err.Error(), reqPb)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": constant.ErrServer.ErrCode, "errMsg": constant.ErrServer.ErrMsg + err.Error()})
+		return
+	}
+	resp.ErrCode = respPb.ErrCode
+	resp.ErrMsg = respPb.ErrMsg
+	resp.Data = respPb.Result
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp)
+	c.JSON(http.StatusOK, resp)
+}

internal/api/msg/send_msg.go

@@ -80,7 +80,7 @@ func SendMsg(c *gin.Context) {
 	}
 	client := pbChat.NewMsgClient(etcdConn)
 
-	log.Info("", "", "api SendMsg call, api call rpc...")
+	log.Info(params.OperationID, "", "api SendMsg call, api call rpc...")
 
 	reply, err := client.SendMsg(context.Background(), pbData)
 	if err != nil {