close conn

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

.docker-compose_cfg/config.yaml

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

.docker-compose_cfg/datasource-compose.yaml

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

.docker-compose_cfg/prometheus-compose.yml

@@ -0,0 +1,71 @@
+#more prometheus-compose.yml 
+global:
+  scrape_interval:     15s 
+  evaluation_interval: 15s 
+  external_labels:
+    monitor: 'openIM-monitor'
+
+scrape_configs:
+    - job_name: 'prometheus'
+      static_configs:
+      - targets: ['localhost:9091']
+
+    - job_name: 'openIM-server'
+      metrics_path: /metrics
+      static_configs:
+      - targets: ['localhost:10002']
+        labels:
+          group: 'api'
+
+      - 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:20230']
+        labels:
+          group: 'conversation' 
+
+      
+      - targets: ['localhost:21400', 'localhost:21401', 'localhost:21402', 'localhost:21403']
+        labels:
+          group: 'msg-transfer'
+       
+ 
+
+
+      
+
+    - job_name: 'node'  
+      scrape_interval: 8s
+      static_configs:
+      - targets: ['localhost:9100']
+     

.env

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

.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE.md

@@ -0,0 +1,37 @@
+---
+name: "\U0001F41E Bug"
+about: File a bug/issue
+title: "[BUG] <title>"
+labels: ''
+assignees: ''
+
+---
+
+<!--
+Note: Please search to see if an issue already exists for the bug you encountered.
+-->
+
+### Environment:
+<!-- linux? windows? or Mac?
+Example:
+- OS: Ubuntu 20.04 -->
+
+### Physical Memory Capacity:
+<!-- 8G or above is better -->
+
+### Docker Image:
+<!-- Did you pull the docker image before execute docker images -->
+
+### Code Version:
+<!-- Did you pull code from github? Make sure the code is up to date-->
+
+### Component installation:
+<!-- Has etcd, mysql, mongodb, redis or Kafka been installed on the server before Open-IM-Server deployment-->
+
+
+### Log File:
+<!-- view log file(logs/openIM.log) content. -->
+
+
+### screenshot:
+<!---->

.github/ISSUE_TEMPLATE/deployment-issues.md

@@ -0,0 +1,36 @@
+---
+name: Deployment issues
+about: Deployment issues
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+If you are deploying OpenIM for the first time
+
+
+
+```
+git clone https://github.com/OpenIMSDK/Open-IM-Server.git --recursive
+```
+
+screenshot here
+
+```
+cd Open-IM-Server/script ; chmod +x *.sh ; ./env_check.sh
+```
+
+screenshot here
+
+```
+cd .. ; docker-compose up -d
+```
+
+screenshot here
+
+```
+cd script ; ./docker_check_service.sh
+```
+
+screenshot here

.github/ISSUE_TEMPLATE/update-.md

@@ -0,0 +1,38 @@
+---
+name: 'update '
+about: update docker image
+title: update docker image
+labels: ''
+assignees: ''
+
+---
+
+```
+cd Open-IM-Server ; docker-compose down
+```
+
+screenshot here
+
+```
+git pull
+```
+
+screenshot here
+
+```
+docker-compose pull
+```
+
+screenshot here
+
+```
+chmod +x script/*.sh ; docker-compose up -d
+```
+
+screenshot here
+
+```
+cd script ; ./docker_check_service.sh
+```
+
+screenshot here

.gitignore

@@ -2,17 +2,16 @@ bin
 logs
 .devcontainer
 components
-logs
 out-test
 .github
 .idea
+.exe
+_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

README.md

@@ -1,4 +1,5 @@
 # Open-IM-Server 
+![avatar](https://github.com/OpenIMSDK/OpenIM-Docs/blob/main/docs/images/WechatIMG20.jpeg)
 
 ![avatar](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/open-im-logo.png)
 
@@ -26,7 +27,6 @@ By deployment of the Open-IM-Server on the customer's server, developers can int
 
 ## Community
 
-- Join the Telegram-OpenIM group: https://t.me/joinchat/zSJLPaHBNLZmODI1
 - 中文官网访问这里：[Open-IM中文开发文档](https://doc.rentsoft.cn/)
 
 ## Quick start
@@ -35,73 +35,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
+```
 
-   ```
-   docker-compose up -d
-   ```
-
-5. Check service
-
-   ```
-   ./docker_check_service.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/api/Makefile

@@ -0,0 +1,34 @@
+.PHONY: all build run gotool install clean help
+
+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=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
+
+run:
+	@go run ./
+
+gotool:
+	go fmt ./
+	go vet ./
+
+install:build
+	mv ${BINARY_NAME} ${BIN_DIR}
+
+clean:
+	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/api/deploy.Dockerfile

@@ -0,0 +1,18 @@
+FROM ubuntu
+
+WORKDIR /Open-IM-Server/bin
+
+RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\
+&&apt-get install net-tools
+#Non-interactive operation
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get install -y vim curl tzdata gawk
+#Time zone adjusted to East eighth District
+RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
+COPY ./open_im_api ./
+
+VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
+
+CMD ["./open_im_api","--port", "10002"]

cmd/api/main.go

@@ -0,0 +1,91 @@
+package main
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"net"
+	"os"
+	"runtime"
+	"strconv"
+	"time"
+
+	"gopkg.in/yaml.v3"
+
+	"net/http"
+	_ "net/http/pprof"
+
+	"github.com/OpenIMSDK/Open-IM-Server/internal/api"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
+	openKeeper "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry/zookeeper"
+)
+
+func main() {
+	apiCmd := cmd.NewApiCmd()
+	apiCmd.AddPortFlag()
+	apiCmd.AddApi(run)
+	if err := apiCmd.Execute(); err != nil {
+		panic(err.Error())
+	}
+}
+
+func startPprof() {
+	runtime.GOMAXPROCS(1)
+	runtime.SetMutexProfileFraction(1)
+	runtime.SetBlockProfileRate(1)
+	if err := http.ListenAndServe(":6060", nil); err != nil {
+		panic(err)
+	}
+	os.Exit(0)
+}
+
+func run(port int) error {
+	if port == 0 {
+		port = config.Config.Api.GinPort[0]
+	}
+	var err error
+	rdb, err := cache.NewRedis()
+	if err != nil {
+		return err
+	}
+	fmt.Println("api start init discov client")
+	var client discoveryregistry.SvcDiscoveryRegistry
+	client, err = openKeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema,
+		openKeeper.WithFreq(time.Hour), openKeeper.WithUserNameAndPassword(config.Config.Zookeeper.UserName,
+			config.Config.Zookeeper.Password), openKeeper.WithRoundRobin(), openKeeper.WithTimeout(10), openKeeper.WithLogger(log.NewZkLogger()))
+	if err != nil {
+		return err
+	}
+	fmt.Println("api init discov client success")
+	buf := bytes.NewBuffer(nil)
+	if err := yaml.NewEncoder(buf).Encode(config.Config); err != nil {
+		return err
+	}
+	fmt.Println("api register public config to discov")
+	if err := client.RegisterConf2Registry(constant.OpenIMCommonConfigKey, buf.Bytes()); err != nil {
+		return err
+	}
+	fmt.Println("api register public config to discov success")
+	router := api.NewGinRouter(client, rdb)
+	fmt.Println("api init router success")
+	var address string
+	if config.Config.Api.ListenIP != "" {
+		address = net.JoinHostPort(config.Config.Api.ListenIP, strconv.Itoa(port))
+	} else {
+		address = net.JoinHostPort("0.0.0.0", strconv.Itoa(port))
+	}
+	fmt.Println("start api server, address: ", address, ", OpenIM version: ", config.Version)
+	log.ZInfo(context.Background(), "start server success", "address", address, "version", config.Version)
+	go startPprof()
+	err = router.Run(address)
+	if err != nil {
+		log.ZError(context.Background(), "api run failed ", err, "address", address)
+		return err
+	}
+	return nil
+}

cmd/cmdutils/Makefile

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

cmd/cmdutils/main.go

@@ -0,0 +1,45 @@
+package main
+
+import (
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
+)
+
+func main() {
+	msgUtilsCmd := cmd.NewMsgUtilsCmd("openIMCmdUtils", "openIM cmd utils", nil)
+	getCmd := cmd.NewGetCmd()
+	fixCmd := cmd.NewFixCmd()
+	clearCmd := cmd.NewClearCmd()
+	seqCmd := cmd.NewSeqCmd()
+	msgCmd := cmd.NewMsgCmd()
+	getCmd.AddCommand(seqCmd.GetSeqCmd(), msgCmd.GetMsgCmd())
+	getCmd.AddSuperGroupIDFlag()
+	getCmd.AddUserIDFlag()
+	getCmd.AddBeginSeqFlag()
+	getCmd.AddLimitFlag()
+	// openIM get seq --userID=xxx
+	// openIM get seq --superGroupID=xxx
+	// openIM get msg --userID=xxx --beginSeq=100 --limit=10
+	// openIM get msg --superGroupID=xxx --beginSeq=100 --limit=10
+
+	fixCmd.AddCommand(seqCmd.FixSeqCmd())
+	fixCmd.AddSuperGroupIDFlag()
+	fixCmd.AddUserIDFlag()
+	fixCmd.AddFixAllFlag()
+	// openIM fix seq --userID=xxx
+	// openIM fix seq --superGroupID=xxx
+	// openIM fix seq --fixAll
+
+	clearCmd.AddCommand(msgCmd.ClearMsgCmd())
+	clearCmd.AddSuperGroupIDFlag()
+	clearCmd.AddUserIDFlag()
+	clearCmd.AddClearAllFlag()
+	clearCmd.AddBeginSeqFlag()
+	clearCmd.AddLimitFlag()
+	// openIM clear msg --userID=xxx --beginSeq=100 --limit=10
+	// openIM clear msg --superGroupID=xxx --beginSeq=100 --limit=10
+	// openIM clear msg --clearAll
+	msgUtilsCmd.AddCommand(&getCmd.Command, &fixCmd.Command, &clearCmd.Command)
+	if err := msgUtilsCmd.Execute(); err != nil {
+		panic(err)
+	}
+}

cmd/crontask/Makefile

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

cmd/crontask/deploy.Dockerfile

@@ -0,0 +1,18 @@
+FROM ubuntu
+
+WORKDIR /Open-IM-Server/bin
+
+RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\
+&&apt-get install net-tools
+#Non-interactive operation
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get install -y vim curl tzdata gawk
+#Time zone adjusted to East eighth District
+RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
+COPY ./open_im_cron_task ./
+
+VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
+
+CMD ["./open_im_cron_task"]

cmd/crontask/main.go

@@ -0,0 +1,13 @@
+package main
+
+import (
+	"github.com/OpenIMSDK/Open-IM-Server/internal/tools"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
+)
+
+func main() {
+	cronTaskCmd := cmd.NewCronTaskCmd()
+	if err := cronTaskCmd.Exec(tools.StartCronTask); err != nil {
+		panic(err.Error())
+	}
+}

cmd/msggateway/Makefile

@@ -0,0 +1,35 @@
+.PHONY: all build run gotool install clean help
+
+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=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
+
+run:
+	@go run ./
+
+gotool:
+	go fmt ./
+	go vet ./
+
+install:build
+	mv ${BINARY_NAME} ${BIN_DIR}
+
+clean:
+	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi
+

cmd/msggateway/deploy.Dockerfile

@@ -0,0 +1,18 @@
+FROM ubuntu
+
+WORKDIR /Open-IM-Server/bin
+
+RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\
+&&apt-get install net-tools
+#Non-interactive operation
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get install -y vim curl tzdata gawk
+#Time zone adjusted to East eighth District
+RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
+COPY ./open_im_msg_gateway ./
+
+VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
+
+CMD ["./open_im_msg_gateway","--port", "10140" "--ws_port", "10001"， "--prometheus_port", "20240"]

cmd/msggateway/main.go

@@ -0,0 +1,15 @@
+package main
+
+import (
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
+)
+
+func main() {
+	msgGatewayCmd := cmd.NewMsgGatewayCmd()
+	msgGatewayCmd.AddWsPortFlag()
+	msgGatewayCmd.AddPortFlag()
+	msgGatewayCmd.AddPrometheusPortFlag()
+	if err := msgGatewayCmd.Exec(); err != nil {
+		panic(err.Error())
+	}
+}

cmd/msgtransfer/Makefile

@@ -0,0 +1,34 @@
+.PHONY: all build run gotool install clean help
+
+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=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
+
+run:
+	@go run ./
+
+gotool:
+	go fmt ./
+	go vet ./
+
+install:build
+	mv ${BINARY_NAME} ${BIN_DIR}
+
+clean:
+	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/msgtransfer/deploy.Dockerfile

@@ -0,0 +1,18 @@
+FROM ubuntu
+
+WORKDIR /Open-IM-Server/bin
+
+RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\
+&&apt-get install net-tools
+#Non-interactive operation
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get install -y vim curl tzdata gawk
+#Time zone adjusted to East eighth District
+RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
+COPY ./open_im_msg_transfer ./
+
+VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
+
+CMD ["./open_im_msg_transfer","--prometheus_port", "21400"]

cmd/msgtransfer/main.go

