Merge remote-tracking branch 'origin/v3dev' into v3dev

add tx_oss cos

.docker-compose_cfg/config.yaml

@@ -1,17 +1,3 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 #---------------Infrastructure configuration---------------------#
 etcd:
   etcdSchema: openim  #默认即可

.docker-compose_cfg/datasource-compose.yaml

@@ -1,17 +1,3 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 #more datasource-compose.yaml 
 apiVersion: 1
 

.docker-compose_cfg/grafana.ini

@@ -633,7 +633,7 @@ active_sync_enabled = true
 #################################### AWS ###########################
 [aws]
 # Enter a comma-separated list of allowed AWS authentication providers.
-# Options are: default (AWS SDK Default), keys (Access && secret key), credentials (Credentials field), ec2_iam_role (EC2 OpenIM Role)
+# Options are: default (AWS SDK Default), keys (Access && secret key), credentials (Credentials field), ec2_iam_role (EC2 IAM Role)
 allowed_auth_providers = default,keys,credentials
 
 # Allow AWS users to assume a role using temporary security credentials.

.docker-compose_cfg/prometheus-compose.yml

@@ -1,17 +1,3 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 #more prometheus-compose.yml 
 global:
   scrape_interval:     15s 

.github/sync.yml

@@ -28,9 +28,6 @@ OpenIMSDK/openim-sdk-core:
   - source: .github/workflows/stale.yml
     dest: .github/workflows/stale.yml
     replace: false
-  - source: .github/.codecov.yml
-    dest: .github/.codecov.yml
-    replace: false
 
 OpenIMSDK/OpenIM-Docs:
   - source: .github/workflows/
@@ -41,9 +38,6 @@ OpenIMSDK/OpenIM-Docs:
   - source: scripts/githooks/
     dest: scripts/githooks/
     replace: true
-  - source: .github/.codecov.yml
-    dest: .github/.codecov.yml
-    replace: false
 
 OpenIMSDK/OpenKF:
   - source: LICENSE
@@ -57,9 +51,6 @@ OpenIMSDK/OpenKF:
   - source: .github/workflows/stale.yml
     dest: .github/workflows/stale.yml
     replace: false
-  - source: .github/.codecov.yml
-    dest: .github/.codecov.yml
-    replace: false
 
 group:
   # first group：common to all warehouses
@@ -84,9 +75,6 @@ group:
       - source: .github/workflows/help-comment-issue.yml
         dest: .github/workflows/help-comment-issue.yml
         replace: false
-      - source: .github/.codecov.yml
-        dest: .github/.codecov.yml
-        replace: false
       - source: ./scripts/githooks/
         dest: ./scripts/githooks/
         replace: true

.github/weekly-digest.yml

@@ -1,7 +0,0 @@
-# https://github.com/apps/weekly-digest/installations/new
-publishDay: sun
-canPublishIssues: true
-canPublishPullRequests: true
-canPublishContributors: true
-canPublishStargazers: true
-canPublishCommits: true

.github/workflows/codeql-analysis.yml

@@ -1,76 +1,71 @@
-# Copyright © 2023 OpenIM open source community. All rights reserved.
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-name: "Code Scanning - Action"
+name: "CodeQL"
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
   pull_request:
-    branches: [main]
-  schedule:
-    #        ┌───────────── minute (0 - 59)
-    #        │  ┌───────────── hour (0 - 23)
-    #        │  │ ┌───────────── day of the month (1 - 31)
-    #        │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
-    #        │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
-    #        │  │ │ │ │
-    #        │  │ │ │ │
-    #        │  │ │ │ │
-    #        *  * * * *
-    - cron: '30 1 * * 0'
+    # The branches below must be a subset of the branches above
+    branches: "*"
+#   schedule:
+#     - cron: '23 2 * * 2'
 
 jobs:
-  CodeQL-Build:
-    # CodeQL runs on ubuntu-latest, windows-latest, and macos-latest
+  analyze:
+    name: Analyze
     runs-on: ubuntu-latest
-
     permissions:
-      # required for all workflows
-      security-events: write
-
-      # only required for workflows in private repositories
       actions: read
       contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
+    - name: Checkout repository
+      uses: actions/checkout@v2
 
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        # Override language selection by uncommenting this and choosing your languages
-        # with:
-        #   languages: go, javascript, csharp, python, cpp, java, ruby
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-      # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below).
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
 
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
 
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following
-      #    three lines and modify them (or add more) to build your code if your
-      #    project uses a compiled language
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
 
-      #- run: |
-      #     make bootstrap
-      #     make release
+    #- run: |
+    #   make bootstrap
+    #   make release
 
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/golangci-link.yml

@@ -1,51 +0,0 @@
-# Copyright © 2023 OpenIM open source community. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-name: OpenKF golangci-lint
-on:
-  push:
-    branches: [main]
-#   pull_request:
-#     branches: [main]
-jobs:
-    golangci:
-      name: lint
-      runs-on: ubuntu-latest
-      steps:
-        - uses: actions/checkout@v3
-        - uses: actions/setup-go@v4
-          with:
-            go-version: '1.20'
-            cache: false
-        - name: golangci-lint
-          uses: golangci/golangci-lint-action@v3
-          with:
-            # Require: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-            version: v1.53
-
-            # Optional: working directory, useful for monorepos
-            working-directory: server
-
-            # Optional: golangci-lint command line arguments.
-            # 
-            # Note: by default the `.golangci.yml` file should be at the root of the repository.
-            # The location of the configuration file can be changed by using `--config=`
-            # args: --timeout=30m --config=/my/path/.golangci.yml --issues-exit-code=0
-
-            # Optional: show only new issues if it's a pull request. The default value is `false`.
-            only-new-issues: true
-
-            # Optional:The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
-            install-mode: "goinstall"

.github/workflows/image.yml

@@ -1,81 +0,0 @@
-name: Build Image
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - "**.go"
-      - "!**_test.go"
-      - "build/**"
-    tags:
-      - v*
-
-jobs:
-  release:
-    strategy:
-      matrix:
-        components: [core, swagger]
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 20
-      - uses: dorny/paths-filter@v2
-        if: ${{ !startsWith(github.ref_name, 'v') }}
-        id: changes
-        with:
-          filters: |
-            go:
-              - '**.go'
-              - 'build/core/Dockerfile'
-            api:
-              - 'openapi/**'
-              - 'build/swagger/build.sh'
-              - 'build/swagger/Dockerfile'
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          flavor: |
-            latest=false
-          images: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/openimsdk-${{ matrix.components }}
-            registry.cn-hangzhou.aliyuncs.com/${{ secrets.ALIREGISTRY_NAMESPACE }}/openimsdk-${{ matrix.components }}
-          tags: |
-            type=ref,event=branch
-            type=sha,prefix={{branch}}-,enable=${{ github.ref_type == 'branch' }}
-            type=ref,event=tag
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Login to Ali Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: registry.cn-hangzhou.aliyuncs.com
-          username: ${{ secrets.ALIREGISTRY_USERNAME }}
-          password: ${{ secrets.ALIREGISTRY_TOKEN }}
-
-      - name: Condition
-        id: condition
-        run: |
-          echo "run=${{ startsWith(github.ref_name, 'v') || ((steps.changes.outputs.go == 'true' && (matrix.components == 'core' || matrix.components == 'job')) || (steps.changes.outputs.api == 'true' && matrix.components == 'swagger')) }}" >> $GITHUB_OUTPUT
-
-      - name: Set up QEMU
-        if: ${{ steps.condition.outputs.run == 'true' }}
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        if: ${{ steps.condition.outputs.run == 'true' }}
-        uses: docker/setup-buildx-action@v2
-      - name: Build and push
-        if: ${{ steps.condition.outputs.run == 'true' }}
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./build/${{ matrix.components }}/Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}

.github/workflows/openim-ci.yml