@@ -0,0 +1,13 @@
+package main
+
+import (
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
+)
+
+func main() {
+	msgTransferCmd := cmd.NewMsgTransferCmd()
+	msgTransferCmd.AddPrometheusPortFlag()
+	if err := msgTransferCmd.Exec(); err != nil {
+		panic(err.Error())
+	}
+}

cmd/open_im_api/Makefile

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

cmd/open_im_api/main.go

@@ -1,110 +0,0 @@
-package main
-
-import (
-	apiAuth "Open_IM/internal/api/auth"
-	apiChat "Open_IM/internal/api/chat"
-	"Open_IM/internal/api/conversation"
-	"Open_IM/internal/api/friend"
-	"Open_IM/internal/api/group"
-	"Open_IM/internal/api/manage"
-	apiThird "Open_IM/internal/api/third"
-	"Open_IM/internal/api/user"
-	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/utils"
-	"flag"
-	"strconv"
-
-	"github.com/gin-gonic/gin"
-	//"syscall"
-)
-
-func main() {
-	gin.SetMode(gin.ReleaseMode)
-	r := gin.Default()
-	r.Use(utils.CorsHandler())
-	// user routing group, which handles user registration and login services
-	userRouterGroup := r.Group("/user")
-	{
-		userRouterGroup.POST("/update_user_info", user.UpdateUserInfo)    //1
-		userRouterGroup.POST("/get_users_info", user.GetUsersInfo)        //1
-		userRouterGroup.POST("/get_self_user_info", user.GetSelfUserInfo) //1
-	}
-	//friend routing group
-	friendRouterGroup := r.Group("/friend")
-	{
-		//	friendRouterGroup.POST("/get_friends_info", friend.GetFriendsInfo)
-		friendRouterGroup.POST("/add_friend", friend.AddFriend)                              //1
-		friendRouterGroup.POST("/delete_friend", friend.DeleteFriend)                        //1
-		friendRouterGroup.POST("/get_friend_apply_list", friend.GetFriendApplyList)          //1
-		friendRouterGroup.POST("/get_self_friend_apply_list", friend.GetSelfFriendApplyList) //1
-		friendRouterGroup.POST("/get_friend_list", friend.GetFriendList)                     //1
-		friendRouterGroup.POST("/add_friend_response", friend.AddFriendResponse)             //1
-		friendRouterGroup.POST("/set_friend_remark", friend.SetFriendRemark)                 //1
-
-		friendRouterGroup.POST("/add_black", friend.AddBlack)          //1
-		friendRouterGroup.POST("/get_black_list", friend.GetBlacklist) //1
-		friendRouterGroup.POST("/remove_black", friend.RemoveBlack)    //1
-
-		friendRouterGroup.POST("/import_friend", friend.ImportFriend) //1
-		friendRouterGroup.POST("/is_friend", friend.IsFriend)         //1
-	}
-	//group related routing group
-	groupRouterGroup := r.Group("/group")
-	{
-		groupRouterGroup.POST("/create_group", group.CreateGroup)                                   //1
-		groupRouterGroup.POST("/set_group_info", group.SetGroupInfo)                                //1
-		groupRouterGroup.POST("join_group", group.JoinGroup)                                        //1
-		groupRouterGroup.POST("/quit_group", group.QuitGroup)                                       //1
-		groupRouterGroup.POST("/group_application_response", group.ApplicationGroupResponse)        //1
-		groupRouterGroup.POST("/transfer_group", group.TransferGroupOwner)                          //1
-		groupRouterGroup.POST("/get_recv_group_applicationList", group.GetRecvGroupApplicationList) //1
-		groupRouterGroup.POST("/get_user_req_group_applicationList", group.GetUserReqGroupApplicationList)
-		groupRouterGroup.POST("/get_groups_info", group.GetGroupsInfo)                              //1
-		groupRouterGroup.POST("/kick_group", group.KickGroupMember)                                 //1
-		groupRouterGroup.POST("/get_group_member_list", group.GetGroupMemberList)                   //no use
-		groupRouterGroup.POST("/get_group_all_member_list", group.GetGroupAllMemberList)            //1
-		groupRouterGroup.POST("/get_group_members_info", group.GetGroupMembersInfo)                 //1
-		groupRouterGroup.POST("/invite_user_to_group", group.InviteUserToGroup)                     //1
-		groupRouterGroup.POST("/get_joined_group_list", group.GetJoinedGroupList)                   //1
-	}
-	//certificate
-	authRouterGroup := r.Group("/auth")
-	{
-		authRouterGroup.POST("/user_register", apiAuth.UserRegister) //1
-		authRouterGroup.POST("/user_token", apiAuth.UserToken)       //1
-	}
-	//Third service
-	thirdGroup := r.Group("/third")
-	{
-		thirdGroup.POST("/tencent_cloud_storage_credential", apiThird.TencentCloudStorageCredential)
-		thirdGroup.POST("/minio_storage_credential", apiThird.MinioStorageCredential)
-	}
-	//Message
-	chatGroup := r.Group("/msg")
-	{
-		chatGroup.POST("/newest_seq", apiChat.GetSeq)
-		chatGroup.POST("/send_msg", apiChat.SendMsg)
-		chatGroup.POST("/pull_msg_by_seq", apiChat.PullMsgBySeqList)
-	}
-	//Manager
-	managementGroup := r.Group("/manager")
-	{
-		managementGroup.POST("/delete_user", manage.DeleteUser) //1
-		managementGroup.POST("/send_msg", manage.ManagementSendMsg)
-		managementGroup.POST("/get_all_users_uid", manage.GetAllUsersUid)             //1
-		managementGroup.POST("/account_check", manage.AccountCheck)                   //1
-		managementGroup.POST("/get_users_online_status", manage.GetUsersOnlineStatus) //1
-	}
-	//Conversation
-	conversationGroup := r.Group("/conversation")
-	{
-		conversationGroup.POST("/set_receive_message_opt", conversation.SetReceiveMessageOpt)                  //1
-		conversationGroup.POST("/get_receive_message_opt", conversation.GetReceiveMessageOpt)                  //1
-		conversationGroup.POST("/get_all_conversation_message_opt", conversation.GetAllConversationMessageOpt) //1
-	}
-	apiThird.MinioInit()
-	log.NewPrivateLog("api")
-	ginPort := flag.Int("port", 10000, "get ginServerPort from cmd,default 10000 as port")
-	flag.Parse()
-	r.Run(":" + strconv.Itoa(*ginPort))
-}

cmd/open_im_cms_api/Makefile

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

cmd/open_im_cms_api/main.go

@@ -1,15 +0,0 @@
-package main
-
-import (
-	"Open_IM/internal/cms_api"
-	"Open_IM/pkg/utils"
-
-	"github.com/gin-gonic/gin"
-)
-
-func main() {
-	gin.SetMode(gin.ReleaseMode)
-	router := cms_api.NewGinRouter()
-	router.Use(utils.CorsHandler())
-	router.Run(":" + "8000")
-}

cmd/open_im_demo/Makefile

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

cmd/open_im_demo/main.go

@@ -1,30 +0,0 @@
-package main
-
-import (
-	"Open_IM/internal/demo/register"
-	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/utils"
-	"flag"
-	"strconv"
-
-	"github.com/gin-gonic/gin"
-)
-
-func main() {
-
-	r := gin.Default()
-	r.Use(utils.CorsHandler())
-
-	authRouterGroup := r.Group("/auth")
-	{
-		authRouterGroup.POST("/code", register.SendVerificationCode)
-		authRouterGroup.POST("/verify", register.Verify)
-		authRouterGroup.POST("/password", register.SetPassword)
-		authRouterGroup.POST("/login", register.Login)
-		authRouterGroup.POST("/reset_password", register.ResetPassword)
-	}
-	log.NewPrivateLog("demo")
-	ginPort := flag.Int("port", 42233, "get ginServerPort from cmd,default 42233 as port")
-	flag.Parse()
-	r.Run(":" + strconv.Itoa(*ginPort))
-}

cmd/open_im_msg_gateway/Makefile

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

cmd/open_im_msg_gateway/main.go

@@ -1,18 +0,0 @@
-package main
-
-import (
-	"Open_IM/internal/msg_gateway/gate"
-	"flag"
-	"sync"
-)
-
-func main() {
-	rpcPort := flag.Int("rpc_port", 10400, "rpc listening port")
-	wsPort := flag.Int("ws_port", 17778, "ws listening port")
-	flag.Parse()
-	var wg sync.WaitGroup
-	wg.Add(1)
-	gate.Init(*rpcPort, *wsPort)
-	gate.Run()
-	wg.Wait()
-}

cmd/open_im_msg_transfer/Makefile

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

cmd/open_im_msg_transfer/main.go

@@ -1,14 +0,0 @@
-package main
-
-import (
-	"Open_IM/internal/msg_transfer/logic"
-	"sync"
-)
-
-func main() {
-	var wg sync.WaitGroup
-	wg.Add(1)
-	logic.Init()
-	logic.Run()
-	wg.Wait()
-}

cmd/open_im_push/Makefile

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

cmd/open_im_push/main.go

@@ -1,17 +0,0 @@
-package main
-
-import (
-	"Open_IM/internal/push/logic"
-	"flag"
-	"sync"
-)
-
-func main() {
-	rpcPort := flag.Int("port", 10700, "rpc listening port")
-	flag.Parse()
-	var wg sync.WaitGroup
-	wg.Add(1)
-	logic.Init(*rpcPort)
-	logic.Run()
-	wg.Wait()
-}

cmd/open_im_timer_task/Makefile

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

cmd/open_im_timer_task/main.go

@@ -1,65 +0,0 @@
-package main
-
-import (
-	commonDB "Open_IM/pkg/common/db"
-	"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
-	"Open_IM/pkg/common/log"
-	"time"
-)
-
-func main() {
-	log.NewPrivateLog("timer")
-	//for {
-	//	fmt.Println("start delete mongodb expired record")
-	//	timeUnixBegin := time.Now().Unix()
-	//	count, _ := db.DB.MgoUserCount()
-	//	fmt.Println("mongodb record count: ", count)
-	//	for i := 0; i < count; i++ {
-	//		time.Sleep(1 * time.Millisecond)
-	//		uid, _ := db.DB.MgoSkipUID(i)
-	//		fmt.Println("operate uid: ", uid)
-	//		err := db.DB.DelUserChat(uid)
-	//		if err != nil {
-	//			fmt.Println("operate uid failed: ", uid, err.Error())
-	//		}
-	//	}
-	//
-	//	timeUnixEnd := time.Now().Unix()
-	//	costTime := timeUnixEnd - timeUnixBegin
-	//	if costTime > int64(config.Config.Mongo.DBRetainChatRecords*24*3600) {
-	//		continue
-	//	} else {
-	//		sleepTime := 0
-	//		if int64(config.Config.Mongo.DBRetainChatRecords*24*3600)-costTime > 24*3600 {
-	//			sleepTime = 24 * 3600
-	//		} else {
-	//			sleepTime = config.Config.Mongo.DBRetainChatRecords*24*3600 - int(costTime)
-	//		}
-	//		fmt.Println("sleep: ", sleepTime)
-	//		time.Sleep(time.Duration(sleepTime) * time.Second)
-	//	}
-	//}
-	for {
-		uidList, err := im_mysql_model.SelectAllUserID()
-		if err != nil {
-			//log.NewError("999999", err.Error())
-		} else {
-			for _, v := range uidList {
-				minSeq, err := commonDB.DB.GetMinSeqFromMongo(v)
-				if err != nil {
-					//log.NewError("999999", "get user minSeq err", err.Error(), v)
-					continue
-				} else {
-					err := commonDB.DB.SetUserMinSeq(v, minSeq)
-					if err != nil {
-						//log.NewError("999999", "set user minSeq err", err.Error(), v)
-					}
-				}
-				time.Sleep(time.Duration(100) * time.Millisecond)
-			}
-
-		}
-
-	}
-
-}

cmd/push/Makefile

@@ -0,0 +1,34 @@
+.PHONY: all build run gotool install clean help
+
+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=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
+
+run:
+	@go run ./
+
+gotool:
+	go fmt ./
+	go vet ./
+
+install:build
+	mv ${BINARY_NAME} ${BIN_DIR}
+
+clean:
+	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/push/deploy.Dockerfile

@@ -0,0 +1,18 @@
+FROM ubuntu
+
+WORKDIR /Open-IM-Server/bin
+
+RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\
+&&apt-get install net-tools
+#Non-interactive operation
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get install -y vim curl tzdata gawk
+#Time zone adjusted to East eighth District
+RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
+COPY ./open_im_push ./
+
+VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
+
+CMD ["./open_im_push", "--port", "10170", "--prometheus_port", "20170"]

cmd/push/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"github.com/OpenIMSDK/Open-IM-Server/internal/push"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+)
+
+func main() {
+	pushCmd := cmd.NewRpcCmd("push")
+	pushCmd.AddPortFlag()
+	pushCmd.AddPrometheusPortFlag()
+	if err := pushCmd.Exec(); err != nil {
+		panic(err.Error())
+	}
+	if err := pushCmd.StartSvr(config.Config.RpcRegisterName.OpenImPushName, push.Start); err != nil {
+		panic(err.Error())
+	}
+}

cmd/rpc/auth/Makefile

@@ -1,12 +1,24 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_user
+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" -o ${BINARY_NAME}
 
 run:
 	@go run ./
@@ -15,11 +27,8 @@ gotool:
 	go fmt ./
 	go vet ./
 
-install:
-	make build
+install:build
 	mv ${BINARY_NAME} ${BIN_DIR}
 
 clean:
 	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi
-
-

cmd/rpc/auth/deploy.Dockerfile

@@ -0,0 +1,18 @@
+FROM ubuntu
+
+WORKDIR /Open-IM-Server/bin
+
+RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\
+&&apt-get install net-tools
+#Non-interactive operation
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get install -y vim curl tzdata gawk
+#Time zone adjusted to East eighth District
+RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
+COPY ./open_im_auth ./
+
+VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
+
+CMD ["./open_im_auth", "--port", "10160"]

cmd/rpc/auth/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"github.com/OpenIMSDK/Open-IM-Server/internal/rpc/auth"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+)
+
+func main() {
+	authCmd := cmd.NewRpcCmd("auth")
+	authCmd.AddPortFlag()
+	authCmd.AddPrometheusPortFlag()
+	if err := authCmd.Exec(); err != nil {
+		panic(err.Error())
+	}
+	if err := authCmd.StartSvr(config.Config.RpcRegisterName.OpenImAuthName, auth.Start); err != nil {
+		panic(err.Error())
+	}
+}

cmd/rpc/conversation/Makefile

@@ -0,0 +1,34 @@
+.PHONY: all build run gotool install clean help
+
+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=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
+
+run:
+	@go run ./
+
+gotool:
+	go fmt ./
+	go vet ./
+
+install:build
+	mv ${BINARY_NAME} ${BIN_DIR}
+
+clean:
+	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/rpc/conversation/deploy.Dockerfile

@@ -0,0 +1,18 @@
+FROM ubuntu
+
+WORKDIR /Open-IM-Server/bin
+
+RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\
+&&apt-get install net-tools
+#Non-interactive operation
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get install -y vim curl tzdata gawk
+#Time zone adjusted to East eighth District
+RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
+COPY ./open_im_conversation ./
+
+VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
+
+CMD ["./open_im_conversation", "--port", "10230", "--prometheus_port","20230"]

cmd/rpc/conversation/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"github.com/OpenIMSDK/Open-IM-Server/internal/rpc/conversation"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+)
+
+func main() {
+	rpcCmd := cmd.NewRpcCmd("conversation")
+	rpcCmd.AddPortFlag()
+	rpcCmd.AddPrometheusPortFlag()
+	if err := rpcCmd.Exec(); err != nil {
+		panic(err.Error())
+	}
+	if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImConversationName, conversation.Start); err != nil {
+		panic(err.Error())
+	}
+}

cmd/rpc/friend/Makefile

@@ -0,0 +1,36 @@
+.PHONY: all build run gotool install clean help
+
+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=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
+
+run:
+	@go run ./
+
+gotool:
+	go fmt ./
+	go vet ./
+
+install:build
+	mv ${BINARY_NAME} ${BIN_DIR}
+
+clean:
+	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi
+
+

cmd/rpc/friend/deploy.Dockerfile

@@ -0,0 +1,18 @@
+FROM ubuntu
+
+WORKDIR /Open-IM-Server/bin
+
+RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\
+&&apt-get install net-tools
+#Non-interactive operation
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get install -y vim curl tzdata gawk
+#Time zone adjusted to East eighth District
+RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
+COPY ./open_im_friend ./
+
+VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
+
+CMD ["./open_im_friend", "--port", "10120", "--prometheus_port","20120"]

cmd/rpc/friend/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"github.com/OpenIMSDK/Open-IM-Server/internal/rpc/friend"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+)
+
+func main() {
+	rpcCmd := cmd.NewRpcCmd("friend")
+	rpcCmd.AddPortFlag()
+	rpcCmd.AddPrometheusPortFlag()
+	if err := rpcCmd.Exec(); err != nil {
+		panic(err.Error())
+	}
+	if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImFriendName, friend.Start); err != nil {
+		panic(err.Error())
+	}
+}

cmd/rpc/group/Makefile

@@ -0,0 +1,39 @@
+.PHONY: all build run gotool install clean help
+
+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=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
+
+run:
+	@go run ./
+
+gotool:
+	go fmt ./
+	go vet ./
+
+install:build
+	mv ${BINARY_NAME} ${BIN_DIR}
+
+clean:
+	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi
+
+
+
+
+

cmd/rpc/group/deploy.Dockerfile

@@ -0,0 +1,18 @@
+FROM ubuntu
+
+WORKDIR /Open-IM-Server/bin
+
+RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\
+&&apt-get install net-tools
+#Non-interactive operation
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get install -y vim curl tzdata gawk
+#Time zone adjusted to East eighth District
+RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
+COPY ./open_im_group ./
+
+VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
+
+CMD ["./open_im_group", "--port", "10150", "--prometheus_port","20150"]

cmd/rpc/group/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"github.com/OpenIMSDK/Open-IM-Server/internal/rpc/group"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+)
+
+func main() {
+	rpcCmd := cmd.NewRpcCmd("group")
+	rpcCmd.AddPortFlag()
+	rpcCmd.AddPrometheusPortFlag()
+	if err := rpcCmd.Exec(); err != nil {
+		panic(err.Error())
+	}
+	if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImGroupName, group.Start); err != nil {
+		panic(err.Error())
+	}
+}

cmd/rpc/msg/Makefile

@@ -1,12 +1,24 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_friend
+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" -o ${BINARY_NAME}
 
 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/msg/deploy.Dockerfile

@@ -0,0 +1,18 @@
+FROM ubuntu
+
+WORKDIR /Open-IM-Server/bin
+
+RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\
+&&apt-get install net-tools
+#Non-interactive operation
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get install -y vim curl tzdata gawk
+#Time zone adjusted to East eighth District
+RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
+COPY ./open_im_msg ./
+
+VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
+
+CMD ["./open_im_msg", "--port", "10130", "--prometheus_port","20130"]

cmd/rpc/msg/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"github.com/OpenIMSDK/Open-IM-Server/internal/rpc/msg"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+)
+
+func main() {
+	rpcCmd := cmd.NewRpcCmd("msg")
+	rpcCmd.AddPortFlag()
+	rpcCmd.AddPrometheusPortFlag()
+	if err := rpcCmd.Exec(); err != nil {
+		panic(err.Error())
+	}
+	if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImMsgName, msg.Start); err != nil {
+		panic(err.Error())
+	}
+}

cmd/rpc/open_im_admin_cms/Makefile

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

cmd/rpc/open_im_admin_cms/main.go

@@ -1,14 +0,0 @@
-package main
-
-import (
-	rpcMessageCMS "Open_IM/internal/rpc/admin_cms"
-	"flag"
-)
-
-func main() {
-	rpcPort := flag.Int("port", 11000, "rpc listening port")
-	flag.Parse()
-	rpcServer := rpcMessageCMS.NewAdminCMSServer(*rpcPort)
-	rpcServer.Run()
-}
-

cmd/rpc/open_im_auth/Makefile

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

cmd/rpc/open_im_auth/main.go

@@ -1,14 +0,0 @@
-package main
-
-import (
-	rpcAuth "Open_IM/internal/rpc/auth"
-	"flag"
-)
-
-func main() {
-	rpcPort := flag.Int("port", 10600, "RpcToken default listen port 10800")
-	flag.Parse()
-	rpcServer := rpcAuth.NewRpcAuthServer(*rpcPort)
-	rpcServer.Run()
-
-}

cmd/rpc/open_im_friend/main.go

@@ -1,14 +0,0 @@
-package main
-
-import (
-	"Open_IM/internal/rpc/friend"
-	"flag"
-)
-
-func main() {
-
-	rpcPort := flag.Int("port", 10200, "get RpcFriendPort from cmd,default 12000 as port")
-	flag.Parse()
-	rpcServer := friend.NewFriendServer(*rpcPort)
-	rpcServer.Run()
-}

cmd/rpc/open_im_group/Makefile

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

cmd/rpc/open_im_group/main.go

@@ -1,13 +0,0 @@
-package main
-
-import (
-	"Open_IM/internal/rpc/group"
-	"flag"
-)
-
-func main() {
-	rpcPort := flag.Int("port", 10500, "get RpcGroupPort from cmd,default 16000 as port")
-	flag.Parse()
-	rpcServer := group.NewGroupServer(*rpcPort)
-	rpcServer.Run()
-}

cmd/rpc/open_im_message_cms/Makefile

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

cmd/rpc/open_im_message_cms/main.go

@@ -1,13 +0,0 @@
-package main
-
-import (
-	rpcMessageCMS "Open_IM/internal/rpc/message_cms"
-	"flag"
-)
-
-func main() {
-	rpcPort := flag.Int("port", 10900, "rpc listening port")
-	flag.Parse()
-	rpcServer := rpcMessageCMS.NewMessageCMSServer(*rpcPort)
-	rpcServer.Run()
-}

cmd/rpc/open_im_msg/Makefile

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

cmd/rpc/open_im_msg/main.go

@@ -1,13 +0,0 @@
-package main
-
-import (
-	rpcChat "Open_IM/internal/rpc/msg"
-	"flag"
-)
-
-func main() {
-	rpcPort := flag.Int("port", 10300, "rpc listening port")
-	flag.Parse()
-	rpcServer := rpcChat.NewRpcChatServer(*rpcPort)
-	rpcServer.Run()
-}

cmd/rpc/open_im_statistics/Makefile

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

cmd/rpc/open_im_statistics/main.go

@@ -1,13 +0,0 @@
-package main
-
-import (
-	"Open_IM/internal/rpc/statistics"
-	"flag"
-)
-
-func main() {
-	rpcPort := flag.Int("port", 10800, "rpc listening port")
-	flag.Parse()
-	rpcServer := statistics.NewStatisticsServer(*rpcPort)
-	rpcServer.Run()
-}

cmd/rpc/open_im_user/main.go

@@ -1,13 +0,0 @@
-package main
-
-import (
-	"Open_IM/internal/rpc/user"
-	"flag"
-)
-
-func main() {
-	rpcPort := flag.Int("port", 10100, "rpc listening port")
-	flag.Parse()
-	rpcServer := user.NewUserServer(*rpcPort)
-	rpcServer.Run()
-}

cmd/rpc/third/Makefile

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

cmd/rpc/third/deploy.Dockerfile

@@ -0,0 +1,18 @@
+FROM ubuntu
+
+WORKDIR /Open-IM-Server/bin
+
+RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\
+&&apt-get install net-tools
+#Non-interactive operation
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get install -y vim curl tzdata gawk
+#Time zone adjusted to East eighth District
+RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
+COPY ./open_im_third ./
+
+VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
+
+CMD ["./open_im_third", "--port", "10200"]

cmd/rpc/third/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"github.com/OpenIMSDK/Open-IM-Server/internal/rpc/third"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+)
+
+func main() {
+	rpcCmd := cmd.NewRpcCmd("third")
+	rpcCmd.AddPortFlag()
+	rpcCmd.AddPrometheusPortFlag()
+	if err := rpcCmd.Exec(); err != nil {
+		panic(err.Error())
+	}
+	if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImThirdName, third.Start); err != nil {
+		panic(err.Error())
+	}
+}

cmd/rpc/user/Makefile

@@ -0,0 +1,39 @@
+.PHONY: all build run gotool install clean help
+
+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=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
+
+run:
+	@go run ./
+
+gotool:
+	go fmt ./
+	go vet ./
+
+install:build
+	mv ${BINARY_NAME} ${BIN_DIR}
+
+clean:
+	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi
+
+
+
+
+

cmd/rpc/user/deploy.Dockerfile

@@ -0,0 +1,18 @@
+FROM ubuntu
+
+WORKDIR /Open-IM-Server/bin
+
+RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\
+&&apt-get install net-tools
+#Non-interactive operation
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get install -y vim curl tzdata gawk
+#Time zone adjusted to East eighth District
+RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates curl
+COPY ./open_im_user ./
+
+VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
+
+CMD ["./open_im_user", "--port", "10110"]

cmd/rpc/user/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"github.com/OpenIMSDK/Open-IM-Server/internal/rpc/user"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+)
+
+func main() {
+	rpcCmd := cmd.NewRpcCmd("user")
+	rpcCmd.AddPortFlag()
+	rpcCmd.AddPrometheusPortFlag()
+	if err := rpcCmd.Exec(); err != nil {
+		panic(err.Error())
+	}
+	if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImUserName, user.Start); err != nil {
+		panic(err.Error())
+	}
+}

cmd/test/main.go