@@ -1,152 +0,0 @@
-# Copyright © 2023 OpenIM open source community. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: OpenIM CI
-
-on: 
-  push:
-    branches:
-        - main
-    paths-ignore:
-        - "docs/**"
-        - "README.md"
-        - "README_zh-CN.md"
-        - "CONTRIBUTING.md"
-  pull_request:
-    branches:
-        - main
-    paths-ignore:
-        - "README.md"
-        - "README_zh-CN.md"
-        - "CONTRIBUTING.md"
-        - "docs/**"
-
-env:
-  GO_VERSION: "1.19"
-  GOLANGCI_VERSION: "v1.50.1"
-
-jobs:
-  openim:
-    name: Test with go ${{ matrix.go_version }} on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    environment:
-      name: openim
-
-    strategy:
-      matrix:
-        go_version: ["1.18","1.19","1.20"]
-        os: [ubuntu-latest]
-
-    steps:
-      - name: Set up Go ${{ matrix.go_version }}
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.go_version }}
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Run go modules tidy
-        run: |
-          make tidy
-
-      - name: Run go format
-        run: |
-          make format
-          echo "Run go format successfully"
-
-    #   - name: Generate all necessary files, such as error code files
-    #     run: |
-    #       make generate
-
-    #   - name: Check syntax and styling of go sources
-    #     run: |
-    #       set -e
-    #       make lint
-
-    #   - name: Run unit test and get test coverage
-    #     run: |
-    #       make cover
-
-      - name: Build source code for host platform
-        run: |
-          make multiarch
-          echo "Build source code for host platform successfully"
-
-    #   - name: Collect Test Coverage File
-    #     uses: actions/upload-artifact@v1.0.0
-    #     with:
-    #       name: main-output
-    #       path: _output/tmp/coverage.out
-
-    #   - name: Set up Docker Buildx
-    #     uses: docker/setup-buildx-action@v1
-
-#   lint:
-#       runs-on: ubuntu-20.04
-#       steps:
-#         - name: Checkout
-#           uses: actions/checkout@v3
-#           with:
-#             fetch-depth: 0
-  
-#         - name: Set up Go
-#           uses: actions/setup-go@v3
-#           with:
-#             go-version: ${{ env.GO_VERSION }}
-  
-#         - name: golangci-lint
-#           uses: golangci/golangci-lint-action@v3
-#           with:
-#             version: ${{ env.GOLANGCI_VERSION }}
-
-#   docker-image-tests:
-#     runs-on: ubuntu-20.04
-#     steps:
-#       - name: Checkout
-#         uses: actions/checkout@v3
-#         with:
-#           fetch-depth: 0
-      
-#       - name: Set up Go
-#         uses: actions/setup-go@v3
-#         with:
-#           go-version: ${{ env.GO_VERSION }}
-
-#       - name: Run tests
-#         run: make build
-      
-#       - name: Test docker image
-#         run: |
-#           docker build -t openim:ci-build .
-
-#   goreleaser-test:
-#     runs-on: ubuntu-20.04
-#     steps:
-#       - name: Checkout
-#         uses: actions/checkout@v3
-#         with:
-#           fetch-depth: 0
-
-#       - name: Set up Go
-#         uses: actions/setup-go@v3
-#         with:
-#           go-version: ${{ env.GO_VERSION }}
-
-#       - name: Run GoReleaser
-#         uses: goreleaser/goreleaser-action@v4
-#         with:
-#           version: latest
-#           args: release --clean --skip-publish --snapshot

.github/workflows/scripts-test.yml

@@ -1,69 +0,0 @@
-name: OpenIM Start Execute Scripts
-
-on: 
-    push:
-      branches:
-          - main
-      paths-ignore:
-          - "docs/**"
-          - "README.md"
-          - "README_zh-CN.md"
-          - "CONTRIBUTING.md"
-    pull_request:
-      branches:
-          - main
-      paths-ignore:
-          - "README.md"
-          - "README_zh-CN.md"
-          - "CONTRIBUTING.md"
-          - "docs/**"
-
-jobs:
-  execute-scripts:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-
-    - name: Start Docker Compose
-      run: |
-        docker-compose stop
-        docker-compose up -d
-        sleep 60
-
-    - name: Stop all services
-      run: |
-        chmod +x ./scripts/stop_all.sh
-        ./scripts/stop_all.sh
-      shell: bash
-
-    - name: Build all services
-      run: |
-        chmod +x ./scripts/build_all_service.sh
-        ./scripts/build_all_service.sh
-        cat logs/openIM.log
-      shell: bash
-
-    - name: Start all services
-      run: |
-        chmod +x ./scripts/start_all.sh
-        ./scripts/start_all.sh
-        cat logs/openIM.log
-      continue-on-error: true
-      shell: bash
-
-    - name: Check all services
-      run: |
-        chmod +x ./scripts/check_all.sh
-        ./scripts/check_all.sh
-        cat logs/openIM.log
-      shell: bash
-      continue-on-error: true
-
-    - name: Print openIM.log
-      run: |
-        cat logs/openIM.log
-        cat logs/openIM.log  >> "$GITHUB_OUTPUT"
-      shell: bash
-      continue-on-error: true

.github/workflows/sync.yml

@@ -8,6 +8,9 @@ on:
     push:
         branches:
           - main
+    pull_request:
+        branches:
+          - main
     workflow_dispatch:
 
 jobs:
@@ -22,6 +25,7 @@ jobs:
         with:
           GH_INSTALLATION_TOKEN: "${{ secrets.BOT_GITHUB_TOKEN }}"
           CONFIG_PATH: .github/sync.yml
+          GH_PAT: "${{ secrets.BOT_GITHUB_TOKEN }}"
           ORIGINAL_MESSAGE: true
           SKIP_PR: true
           COMMIT_EACH_FILE: false

.gitignore

@@ -30,17 +30,17 @@ output/
 _output/
 
 ### OpenIM deploy ###
-deploy/openim_demo
-deploy/openim-api
-deploy/openim-rpc-msg_gateway
-deploy/openim-msgtransfer
-deploy/openim-push
-deploy/openim_timer_task
-deploy/openim-rpc-user
-deploy/openim-rpc-friend
-deploy/openim-rpc-group
-deploy/openim-rpc-msg
-deploy/openim-rpc-auth
+deploy/open_im_demo
+deploy/open_im_api
+deploy/open_im_msg_gateway
+deploy/open_im_msg_transfer
+deploy/open_im_push
+deploy/open_im_timer_task
+deploy/open_im_rpc_user
+deploy/open_im_rpc_friend
+deploy/open_im_rpc_group
+deploy/open_im_rpc_msg
+deploy/open_im_rpc_auth
 deploy/Open-IM-SDK-Core
 
 # files used by the developer

.gitmodules

@@ -0,0 +1,4 @@
+
+[submodule "cmd/Open-IM-SDK-Core"]
+	path = cmd/Open-IM-SDK-Core
+	url = https://github.com/OpenIMSDK/Open-IM-SDK-Core.git

.idea/Open-IM-Server.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true" />
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/dataSources.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="grafana" uuid="95aae14a-3593-4ff7-ab49-5e4316cbecd1">
+      <driver-ref>sqlite.xerial</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
+      <jdbc-url>jdbc:sqlite:C:\Users\Administrator\Desktop\Open-IM-Server\docker-compose_cfg\grafana.db</jdbc-url>
+      <driver-properties>
+        <property name="enable_load_extension" value="true" />
+      </driver-properties>
+    </data-source>
+  </component>
+</project>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/Open-IM-Server.iml" filepath="$PROJECT_DIR$/.idea/Open-IM-Server.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

CHANGELOG.md

@@ -1 +0,0 @@
-CHANGELOG/CHANGELOG.md

CHANGELOG/.chglog/CHANGELOG.tpl.md

@@ -1,62 +1,40 @@
-# Version logging for OpenIM
-
-<!-- BEGIN MUNGE: GENERATED_TOC -->
-
-<!-- END MUNGE: GENERATED_TOC -->
-
-{{ if .Versions -}}
-<a name="unreleased"></a>
-## [Unreleased]
-
-{{ if .Unreleased.CommitGroups -}}
-{{ range .Unreleased.CommitGroups -}}
-### {{ .Title }}
-{{ range .Commits -}}
-- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
-{{ end }}
-{{ end -}}
-{{ end -}}
-{{ end -}}
-
 {{ range .Versions }}
 <a name="{{ .Tag.Name }}"></a>
-## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }}
+## {{ if .Tag.Previous }}[{{ .Tag.Name }}]({{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}){{ else }}{{ .Tag.Name }}{{ end }}
+
+> {{ datetime "2006-01-02" .Tag.Date }}
+
 {{ range .CommitGroups -}}
 ### {{ .Title }}
+
 {{ range .Commits -}}
-- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
+* {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
 {{ end }}
 {{ end -}}
 
 {{- if .RevertCommits -}}
 ### Reverts
+
 {{ range .RevertCommits -}}
-- {{ .Revert.Header }}
+* {{ .Revert.Header }}
 {{ end }}
 {{ end -}}
 
 {{- if .MergeCommits -}}
 ### Pull Requests
+
 {{ range .MergeCommits -}}
-- {{ .Header }}
+* {{ .Header }}
 {{ end }}
 {{ end -}}
 
 {{- if .NoteGroups -}}
 {{ range .NoteGroups -}}
 ### {{ .Title }}
+
 {{ range .Notes }}
 {{ .Body }}
 {{ end }}
 {{ end -}}
 {{ end -}}
-{{ end -}}
-
-{{- if .Versions }}
-[Unreleased]: {{ .Info.RepositoryURL }}/compare/{{ $latest := index .Versions 0 }}{{ $latest.Tag.Name }}...HEAD
-{{ range .Versions -}}
-{{ if .Tag.Previous -}}
-[{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}
-{{ end -}}
-{{ end -}}
 {{ end -}}

CHANGELOG/.chglog/config.yml

@@ -1,67 +1,28 @@
-bin: git
 style: github
 template: CHANGELOG.tpl.md
 info:
   title: CHANGELOG
   repository_url: https://github.com/OpenIMSDK/Open-IM-Server
 options:
-  tag_filter_pattern: '^v'
-  sort: "date"
-
   commits:
-    filters:
-      Type:
-        - feat
-        - fix
-        - perf
-        - refactor
-        - docs
-        - test
-        - chore
-        - ci
-        - build
-    sort_by: Scope
-
+    # filters:
+    #   Type:
+    #     - feat
+    #     - fix
+    #     - perf
+    #     - refactor
   commit_groups:
-    group_by: Type
-    sort_by: Title
-    title_order:
-      - feat
-      - fix
-      - perf
-      - refactor
-      - docs
-      - test
-      - chore
-      - ci
-      - build
-    title_maps:
-      feat: Features
-
+    # title_maps:
+    #   feat: Features
+    #   fix: Bug Fixes
+    #   perf: Performance Improvements
+    #   refactor: Code Refactoring
   header:
-    pattern: "<regexp>"
+    pattern: "^(\\w*)(?:\\(([\\w\\$\\.\\-\\*\\s]*)\\))?\\:\\s(.*)$"
     pattern_maps:
-      - PropName
-
-  issues:
-    prefix:
-      - #
-
-  refs:
-    actions:
-      - Closes
-      - Fixes
-
-  merges:
-    pattern: "^Merge branch '(\\w+)'$"
-    pattern_maps:
-      - Source
-
-  reverts:
-    pattern: "^Revert \"([\\s\\S]*)\"$"
-    pattern_maps:
-      - Header
-
+      - Type
+      - Scope
+      - Subject
   notes:
     keywords:
       - BREAKING CHANGE

CHANGELOG/CHANGELOG-0.0.0.md

@@ -0,0 +1,228 @@
+
+<a name="v2.3.3"></a>
+## [v2.3.3](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.2...v2.3.3)
+
+> 2022-09-18
+
+
+<a name="v2.3.2"></a>
+## [v2.3.2](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc2...v2.3.2)
+
+> 2022-09-09
+
+### GetSelfUserInfo
+
+* Handle the case where the user does not exist
+
+### Pull Requests
+
+* Merge pull request [#267](https://github.com/OpenIMSDK/Open-IM-Server/issues/267) from ouyangshi/del
+* Merge pull request [#265](https://github.com/OpenIMSDK/Open-IM-Server/issues/265) from ouyangshi/del
+* Merge pull request [#252](https://github.com/OpenIMSDK/Open-IM-Server/issues/252) from x-shadow-man/config-perf
+* Merge pull request [#263](https://github.com/OpenIMSDK/Open-IM-Server/issues/263) from ouyangshi/main
+* Merge pull request [#258](https://github.com/OpenIMSDK/Open-IM-Server/issues/258) from ouyangshi/main
+* Merge pull request [#261](https://github.com/OpenIMSDK/Open-IM-Server/issues/261) from ouyangshi/v2.3.0release
+
+
+<a name="v2.3.0-rc2"></a>
+## [v2.3.0-rc2](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc1...v2.3.0-rc2)
+
+> 2022-07-29
+
+
+<a name="v2.3.0-rc1"></a>
+## [v2.3.0-rc1](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc0...v2.3.0-rc1)
+
+> 2022-07-25
+
+
+<a name="v2.3.0-rc0"></a>
+## [v2.3.0-rc0](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.2.0...v2.3.0-rc0)
+
+> 2022-07-15
+
+
+<a name="v2.2.0"></a>
+## [v2.2.0](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.1.0...v2.2.0)
+
+> 2022-07-01
+
+
+<a name="v2.1.0"></a>
+## [v2.1.0](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.10...v2.1.0)
+
+> 2022-06-17
+
+
+<a name="v2.0.10"></a>
+## [v2.0.10](https://github.com/OpenIMSDK/Open-IM-Server/compare/list...v2.0.10)
+
+> 2022-05-13
+
+
+<a name="list"></a>
+## [list](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.9...list)
+
+> 2022-04-29
+
+
+<a name="v2.0.9"></a>
+## [v2.0.9](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.7...v2.0.9)
+
+> 2022-04-29
+
+### Reverts
+
+* update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206))
+
+
+<a name="v2.0.7"></a>
+## [v2.0.7](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.6...v2.0.7)
+
+> 2022-04-08
+
+
+<a name="v2.0.6"></a>
+## [v2.0.6](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.5...v2.0.6)
+
+> 2022-04-01
+
+### Fix
+
+* json tag value of UserIDResult.UserID ([#178](https://github.com/OpenIMSDK/Open-IM-Server/issues/178))
+
+### Pull Requests
+
+* Merge pull request [#173](https://github.com/OpenIMSDK/Open-IM-Server/issues/173) from OpenIMSDK/tuoyun
+
+
+<a name="v2.0.5"></a>
+## [v2.0.5](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.04...v2.0.5)
+
+> 2022-03-24
+
+
+<a name="v2.04"></a>
+## [v2.04](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.3...v2.04)
+
+> 2022-03-18
+
+
+<a name="v2.0.3"></a>
+## [v2.0.3](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.2...v2.0.3)
+
+> 2022-03-11
+
+
+<a name="v2.0.2"></a>
+## [v2.0.2](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.1...v2.0.2)
+
+> 2022-03-04
+
+### Version
+
+* "3"
+* "2"
+
+
+<a name="v2.0.1"></a>
+## [v2.0.1](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.0...v2.0.1)
+
+> 2022-02-25
+
+### DbMysqlDatabaseName
+
+* openIM_v2
+
+
+<a name="v2.0.0"></a>
+## [v2.0.0](https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.7...v2.0.0)
+
+> 2022-02-23
+
+### Pb
+
+* open_im_sdk.OfflinePushInfo
+
+### Pull Requests
+
+* Merge pull request [#131](https://github.com/OpenIMSDK/Open-IM-Server/issues/131) from OpenIMSDK/cms-dev
+
+
+<a name="v1.0.7"></a>
+## [v1.0.7](https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.6...v1.0.7)
+
+> 2021-12-17
+
+
+<a name="v1.0.6"></a>
+## [v1.0.6](https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.5...v1.0.6)
+
+> 2021-12-10
+
+### Pb
+
+* open_im_sdk.OfflinePushInfo
+
+
+<a name="v1.0.5"></a>
+## [v1.0.5](https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.4...v1.0.5)
+
+> 2021-12-03
+
+
+<a name="v1.0.4"></a>
+## [v1.0.4](https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.3...v1.0.4)
+
+> 2021-11-25
+
+
+<a name="v1.0.3"></a>
+## [v1.0.3](https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.1...v1.0.3)
+
+> 2021-11-12
+
+### Feat
+
+* test utils ([#26](https://github.com/OpenIMSDK/Open-IM-Server/issues/26))
+
+### Fix
+
+* Startup error ([#11](https://github.com/OpenIMSDK/Open-IM-Server/issues/11))
+
+### Pull Requests
+
+* Merge pull request [#12](https://github.com/OpenIMSDK/Open-IM-Server/issues/12) from njulk/main
+* Merge pull request [#9](https://github.com/OpenIMSDK/Open-IM-Server/issues/9) from xmcy0011/dev
+* Merge pull request [#6](https://github.com/OpenIMSDK/Open-IM-Server/issues/6) from Bloomingg/int
+
+
+<a name="v1.0.1"></a>
+## [v1.0.1](https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.0...v1.0.1)
+
+> 2021-11-04
+
+
+<a name="v1.0.0"></a>
+## v1.0.0
+
+> 2021-10-28
+
+### Ci
+
+* ignore files created by docker-compose ([#19](https://github.com/OpenIMSDK/Open-IM-Server/issues/19))
+
+### Feat
+
+* optimise get server ip ([#20](https://github.com/OpenIMSDK/Open-IM-Server/issues/20))
+
+### Reverts
+
+* friend modify
+* update
+
+### Pull Requests
+
+* Merge pull request [#7](https://github.com/OpenIMSDK/Open-IM-Server/issues/7) from memory-qianxiao/docker-compose_update
+* Merge pull request [#4](https://github.com/OpenIMSDK/Open-IM-Server/issues/4) from wujingke/patch-1
+

CHANGELOG/CHANGELOG-1.0.md

@@ -1,56 +0,0 @@
-# Version logging for OpenIM
-
-> **Note**:
-> Deprecated version logging for OpenIM, please refer to [CHANGELOG.md](../CHANGELOG.md)
-
-<!-- BEGIN MUNGE: GENERATED_TOC -->
-
-- [Version logging for OpenIM](#version-logging-for-openim)
-  - [Unreleased](#unreleased)
-  - [v1.0.7 - 2021-12-17](#v107---2021-12-17)
-  - [v1.0.6 - 2021-12-10](#v106---2021-12-10)
-  - [v1.0.5 - 2021-12-03](#v105---2021-12-03)
-  - [v1.0.4 - 2021-11-25](#v104---2021-11-25)
-  - [v1.0.3 - 2021-11-12](#v103---2021-11-12)
-  - [v1.0.1 - 2021-11-04](#v101---2021-11-04)
-  - [v1.0.0 - 2021-10-28](#v100---2021-10-28)
-    - [Reverts](#reverts)
-
-<!-- END MUNGE: GENERATED_TOC -->
-
-<a name="unreleased"></a>
-## [Unreleased]
-
-
-<a name="v1.0.7"></a>
-## [v1.0.7] - 2021-12-17
-
-<a name="v1.0.6"></a>
-## [v1.0.6] - 2021-12-10
-
-<a name="v1.0.5"></a>
-## [v1.0.5] - 2021-12-03
-
-<a name="v1.0.4"></a>
-## [v1.0.4] - 2021-11-25
-
-<a name="v1.0.3"></a>
-## [v1.0.3] - 2021-11-12
-
-<a name="v1.0.1"></a>
-## [v1.0.1] - 2021-11-04
-
-<a name="v1.0.0"></a>
-## v1.0.0 - 2021-10-28
-### Reverts
-- friend modify
-- update
-
-
-[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.7...HEAD
-[v1.0.7]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.6...v1.0.7
-[v1.0.6]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.5...v1.0.6
-[v1.0.5]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.4...v1.0.5
-[v1.0.4]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.3...v1.0.4
-[v1.0.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.1...v1.0.3
-[v1.0.1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.0...v1.0.1

CHANGELOG/CHANGELOG-2.0.md

@@ -1,121 +0,0 @@
-# Version logging for OpenIM:v2.0
-
-> **Note**:
-> Deprecated version logging for OpenIM, please refer to [CHANGELOG.md](../CHANGELOG.md)
-
-<!-- BEGIN MUNGE: GENERATED_TOC -->
-
-- [Version logging for OpenIM:v2.0](#version-logging-for-openimv20)
-  - [\[Unreleased\]](#unreleased)
-  - [\[v2.0.10\] - 2022-05-13](#v2010---2022-05-13)
-  - [\[v2.0.9\] - 2022-04-29](#v209---2022-04-29)
-    - [Reverts](#reverts)
-    - [Pull Requests](#pull-requests)
-  - [\[v2.0.8\] - 2022-04-24](#v208---2022-04-24)
-    - [Pull Requests](#pull-requests-1)
-  - [\[v2.0.7\] - 2022-04-08](#v207---2022-04-08)
-    - [Pull Requests](#pull-requests-2)
-  - [\[v2.0.6\] - 2022-04-01](#v206---2022-04-01)
-    - [Pull Requests](#pull-requests-3)
-  - [\[v2.0.5\] - 2022-03-24](#v205---2022-03-24)
-  - [\[v2.04\] - 2022-03-18](#v204---2022-03-18)
-  - [\[v2.0.3\] - 2022-03-11](#v203---2022-03-11)
-  - [\[v2.0.2\] - 2022-03-04](#v202---2022-03-04)
-    - [Pull Requests](#pull-requests-4)
-  - [\[v2.0.1\] - 2022-02-25](#v201---2022-02-25)
-  - [v2.0.0 - 2022-02-23](#v200---2022-02-23)
-    - [Reverts](#reverts-1)
-
-<!-- END MUNGE: GENERATED_TOC -->
-
-
-<a name="unreleased"></a>
-
-## [Unreleased]
-
-
-<a name="v2.0.10"></a>
-
-## [v2.0.10] - 2022-05-13
-
-<a name="v2.0.9"></a>
-
-## [v2.0.9] - 2022-04-29
-
-### Reverts
-
-- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206))
-
-### Pull Requests
-
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-
-
-<a name="v2.0.8"></a>
-
-## [v2.0.8] - 2022-04-24
-
-### Pull Requests
-
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-
-
-<a name="v2.0.7"></a>
-
-## [v2.0.7] - 2022-04-08
-
-### Pull Requests
-
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-
-
-<a name="v2.0.6"></a>
-
-## [v2.0.6] - 2022-04-01
-
-### Pull Requests
-
-- Merge branch 'tuoyun'
-
-
-<a name="v2.0.5"></a>
-
-## [v2.0.5] - 2022-03-24
-
-<a name="v2.04"></a>
-
-## [v2.04] - 2022-03-18
-
-<a name="v2.0.3"></a>
-
-## [v2.0.3] - 2022-03-11
-
-<a name="v2.0.2"></a>
-
-## [v2.0.2] - 2022-03-04
-
-### Pull Requests
-
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-
-
-<a name="v2.0.1"></a>
-
-## [v2.0.1] - 2022-02-25
-
-<a name="v2.0.0"></a>
-
-## v2.0.0 - 2022-02-23
-
-### Reverts

CHANGELOG/CHANGELOG-2.1.md

@@ -1,50 +0,0 @@
-# Version logging for OpenIM:v2.1
-
-> **Note**:
-> Deprecated version logging for OpenIM, please refer to [CHANGELOG.md](../CHANGELOG.md)
-
-<!-- BEGIN MUNGE: GENERATED_TOC -->
-
-- [Version logging for OpenIM:v2.1](#version-logging-for-openimv21)
-  - [Unreleased](#unreleased)
-  - [v2.1.0 - 2022-06-17](#v210---2022-06-17)
-    - [Reverts](#reverts)
-    - [Pull Requests](#pull-requests)
-
-
-<!-- END MUNGE: GENERATED_TOC -->
-
-<a name="unreleased"></a>
-## [Unreleased]
-
-
-<a name="v2.1.0"></a>
-## v2.1.0 - 2022-06-17
-### Reverts
-- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206))
-- friend modify
-- update
-
-### Pull Requests
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-
-
-[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.1.0...HEAD

CHANGELOG/CHANGELOG-2.2.md

@@ -1,50 +0,0 @@
-# Version logging for OpenIM:v2.2
-
-> **Note**:
-> Deprecated version logging for OpenIM, please refer to [CHANGELOG.md](../CHANGELOG.md)
-
-<!-- BEGIN MUNGE: GENERATED_TOC -->
-
-- [Version logging for OpenIM:v2.2](#version-logging-for-openimv22)
-  - [Unreleased](#unreleased)
-  - [v2.2.0 - 2022-07-01](#v220---2022-07-01)
-    - [Reverts](#reverts)
-    - [Pull Requests](#pull-requests)
-
-
-<!-- END MUNGE: GENERATED_TOC -->
-
-<a name="unreleased"></a>
-## [Unreleased]
-
-
-<a name="v2.2.0"></a>
-## v2.2.0 - 2022-07-01
-### Reverts
-- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206))
-- friend modify
-- update
-
-### Pull Requests
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-
-
-[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.2.0...HEAD

CHANGELOG/CHANGELOG-2.3.md

@@ -1,70 +0,0 @@
-# Version logging for OpenIM:v2.3
-
-> **Note**:
-> Deprecated version logging for OpenIM, please refer to [CHANGELOG.md](../CHANGELOG.md)
-
-<!-- BEGIN MUNGE: GENERATED_TOC -->
-
-- [Version logging for OpenIM:v2.3](#version-logging-for-openimv23)
-  - [Unreleased](#unreleased)
-  - [v2.3.3 - 2022-09-18](#v233---2022-09-18)
-  - [v2.3.2 - 2022-09-09](#v232---2022-09-09)
-  - [v2.3.0-rc2 - 2022-07-29](#v230-rc2---2022-07-29)
-  - [v2.3.0-rc1 - 2022-07-25](#v230-rc1---2022-07-25)
-  - [v2.3.0-rc0 - 2022-07-15](#v230-rc0---2022-07-15)
-    - [Reverts](#reverts)
-    - [Pull Requests](#pull-requests)
-
-
-<!-- END MUNGE: GENERATED_TOC -->
-
-<a name="unreleased"></a>
-## [Unreleased]
-
-
-<a name="v2.3.3"></a>
-## [v2.3.3] - 2022-09-18
-
-<a name="v2.3.2"></a>
-## [v2.3.2] - 2022-09-09
-
-<a name="v2.3.0-rc2"></a>
-## [v2.3.0-rc2] - 2022-07-29
-
-<a name="v2.3.0-rc1"></a>
-## [v2.3.0-rc1] - 2022-07-25
-
-<a name="v2.3.0-rc0"></a>
-## v2.3.0-rc0 - 2022-07-15
-### Reverts
-- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206))
-- friend modify
-- update
-
-### Pull Requests
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-
-
-[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.3...HEAD
-[v2.3.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.2...v2.3.3
-[v2.3.2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc2...v2.3.2
-[v2.3.0-rc2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc1...v2.3.0-rc2
-[v2.3.0-rc1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc0...v2.3.0-rc1

CHANGELOG/CHANGELOG-2.9.md

@@ -1,52 +0,0 @@
-# Version logging for OpenIM
-
-<!-- BEGIN MUNGE: GENERATED_TOC -->
-
-- [Version logging for OpenIM](#version-logging-for-openim)
-  - [Unreleased](#unreleased)
-  - [v2.9.0+1.839643f - 2023-07-07](#v2901839643f---2023-07-07)
-  - [v2.9.0+2.35f07fe - 2023-07-06](#v290235f07fe---2023-07-06)
-  - [v2.9.0+1.b5072b1 - 2023-07-05](#v2901b5072b1---2023-07-05)
-  - [v2.9.0+3.2667a3a - 2023-07-05](#v29032667a3a---2023-07-05)
-  - [v2.9.0+7.04818ca - 2023-07-05](#v290704818ca---2023-07-05)
-  - [v2.9.0 - 2023-07-04](#v290---2023-07-04)
-    - [Reverts](#reverts)
-    - [Pull Requests](#pull-requests)
-
-
-<!-- END MUNGE: GENERATED_TOC -->
-
-<a name="unreleased"></a>
-## [Unreleased]
-
-
-<a name="v2.9.0+1.839643f"></a>
-## [v2.9.0+1.839643f] - 2023-07-07
-
-<a name="v2.9.0+2.35f07fe"></a>
-## [v2.9.0+2.35f07fe] - 2023-07-06
-
-<a name="v2.9.0+1.b5072b1"></a>
-## [v2.9.0+1.b5072b1] - 2023-07-05
-
-<a name="v2.9.0+3.2667a3a"></a>
-## [v2.9.0+3.2667a3a] - 2023-07-05
-
-<a name="v2.9.0+7.04818ca"></a>
-## [v2.9.0+7.04818ca] - 2023-07-05
-
-<a name="v2.9.0"></a>
-## v2.9.0 - 2023-07-04
-### Reverts
-- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206))
-
-### Pull Requests
-- Merge branch 'tuoyun'
-
-
-[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+1.839643f...HEAD
-[v2.9.0+1.839643f]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+2.35f07fe...v2.9.0+1.839643f
-[v2.9.0+2.35f07fe]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+1.b5072b1...v2.9.0+2.35f07fe
-[v2.9.0+1.b5072b1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+3.2667a3a...v2.9.0+1.b5072b1
-[v2.9.0+3.2667a3a]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+7.04818ca...v2.9.0+3.2667a3a
-[v2.9.0+7.04818ca]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0...v2.9.0+7.04818ca

CHANGELOG/CHANGELOG-3.0.md

@@ -1,255 +0,0 @@
-# Version logging for OpenIM
-
-**3.0 Major refactoring**
-
-<!-- BEGIN MUNGE: GENERATED_TOC -->
-
-- [Version logging for OpenIM](#version-logging-for-openim)
-  - [\[v3.0\]](#v30)
-  - [v3.0.0 - 2023-07-10](#v300---2023-07-10)
-  - [v2.9.0+1.839643f - 2023-07-07](#v2901839643f---2023-07-07)
-  - [v2.9.0+2.35f07fe - 2023-07-06](#v290235f07fe---2023-07-06)
-  - [v2.9.0+1.b5072b1 - 2023-07-05](#v2901b5072b1---2023-07-05)
-  - [v2.9.0+3.2667a3a - 2023-07-05](#v29032667a3a---2023-07-05)
-  - [v2.9.0+7.04818ca - 2023-07-05](#v290704818ca---2023-07-05)
-  - [v2.9.0 - 2023-07-04](#v290---2023-07-04)
-  - [v0.0.0+1.3714b4f - 2023-07-04](#v00013714b4f---2023-07-04)
-  - [v0.0.0+635.8b92c90 - 2023-07-04](#v0006358b92c90---2023-07-04)
-  - [v0.0.0+1.78a6d03 - 2023-07-04](#v000178a6d03---2023-07-04)
-  - [v0.0.0+2.e057c18 - 2023-07-04](#v0002e057c18---2023-07-04)
-  - [v0.0.0+630.b55ac4a - 2023-07-04](#v000630b55ac4a---2023-07-04)
-    - [Reverts](#reverts)
-    - [Pull Requests](#pull-requests)
-  - [v2.3.3 - 2022-09-18](#v233---2022-09-18)
-  - [v2.3.2 - 2022-09-09](#v232---2022-09-09)
-  - [v2.3.0-rc2 - 2022-07-29](#v230-rc2---2022-07-29)
-  - [v2.3.0-rc1 - 2022-07-25](#v230-rc1---2022-07-25)
-  - [v2.3.0-rc0 - 2022-07-15](#v230-rc0---2022-07-15)
-  - [v2.2.0 - 2022-07-01](#v220---2022-07-01)
-  - [v2.1.0 - 2022-06-17](#v210---2022-06-17)
-    - [Pull Requests](#pull-requests-1)
-  - [v2.0.10 - 2022-05-13](#v2010---2022-05-13)
-  - [v2.0.9 - 2022-04-29](#v209---2022-04-29)
-    - [Reverts](#reverts-1)
-    - [Pull Requests](#pull-requests-2)
-  - [v2.0.8 - 2022-04-24](#v208---2022-04-24)
-    - [Pull Requests](#pull-requests-3)
-  - [v2.0.7 - 2022-04-08](#v207---2022-04-08)
-    - [Pull Requests](#pull-requests-4)
-  - [v2.0.6 - 2022-04-01](#v206---2022-04-01)
-    - [Pull Requests](#pull-requests-5)
-  - [v2.0.5 - 2022-03-24](#v205---2022-03-24)
-  - [v2.04 - 2022-03-18](#v204---2022-03-18)
-  - [v2.0.3 - 2022-03-11](#v203---2022-03-11)
-  - [v2.0.2 - 2022-03-04](#v202---2022-03-04)
-    - [Pull Requests](#pull-requests-6)
-  - [v2.0.1 - 2022-02-25](#v201---2022-02-25)
-  - [v2.0.0 - 2022-02-23](#v200---2022-02-23)
-  - [v1.0.7 - 2021-12-17](#v107---2021-12-17)
-  - [v1.0.6 - 2021-12-10](#v106---2021-12-10)
-  - [v1.0.5 - 2021-12-03](#v105---2021-12-03)
-  - [v1.0.4 - 2021-11-25](#v104---2021-11-25)
-  - [v1.0.3 - 2021-11-12](#v103---2021-11-12)
-  - [v1.0.1 - 2021-11-04](#v101---2021-11-04)
-  - [v1.0.0 - 2021-10-28](#v100---2021-10-28)
-    - [Reverts](#reverts-2)
-
-
-<!-- END MUNGE: GENERATED_TOC -->
-
-<a name="unreleased"></a>
-## [v3.0]
-
-
-<a name="v3.0.0"></a>
-## [v3.0.0] - 2023-07-10
-
-<a name="v2.9.0+1.839643f"></a>
-## [v2.9.0+1.839643f] - 2023-07-07
-
-<a name="v2.9.0+2.35f07fe"></a>
-## [v2.9.0+2.35f07fe] - 2023-07-06
-
-<a name="v2.9.0+1.b5072b1"></a>
-## [v2.9.0+1.b5072b1] - 2023-07-05
-
-<a name="v2.9.0+3.2667a3a"></a>
-## [v2.9.0+3.2667a3a] - 2023-07-05
-
-<a name="v2.9.0+7.04818ca"></a>
-## [v2.9.0+7.04818ca] - 2023-07-05
-
-<a name="v2.9.0"></a>
-## [v2.9.0] - 2023-07-04
-
-<a name="v0.0.0+1.3714b4f"></a>
-## [v0.0.0+1.3714b4f] - 2023-07-04
-
-<a name="v0.0.0+635.8b92c90"></a>
-## [v0.0.0+635.8b92c90] - 2023-07-04
-
-<a name="v0.0.0+1.78a6d03"></a>
-## [v0.0.0+1.78a6d03] - 2023-07-04
-
-<a name="v0.0.0+2.e057c18"></a>
-## [v0.0.0+2.e057c18] - 2023-07-04
-
-<a name="v0.0.0+630.b55ac4a"></a>
-## [v0.0.0+630.b55ac4a] - 2023-07-04
-### Reverts
-- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206))
-
-### Pull Requests
-- Merge branch 'tuoyun'
-
-
-<a name="v2.3.3"></a>
-## [v2.3.3] - 2022-09-18
-
-<a name="v2.3.2"></a>
-## [v2.3.2] - 2022-09-09
-
-<a name="v2.3.0-rc2"></a>
-## [v2.3.0-rc2] - 2022-07-29
-
-<a name="v2.3.0-rc1"></a>
-## [v2.3.0-rc1] - 2022-07-25
-
-<a name="v2.3.0-rc0"></a>
-## [v2.3.0-rc0] - 2022-07-15
-
-<a name="v2.2.0"></a>
-## [v2.2.0] - 2022-07-01
-
-<a name="v2.1.0"></a>
-## [v2.1.0] - 2022-06-17
-### Pull Requests
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-
-
-<a name="v2.0.10"></a>
-## [v2.0.10] - 2022-05-13
-
-<a name="v2.0.9"></a>
-## [v2.0.9] - 2022-04-29
-### Reverts
-- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206))
-
-### Pull Requests
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-
-
-<a name="v2.0.8"></a>
-## [v2.0.8] - 2022-04-24
-### Pull Requests
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-
-
-<a name="v2.0.7"></a>
-## [v2.0.7] - 2022-04-08
-### Pull Requests
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-
-
-<a name="v2.0.6"></a>
-## [v2.0.6] - 2022-04-01
-### Pull Requests
-- Merge branch 'tuoyun'
-
-
-<a name="v2.0.5"></a>
-## [v2.0.5] - 2022-03-24
-
-<a name="v2.04"></a>
-## [v2.04] - 2022-03-18
-
-<a name="v2.0.3"></a>
-## [v2.0.3] - 2022-03-11
-
-<a name="v2.0.2"></a>
-## [v2.0.2] - 2022-03-04
-### Pull Requests
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-- Merge branch 'tuoyun'
-
-
-<a name="v2.0.1"></a>
-## [v2.0.1] - 2022-02-25
-
-<a name="v2.0.0"></a>
-## [v2.0.0] - 2022-02-23
-
-<a name="v1.0.7"></a>
-## [v1.0.7] - 2021-12-17
-
-<a name="v1.0.6"></a>
-## [v1.0.6] - 2021-12-10
-
-<a name="v1.0.5"></a>
-## [v1.0.5] - 2021-12-03
-
-<a name="v1.0.4"></a>
-## [v1.0.4] - 2021-11-25
-
-<a name="v1.0.3"></a>
-## [v1.0.3] - 2021-11-12
-
-<a name="v1.0.1"></a>
-## [v1.0.1] - 2021-11-04
-
-<a name="v1.0.0"></a>
-## v1.0.0 - 2021-10-28
-### Reverts
-- friend modify
-- update
-
-
-[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.0.0...HEAD
-[v3.0.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+1.839643f...v3.0.0
-[v2.9.0+1.839643f]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+2.35f07fe...v2.9.0+1.839643f
-[v2.9.0+2.35f07fe]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+1.b5072b1...v2.9.0+2.35f07fe
-[v2.9.0+1.b5072b1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+3.2667a3a...v2.9.0+1.b5072b1
-[v2.9.0+3.2667a3a]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+7.04818ca...v2.9.0+3.2667a3a
-[v2.9.0+7.04818ca]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0...v2.9.0+7.04818ca
-[v2.9.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v0.0.0+1.3714b4f...v2.9.0
-[v0.0.0+1.3714b4f]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v0.0.0+635.8b92c90...v0.0.0+1.3714b4f
-[v0.0.0+635.8b92c90]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v0.0.0+1.78a6d03...v0.0.0+635.8b92c90
-[v0.0.0+1.78a6d03]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v0.0.0+2.e057c18...v0.0.0+1.78a6d03
-[v0.0.0+2.e057c18]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v0.0.0+630.b55ac4a...v0.0.0+2.e057c18
-[v0.0.0+630.b55ac4a]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.3...v0.0.0+630.b55ac4a
-[v2.3.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.2...v2.3.3
-[v2.3.2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc2...v2.3.2
-[v2.3.0-rc2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc1...v2.3.0-rc2
-[v2.3.0-rc1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc0...v2.3.0-rc1
-[v2.3.0-rc0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.2.0...v2.3.0-rc0
-[v2.2.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.1.0...v2.2.0
-[v2.1.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.10...v2.1.0
-[v2.0.10]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.9...v2.0.10
-[v2.0.9]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.8...v2.0.9
-[v2.0.8]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.7...v2.0.8
-[v2.0.7]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.6...v2.0.7
-[v2.0.6]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.5...v2.0.6
-[v2.0.5]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.04...v2.0.5
-[v2.04]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.3...v2.04
-[v2.0.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.2...v2.0.3
-[v2.0.2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.1...v2.0.2
-[v2.0.1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.0...v2.0.1
-[v2.0.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.7...v2.0.0
-[v1.0.7]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.6...v1.0.7
-[v1.0.6]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.5...v1.0.6
-[v1.0.5]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.4...v1.0.5
-[v1.0.4]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.3...v1.0.4
-[v1.0.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.1...v1.0.3
-[v1.0.1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.0...v1.0.1

CHANGELOG/CHANGELOG.md

@@ -1,29 +1,3 @@
 # Changelog
 
-All notable changes to this project will be documented in this file.
-
-+ [https://github.com/OpenIMSDK/Open-IM-Server/releases](https://github.com/OpenIMSDK/Open-IM-Server/releases)
-
-## command
-
-```bash
-git-chglog --tag-filter-pattern 'v2.0.*'  -o CHANGELOG-2.0.md
-```
-
-## create next tag
-
-```bash
-git-chglog --next-tag 2.0.0 -o CHANGELOG.md
-git commit -am "release 2.0.0"
-git tag 2.0.0
-```
-
-## Release version logs
-
-+ [OpenIM CHANGELOG-V1.0](CHANGELOG-1.0.md)
-+ [OpenIM CHANGELOG-V2.0](CHANGELOG-2.0.md)
-+ [OpenIM CHANGELOG-V2.1](CHANGELOG-2.1.md)
-+ [OpenIM CHANGELOG-V2.2](CHANGELOG-2.2.md)
-+ [OpenIM CHANGELOG-V2.3](CHANGELOG-2.3.md)
-+ [OpenIM CHANGELOG-V2.9](CHANGELOG-2.9.md)
-+ [OpenIM CHANGELOG-V3.0](CHANGELOG-3.0.md)
+All notable changes to this project will be documented in this file.

CONTRIBUTING.md

@@ -8,23 +8,13 @@ This document provides guidelines and best practices to help you contribute effe
 
 ## 📇Topics
 
-- [Contributing to Open-IM-Server](#contributing-to-open-im-server)
-  - [📇Topics](#topics)
-  - [What we expect of you](#what-we-expect-of-you)
-  - [Code of ConductCode of Conduct](#code-of-conductcode-of-conduct)
-      - [Code and doc contribution](#code-and-doc-contribution)
-      - [Where should I start?](#where-should-i-start)
-      - [Design documents](#design-documents)
-  - [Getting Started](#getting-started)
-  - [Style and Specification](#style-and-specification)
-      - [Reporting security issues](#reporting-security-issues)
-      - [Reporting general issues](#reporting-general-issues)
-      - [Commit Rules](#commit-rules)
-      - [PR Description](#pr-description)
-      - [Docs Contribution](#docs-contribution)
-  - [Engage to help anything](#engage-to-help-anything)
-  - [Release version](#release-version)
-  - [Contact Us](#contact-us)
+- [What we expect of you](#What-we-expect-of-you)
+- [Code of Conduct](#Code-of-Conduct)
+- [Getting Started](#Getting-Started)
+- [Style and Specification](#Style-and-Specification)
+- [Engage to help anything](#Engage-to-help-anything)
+- [Release version](#Release-version)
+- [Contact Us](#Contact-Us)
 
 ## What we expect of you
 
@@ -42,7 +32,7 @@ The [Makefile](./Makefile) is for every developer, even if you don't know how to
 
 #### Code and doc contribution
 
-Every action to make project Open-IM-Server better is encouraged. On GitHub, every improvement for Open-IM-Server could be via a [PR](https://github.com/OpenIMSDK/Open-IM-Server/pulls) (short for pull request).
+Every action to make project Open-IM-Server better is encouraged. On GitHub, every improvement for Open-IM-Server could be via a [PR](https://github.com/Open-IM-Server/pulls) (short for pull request).
 
 + If you find a typo, try to fix it!
 + If you find a bug, try to fix it!
@@ -58,7 +48,7 @@ Every action to make project Open-IM-Server better is encouraged. On GitHub, eve
 #### Where should I start?
 
 + If you are new to the project, don't know how to contribute Open-IM-Server, please check out the [good first issue](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aopen+label%3A"good+first+issue"+sort%3Aupdated-desc) label.
-+ You should be good at filtering the Open-IM-Server issue tags and finding the ones you like, such as [RFC](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+is%3Aopen+RFC+label%3ARFC) for big initiatives, features for [feature](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+label%3Afeature) proposals, and [bug](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+label%3Abug+) fixes.
++ You should be good at filtering the Open-IM-Server issue tags and finding the ones you like, such as [RFC](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+is%3Aopen+RFC+label%3ARFC) for big initiatives, features for [feature](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+label%3Afeature) proposals, and [bug](https://github.com/{github/issues?q=is%3Aissue+label%3Abug+) fixes.
 + If you are looking for something to work on, check out our [open issues](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc).
 + If you have an idea for a new feature, please [open an issue](https://github.com/OpenIMSDK/Open-IM-Server/issues/new/choose), and we can discuss it.
 
@@ -89,7 +79,7 @@ To propose PR for the Open-IM-Server item, we assume you have registered a GitHu
 
 1. Fork the repository(Open-IM-Server)
 
-2. **CLONE** your own repository to main locally. Use `git clone https://github.com/<your-username>/Open-IM-Server.git` to clone repository to your local machine. Then you can create new branches to finish the change you wish to make.
+2. **CLONE** your own repository to master locally. Use `git clone https://github.com/<your-username>/Open-IM-Server.git` to clone repository to your local machine. Then you can create new branches to finish the change you wish to make.
 
 3. **Set Remote** upstream to be `https://github.com/OpenIMSDK/Open-IM-Server.git` using the following two commands:
 
@@ -190,7 +180,7 @@ To be honest, we regard every user of Open-IM-Serveras a very kind contributor.
 
 Since we collaborate project Open-IM-Server in a distributed way, we appreciate **WELL-WRITTEN**, **DETAILED**, **EXPLICIT** issue reports. To make the communication more efficient, we wish everyone could search if your issue is an existing one in the searching list. If you find it existing, please add your details in comments under the existing issue instead of opening a brand new one.
 
-To make the issue details as standard as possible, we setup an [ISSUE TEMPLATE](https://github.com/OpenIMSDK/.github/tree/main/.github/ISSUE_TEMPLATE) for issue reporters. You can find three kinds of issue templates there: question, bug report and feature request. Please **BE SURE** to follow the instructions to fill fields in template.
+To make the issue details as standard as possible, we setup an [ISSUE TEMPLATE](https://github.com/OpenIMSDK/Open-IM-Server/tree/main/.github/ISSUE_TEMPLATE) for issue reporters. You can find three kinds of issue templates there: question, bug report and feature request. Please **BE SURE** to follow the instructions to fill fields in template.
 
 **There are a lot of cases when you could open an issue:**
 
@@ -252,7 +242,7 @@ An example for this could be:
 
 #### PR Description
 
-PR is the only way to make change to Open-IM-Server project files. To help reviewers better get your purpose, PR description could not be too detailed. We encourage contributors to follow the [PR template](https://github.com/OpenIMSDK/.github/tree/main/.github/PULL_REQUEST_TEMPLATE.md) to finish the pull request.
+PR is the only way to make change to Open-IM-Server project files. To help reviewers better get your purpose, PR description could not be too detailed. We encourage contributors to follow the [PR template](https://github.com/OpenIMSDK/Open-IM-Server/tree/main/.github/PULL_REQUEST_TEMPLATE.md) to finish the pull request.
 
 You can find some very formal PR in [RFC](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+is%3Aopen+RFC+label%3ARFC) issues and learn about them.
 
@@ -305,6 +295,7 @@ The documentation for Open-IM-Server includes:
 
 + [README.md](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/README.md): This file includes the basic information and instructions for getting started with Open-IM-Server.
 + [CONTRIBUTING.md](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/CONTRIBUTING.md): This file contains guidelines for contributing to Open-IM-Server's codebase, such as how to submit issues, pull requests, and code reviews.
++ [DEVELOPGUIDE.md](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/DEVELOPGUIDE.md): This file provides a more in-depth guide to developing Open-IM-Server, including information on the project's architecture, coding conventions, and testing practices.
 + [Official Documentation](https://doc.rentsoft.cn/): This is the official documentation for Open-IM-Server, which includes comprehensive information on all of its features, configuration options, and troubleshooting tips.
 
 Please obey the following rules to better format the docs, which would greatly improve the reading experience.
@@ -324,7 +315,7 @@ We choose GitHub as the primary place for Open-IM-Server to collaborate. So the
 + help solve other user's problems;
 + help review other's [PR](https://github.com/OpenIMSDK/Open-IM-Server/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) design; 
 + discuss about Open-IM-Server to make things clearer;
-+ advocate [Open-IM-Server](https://google.com/search?q=Open-IM-Server) technology beyond GitHub;
++ advocate [Open-IM-Server](google.com/search?q=Open-IM-Server) technology beyond GitHub;
 + write blogs on Open-IM-Server and so on.
 
 In a word, **ANY HELP IS CONTRIBUTION.**

Dockerfile

@@ -32,7 +32,7 @@ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts
 
 #Copy scripts files and binary files to the blank image
 COPY --from=build /Open-IM-Server/scripts /Open-IM-Server/scripts
-COPY --from=build /Open-IM-Server/_output/bin/platforms/linux/amd64 /Open-IM-Server/_output/bin/platforms/linux/amd64  
+COPY --from=build /Open-IM-Server/bin /Open-IM-Server/bin
 
 WORKDIR /Open-IM-Server/scripts
 

Makefile

@@ -4,7 +4,6 @@
 
 .DEFAULT_GOAL := help
 
-## all: Run tidy, gen, add-copyright, format, lint, cover, build ✨
 .PHONY: all
 all: tidy gen add-copyright format lint cover build
 
@@ -25,8 +24,6 @@ include scripts/make-rules/copyright.mk
 include scripts/make-rules/gen.mk
 include scripts/make-rules/dependencies.mk
 include scripts/make-rules/tools.mk
-include scripts/make-rules/release.mk
-include scripts/make-rules/swagger.mk
 
 # ==============================================================================
 # Usage
@@ -39,12 +36,11 @@ Options:
 
   BINS             Binaries to build. Default is all binaries under cmd.
                    This option is available when using: make {build}(.multiarch)
-                   Example: make build BINS="openim-api openim-cmdutils".
+                   Example: make build BINS="open_im_api open_im_cms_api".
 
   PLATFORMS        Platform to build for. Default is linux_arm64 and linux_amd64.
                    This option is available when using: make {build}.multiarch
-                   Example: make multiarch PLATFORMS="linux_s390x linux_mips64
-                   linux_mips64le darwin_amd64 windows_amd64 linux_amd64 linux_arm64".
+                   Example: make build.multiarch PLATFORMS="linux_arm64 linux_amd64".
 
   V                Set to 1 enable verbose build. Default is 0.
 endef
@@ -53,135 +49,120 @@ export USAGE_OPTIONS
 # ==============================================================================
 # Targets
 
-## build: Build binaries by default ✨
+## build: Build binaries by default
 .PHONY: build
 build:
 	@$(MAKE) go.build
 
-## multiarch: Build binaries for multiple platforms. See option PLATFORMS. ✨
-.PHONY: multiarch
-multiarch:
+## build-multiarch: Build binaries for multiple platforms. See option PLATFORMS.
+.PHONY: build-multiarch
+build-multiarch:
 	@$(MAKE) go.build.multiarch
 
-## tidy: tidy go.mod ✨
+## tidy: tidy go.mod
 .PHONY: tidy
 tidy:
 	@$(GO) mod tidy
 
-## vendor: vendor go.mod ✨
+## vendor: vendor go.mod
 .PHONY: vendor
 vendor:
 	@$(GO) mod vendor
 
-## style: code style -> fmt,vet,lint ✨
+## style: code style -> fmt,vet,lint
 .PHONY: style
 style: fmt vet lint
 
-## fmt: Run go fmt against code. ✨
+## fmt: Run go fmt against code.
 .PHONY: fmt
 fmt:
 	@$(GO) fmt ./...
 
-## vet: Run go vet against code. ✨
+## vet: Run go vet against code.
 .PHONY: vet
 vet:
 	@$(GO) vet ./...
 
-## lint: Check syntax and styling of go sources. ✨
+## lint: Check syntax and styling of go sources.
 .PHONY: lint
 lint:
 	@$(MAKE) go.lint
 
-## format: Gofmt (reformat) package sources (exclude vendor dir if existed). ✨
+## format: Gofmt (reformat) package sources (exclude vendor dir if existed).
 .PHONY: format
 format:
 	@$(MAKE) go.format
 
-## test: Run unit test. ✨
+## test: Run unit test.
 .PHONY: test
 test:
 	@$(MAKE) go.test
 
-## cover: Run unit test and get test coverage. ✨
-.PHONY: cover
+## cover: Run unit test and get test coverage.
+.PHONY: cover 
 cover:
 	@$(MAKE) go.test.cover
 
-## updates: Check for updates to go.mod dependencies. ✨
+## updates: Check for updates to go.mod dependencies
 .PHONY: updates
 	@$(MAKE) go.updates
 
-## imports: task to automatically handle import packages in Go files using goimports tool. ✨
+## imports: task to automatically handle import packages in Go files using goimports tool
 .PHONY: imports
 imports:
 	@$(MAKE) go.imports
 
-## clean: Remove all files that are created by building. ✨
+## clean: Remove all files that are created by building. 
 .PHONY: clean
 clean:
 	@$(MAKE) go.clean
 
-## image: Build docker images for host arch. ✨
+## image: Build docker images for host arch.
 .PHONY: image
 image:
 	@$(MAKE) image.build
 
-## image.multiarch: Build docker images for multiple platforms. See option PLATFORMS. ✨
+## image.multiarch: Build docker images for multiple platforms. See option PLATFORMS.
 .PHONY: image.multiarch
 image.multiarch:
 	@$(MAKE) image.build.multiarch
 
-## push: Build docker images for host arch and push images to registry. ✨
+## push: Build docker images for host arch and push images to registry.
 .PHONY: push
 push:
 	@$(MAKE) image.push
 
-## push.multiarch: Build docker images for multiple platforms and push images to registry. ✨
+## push.multiarch: Build docker images for multiple platforms and push images to registry.
 .PHONY: push.multiarch
 push.multiarch:
 	@$(MAKE) image.push.multiarch
 
-## tools: Install dependent tools. ✨
+## tools: Install dependent tools.
 .PHONY: tools
 tools:
 	@$(MAKE) tools.install
 
-## gen: Generate all necessary files. ✨
+## gen: Generate all necessary files.
 .PHONY: gen
 gen:
 	@$(MAKE) gen.run
 
-## swagger: Generate swagger document. ✨
-.PHONY: swagger
-swagger:
-	@$(MAKE) swagger.run
-
-## serve-swagger: Serve swagger spec and docs. ✨
-.PHONY: swagger.serve
-serve-swagger:
-	@$(MAKE) swagger.serve
-
-## verify-copyright: Verify the license headers for all files. ✨
+## verify-copyright: Verify the license headers for all files.
 .PHONY: verify-copyright
 verify-copyright:
 	@$(MAKE) copyright.verify
 
-## add-copyright: Add copyright ensure source code files have license headers. ✨
+## add-copyright: Add copyright ensure source code files have license headers.
 .PHONY: add-copyright
 add-copyright:
 	@$(MAKE) copyright.add
 
-## release: release the project ✨
-.PHONY: release
-release: release.verify release.ensure-tag
-	@scripts/release.sh
-
-## help: Show this help info. ✨
+## help: Show this help info.
 .PHONY: help
 help: Makefile
 	$(call makehelp)
 
-## help-all: Show all help details info. ✨
+## help-all: Show all help details info.
 .PHONY: help-all
-help-all: go.help copyright.help tools.help image.help dependencies.help gen.help release.help swagger.help help
+help-all: go.help copyright.help tools.help image.help help
 	$(call makeallhelp)

README-zh_CN.md

@@ -19,7 +19,7 @@
 
 <p align="center">
     <a href="./README.md"><b>English</b></a> •
-    <a href="./README_zh-CN.md"><b>中文</b></a>
+    <a href="./README_zh.md"><b>中文</b></a>
 </p>
 
 </p>
@@ -142,7 +142,7 @@ Open-IM-Server 是一款即时通讯服务器，使用纯 Golang 开发，采用
 
 > Open-IM 脚本提供服务编译、启动和停止脚本。有四个 Open-IM 脚本启动模块，一个是 http+rpc 服务启动模块，第二个是 WebSocket 服务启动模块，然后是 msg_transfer 模块，最后是 push 模块。
 
-+ path_info.sh&&style_info.sh&&
++ path_info.cfg&&style_info.cfg&&
 
   functions.sh
 

README.md

@@ -1,11 +1,9 @@
-<p align="center">
-    <a href="https://www.openim.online">
-        <img src="./assets/logo-gif/openim-logo.gif" width="60%" height="30%"/>
-    </a>
-</p>
-<h3 align="center" style="border-bottom: none">
-    ⭐️  Open source Instant Messaging Server ⭐️ <br>
-<h3>
+<h1 align="center" style="border-bottom: none">
+    <b>
+        <a href="https://doc.rentsoft.cn/">Open IM Server</a><br>
+    </b>
+    ⭐️  Open source Instant Messaging Server  ⭐️ <br>
+</h1>
 
 
 <p align=center>
@@ -88,7 +86,7 @@ By deployment of the Open-IM-Server on the customer's server, developers can int
        ./docker_check_service.sh./check_all.sh
        ```
        
-       ![OpenIMServersonSystempng](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/Open-IM-Servers-on-System.png)
+       ![OpenIMServersonSystempng](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/Open-IM-Servers-on-System.png)
 
 #### Deploy using source code
 
@@ -148,7 +146,7 @@ all services build success
 
 > Open-IM scripts provides service compilation, start, and stop scripts. There are four Open-IM scripts start modules, one is the http+rpc service start module, the second is the websocket service start module, then the msg_transfer module, and the last is the push module
 
-- path_info.sh&&style_info.sh&&functions.sh
+- path_info.cfg&&style_info.cfg&&functions.sh
     - Contains the path information of each module, including the path where the source code is located, the name of the service startup, the shell print font style, and some functions for processing shell strings
 - build_all_service.sh
     - Compile the module, compile all the source code of Open-IM into a binary file and put it into the bin directory
@@ -159,11 +157,11 @@ all services build success
 
 ## Authentication Clow Chart 
 
-![avatar](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/open-im-server.png)
+![avatar](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/open-im-server.png)
 
 ## Architecture
 
-![avatar](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/Architecture.jpg)
+![avatar](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/Architecture.jpg)
 
 ## To start developing OpenIM
 The [community repository](https://github.com/OpenIMSDK/community) hosts all information about building Kubernetes from source, how to contribute code and documentation, who to contact about what, etc.

assets/README.md

@@ -1,32 +0,0 @@
-# `/assets`
-
-The `/assets` directory in the OpenIM repository contains various assets such as images, logos, and animated GIFs. These assets serve different purposes and contribute to the functionality and aesthetics of the OpenIM project.
-
-## Directory Structure:
-
-```bash
-assets/
-├── README.md                     # Documentation for the assets directory
-├── images                        # Directory holding images related to OpenIM
-│   ├── architecture.png          # Image depicting the architecture of OpenIM
-│   └── mvc.png                   # Image illustrating the Model-View-Controller (MVC) pattern
-├── intive-slack.png              # Image displaying the Intive Slack logo
-├── logo                          # Directory containing various logo variations for OpenIM
-│   ├── openim-logo-black.png     # OpenIM logo with a black background
-│   ├── openim-logo-blue.png      # OpenIM logo with a blue background
-│   ├── openim-logo-green.png     # OpenIM logo with a green background
-│   ├── openim-logo-purple.png    # OpenIM logo with a purple background
-│   ├── openim-logo-white.png     # OpenIM logo with a white background
-│   ├── openim-logo-yellow.png    # OpenIM logo with a yellow background
-│   └── openim-logo.png           # OpenIM logo with a transparent background
-└── logo-gif                      # Directory containing animated GIF versions of the OpenIM logo
-    └── openim-log.gif            # Animated OpenIM logo with a transparent background
-```
-
-## Copyright Notice:
-
-The OpenIM logo, including its variations and animated versions, displayed in this repository [OpenIM](https://github.com/OpenIMSDK/openim) under the `/assets/logo` and `/assets/logo-gif` directories, are protected by copyright laws.
-
-The logo design is credited to @Xx(席欣).
-
-Please respect the intellectual property rights and refrain from unauthorized use and distribution of these assets.

assets/logo-gif/LICENSE

@@ -1 +0,0 @@
-# The OpenIM logo files are licensed under a choice of either Apache-2.0 or CC-BY-4.0 (Creative Commons Attribution 4.0 International).

assets/logo/LICENSE

@@ -1 +0,0 @@
-# The OpenIM logo files are licensed under a choice of either Apache-2.0 or CC-BY-4.0 (Creative Commons Attribution 4.0 International).

cmd/api/Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build run gotool install clean help
 
-NAME=openim-api
+NAME=open_im_api
 BIN_DIR=../../bin/
 
 OS:= $(or $(os),linux)

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

@@ -1,17 +1,3 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 package main
 
 import (
@@ -66,10 +52,8 @@ func run(port int) error {
 	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()))
+		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
 	}

cmd/cmdutils/Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build run gotool install clean help
 
-NAME=openim-cmdutils
+NAME=open_im_cmd_utils
 BIN_DIR=../../bin/
 
 OS:= $(or $(os),linux)

cmd/cmdutils/main.go

@@ -1,17 +1,3 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 package main
 
 import (

cmd/crontask/Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build run gotool install clean help
 
-NAME=openim-crontask
+NAME=open_im_cron_task
 BIN_DIR=../../bin/
 
 OS:= $(or $(os),linux)

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

@@ -1,6 +1,6 @@
 .PHONY: all build run gotool install clean help
 
-NAME=openim-msgtransfer
+NAME=open_im_msg_gateway
 BIN_DIR=../../bin/
 
 OS:= $(or $(os),linux)
@@ -32,3 +32,4 @@ install:build
 
 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/openim-api/deploy.Dockerfile

@@ -1,32 +0,0 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-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 ./openim-api ./
-
-VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
-
-CMD ["./openim-api","--port", "10002"]

cmd/openim-crontask/deploy.Dockerfile

@@ -1,32 +0,0 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-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 ./openim-crontask ./
-
-VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
-
-CMD ["./openim-crontask"]

cmd/openim-crontask/main.go

@@ -1,27 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-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/openim-msggateway/Makefile

@@ -1,34 +0,0 @@
-.PHONY: all build run gotool install clean help
-
-NAME=openim-rpc-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/openim-msggateway/deploy.Dockerfile

@@ -1,32 +0,0 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-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 ./openim-rpc-msg_gateway ./
-
-VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
-
-CMD ["./openim-rpc-msg_gateway","--port", "10140" "--ws_port", "10001", "--prometheus_port", "20240"]

cmd/openim-msggateway/main.go

@@ -1,29 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-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/openim-msgtransfer/deploy.Dockerfile

@@ -1,32 +0,0 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-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 ./openim-msgtransfer ./
-
-VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
-
-CMD ["./openim-msgtransfer","--prometheus_port", "21400"]

cmd/openim-push/deploy.Dockerfile

@@ -1,32 +0,0 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-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 ./openim-push ./
-
-VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
-
-CMD ["./openim-push", "--port", "10170", "--prometheus_port", "20170"]

cmd/openim-push/main.go

@@ -1,33 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-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/openim-rpc/openim-rpc-auth/deploy.Dockerfile

@@ -1,32 +0,0 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-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 ./openim-rpc-auth ./
-
-VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
-
-CMD ["./openim-rpc-auth", "--port", "10160"]

cmd/openim-rpc/openim-rpc-auth/main.go

@@ -1,33 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-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/openim-rpc/openim-rpc-conversation/Makefile

@@ -1,34 +0,0 @@
-.PHONY: all build run gotool install clean help
-
-NAME=openim-rpc-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/openim-rpc/openim-rpc-conversation/deploy.Dockerfile

@@ -1,32 +0,0 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-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 ./openim-rpc-conversation ./
-
-VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
-
-CMD ["./openim-rpc-conversation", "--port", "10230", "--prometheus_port","20230"]

cmd/openim-rpc/openim-rpc-conversation/main.go

@@ -1,33 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-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/openim-rpc/openim-rpc-friend/deploy.Dockerfile

@@ -1,32 +0,0 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-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 ./openim-rpc-friend ./
-
-VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
-
-CMD ["./openim-rpc-friend", "--port", "10120", "--prometheus_port","20120"]

cmd/openim-rpc/openim-rpc-friend/main.go

@@ -1,33 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-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/openim-rpc/openim-rpc-group/deploy.Dockerfile

@@ -1,32 +0,0 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-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 ./openim-rpc-group ./
-
-VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
-
-CMD ["./openim-rpc-group", "--port", "10150", "--prometheus_port","20150"]

cmd/openim-rpc/openim-rpc-group/main.go

@@ -1,33 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-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/openim-rpc/openim-rpc-msg/deploy.Dockerfile

@@ -1,32 +0,0 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-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 ./openim-rpc-msg ./
-
-VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
-
-CMD ["./openim-rpc-msg", "--port", "10130", "--prometheus_port","20130"]

cmd/openim-rpc/openim-rpc-msg/main.go

@@ -1,33 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-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/openim-rpc/openim-rpc-third/deploy.Dockerfile

@@ -1,32 +0,0 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-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 ./openim-rpc-third ./
-
-VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
-
-CMD ["./openim-rpc-third", "--port", "10200"]

cmd/openim-rpc/openim-rpc-third/main.go

@@ -1,33 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-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/openim-rpc/openim-rpc-user/Makefile

@@ -1,34 +0,0 @@
-.PHONY: all build run gotool install clean help
-
-NAME=openim-rpc-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/openim-rpc/openim-rpc-user/deploy.Dockerfile

@@ -1,32 +0,0 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-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 ./openim-rpc-user ./
-
-VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"]
-
-CMD ["./openim-rpc-user", "--port", "10110"]

cmd/openim-rpc/openim-rpc-user/main.go

@@ -1,33 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-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/push/Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build run gotool install clean help
 
-NAME=openim-push
+NAME=open_im_push
 BIN_DIR=../../bin/
 
 OS:= $(or $(os),linux)

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,6 +1,6 @@
 .PHONY: all build run gotool install clean help
 
-NAME=openim-rpc-msg
+NAME=open_im_auth
 BIN_DIR=../../../bin/
 
 OS:= $(or $(os),linux)

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