@@ -1,69 +0,0 @@
-package main
-
-import (
-	"Open_IM/pkg/utils"
-	"context"
-	"fmt"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-	"time"
-)
-
-type MongoMsg struct {
-	UID string
-	Msg []string
-}
-
-
-func main()  {
-	//"mongodb://%s:%s@%s/%s/?maxPoolSize=%d"
-	uri := "mongodb://user:pass@sample.host:27017/?maxPoolSize=20&w=majority"
-	DBAddress := "127.0.0.1:37017"
-	DBDatabase := "new-test-db"
-	Collection := "new-test-collection"
-	DBMaxPoolSize := 100
-	uri = fmt.Sprintf("mongodb://%s/%s/?maxPoolSize=%d",
-		DBAddress,DBDatabase,
-		DBMaxPoolSize)
-
-	mongoClient, err := mongo.Connect(context.TODO(), options.Client().ApplyURI(uri))
-	if err != nil {
-		panic(err)
-	}
-	filter := bson.M{"uid":"my_uid"}
-	ctx, _ := context.WithTimeout(context.Background(), 30*time.Second)
-	for i:=0; i < 2; i++{
-
-		if err = mongoClient.Database(DBDatabase).Collection(Collection).FindOneAndUpdate(ctx, filter,
-			bson.M{"$push": bson.M{"msg": utils.Int32ToString(int32(i))}}).Err(); err != nil{
-			fmt.Println("FindOneAndUpdate failed ", i, )
-			var mmsg MongoMsg
-			mmsg.UID = "my_uid"
-			mmsg.Msg = append(mmsg.Msg, utils.Int32ToString(int32(i)))
-			_, err := mongoClient.Database(DBDatabase).Collection(Collection).InsertOne(ctx, &mmsg)
-			if err != nil {
-				fmt.Println("insertone failed ", err.Error(), i)
-			} else{
-				fmt.Println("insertone ok ", i)
-			}
-
-		}else {
-			fmt.Println("FindOneAndUpdate ok ", i)
-		}
-
-	}
-
-	var mmsg MongoMsg
-
-	if  err = mongoClient.Database(DBDatabase).Collection(Collection).FindOne(ctx, filter).Decode(&mmsg); err != nil {
-		fmt.Println("findone failed ", err.Error())
-	}else{
-		fmt.Println("findone ok ", mmsg.UID)
-		for i, v:=range mmsg.Msg{
-			fmt.Println("find value: ", i, v)
-		}
-	}
-
-
-}

config/config.yaml

@@ -1,53 +1,70 @@
 # The class cannot be named by Pascal or camel case.
 # If it is not used, the corresponding structure will not be set,
 # and it will not be read naturally.
-serverversion: 2.0.0
+serverversion: 2.3.7
 #---------------Infrastructure configuration---------------------#
-etcd:
-  etcdSchema: openIM  #默认即可
-  etcdAddr: [ 127.0.0.1:2379 ] #单机部署时，默认即可
+zookeeper:
+  schema: openim  #默认即可
+  zkAddr: [ 127.0.0.1:2181 ] #单机部署时，默认即可
+  userName:
+  password:
 
 mysql:
   dbMysqlAddress: [ 127.0.0.1:13306 ] #mysql地址 目前仅支持单机，默认即可
   dbMysqlUserName: root #mysql用户名，建议修改
-  dbMysqlPassword: openIM # mysql密码，建议修改
+  dbMysqlPassword: openIM123 # mysql密码，建议修改
   dbMysqlDatabaseName: openIM_v2 #默认即可
   dbTableName: eMsg #默认即可
   dbMsgTableNum: 1
-  dbMaxOpenConns: 20
+  dbMaxOpenConns: 100
   dbMaxIdleConns: 10
-  dbMaxLifeTime: 120
+  dbMaxLifeTime: 5
+  logLevel: 4 #1=slient 2=error 3=warn 4=info
+  slowThreshold: 500
 
 mongo:
-  dbAddress: [ 127.0.0.1:37017 ] #redis地址 目前仅支持单机，默认即可
+  dbUri: ""#当dbUri值不为空则直接使用该值
+  dbAddress: [ 127.0.0.1:37017 ]  #单机时为mongo地址，使用分片集群时，为mongos地址 默认即可
   dbDirect: false
-  dbTimeout: 10
+  dbTimeout: 60
   dbDatabase: openIM  #mongo db 默认即可
   dbSource: admin
-  dbUserName: #mongo用户名，建议先不设置
-  dbPassword: #mongo密码，建议先不设置
-  dbMaxPoolSize: 20
+  dbUserName: root #mongo用户名，建议先不设置
+  dbPassword: openIM123  #mongo密码，建议先不设置
+  dbMaxPoolSize: 100
   dbRetainChatRecords: 3650 #mongo保存离线消息时间（天），根据需求修改
+  chatRecordsClearTime: "0 2 * * 3" # 每周三凌晨2点清除消息，该配置和linux定时任务一样， 清理操作建议设置在用户活跃少的时候 # 0 3 * * *
 
 redis:
-  dbAddress: 127.0.0.1:16379 #redis地址 目前仅支持单机，默认即可
+  dbAddress: [ 127.0.0.1:16379 ] #redis地址 单机时，填写一个地址即可，使用redis集群时候，填写集群中多个节点地址（主从地址都可以填写，增加容灾能力），默认即可
   dbMaxIdle: 128
   dbMaxActive: 0
   dbIdleTimeout: 120
-  dbPassWord: openIM #redis密码 建议修改
+  dbUserName:     #only redis version 6.0+ need username
+  dbPassWord: openIM123 #redis密码 建议修改
+  enableCluster: false #如果外部redis以集群方式启动，需要打开此开关
 
 kafka:
+  SASLUserName:
+  SASLPassword:
   ws2mschat:
     addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可
-    topic: "ws2ms_chat"
+    topic: "ws2ms_chat" #用于mongo和mysql保存消息
+  msgtomongo:
+    addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可
+    topic: "msg_to_mongo"
   ms2pschat:
     addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可
-    topic: "ms2ps_chat"
+    topic: "ms2ps_chat" #消息push
+  msgtomodify:
+    addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可
+    topic: "msg_to_modify"
   consumergroupid:
-    msgToMongo: mongo
+    msgToTransfer: mongo
+    msgToMongo: mongo_ex
     msgToMySql: mysql
     msgToPush: push
-
+    msgToModify: modify
 
 
 #---------------Internal service configuration---------------------#
@@ -56,88 +73,97 @@ kafka:
 # automatically obtain the machine's valid network card ip as the service ip,
 # otherwise the configuration ip is preferred
 #如果是单机模式，用0.0.0.0或者不填，默认即可
-serverip: 0.0.0.0
 
-# endpoints 内部组件间访问的端点host名称，访问时，可以内部直接访问 host:port 来访问
-endpoints:
-  api: openim_api
-  cmsapi: openim_cms_api
-  push: openim_push
-  msg_gateway: openim_msg_gateway
-  rpc_auth: openim_rpc_auth
-  rpc_friend: openim_rpc_friend
-  rpc_group: openim_rpc_group
-  rpc_msg: openim_rpc_msg
-  rpc_user: openim_rpc_user
-  rpc_statistic: openim_rpc_statistic
-  rpc_admin_cms: openim_rpc_admin_cms
-  rpc_message_cms: openim_rpc_admin_cms
+#作为rpc时，注册到etcd的地址，单机默认即可，如果是集群部署，需要修改（具体使用内网地址还是外网地址，要依情况而定，目的是api/gateway能访问到）
+rpcRegisterIP:
+#默认即可
+listenIP: 0.0.0.0
+
 
 api:
-  openImApiPort: [ 10000 ] #api服务端口，默认即可，需要开放此端口或做nginx转发
-cmsapi:
-  openImCmsApiPort: [ 8000 ] #管理后台api服务端口，默认即可，需要开放此端口或做nginx转发
+  openImApiPort: [ 10002 ] #api服务端口，默认即可，需要开放此端口或做nginx转发
+  listenIP: 0.0.0.0
+
 sdk:
-  openImSdkWsPort: [ 30000 ] #jssdk服务端口，默认即可，项目中使用jssdk才需开放此端口或做nginx转发
+  openImSdkWsPort: [ 10003 ] #jssdk服务端口，默认即可，项目中使用jssdk才需开放此端口或做nginx转发
+  dataDir: [ ../db/sdk/ ]
+  openImWsAddress: ws://127.0.0.1:10001
+  openImApiAddress: http://127.0.0.1:10002
 
+#对象存储服务，以下配置二选一，目前支持两种，腾讯云和minio，二者配置好其中一种即可（如果使用minio参考https://doc.rentsoft.cn/#/qa/minio搭建minio服务器）
 credential: #腾讯cos，发送图片、视频、文件时需要，请自行申请后替换，必须修改
-  tencent:
-    appID: 1302656840
-    region: ap-chengdu
-    bucket: echat-1302656840
-    secretID: AKIDGNYVChzIQinu7QEgtNp0hnNgqcV8vZTC
-    secretKey: kz15vW83qM6dBUWIq681eBZA0c0vlIbe
-  minio: #MinIO 发送图片、视频、文件时需要，请自行申请后替换，必须修改。 客户端初始化时相应改动
-    bucket: openim
-    location: us-east-1
-    endpoint: http://127.0.0.1:9000
-    accessKeyID: user12345
-    secretAccessKey: key12345
 
 
+object:
+  enable: minio
+  apiURL: http://127.0.0.1:10002/third/object
+  minio: #MinIO 发送图片、视频、文件时需要，请自行申请后替换，必须修改。 客户端初始化InitSDK，中 object_storage参数为minio
+    tempBucket: "openim"
+    dataBucket: "openim"
+    location: us-east-1
+    endpoint: http://127.0.0.1:10005 #minio外网ip 这个ip是给客户端访问的
+    accessKeyID: root
+    secretAccessKey: openIM123
+    isDistributedMod: false # 是否分布式多硬盘部署 默认docker-compose中为false，如果是多硬盘部署，需要修改为true
+  tencent:
+    appID:
+    region:
+    bucket:
+    secretID:
+    secretKey:
+  ali: # ali oss
+    regionID:
+    accessKeyID:
+    accessKeySecret:
+    stsEndpoint:
+    ossEndpoint:
+    bucket:
+    finalHost:
+    stsDurationSeconds:
+    OssRoleArn:
+  aws:
+    accessKeyID:                              #AssumeRole用户关联的accessKeyID
+    accessKeySecret:                          #AssumeRole用户关联的accessKeySecrect
+    region:                                   #分区
+    bucket:                                   #桶
+    finalHost:                                #对外Host
+    roleArn:                                  #RoleArn
+    externalId:                               #角色扩展Id
+    roleSessionName:                          #角色SESSION名称
+
 rpcport: #rpc服务端口 默认即可
-  openImUserPort: [ 10100 ]
-  openImFriendPort: [ 10200 ]
-  openImOfflineMessagePort: [ 10300 ]
-  openImOnlineRelayPort: [ 10400 ]
-  openImGroupPort: [ 10500 ]
-  openImAuthPort: [ 10600 ]
-  openImPushPort: [ 10700 ]
-  openImStatisticsPort: [ 10800 ]
-  openImMessageCmsPort: [ 10900 ]
-  openImAdminCmsPort: [ 11000 ]
-  c2c:
-    callbackBeforeSendMsg:
-      switch: false
-      timeoutStrategy: 1 #1:send
-    callbackAfterSendMsg:
-      switch: false
-  state:
-    stateChange:
-      switch: false
+  openImUserPort: [ 10110 ]
+  openImFriendPort: [ 10120 ]
+  openImMessagePort: [ 10130 ]
+  openImMessageGatewayPort: [ 10140 ]
+  openImGroupPort: [ 10150 ]
+  openImAuthPort: [ 10160 ]
+  openImPushPort: [ 10170 ]
+  openImConversationPort: [ 10180 ]
+  openImRtcPort: [ 10190 ]
+  openImThirdPort: [ 10200 ]
 
 rpcregistername: #rpc注册服务名，默认即可
   openImUserName: User
   openImFriendName: Friend
-  openImOfflineMessageName: OfflineMessage
+  openImMsgName: Msg
   openImPushName: Push
-  openImOnlineMessageRelayName: OnlineMessageRelay
+  openImMessageGatewayName: MessageGateway
   openImGroupName: Group
   openImAuthName: Auth
-  OpenImStatisticsName: Statistics
-  OpenImMessageCMSName: MessageCMS
-  openImAdminCMSName: AdminCMS
+  openImConversationName: Conversation
+  openImRtcName: Rtc
+  openImThirdName: Third
 
 log:
   storageLocation: ../logs/
   rotationTime: 24
-  remainRotationCount: 3 #日志数量
+  remainRotationCount: 2 #日志数量
   #日志级别 6表示全都打印，测试阶段建议设置为6
-  remainLogLevel: 4
-  elasticSearchSwitch: false
-  elasticSearchAddr: [ 127.0.0.1:9201 ]
-  elasticSearchUser: ""
-  elasticSearchPassword: ""
+  remainLogLevel: 6
+  isStdout: false
+  isJson: false
+  withStack: false
 
 modulename: #日志文件按模块命名，默认即可
   longConnSvrName: msg_gateway
@@ -145,11 +171,12 @@ modulename: #日志文件按模块命名，默认即可
   pushName: push
 
 longconnsvr:
-  openImWsPort: [ 17778 ] # ws服务端口，默认即可，要开放此端口或做nginx转发
+  openImWsPort: [ 10001 ] # ws服务端口，默认即可，要开放此端口或做nginx转发
   websocketMaxConnNum: 10000
   websocketMaxMsgLen: 4096
   websocketTimeOut: 10
 
+## 推送只能开启一个 enable代表开启
 push:
   tpns: #腾讯推送，暂未测试 暂不要使用
     ios:
@@ -158,344 +185,134 @@ push:
     android:
       accessID: 111
       secretKey: 111
+    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"
+    appKey:
+    masterSecret:
+    pushUrl:
+    pushIntent:
+    enable: false # true or false (bool)
+  getui: #个推推送
+    pushUrl: "https://restapi.getui.com/v2/$appId"
+    masterSecret: ""
+    appKey: ""
+    intent: ""
+    enable: false # true or false (bool)
+    channelID: ""
+    channelName: ""
+  fcm: #firebase cloud message 消息推送
+    serviceAccount: "openim-5c6c0-firebase-adminsdk-ppwol-8765884a78.json" #帐号文件，此处需要改修配置，并且这个文件放在 config目录下
+    enable: false
+
 manager:
   #app管理员userID和对应的secret  建议修改。 用于管理后台登录，也可以用户管理后台对应的api
-  appManagerUid: [ "openIM123456","openIM654321", "openIM333", "openIMAdmin"]
-  secrets: [ "openIM1","openIM2", "openIM333", "openIMAdmin"]
+  appManagerUid: [ "openIM123456","openIM654321", "openIM333", "openIMAdmin" ]
+  nickname: [ "系统通知","openIM654321", "openIM333", "openIMAdmin" ]
+
 
 secret: tuoyun
 # 多端互踢策略
 # 1：多平台登录：Android、iOS、Windows、Mac 每种平台只能一个在线，web端可以多个同时在线
 multiloginpolicy: 1
 
+#msg log insert to db
+chatpersistencemysql: true
+#消息缓存时间
+msgCacheTimeout: 86400
+#群聊已读开启
+groupMessageHasReadReceiptEnable: true
+#单聊已读开启
+singleMessageHasReadReceiptEnable: true
+
 #token config
 tokenpolicy:
-  accessSecret: "open_im_server" #token生成相关，默认即可
+  accessSecret: "OpenIM_server" #token生成相关，默认即可
   # Token effective time day as a unit
-  accessExpire: 3650 #token过期时间（天） 默认即可
+  accessExpire: 90  #token过期时间（天） 默认即可
+messageverify:
+  friendVerify: false
 
-#  c2c:
-#    callbackBeforeSendMsg:
-#      switch: false
-#      timeoutStrategy: 1 #1:send
-#    callbackAfterSendMsg:
-#      switch: false
-#  state:
-#    stateChange:
-#      switch: false
 #ios系统推送声音以及标记计数
 iospush:
   pushSound: "xxx"
   badgeCount: true
+  production: false
 
 callback:
   # callback url 需要自行更换callback url
-  callbackUrl : "http://127.0.0.1:8080/callback"
+  callbackUrl: "http://127.0.0.1:10008/callback/open_im"
   # 开启关闭操作前后回调的配置
-  callbackbeforeSendSingleMsg:
+  callbackBeforeSendSingleMsg:
     enable: false # 回调是否启用
     callbackTimeOut: 2 # 回调超时时间
-    CallbackFailedContinue: true # 回调超时是否继续执行代码
+    callbackFailedContinue: true # 回调超时是否继续执行代码
   callbackAfterSendSingleMsg:
     enable: false
     callbackTimeOut: 2
   callbackBeforeSendGroupMsg:
     enable: false
     callbackTimeOut: 2
-    CallbackFailedContinue: true
+    callbackFailedContinue: true
   callbackAfterSendGroupMsg:
     enable: false
     callbackTimeOut: 2
-  callbackWordFilter:
+  callbackMsgModify:
     enable: false
     callbackTimeOut: 2
-    CallbackFailedContinue: true
-
-
-notification:
-  groupCreated:
-    conversation:
-      reliabilityLevel: 3
-      unreadCount: true
-    offlinePush:
-      switch: true
-      title: "create group title" # xx create the group
-      desc: "create group desc"
-      ext: "create group ext"
-    defaultTips:
-      tips: "create the group"  # xx create the group
-
-  groupInfoSet:
-    conversation:
-      reliabilityLevel: 3
-      unreadCount: true
-    offlinePush:
-      switch: false
-      title: "groupInfoSet title"
-      desc: "groupInfoSet desc"
-      ext: "groupInfoSet ext"
-    defaultTips:
-      tips: "modified the group profile"  # group info changed by xx
-
-  joinGroupApplication:
-    conversation:
-      reliabilityLevel: 2
-      unreadCount: false
-    offlinePush:
-      switch: false
-      title: "joinGroupApplication title"
-      desc: "joinGroupApplication desc"
-      ext: "joinGroupApplication ext"
-    defaultTips:
-      tips: "apply to join the group"  # group info changed by xx
-
-  memberQuit:
-    conversation:
-      reliabilityLevel: 3
-      unreadCount: true
-    offlinePush:
-      switch: false
-      title: "memberQuit title"
-      desc: "memberQuit desc"
-      ext: "memberQuit ext"
-    defaultTips:
-      tips: "quit group chat"  # group info changed by xx
-
-  groupApplicationAccepted:
-    conversation:
-      reliabilityLevel: 2
-      unreadCount: true
-    offlinePush:
-      switch: false
-      title: "groupApplicationAccepted title"
-      desc: "groupApplicationAccepted desc"
-      ext: "groupApplicationAccepted ext"
-    defaultTips:
-      tips: "was allowed to join the group"  # group info changed by xx
-
-  groupApplicationRejected:
-    conversation:
-      reliabilityLevel: 2
-      unreadCount: false
-    offlinePush:
-      switch: false
-      title: " title"
-      desc: " desc"
-      ext: " ext"
-    defaultTips:
-      tips: "was rejected into the group"  # group info changed by xx
-
-  groupOwnerTransferred:
-    conversation:
-      reliabilityLevel: 3
-      unreadCount: true
-    offlinePush:
-      switch: false
-      title: "groupOwnerTransferred title"
-      desc: "groupOwnerTransferred desc"
-      ext: "groupOwnerTransferred ext"
-    defaultTips:
-      tips: "become a new group owner"  # group info changed by xx
-
-  memberKicked:
-    conversation:
-      reliabilityLevel: 3
-      unreadCount: true
-    offlinePush:
-      switch: false
-      title: "memberKicked title"
-      desc: "memberKicked desc"
-      ext: "memberKicked ext"
-    defaultTips:
-      tips: "was kicked out of the group"  # group info changed by xx
-
-  memberInvited:
-    conversation:
-      reliabilityLevel: 3
-      unreadCount: true
-    offlinePush:
-      switch: false
-      title: "memberInvited title"
-      desc: "memberInvited desc"
-      ext: "memberInvited ext"
-    defaultTips:
-      tips: "was invited into the group"  # group info changed by xx
-
-  memberEnter:
-    conversation:
-      reliabilityLevel: 3
-      unreadCount: true
-    offlinePush:
-      switch: false
-      title: "memberEnter title"
-      desc: "memberEnter desc"
-      ext: "memberEnter ext"
-    defaultTips:
-      tips: "entered the group"  # group info changed by xx
-
-  #############################friend#################################
-
-  friendApplicationAdded:
-    conversation:
-      reliabilityLevel: 2
-      unreadCount: false
-    offlinePush:
-      switch: true
-      title: "Somebody applies to add you as a friend"
-      desc: "Somebody applies to add you as a friend"
-      ext: "Somebody applies to add you as a friend"
-    defaultTips:
-      tips: "I applies to add you as a friend"  #
-
-  friendApplicationApproved:
-    conversation:
-      reliabilityLevel: 2
-      unreadCount: false
-    offlinePush:
-      switch: true
-      title: "Someone applies to add your friend application"
-      desc: "Someone applies to add your friend application"
-      ext: "Someone applies to add your friend application"
-    defaultTips:
-      tips: "I applies to add your friend application"  #
-
-
-  friendApplicationRejected:
-    conversation:
-      reliabilityLevel: 2
-      unreadCount: false
-    offlinePush:
-      switch: true
-      title: "Someone rejected your friend application"
-      desc: "Someone rejected your friend application"
-      ext: "Someone rejected your friend application"
-    defaultTips:
-      tips: "I rejected your friend application"  #
-
-
-
-
-
-  friendAdded:
-    conversation:
-      reliabilityLevel: 3
-      unreadCount: true
-    offlinePush:
-      switch: true
-      title: "We have become friends"
-      desc: "We have become friends"
-      ext: "We have become friends"
-    defaultTips:
-      tips: "We have become friends"  #
-
-
-
-  friendDeleted:
-    conversation:
-      reliabilityLevel: 2
-      unreadCount: false
-    offlinePush:
-      switch: true
-      title: "deleted a friend"
-      desc: "deleted a friend"
-      ext: "deleted a friend"
-    defaultTips:
-      tips: "deleted a friend"  #
-
-
-  friendRemarkSet:
-    conversation:
-      reliabilityLevel: 2
-      unreadCount: false
-    offlinePush:
-      switch: true
-      title: "Your friend's profile has been changed"
-      desc: "Your friend's profile has been changed"
-      ext: "Your friend's profile has been changed"
-    defaultTips:
-      tips: "Your friend's profile has been changed"  #
-
-
-
-  blackAdded:
-    conversation:
-      reliabilityLevel: 2
-      unreadCount: false
-    offlinePush:
-      switch: true
-      title: "blocked a user"
-      desc: "blocked a user"
-      ext: "blocked a user"
-    defaultTips:
-      tips: "blocked a user"  #
-
-
-  blackDeleted:
-    conversation:
-      reliabilityLevel: 2
-      unreadCount: false
-    offlinePush:
-      switch: true
-      title: "Remove a blocked user"
-      desc: "Remove a blocked user"
-      ext: "Remove a blocked user"
-    defaultTips:
-      tips: "Remove a blocked user"
-
-  #####################user#########################
-  userInfoUpdated:
-    conversation:
-      reliabilityLevel: 2
-      unreadCount: false
-    offlinePush:
-      switch: true
-      title: "Remove a blocked user"
-      desc: "Remove a blocked user"
-      ext: "Remove a blocked user"
-    defaultTips:
-      tips: "remove a blocked user"
-
-  #####################conversation#########################
-  conversationOptUpdate:
-    conversation:
-      reliabilityLevel: 2
-      unreadCount: false
-      offlinePush:
-        switch: true
-        title: "conversation opt update"
-        desc: "conversation opt update"
-        ext: "conversation opt update"
-      defaultTips:
-        tips: "conversation opt update"
-
-
-
-#---------------demo configuration---------------------#
-#The following configuration items are applied to openIM Demo configuration
-#是否启动demo，如果自身没有账号体系，设置为true
-demoswitch: true
-demo:
-  #demo对外服务端口，默认即可，需要开放此端口或做nginx转发
-  openImDemoPort: [ 42233 ]
-  alismsverify: #阿里云短信配置，在阿里云申请成功后修改以下四项，必须修改
-    accessKeyId: LTAI5tJPkn4HuuePdiLdGqe7
-    accessKeySecret: 4n9OJ7ZCVN1U6KeHDAtOyNeVZcjOuV
-    signName: 托云信息技术
-    verificationCodeTemplateCode: SMS_226810164
-  superCode: 666666 #超级验证码，建议修改掉，收不到短信验证码时可以用此替代
-  #  second
-  codeTTL: 300
-  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   #需开放此端口 出口方向
-
+    callbackFailedContinue: true
+  callbackUserOnline:
+    enable: false
+    callbackTimeOut: 2
+  callbackUserOffline:
+    enable: false
+    callbackTimeOut: 2
+  callbackUserKickOff:
+    enable: false
+    callbackTimeOut: 2
+  callbackOfflinePush:
+    enable: false
+    callbackTimeOut: 2
+    callbackFailedContinue: true # 回调超时是否继续离线推送
+  callbackOnlinePush:
+    enable: false
+    callbackTimeOut: 2
+    callbackFailedContinue: true # 回调超时是否继续离线推送
+  callbackSuperGroupOnlinePush:
+    enable: false
+    callbackTimeOut: 2
+    callbackFailedContinue: true # 回调超时是否继续离线推送
+  callbackBeforeAddFriend:
+    enable: false
+    callbackTimeOut: 2
+    callbackFailedContinue: true # 回调超时是否继续
+  callbackBeforeCreateGroup:
+    enable: false
+    callbackTimeOut: 2
+    callbackFailedContinue: true # 回调超时是否继续
+  callbackBeforeMemberJoinGroup:
+    enable: false
+    callbackTimeOut: 2
+    callbackFailedContinue: true # 回调超时是否继续
+  callbackBeforeSetGroupMemberInfo:
+    enable: false
+    callbackTimeOut: 2
+    callbackFailedContinue: true # 回调超时是否继续
+  callbackSetMessageReactionExtensions:
+    enable: false
+    callbackTimeOut: 2
+    callbackFailedContinue: true # 回调超时是否继续
 
+# prometheus每个服务监听的端口数量需要和rpc port保持一致
+prometheus:
+  enable: false
+  userPrometheusPort: [ 20110 ]
+  friendPrometheusPort: [ 20120 ]
+  messagePrometheusPort: [ 20130 ]
+  messageGatewayPrometheusPort: [ 20140 ]
+  groupPrometheusPort: [ 20150 ]
+  authPrometheusPort: [ 20160 ]
+  pushPrometheusPort: [ 20170 ]
+  conversationPrometheusPort: [ 20230 ]
+  rtcPrometheusPort: [ 21300 ]
+  messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ] # 端口数量和 script/path_info.cfg  msg_transfer_service_num保持一致
 

config/notification.yaml

@@ -0,0 +1,313 @@
+groupCreated:
+  isSendMsg: true #是否发送消息，false不发消息为无声的触发同步。true发消息需要触发会话，rpc notification直接发两次，一次消息一次通知, options字段isNotification是否为通知
+  reliabilityLevel: 1 # 1为online才发送 2为必达
+  unreadCount: false # 只在isSendMsg为true的情况下有作用
+  offlinePush:
+    enable: false # 开启该开关
+    title: "create group title" # xx create the group
+    desc: "create group desc"
+    ext: "create group ext"
+
+# 不加消息contentType，content统一json 结构体使用pb的
+
+
+groupInfoSet:
+  isSendMsg: false
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: false
+    title: "groupInfoSet title"
+    desc: "groupInfoSet desc"
+    ext: "groupInfoSet ext"
+
+
+joinGroupApplication:
+  isSendMsg: false
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: false
+    title: "joinGroupApplication title"
+    desc: "joinGroupApplication desc"
+    ext: "joinGroupApplication ext"
+
+memberQuit:
+  isSendMsg: true
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: false
+    title: "memberQuit title"
+    desc: "memberQuit desc"
+    ext: "memberQuit ext"
+
+groupApplicationAccepted:
+  isSendMsg: false
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: false
+    title: "groupApplicationAccepted title"
+    desc: "groupApplicationAccepted desc"
+    ext: "groupApplicationAccepted ext"
+
+groupApplicationRejected:
+  isSendMsg: false
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: false
+    title: " title"
+    desc: " desc"
+    ext: " ext"
+
+
+groupOwnerTransferred:
+  isSendMsg: true
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: false
+    title: "groupOwnerTransferred title"
+    desc: "groupOwnerTransferred desc"
+    ext: "groupOwnerTransferred ext"
+
+memberKicked:
+  isSendMsg: true
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: false
+    title: "memberKicked title"
+    desc: "memberKicked desc"
+    ext: "memberKicked ext"
+
+memberInvited:
+  isSendMsg: true
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: false
+    title: "memberInvited title"
+    desc: "memberInvited desc"
+    ext: "memberInvited ext"
+
+memberEnter:
+  isSendMsg: true
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: false
+    title: "memberEnter title"
+    desc: "memberEnter desc"
+    ext: "memberEnter ext"
+
+groupDismissed:
+  isSendMsg: true
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: false
+    title: "groupDismissed title"
+    desc: "groupDismissed desc"
+    ext: "groupDismissed ext"
+
+groupMuted:
+  isSendMsg: true
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: false
+    title: "groupMuted title"
+    desc: "groupMuted desc"
+    ext: "groupMuted ext"
+
+groupCancelMuted:
+  isSendMsg: true
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: false
+    title: "groupCancelMuted title"
+    desc: "groupCancelMuted desc"
+    ext: "groupCancelMuted ext"
+  defaultTips:
+    tips: "group Cancel Muted"
+
+
+groupMemberMuted:
+  isSendMsg: true
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: false
+    title: "groupMemberMuted title"
+    desc: "groupMemberMuted desc"
+    ext: "groupMemberMuted ext"
+
+groupMemberCancelMuted:
+  isSendMsg: true
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: false
+    title: "groupMemberCancelMuted title"
+    desc: "groupMemberCancelMuted desc"
+    ext: "groupMemberCancelMuted ext"
+
+groupMemberInfoSet:
+  isSendMsg: false
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: false
+    title: "groupMemberInfoSet title"
+    desc: "groupMemberInfoSet desc"
+    ext: "groupMemberInfoSet ext"
+
+groupInfoSetAnnouncement:
+  isSendMsg: true
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: false
+    title: "groupInfoSetAnnouncement title"
+    desc: "groupInfoSetAnnouncement desc"
+    ext: "groupInfoSetAnnouncement ext"
+
+
+groupInfoSetName:
+  isSendMsg: true
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: false
+    title: "groupInfoSetName title"
+    desc: "groupInfoSetName desc"
+    ext: "groupInfoSetName ext"
+
+
+#############################friend#################################
+friendApplicationAdded:
+  isSendMsg: false
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: false
+    title: "Somebody applies to add you as a friend"
+    desc: "Somebody applies to add you as a friend"
+    ext: "Somebody applies to add you as a friend"
+
+friendApplicationApproved:
+  isSendMsg: true
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: true
+    title: "Someone applies to add your friend application"
+    desc: "Someone applies to add your friend application"
+    ext: "Someone applies to add your friend application"
+
+friendApplicationRejected:
+  isSendMsg: false
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: true
+    title: "Someone rejected your friend application"
+    desc: "Someone rejected your friend application"
+    ext: "Someone rejected your friend application"
+
+friendAdded:
+  isSendMsg: false
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: true
+    title: "We have become friends"
+    desc: "We have become friends"
+    ext: "We have become friends"
+
+friendDeleted:
+  isSendMsg: false
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: true
+    title: "deleted a friend"
+    desc: "deleted a friend"
+    ext: "deleted a friend"
+
+friendRemarkSet:
+  isSendMsg: false
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: true
+    title: "Your friend's profile has been changed"
+    desc: "Your friend's profile has been changed"
+    ext: "Your friend's profile has been changed"
+
+blackAdded:
+  isSendMsg: false
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: true
+    title: "blocked a user"
+    desc: "blocked a user"
+    ext: "blocked a user"
+
+blackDeleted:
+  isSendMsg: false
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: true
+    title: "Remove a blocked user"
+    desc: "Remove a blocked user"
+    ext: "Remove a blocked user"
+
+friendInfoUpdated:
+  isSendMsg: false
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: true
+    title: "friend info updated"
+    desc: "friend info updated"
+    ext: "friend info updated"
+
+#####################user#########################
+userInfoUpdated:
+  isSendMsg: false
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: true
+    title: "Remove a blocked user"
+    desc: "Remove a blocked user"
+    ext: "Remove a blocked user"
+
+#####################conversation#########################
+conversationChanged:
+  isSendMsg: false
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: true
+    title: "conversation changed"
+    desc: "conversation changed"
+    ext: "conversation changed"
+
+conversationSetPrivate:
+  isSendMsg: true
+  reliabilityLevel: 1
+  unreadCount: false
+  offlinePush:
+    enable: true
+    title: "burn after reading"
+    desc: "burn after reading"
+    ext: "burn after reading"
+

config/open-im-ng-example.conf

@@ -0,0 +1,194 @@
+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 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 ^~/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;
+}

deploy/.dockerignore

@@ -1,6 +0,0 @@
-# 先设为忽略所有内容
-**/**
-
-
-# 然后逐个排除
-!open_im_*

deploy/Makefile

@@ -1,158 +0,0 @@
-
-GREEN_PREFIX="\033[32m"
-COLOR_SUFFIX="\033[0m"
-SKY_BLUE_PREFIX="\033[36m"
-
-
-# 编译所有需要的组件源码
-win-build-all:
-	go env -w GOOS=linux 
-
-	make build-api && make build-msg-gateway && make build-msg-transfer  && make build-push && make build-timer-task
-	make build-rpc-user && make build-rpc-friend && make build-rpc-group && make build-rpc-msg && make build-rpc-auth
-	make build-demo
-
-	go env -w GOOS=windows
-
-# 编译 open_im_api
-build-api:
-	echo -e ${GREEN_PREFIX} "open_im_api building..." ${COLOR_SUFFIX}
-	go build -ldflags="-w -s" -o open_im_api ../cmd/open_im_api/main.go
-	echo -e ${GREEN_PREFIX} "open_im_api build ok" ${COLOR_SUFFIX}
-
-# 编译 open_im_msg_gateway
-build-msg-gateway:
-	echo -e ${GREEN_PREFIX} "open_im_msg_gateway building..." ${COLOR_SUFFIX}
-	go build -ldflags="-w -s" -o open_im_msg_gateway ../cmd/open_im_msg_gateway/main.go
-	echo -e ${GREEN_PREFIX} "open_im_msg_gateway build ok" ${COLOR_SUFFIX}
-
-# 编译 open_im_msg_transfer
-build-msg-transfer:
-	echo -e ${GREEN_PREFIX} "open_im_msg_transfer building..." ${COLOR_SUFFIX}
-	go build -ldflags="-w -s" -o open_im_msg_transfer ../cmd/open_im_msg_transfer/main.go
-	echo -e ${GREEN_PREFIX} "open_im_msg_transfer build ok" ${COLOR_SUFFIX}
-
-# 编译 open_im_push
-build-push:
-	echo -e ${GREEN_PREFIX} "open_im_push building..." ${COLOR_SUFFIX}
-	go build -ldflags="-w -s" -o open_im_push ../cmd/open_im_push/main.go
-	echo -e ${GREEN_PREFIX} "open_im_push build ok" ${COLOR_SUFFIX}
-
-# 编译 open_im_timer_task
-build-timer-task:
-	echo -e ${GREEN_PREFIX} "open_im_timer_task building..." ${COLOR_SUFFIX}
-	go build -ldflags="-w -s" -o open_im_timer_task ../cmd/open_im_timer_task/main.go
-	echo -e ${GREEN_PREFIX} "open_im_timer_task build ok" ${COLOR_SUFFIX}
-
-# 编译 build-rpc-user
-build-rpc-user:
-	echo -e ${SKY_BLUE_PREFIX} "open_im_rpc_user building..." ${COLOR_SUFFIX}
-	go build -ldflags="-w -s" -o open_im_rpc_user ../cmd/rpc/open_im_user/main.go
-	echo -e ${SKY_BLUE_PREFIX} "open_im_rpc_user build ok" ${COLOR_SUFFIX}
-
-# 编译 build-rpc-friend
-build-rpc-friend:
-	echo -e ${SKY_BLUE_PREFIX} "open_im_rpc_friend building..." ${COLOR_SUFFIX}
-	go build -ldflags="-w -s" -o open_im_rpc_friend ../cmd/rpc/open_im_friend/main.go
-	echo -e ${SKY_BLUE_PREFIX} "open_im_rpc_friend build ok" ${COLOR_SUFFIX}
-
-# 编译 build-rpc-group
-build-rpc-group:
-	echo -e ${SKY_BLUE_PREFIX} "open_im_rpc_group building..." ${COLOR_SUFFIX}
-	go build -ldflags="-w -s" -o open_im_rpc_group ../cmd/rpc/open_im_group/main.go
-	echo -e ${SKY_BLUE_PREFIX} "open_im_rpc_group build ok" ${COLOR_SUFFIX}
-
-# 编译 build-rpc-auth
-build-rpc-auth:
-	echo -e ${SKY_BLUE_PREFIX} "open_im_rpc_auth building..." ${COLOR_SUFFIX}
-	go build -ldflags="-w -s" -o open_im_rpc_auth ../cmd/rpc/open_im_auth/main.go
-	echo -e ${SKY_BLUE_PREFIX} "open_im_rpc_auth build ok" ${COLOR_SUFFIX}
-
-# 编译 build-rpc-msg
-build-rpc-msg:
-	echo -e ${SKY_BLUE_PREFIX} "open_im_rpc_msg building..." ${COLOR_SUFFIX}
-	go build -ldflags="-w -s" -o open_im_rpc_msg ../cmd/rpc/open_im_msg/main.go
-	echo -e ${SKY_BLUE_PREFIX} "open_im_rpc_msg build ok" ${COLOR_SUFFIX}
-
-# 编译 open_im_demo
-build-demo:
-	echo -e ${SKY_BLUE_PREFIX} "open_im_demo building..." ${COLOR_SUFFIX}
-	go build -ldflags="-w -s" -o open_im_demo ../cmd/open_im_demo/main.go
-	echo -e ${SKY_BLUE_PREFIX} "open_im_demo build ok" ${COLOR_SUFFIX}
-
-# 打包所有组件为镜像
-image-all:
-	make image-api && make image-msg-gateway && make image-msg-transfer & make image-push && make image-timer-task
-	make image-rpc-user && make image-rpc-friend && make image-rpc-group && make image-rpc-msg && make image-rpc-auth
-	make image-demo
-
-# 打包 open_im_api
-image-api:
-	echo -e ${GREEN_PREFIX} "IMAGE:openim/api building..." ${COLOR_SUFFIX}
-	docker build -t openim/api:latest -f ./dockerfiles/Dockerfile.api .
-	echo -e ${GREEN_PREFIX} "IMAGE:openim/api build ok" ${COLOR_SUFFIX}
-
-# 打包 open_im_msg_gateway
-image-msg-gateway:
-	echo -e ${GREEN_PREFIX} "IMAGE:openim/msg_gateway building..." ${COLOR_SUFFIX}
-	docker build -t openim/msg_gateway:latest -f ./dockerfiles/Dockerfile.msg_gateway .
-	echo -e ${GREEN_PREFIX} "IMAGE:openim/msg_gateway build ok" ${COLOR_SUFFIX}
-
-# 打包 open_im_msg_transfer
-image-msg-transfer:
-	echo -e ${GREEN_PREFIX} "IMAGE:openim/msg_transfer building..." ${COLOR_SUFFIX}
-	docker build -t openim/msg_transfer:latest -f ./dockerfiles/Dockerfile.msg_transfer .
-	echo -e ${GREEN_PREFIX} "IMAGE:openim/msg_transfer build ok" ${COLOR_SUFFIX}
-
-# 打包 open_im_push
-image-push:
-	echo -e ${GREEN_PREFIX} "IMAGE:openim/push building..." ${COLOR_SUFFIX}
-	docker build -t openim/push:latest -f ./dockerfiles/Dockerfile.push .
-	echo -e ${GREEN_PREFIX} "IMAGE:openim/push build ok" ${COLOR_SUFFIX}
-
-# 打包 open_im_timer_task
-image-timer-task:
-	echo -e ${GREEN_PREFIX} "IMAGE:openim/timer_task building..." ${COLOR_SUFFIX}
-	docker build -t openim/timer_task:latest -f ./dockerfiles/Dockerfile.timer_task .
-	echo -e ${GREEN_PREFIX} "IMAGE:openim/timer_task build ok" ${COLOR_SUFFIX}
-
-# 打包 build-rpc-user
-image-rpc-user:
-	echo -e ${SKY_BLUE_PREFIX} "IMAGE:openim/rpc_user building..." ${COLOR_SUFFIX}
-	docker build -t openim/rpc_user:latest -f ./dockerfiles/Dockerfile.rpc_user .
-	echo -e ${SKY_BLUE_PREFIX} "IMAGE:openim/rpc_user build ok" ${COLOR_SUFFIX}
-
-# 打包 build-rpc-friend
-image-rpc-friend:
-	echo -e ${SKY_BLUE_PREFIX} "IMAGE:openim/rpc_friend building..." ${COLOR_SUFFIX}
-	docker build -t openim/rpc_friend:latest -f ./dockerfiles/Dockerfile.rpc_friend .
-	echo -e ${SKY_BLUE_PREFIX} "IMAGE:openim/rpc_friend build ok" ${COLOR_SUFFIX}
-
-# 打包 build-rpc-group
-image-rpc-group:
-	echo -e ${SKY_BLUE_PREFIX} "IMAGE:openim/rpc_group building..." ${COLOR_SUFFIX}
-	docker build -t openim/rpc_group:latest -f ./dockerfiles/Dockerfile.rpc_group .
-	echo -e ${SKY_BLUE_PREFIX} "IMAGE:openim/rpc_group build ok" ${COLOR_SUFFIX}
-
-# 打包 build-rpc-auth
-image-rpc-auth:
-	echo -e ${SKY_BLUE_PREFIX} "IMAGE:openim/rpc_auth building..." ${COLOR_SUFFIX}
-	docker build -t openim/rpc_auth:latest -f ./dockerfiles/Dockerfile.rpc_auth .
-	echo -e ${SKY_BLUE_PREFIX} "IMAGE:openim/rpc_auth build ok" ${COLOR_SUFFIX}
-
-# 打包 build-rpc-msg
-image-rpc-msg:
-	echo -e ${SKY_BLUE_PREFIX} "IMAGE:openim/rpc_msg building..." ${COLOR_SUFFIX}
-	docker build -t openim/rpc_msg:latest -f ./dockerfiles/Dockerfile.rpc_msg .
-	echo -e ${SKY_BLUE_PREFIX} "IMAGE:openim/rpc_msg build ok" ${COLOR_SUFFIX}
-
-# 打包 open_im_demo
-image-demo:
-	echo -e ${SKY_BLUE_PREFIX} "IMAGE:openim/demo building..." ${COLOR_SUFFIX}
-	docker build -t openim/demo:latest -f ./dockerfiles/Dockerfile.demo .
-	echo -e ${SKY_BLUE_PREFIX} "IMAGE:openim/demo build ok" ${COLOR_SUFFIX}
-
-.PHONY: win-build-all build-api build-msg-gateway build-msg-transfer build-push 
-	build-timer-task build-rpc-user build-rpc-friend build-rpc-group build-rpc-msg build-demo
-	image-all image-api image-msg-gateway image-msg-transfer image-push 
-	image-timer-task image-rpc-user image-rpc-friend image-rpc-group image-rpc-msg image-demo

deploy/config.example.yaml

@@ -1,182 +0,0 @@
-# The class cannot be named by Pascal or camel case.
-# If it is not used, the corresponding structure will not be set,
-# and it will not be read naturally.
-serverversion: 1.0.3
-#---------------Infrastructure configuration---------------------#
-etcd:
-  etcdSchema: openIM
-  etcdAddr: [ openim_etcd:2379 ]
-
-mysql:
-  dbMysqlAddress: [ openim_mysql:3306 ] # openim_mysql 是对应的mysql服务的host
-  dbMysqlUserName: openIM
-  dbMysqlPassword: openIM
-  dbMysqlDatabaseName: openIM
-  dbTableName: eMsg
-  dbMsgTableNum: 1
-  dbMaxOpenConns: 20
-  dbMaxIdleConns: 10
-  dbMaxLifeTime: 120
-
-mongo:
-  dbAddress: [ openim_mongo:27017 ]
-  dbDirect: false
-  dbTimeout: 10
-  dbDatabase: openIM
-  dbSource: admin
-  dbUserName:
-  dbPassword:
-  dbMaxPoolSize: 20
-  dbRetainChatRecords: 7
-
-redis:
-  dbAddress: openim_redis:6379
-  dbMaxIdle: 128
-  dbMaxActive: 0
-  dbIdleTimeout: 120
-  dbPassWord: openIM
-
-kafka:
-  ws2mschat:
-    addr: [ openim_kafka:9092 ]
-    topic: "ws2ms_chat"
-  ms2pschat:
-    addr: [ openim_kafka:9092 ]
-    topic: "ms2ps_chat"
-  consumergroupid:
-    msgToMongo: mongo
-    msgToMySql: mysql
-    msgToPush: push
-
-
-
-#---------------Internal service configuration---------------------#
-
-# The service ip default is empty,
-# automatically obtain the machine's valid network card ip as the service ip,
-# otherwise the configuration ip is preferred
-serverip: 0.0.0.0
-
-# endpoints 内部组件间访问的端点host名称，访问时，可以内部直接访问 host:port 来访问
-#   新增的这一段配置节，主要是位了注册到etcd时，可以使用同一network下的容器名(host)来访问不同的容器，拆分到不同容器后原来全部使用serverip的形式不能用了
-endpoints:
-  api: openim_api
-  push: openim_push
-  msg_gateway: openim_msg_gateway
-  rpc_auth: openim_rpc_auth
-  rpc_friend: openim_rpc_friend
-  rpc_group: openim_rpc_group
-  rpc_msg: openim_rpc_msg
-  rpc_user: openim_rpc_user
-
-api:
-  openImApiPort: [ 10000 ]
-sdk:
-  openImSdkWsPort: [ 30000 ]
-cmsapi:
-  openImCmsApiPort: [ 8000 ]
-
-credential:
-  tencent:
-    appID: 1302656840
-    region: ap-chengdu
-    bucket: echat-1302656840
-    secretID: AKIDGNYVChzIQinu7QEgtNp0hnNgqcV8vZTC
-    secretKey: kz15vW83qM6dBUWIq681eBZA0c0vlIbe
-
-
-rpcport:
-  openImUserPort: [ 10100 ]
-  openImFriendPort: [ 10200 ]
-  openImOfflineMessagePort: [ 10300]
-  openImOnlineRelayPort: [ 10400 ]
-  openImGroupPort: [ 10500  ]
-  openImAuthPort: [ 10600 ]
-  openImPushPort: [ 10700 ]
-  openImStatisticsPort: [ 10800 ]
-  openImMessageCmsPort: [ 10900 ]
-  openImAdminCmsPort: [ 11000 ]
-
-rpcregistername:
-  openImUserName: User
-  openImFriendName: Friend
-  openImOfflineMessageName: OfflineMessage
-  openImPushName: Push
-  openImOnlineMessageRelayName: OnlineMessageRelay
-  openImGroupName: Group
-  openImAuthName: Auth
-
-log:
-  storageLocation: ../logs/
-  rotationTime: 24
-  remainRotationCount: 5
-  remainLogLevel: 6
-  elasticSearchSwitch: false
-  elasticSearchAddr: [ 127.0.0.1:9201 ]
-  elasticSearchUser: ""
-  elasticSearchPassword: ""
-
-modulename:
-  longConnSvrName: msg_gateway
-  msgTransferName: msg_transfer
-  pushName: push
-
-longconnsvr:
-  openImWsPort: [ 17778 ]
-  websocketMaxConnNum: 10000
-  websocketMaxMsgLen: 4096
-  websocketTimeOut: 10
-
-push:
-  tpns:
-    ios:
-      accessID: 1600018281
-      secretKey: 3cd68a77a95b89e5089a1aca523f318f
-    android:
-      accessID: 111
-      secretKey: 111
-  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"
-manager:
-  appManagerUid: ["openIM123456","openIM654321"]
-  secrets: ["openIM1","openIM2"]
-
-secret: tuoyun
-
-multiloginpolicy: 1
-
-#token config
-tokenpolicy:
-  accessSecret: "open_im_server"
-  # Token effective time day as a unit
-  accessExpire: 7
-
-messagecallback:
-  callbackSwitch: false
-  callbackUrl: "http://www.xxx.com/msg/judge"
-  #TimeOut use second as unit
-  callbackTimeOut: 10
-
-
-#---------------demo configuration---------------------#
-#The following configuration items are applied to openIM Demo configuration
-demoswitch: true
-demo:
-  openImDemoPort: [ 42233 ]
-  alismsverify:
-    accessKeyId: LTAI5tJPkn4HuuePdiLdGqe71
-    accessKeySecret: 4n9OJ7ZCVN1U6KeHDAtOyNeVZcjOuV1
-    signName: OpenIM Corporation
-    verificationCodeTemplateCode: SMS_2268101641
-  superCode: 666666
-  mail:
-    title: "openIM"
-    senderMail: "1765567899@qq.com"
-    senderAuthorizationCode: "1gxyausfoevlzbfag"
-    smtpAddr: "smtp.qq.com"
-    smtpPort: 25
-
-

deploy/dockerfiles/Dockerfile.api

@@ -1,16 +0,0 @@
-FROM alpine:3.13
-
-# 设置固定的项目路径
-ENV WORKDIR /app
-ENV CONFIG_NAME $WORKDIR/config/config.yaml
-
-# 将可执行文件复制到目标目录
-ADD ./open_im_api $WORKDIR/main
-
-# 创建用于挂载的几个目录，添加可执行权限
-RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \
-  chmod +x $WORKDIR/main
-
-
-WORKDIR $WORKDIR
-CMD ./main

deploy/dockerfiles/Dockerfile.demo

@@ -1,16 +0,0 @@
-FROM alpine:3.13
-
-# 设置固定的项目路径
-ENV WORKDIR /app
-ENV CONFIG_NAME $WORKDIR/config/config.yaml
-
-# 将可执行文件复制到目标目录
-ADD ./open_im_demo $WORKDIR/main
-
-# 创建用于挂载的几个目录，添加可执行权限
-RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \
-  chmod +x $WORKDIR/main
-
-
-WORKDIR $WORKDIR
-CMD ./main

deploy/dockerfiles/Dockerfile.msg_gateway

@@ -1,16 +0,0 @@
-FROM alpine:3.13
-
-# 设置固定的项目路径
-ENV WORKDIR /app
-ENV CONFIG_NAME $WORKDIR/config/config.yaml
-
-# 将可执行文件复制到目标目录
-ADD ./open_im_msg_gateway $WORKDIR/main
-
-# 创建用于挂载的几个目录，重命名可执行文件为 main，添加可执行权限
-RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \
-  chmod +x $WORKDIR/main
-
-
-WORKDIR $WORKDIR
-CMD ./main

deploy/dockerfiles/Dockerfile.msg_transfer

@@ -1,16 +0,0 @@
-FROM alpine:3.13
-
-# 设置固定的项目路径
-ENV WORKDIR /app
-ENV CONFIG_NAME $WORKDIR/config/config.yaml
-
-# 将可执行文件复制到目标目录
-ADD ./open_im_msg_transfer $WORKDIR/main
-
-# 创建用于挂载的几个目录，添加可执行权限
-RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \
-  chmod +x $WORKDIR/main
-
-
-WORKDIR $WORKDIR
-CMD ./main

deploy/dockerfiles/Dockerfile.push

@@ -1,16 +0,0 @@
-FROM alpine:3.13
-
-# 设置固定的项目路径
-ENV WORKDIR /app
-ENV CONFIG_NAME $WORKDIR/config/config.yaml
-
-# 将可执行文件复制到目标目录
-ADD ./open_im_push $WORKDIR/main
-
-# 创建用于挂载的几个目录，添加可执行权限
-RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \
-  chmod +x $WORKDIR/main
-
-
-WORKDIR $WORKDIR
-CMD ./main

deploy/dockerfiles/Dockerfile.rpc_auth

@@ -1,16 +0,0 @@
-FROM alpine:3.13
-
-# 设置固定的项目路径
-ENV WORKDIR /app
-ENV CONFIG_NAME $WORKDIR/config/config.yaml
-
-# 将可执行文件复制到目标目录
-ADD ./open_im_rpc_auth $WORKDIR/main
-
-# 创建用于挂载的几个目录，添加可执行权限
-RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \
-  chmod +x $WORKDIR/main
-
-
-WORKDIR $WORKDIR
-CMD ./main

deploy/dockerfiles/Dockerfile.rpc_friend

@@ -1,16 +0,0 @@
-FROM alpine:3.13
-
-# 设置固定的项目路径
-ENV WORKDIR /app
-ENV CONFIG_NAME $WORKDIR/config/config.yaml
-
-# 将可执行文件复制到目标目录
-ADD ./open_im_rpc_friend $WORKDIR/main
-
-# 创建用于挂载的几个目录，添加可执行权限
-RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \
-  chmod +x $WORKDIR/main
-
-
-WORKDIR $WORKDIR
-CMD ./main

deploy/dockerfiles/Dockerfile.rpc_group

@@ -1,16 +0,0 @@
-FROM alpine:3.13
-
-# 设置固定的项目路径
-ENV WORKDIR /app
-ENV CONFIG_NAME $WORKDIR/config/config.yaml
-
-# 将可执行文件复制到目标目录
-ADD ./open_im_rpc_group $WORKDIR/main
-
-# 创建用于挂载的几个目录，添加可执行权限
-RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \
-  chmod +x $WORKDIR/main
-
-
-WORKDIR $WORKDIR
-CMD ./main

deploy/dockerfiles/Dockerfile.rpc_msg

@@ -1,16 +0,0 @@
-FROM alpine:3.13
-
-# 设置固定的项目路径
-ENV WORKDIR /app
-ENV CONFIG_NAME $WORKDIR/config/config.yaml
-
-# 将可执行文件复制到目标目录
-ADD ./open_im_rpc_msg $WORKDIR/main
-
-# 创建用于挂载的几个目录，添加可执行权限
-RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \
-  chmod +x $WORKDIR/main
-
-
-WORKDIR $WORKDIR
-CMD ./main

deploy/dockerfiles/Dockerfile.rpc_user

@@ -1,16 +0,0 @@
-FROM alpine:3.13
-
-# 设置固定的项目路径
-ENV WORKDIR /app
-ENV CONFIG_NAME $WORKDIR/config/config.yaml
-
-# 将可执行文件复制到目标目录
-ADD ./open_im_rpc_user $WORKDIR/main
-
-# 创建用于挂载的几个目录，添加可执行权限
-RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \
-  chmod +x $WORKDIR/main
-
-
-WORKDIR $WORKDIR
-CMD ./main

deploy/dockerfiles/Dockerfile.timer_task

@@ -1,16 +0,0 @@
-FROM alpine:3.13
-
-# 设置固定的项目路径
-ENV WORKDIR /app
-ENV CONFIG_NAME $WORKDIR/config/config.yaml
-
-# 将可执行文件复制到目标目录
-ADD ./open_im_timer_task $WORKDIR/main
-
-# 创建用于挂载的几个目录，添加可执行权限
-RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \
-  chmod +x $WORKDIR/main
-
-
-WORKDIR $WORKDIR
-CMD ./main

deploy/env.yaml

@@ -1,101 +0,0 @@
-version: "3.7"
-networks: 
-  openim: 
-    external: true
- 
-services:
-  mysql:
-    networks: 
-      - openim
-    image: mysql:5.7
-    # ports:
-    #   #- 13306:3306
-    #   - 23306:33060
-    container_name: openim_mysql
-    volumes:
-      - ./components/mysql/data:/var/lib/mysql
-      - /etc/localtime:/etc/localtime
-    environment:
-      MYSQL_ROOT_PASSWORD: openIM
-    restart: always
-
-  mongodb:
-    networks: 
-      - openim
-    image: mongo:4.4.5-bionic
-    # ports:
-    #   - 37017:27017
-    container_name: openim_mongo
-    volumes:
-      - ./components/mongodb/data/db:/data/db
-      - ./components/mongodb/data/logs:/data/logs
-      - ./components/mongodb/data/conf:/etc/mongo
-   environment:
-    TZ: Asia/Shanghai
-   #   - MONGO_INITDB_ROOT_USERNAME=openIM
-    #  - MONGO_INITDB_ROOT_PASSWORD=openIM
-    restart: always
-
-  redis:
-    networks: 
-      - openim
-    image: redis:6.2.4-alpine
-    # ports:
-    #   - 16379:6379
-    container_name: openim_redis
-    volumes:
-      - ./components/redis/data:/data
-      #redis config file
-      #- ./components/redis/config/redis.conf:/usr/local/redis/config/redis.conf
-    environment:
-      TZ: Asia/Shanghai
-    restart: always
-    sysctls:
-      net.core.somaxconn: 1024
-    command: redis-server --requirepass openIM --appendonly yes
-
-
-  zookeeper:
-    networks: 
-      - openim
-    image: wurstmeister/zookeeper
-    # ports:
-    #   - 2181:2181
-    container_name: openim_zookeeper
-    volumes:
-      - /etc/localtime:/etc/localtime
-    environment:
-      TZ: Asia/Shanghai
-    restart: always
-
-  kafka:
-    networks: 
-      - openim
-    image: wurstmeister/kafka
-    container_name: openim_kafka
-    restart: always
-    environment:
-      TZ: Asia/Shanghai
-      KAFKA_BROKER_ID: 0
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092
-      KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:9092
-    depends_on:
-      - zookeeper
-
-  etcd:
-    networks: 
-      - openim
-    image: quay.io/coreos/etcd
-    # ports:
-    #   - 2379:2379
-    #   - 2380:2380
-    container_name: openim_etcd
-    volumes:
-      - /etc/timezone:/etc/timezone
-      - /etc/localtime:/etc/localtime
-    environment:
-      ETCDCTL_API: 3
-    restart: always
-    command: /usr/local/bin/etcd --name etcd0 --data-dir /etcd-data --listen-client-urls http://0.0.0.0:2379 --advertise-client-urls http://0.0.0.0:2379 --listen-peer-urls http://0.0.0.0:2380 --initial-advertise-peer-urls http://0.0.0.0:2380 --initial-cluster etcd0=http://0.0.0.0:2380 --initial-cluster-token tkn --initial-cluster-state new
-

deploy/openim.yaml

@@ -1,223 +0,0 @@
-version: "3.7"
-networks: 
-  openim:
-    external: true
- 
-services:
-  api:
-    networks: 
-      - openim
-    image: openim/api
-    container_name: openim_api
-    ports:
-      - 10000:10000 # API，必须开
-    volumes:
-      - ./logs:/app/logs
-      # Dockerfile 里定义了配置文件的路径环境变量，CONFIG_NAME，默认指向了 /app/config/config.yaml
-      - ./config/config.yaml:/app/config/config.yaml
-      - ./db/sdk:/app/db/sdk
-    restart: always
-    # depends_on:
-    #   - kafka
-    #   # - mysql
-    #   # - mongodb
-    #   - redis
-    #   - etcd
-    logging:
-      driver: json-file
-      options:
-        max-size: "1g"
-        max-file: "2"
-
-  msg_gateway:
-    networks: 
-      - openim
-    image: openim/msg_gateway
-    container_name: openim_msg_gateway
-    ports:
-      - 17778:17778 # 消息，必须开
-    volumes:
-      - ./logs:/app/logs
-      - ./config/config.yaml:/app/config/config.yaml
-      - ./db/sdk:/app/db/sdk
-    restart: always
-    # depends_on:
-    #   - kafka
-    #   # - mysql
-    #   # - mongodb
-    #   - redis
-    #   - etcd
-    logging:
-      driver: json-file
-      options:
-        max-size: "1g"
-        max-file: "2"
-        
-  msg_transfer:
-    networks: 
-      - openim
-    image: openim/msg_transfer
-    container_name: openim_msg_transfer
-    volumes:
-      - ./logs:/app/logs
-      - ./config/config.yaml:/app/config/config.yaml
-      - ./db/sdk:/app/db/sdk
-    restart: always
-    # depends_on:
-    #   - kafka
-    #   # - mysql
-    #   # - mongodb
-    #   - redis
-    #   - etcd
-    logging:
-      driver: json-file
-      options:
-        max-size: "1g"
-        max-file: "2"
-  
-  push:
-    networks: 
-      - openim
-    image: openim/push
-    container_name: openim_push
-    volumes:
-      - ./logs:/app/logs
-      - ./config/config.yaml:/app/config/config.yaml
-      - ./db/sdk:/app/db/sdk
-    restart: always
-    # depends_on:
-    #   - kafka
-    #   # - mysql
-    #   # - mongodb
-    #   - redis
-    #   - etcd
-    logging:
-      driver: json-file
-      options:
-        max-size: "1g"
-        max-file: "2"
-
-  timer_task:
-    networks: 
-      - openim
-    image: openim/timer_task
-    container_name: openim_timer_task
-    volumes:
-      - ./logs:/app/logs
-      - ./config/config.yaml:/app/config/config.yaml
-      - ./db/sdk:/app/db/sdk
-    restart: always
-    # depends_on:
-    #   - kafka
-    #   # - mysql
-    #   # - mongodb
-    #   - redis
-    #   - etcd
-    logging:
-      driver: json-file
-      options:
-        max-size: "1g"
-        max-file: "2"
-
-  rpc_user:
-    networks: 
-      - openim
-    image: openim/rpc_user
-    container_name: openim_rpc_user
-    volumes:
-      - ./logs:/app/logs
-      - ./config/config.yaml:/app/config/config.yaml
-      - ./db/sdk:/app/db/sdk
-    restart: always
-    # depends_on:
-    #   - kafka
-    #   # - mysql
-    #   # - mongodb
-    #   - redis
-    #   - etcd
-    logging:
-      driver: json-file
-      options:
-        max-size: "1g"
-        max-file: "2"
-
-  rpc_friend:
-    networks: 
-      - openim
-    image: openim/rpc_friend
-    container_name: openim_rpc_friend
-    volumes:
-      - ./logs:/app/logs
-      - ./config/config.yaml:/app/config/config.yaml
-      - ./db/sdk:/app/db/sdk
-    restart: always
-    # depends_on:
-    #   - kafka
-    #   # - mysql
-    #   # - mongodb
-    #   - redis
-    #   - etcd
-
-  rpc_group:
-    networks: 
-      - openim
-    image: openim/rpc_group
-    container_name: openim_rpc_group
-    volumes:
-      - ./logs:/app/logs
-      - ./config/config.yaml:/app/config/config.yaml
-      - ./db/sdk:/app/db/sdk
-    restart: always
-    # depends_on:
-    #   - kafka
-    #   # - mysql
-    #   # - mongodb
-    #   - redis
-    #   - etcd
-
-  rpc_auth:
-    networks: 
-      - openim
-    image: openim/rpc_auth
-    container_name: openim_rpc_auth
-    volumes:
-      - ./logs:/app/logs
-      - ./config/config.yaml:/app/config/config.yaml
-      - ./db/sdk:/app/db/sdk
-    restart: always
-    # depends_on:
-    #   - kafka
-    #   # - mysql
-    #   # - mongodb
-    #   - redis
-    #   - etcd
-
-  rpc_msg:
-    networks: 
-      - openim
-    image: openim/rpc_msg
-    container_name: openim_rpc_msg
-    volumes:
-      - ./logs:/app/logs
-      - ./config/config.yaml:/app/config/config.yaml
-      - ./db/sdk:/app/db/sdk
-    restart: always
-    # depends_on:
-    #   - kafka
-    #   # - mysql
-    #   # - mongodb
-    #   - redis
-    #   - etcd
-
-  demo:
-    networks: 
-      - openim
-    image: openim/demo
-    container_name: openim_demo
-    ports:
-      - 42233:42233
-    volumes:
-      - ./logs:/app/logs
-      - ./config/config.yaml:/app/config/config.yaml
-      - ./db/sdk:/app/db/sdk
-    restart: always

deploy/readme.md

@@ -1,30 +0,0 @@
-
-### 以docker-compose 形式单独部署
-```sh
-# 查看 ./Makefile ，先编译各个需要的源码到 ../bin 
-# win-* 表示在win平台编译位linux二进制，其实就是处理了 go env -w GOOS=linux 
-make win-build-all
-
-# 得到各个二进制程序之后，打包为镜像
-# 目前没有处理 Open-IM-SDK-Core ，需要的话可以自己单独处理这个模块
-make image-all
-
-# docker-compose.yaml 分成了两部分，一部分是openIM的镜像容器 openim.yaml，一部分是依赖的环境 env.yaml
-# 两部分使用一个外部的网络来联通，所以首先创建用到的 network
-docker network create openim --attachable=true -d bridge
-
-# 处理openim组件需要的挂载目录，主要是处理config目录
-mkdir ./config
-cp ./config.example.yaml ./config/config.yaml # 修改 ./config/config.yaml 内容，比如各个依赖组件的 host
-
-# 然后拉起env.yaml
-docker-compose -f ./env.yaml up -d
-
-# 等env 容器全部拉起成功之后，拉起openim.yaml
-docker-compose -f ./openim.yaml up -d
-
-# 查看容器运行，推荐使用下 portainer ，web查看容器情况，查看日志等等
-docker container ps -a | grep openim
-
-# 正常应该是查看api,demo等的容器日志，看到gin打印的路由日志才算是成功
-```