feat: add more test

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

.dockerignore

@@ -4,7 +4,7 @@
 .dockerignore
 
 # Ignore build artifacts
-_output/
+# _output/
 logs/
 
 # Ignore non-essential documentation
@@ -15,7 +15,7 @@ CHANGELOG/
 # LICENSE
 
 # Ignore testing and linting configuration
-scripts/golangci.yml
+.golangci.yml
 
 # Ignore deployment-related files
 docker-compose.yaml

.env

@@ -1,5 +1,19 @@
+# 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.
+
 USER=root
 PASSWORD=openIM123
 MINIO_ENDPOINT=http://127.0.0.1:10005
 API_URL=http://127.0.0.1:10002
-DATA_DIR=./
+DATA_DIR=./

.github/sync-release.yml

@@ -0,0 +1,30 @@
+# 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.
+
+OpenIMSDK/openim-docker:
+  - source: ./config
+    dest: ./openim-server/release/config
+    replace: true
+  - source: ./docs
+    dest: ./openim-server/release/docs
+    replace: true
+  - source: ./scripts
+    dest: ./openim-server/release/scripts
+    replace: true
+  - source: ./scripts
+    dest: ./scripts
+    replace: false
+  - source: ./Makefile
+    dest: ./Makefile
+    replace: false

.github/sync.yml

@@ -75,15 +75,21 @@ OpenIMSDK/OpenKF:
     dest: .github/.codecov.yml
     replace: false
 
-openim-sigs/openim-docker:
+OpenIMSDK/openim-docker:
   - source: ./config
-    dest: ./openim-server/config
+    dest: ./openim-server/main/config
     replace: true
   - source: ./docs
-    dest: ./openim-server/docs
+    dest: ./openim-server/main/docs
     replace: true
   - source: ./scripts
-    dest: ./openim-server/scripts
+    dest: ./openim-server/main/scripts
+    replace: true
+  - source: ./scripts
+    dest: ./scripts
+    replace: true
+  - source: ./Makefile
+    dest: ./Makefile
     replace: true
 
 group:

.github/workflows/auto-gh-pr.yml

@@ -26,7 +26,8 @@ on:
 jobs:
   create-pr:
     runs-on: ubuntu-latest
-    if: github.event.pull_request.base.ref == 'main' && github.event.pull_request.merged == true
+    if: github.event.pull_request.base.ref == 'main'
+    # && github.event.pull_request.merged == true
     steps:
         - name: Check out code
           uses: actions/checkout@v3

.github/workflows/deploy.yml

@@ -52,22 +52,4 @@ jobs:
             echo "REPO: $REPO"
             git clone -b develop https://github.com/${OWNER}/${REPO}.git; cd ${REPO}
             docker compose up -d
-
-
-    #   - name: deploy # Deployment
-    #     run: |
-    #       ssh work@182.92.xxx.xxx "
-    #         # 【Attention】Log in with the 'work' account, manually create /home/work/imooc-lego directory
-    #         # Then git clone https://username:password@github.com/imooc-lego/biz-editor-server.git -b dev (private repository, use GitHub username and password)
-    #         # Remember to delete origin to avoid exposing GitHub password
-    #         cd /home/work/imooc-lego/biz-editor-server;
-    #         git remote add origin https://openimbot:${{secrets.WFP_PASSWORD}}@github.com/OpenIMSDK/open-im-server.git;
-    #         git checkout dev;
-    #         git pull origin dev; # Download the latest code again
-    #         git remote remove origin; # Remove origin to avoid exposing GitHub password
-    #         # Start docker
-    #         docker-compose build editor-server; # Same as the service name in docker-compose.yml
-    #         docker-compose up -d;
-    #       "
-    #   - name: delete ssh key # Delete ssh key
-    #     run: rm -rf ~/.ssh/id_rsa
+        continue-on-error: true

.github/workflows/e2e-test.yml

@@ -12,5 +12,33 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# name: OpenIM e2e Test
+name: e2e
 
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+  schedule:
+    # run e2e test every 4 hours
+    - cron: 0 */4 * * *
+
+jobs:
+  build:
+    name: Test
+    runs-on: ubuntu-latest
+    env:
+      GO111MODULE: on
+    steps:
+
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.21
+        id: go
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Create e2e test
+        run: |
+          echo "...test e2e"

.github/workflows/golangci-lint.yml

@@ -18,7 +18,6 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches: [main]
 jobs:
     golangci:
       name: lint
@@ -27,25 +26,25 @@ jobs:
         - uses: actions/checkout@v3
         - uses: actions/setup-go@v4
           with:
-            go-version: '1.20'
+            go-version: '1.21'
             cache: false
         - name: golangci-lint
-          uses: golangci/golangci-lint-action@v3
+          uses: golangci/golangci-lint-action@v3.7.0
           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
+            version: v1.54
 
             # Optional: working directory, useful for monorepos
-            working-directory: server
+            # 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=/scripts/golangci.yml # --issues-exit-code=0
+            # args: --timeout=30m --config=/scripts/.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
+            only-new-issues: true
 
             # Optional:The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
-            install-mode: "goinstall"
+            # install-mode: "goinstall"

.github/workflows/greetings.yml

@@ -26,15 +26,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/first-interaction@main
+      - uses: actions/first-interaction@v1.1.1
         with:
           repo-token: ${{ secrets.BOT_GITHUB_TOKEN }}
-          issue-message: |
-            Hello! Thank you for filing an issue.
-
-            If this is a bug report, please include relevant logs to help us debug the problem.
-            
-            [Join slack 🤖](https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg) to connect and communicate with our developers.
           pr-message: |
             Hello! Thank you for your contribution.
             
@@ -42,4 +36,12 @@ jobs:
 
             If you are implementing a feature request, please check with the maintainers that the feature will be accepted first.
 
-            [Join slack 🤖](https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg) to connect and communicate with our developers.
+            [Join slack 🤖](https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg) to connect and communicate with our developers.
+
+          issue-message: |
+            Hello! Thank you for filing an issue.
+
+            If this is a bug report, please include relevant logs to help us debug the problem.
+            
+            [Join slack 🤖](https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg) to connect and communicate with our developers.
+        continue-on-error: true

.github/workflows/help-comment-issue.yml

@@ -32,4 +32,4 @@ jobs:
           body: |
             This issue is available for anyone to work on. **Make sure to reference this issue in your pull request.** :sparkles: Thank you for your contribution! :sparkles:
             [Join slack 🤖](https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg) to connect and communicate with our developers.
-            If you wish to accept this assignment, please leave a comment in the comments section: `/accept`.🎯
+            If you wish to accept this assignment, please leave a comment in the comments section: `/accept`.🎯

.github/workflows/openimci.yml

@@ -151,7 +151,7 @@ jobs:
         version: 2.x
     - name: Docker Operations
       run: |
-        curl -o docker-compose.yaml https://gist.githubusercontent.com/cubxxw/b1d5cbd2edfa23fee911118aa3e8249e/raw/openim-server.sh
+        curl -o docker-compose.yaml https://raw.githubusercontent.com/OpenIMSDK/openim-docker/main/example/basic-openim-server-dependency.yml
         sudo docker compose up -d
         sudo sleep 60
 
@@ -162,9 +162,10 @@ jobs:
 
     - name: Build, Start and Check Services
       run: |
-        make build
-        make start
-        make check
+        sudo make init
+        sudo make build
+        sudo make start
+        sudo make check
 
     - name: Print OpenIM Logs
       run: sudo cat ./_output/logs/* 2>/dev/null

.github/workflows/project-progress.yml

@@ -31,6 +31,6 @@ jobs:
     steps:
       - uses: alex-page/github-project-automation-plus@v0.8.3
         with:
-          project: OpenIM-V3.1
+          project: openim-powerful
           column: In Progress
           repo-token: ${{ secrets.BOT_GITHUB_TOKEN }}

.github/workflows/pull-request.yml

@@ -20,16 +20,13 @@ on:
       - 'README.md'
       - 'CONTRIBUTING.md'
       - 'docs/**'
-  pull_request:
-    branches: [main]
-    paths-ignore:
-      - 'README.md'
-      - 'CONTRIBUTING.md'
-      - 'docs/**'
+  workflow_dispatch:
+  schedule:
+    - cron: '0 2 * * *'
 
 permissions:
-  pull-requests: write
   contents: write
+  pull-requests: write
 
 jobs:
   build:
@@ -60,6 +57,12 @@ jobs:
           echo "Run go format successfully" 
         continue-on-error: true
 
+      - name: Run go lint
+        run: |
+          sudo make lint
+          echo "Run go lint successfully" 
+        continue-on-error: true
+
       - name: Generate all necessary files, such as error code files
         run: |
           make generate
@@ -72,18 +75,13 @@ jobs:
           echo "Run unit test and get test coverage successfully" 
         continue-on-error: true
 
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          languages: go
+    #   - name: Initialize CodeQL
+    #     uses: github/codeql-action/init@v2
+    #     with:
+    #       languages: go
 
-      - name: Build source code for host platform
-        run: |
-          sudo make build
-          echo "Build source code for host platform successfully" 
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+    #   - name: Perform CodeQL Analysis
+        # uses: github/codeql-action/analyze@v2
 
       - name: OpenIM verify copyright
         run: |
@@ -92,23 +90,33 @@ jobs:
           echo "OpenIM verify successfully" 
         continue-on-error: true
       
-      - name: Commit code
-        run: |
-            git add .
+    #   - name: Commit code
+    #     run: |
+    #         git add .
+    #         git commit -m "cicd: bump League Patch to cicd/patch-${{ github.event.number }}"
     
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v5
         with:
+          token: ${{ secrets.BOT_GITHUB_TOKEN }}
           commit-message: "cicd: bump League Patch to cicd/patch-${{ github.event.number }}"
           title: Bump League Patch to cicd/patch-${{ github.event.number }}
+          author: kubbot <kubbot@3293172751ysy@gmail.com>
+          signoff: false
+          draft: false
+          branch: "cicd/patch-${{ github.event.number }}"
+          assignees: cubxxw
+          reviewers: cubxxw
+          delete-branch: true
           body: |
             Review criteria:
-            
+
             - [ ] Disenchanter can connect and issue actions
             
-            This is an automated PR.
+            This is an automated PR. @ ${{ github.actor }}
             <sub>[workflow](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/.github/workflows/pull-request.yml).</sub>
           base: main
-          branch: cicd/patch-${{ github.event.number }}
-          labels: kind/documentation, area/test, ok-to-test
-          token: ${{ secrets.REDBOT_GITHUB_TOKEN }}
+          labels: |
+            kind/documentation
+            enhancement
+            report

.github/workflows/release-drafter.yml

@@ -18,11 +18,11 @@ on:
   push:
     # branches to consider in the event; optional, defaults to all
     branches:
-      - master
+      - main
   # pull_request event is required only for autolabeler
   pull_request:
     # Only following types are handled by the action, but one can default to all as well
-    types: [opened, reopened, synchronize]
+    # types: [opened, reopened, synchronize]
   # pull_request_target event is required for autolabeler to support PRs from forks
   # pull_request_target:
   #   types: [opened, reopened, synchronize]

.github/workflows/scripts-verify.yml

@@ -0,0 +1,74 @@
+# 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.
+
+name: OpenIM executes the script validation code
+
+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 }}
+    permissions:
+        contents: write
+    environment:
+      name: openim
+
+    strategy:
+      matrix:
+        go_version: ["1.21"]
+        os: [ubuntu-latest]
+
+    steps:
+    - name: Setup
+      uses: actions/checkout@v3
+      
+    - name: In ${{ matrix.os }} Execute the script validation code
+      uses: actions/setup-go@v4
+      with:
+        go-version: ${{ matrix.go_version }}
+      id: go
+
+    - name: scripts validation
+      run: |
+        sudo make verify
+      continue-on-error: true
+
+    - name: verify format
+      run: |
+        sudo make format
+
+    - name: verify license
+      run: |
+        sudo make verify-copyright

.github/workflows/sync-release.yml

@@ -0,0 +1,43 @@
+# Copyright © 2023 KubeCub open source community. All rights reserved.
+# Licensed under the MIT License (the "License");
+# you may not use this file except in compliance with the License.
+
+# https://github.com/BetaHuhn/repo-file-sync-action
+name: Synchronize kubecub public code to other repositories
+on:
+    push:
+        paths:
+            - scripts/*
+            - docs/*
+            - config/*
+        branches:
+          - release-v*.*
+    workflow_dispatch:
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Run GitHub File Sync
+        uses: BetaHuhn/repo-file-sync-action@latest
+        with:
+          GH_INSTALLATION_TOKEN: "${{ secrets.BOT_GITHUB_TOKEN }}"
+          CONFIG_PATH: .github/sync-release.yml
+          ORIGINAL_MESSAGE: true
+          SKIP_PR: true
+          COMMIT_EACH_FILE: false
+          COMMIT_BODY: "🤖 kubbot to synchronize the warehouse"
+          GIT_EMAIL: "3293172751ysy@gmail.com"
+          GIT_USERNAME: "kubbot"
+          PR_BODY: 👌 kubecub provides automated community services
+          REVIEWERS: |
+            kubbot
+            cubxxw
+          PR_LABELS: |
+            file-sync
+            automerge
+          ASSIGNEES: |
+            kubbot

.github/workflows/sync.yml

@@ -6,10 +6,6 @@
 name: Synchronize kubecub public code to other repositories
 on:
     push:
-        paths:
-            - scripts/*
-            - docs/*
-            - config/*
         branches:
           - main
     workflow_dispatch:

.gitignore

@@ -399,3 +399,5 @@ Sessionx.vim
 # End of https://www.toptal.com/developers/gitignore/api/go,git,vim,tags,test,emacs,backup,jetbrains
 .idea
 dist/
+.env
+config/config.yaml

.golangci.yml

@@ -58,7 +58,6 @@ run:
   skip-files:
     - ".*\\.my\\.go$"
     - _test.go
-    - ".*\\.pb\\.go"
 
   # by default isn't set. If set we pass it to "go list -mod={option}". From "go help modules":
   # If invoked with -mod=readonly, the go command is disallowed from the implicit
@@ -177,7 +176,7 @@ linters-settings:
     # put imports beginning with prefix after 3rd-party packages;
     # only support one prefix
     # if not set, use goimports.local-prefixes
-    prefix: github.com/OpenIMSDK/OpenKF
+    prefix: github.com/OpenIMSDK/Open-IM-Server
   gocognit:
     # minimal code complexity to report, 30 by default (but we recommend 10-20)
     min-complexity: 30
@@ -334,10 +333,8 @@ linters-settings:
   goimports:
     # put imports beginning with prefix after 3rd-party packages;
     # it's a comma-separated list of prefixes
-    local-prefixes: github.com/OpenIMSDK/OpenKF
-  golint:
-    # minimal confidence for issues, default is 0.8
-    min-confidence: 0.9
+    local-prefixes: github.com/OpenIMSDK/Open-IM-Server
+
   gomnd:
     settings:
       mnd:
@@ -443,12 +440,7 @@ linters-settings:
   #   packages-with-error-message:
   #     # specify an error message to output when a blacklisted package is used
   #     - github.com/Sirupsen/logrus: "logging is allowed only by logutils.Log"
-  ifshort:
-    # Maximum length of variable declaration measured in number of lines, after which linter won't suggest using short syntax.
-    # Has higher priority than max-decl-chars.
-    max-decl-lines: 1
-    # Maximum length of variable declaration measured in number of characters, after which linter won't suggest using short syntax.
-    max-decl-chars: 30
+
 
   importas:
     # if set to `true`, force to use alias.
@@ -723,7 +715,6 @@ linters:
     - asciicheck
     - bodyclose
     - cyclop
-    - deadcode
     # - depguard
     - dogsled
     - dupl
@@ -751,7 +742,6 @@ linters:
     - gosec
     - gosimple
     - govet
-    - ifshort
     - importas
     - ineffassign
     - lll
@@ -771,19 +761,16 @@ linters:
     - rowserrcheck
     - sqlclosecheck
     - staticcheck
-    - structcheck
     - stylecheck
     - thelper
     - tparallel
     - unconvert
     - unparam
     - unused
-    - varcheck
     - wastedassign
     - whitespace
     - bidichk
     - wastedassign
-    - golint
     - execinquery
     - nosprintfhostport
     - grouper
@@ -814,10 +801,6 @@ issues:
 
   # Excluding configuration per-path, per-linter, per-text and per-source
   exclude-rules:
-    - linters:
-      - golint
-      path: (internal/api/.*)\.go # exclude golint for internal/api/... files
-
     - linters:
       - revive
       path: (log/.*)\.go
@@ -857,9 +840,7 @@ issues:
 
     - path: (pkg/app/.*)\.go
       linters:
-        - deadcode
         - unused
-        - varcheck
         - forbidigo
 
     # Exclude some staticcheck messages

CHANGELOG/CHANGELOG-2.0.md

@@ -1,53 +1,22 @@
-# Version logging for OpenIM:v2.0
-
-> **Note**:
-> Deprecated version logging for OpenIM, please refer to [CHANGELOG.md](../CHANGELOG.md)
+# Version logging for OpenIM
 
 <!-- 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'
@@ -57,53 +26,38 @@
 
 
 <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'
@@ -111,11 +65,23 @@
 
 
 <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
+- friend modify
+- update
+
+
+[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.10...HEAD
+[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

CHANGELOG/CHANGELOG-3.2.md

@@ -0,0 +1,44 @@
+# Version logging for OpenIM
+
+<!-- BEGIN MUNGE: GENERATED_TOC -->
+
+<!-- END MUNGE: GENERATED_TOC -->
+
+<a name="unreleased"></a>
+## [Unreleased]
+
+
+<a name="v3.2.2-beta.3"></a>
+## [v3.2.2-beta.3] - 2023-08-22
+
+<a name="v3.2.2-beta.2"></a>
+## [v3.2.2-beta.2] - 2023-08-21
+
+<a name="v3.2.2-beta.1"></a>
+## [v3.2.2-beta.1] - 2023-08-19
+
+<a name="v3.2.0"></a>
+## [v3.2.0] - 2023-08-18
+
+<a name="v3.2.0-rc.0"></a>
+## [v3.2.0-rc.0] - 2023-08-17
+
+<a name="v3.2.2-beta.0"></a>
+## [v3.2.2-beta.0] - 2023-08-17
+
+<a name="v3.2.0-alpha.0"></a>
+## v3.2.0-alpha.0 - 2023-08-16
+### 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/v3.2.2-beta.3...HEAD
+[v3.2.2-beta.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.2.2-beta.2...v3.2.2-beta.3
+[v3.2.2-beta.2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.2.2-beta.1...v3.2.2-beta.2
+[v3.2.2-beta.1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.2.0...v3.2.2-beta.1
+[v3.2.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.2.0-rc.0...v3.2.0
+[v3.2.0-rc.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.2.2-beta.0...v3.2.0-rc.0
+[v3.2.2-beta.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v3.2.0-alpha.0...v3.2.2-beta.0

Dockerfile

@@ -10,8 +10,8 @@ ENV GOPROXY=$GOPROXY
 # Set up the working directory
 WORKDIR /openim/openim-server
 
-COPY go.mod go.sum go.work ./
-#RUN go mod download
+COPY go.mod go.sum ./
+RUN go mod download
 
 # Copy all files to the container
 ADD . .

Makefile

@@ -6,7 +6,7 @@
 
 ## all: Run tidy, gen, add-copyright, format, lint, cover, build ✨
 .PHONY: all
-all: tidy gen add-copyright lint cover restart
+all: tidy gen add-copyright verify lint cover restart
 
 # ==============================================================================
 # Build set
@@ -58,6 +58,16 @@ export USAGE_OPTIONS
 init:
 	@$(MAKE) gen.init
 
+## init-githooks: Initialize git hooks ✨
+.PHONY: init-githooks
+init-githooks:
+	@$(MAKE) gen.init-githooks
+
+## gen: Generate all necessary files. ✨
+.PHONY: gen
+gen:
+	@$(MAKE) gen.run
+
 ## demo: Run demo get started with Makefiles quickly ✨
 .PHONY: demo
 demo:
@@ -80,7 +90,7 @@ stop:
 
 ## restart: Restart openim ✨
 .PHONY: restart
-restart: clean stop build start
+restart: clean stop build init start
 
 ## multiarch: Build binaries for multiple platforms. See option PLATFORMS. ✨
 .PHONY: multiarch
@@ -102,6 +112,11 @@ install:
 check:
 	@$(MAKE) go.check
 
+## check-component
+.PHONY: check-component
+check-component:
+	@$(MAKE) go.check-component
+
 ## tidy: tidy go.mod ✨
 .PHONY: tidy
 tidy:
@@ -185,11 +200,6 @@ push.multiarch:
 tools:
 	@$(MAKE) tools.install
 
-## gen: Generate all necessary files. ✨
-.PHONY: gen
-gen:
-	@$(MAKE) gen.run
-
 ## swagger: Generate swagger document. ✨
 .PHONY: swagger
 swagger:

build/README.md

@@ -0,0 +1,65 @@
+# Building OpenIM
+
+Building OpenIM is easy if you take advantage of the containerized build environment. This document will help guide you through understanding this build process.
+
+## Requirements
+
+1. Docker, using one of the following configurations:
+  * **macOS** Install Docker for Mac. See installation instructions [here](https://docs.docker.com/docker-for-mac/).
+     **Note**: You will want to set the Docker VM to have at least 4GB of initial memory or building will likely fail.
+  * **Linux with local Docker**  Install Docker according to the [instructions](https://docs.docker.com/installation/#installation) for your OS.
+  * **Windows with Docker Desktop WSL2 backend**  Install Docker according to the [instructions](https://docs.docker.com/docker-for-windows/wsl-tech-preview/). Be sure to store your sources in the local Linux file system, not the Windows remote mount at `/mnt/c`.
+  
+  **Note**: You will need to check if Docker CLI plugin buildx is properly installed (`docker-buildx` file should be present in `~/.docker/cli-plugins`). You can install buildx according to the [instructions](https://github.com/docker/buildx/blob/master/README.md#installing).
+
+2. **Optional** [Google Cloud SDK](https://developers.google.com/cloud/sdk/)
+
+You must install and configure Google Cloud SDK if you want to upload your release to Google Cloud Storage and may safely omit this otherwise.
+
+## Actions
+
+About [Images packages](https://github.com/orgs/OpenIMSDK/packages?repo_name=Open-IM-Server)
+
+All files in the `build/images` directory are not templated and are instead rendered by Github Actions, which is an automated process.
+
+Trigger condition:
+1. create a new tag with the format `vX.Y.Z` (e.g. `v1.0.0`)
+2. push the tag to the remote repository
+3. wait for the build to finish
+4. download the artifacts from the release page
+
+## Make images
+
+**help info:**
+
+```bash
+$ make image.help
+```
+
+**build images:**
+
+```bash
+$ make image
+```
+
+## Overview
+
+While it is possible to build OpenIM using a local golang installation, we have a build process that runs in a Docker container.  This simplifies initial set up and provides for a very consistent build and test environment.
+
+
+## Basic Flow
+
+The scripts directly under [`build/`](.) are used to build and test.  They will ensure that the `kube-build` Docker image is built (based on [`build/build-image/Dockerfile`](build-image/Dockerfile) and after base image's `KUBE_BUILD_IMAGE_CROSS_TAG` from Dockerfile is replaced with one of those actual tags of the base image, like `v1.13.9-2`) and then execute the appropriate command in that container.  These scripts will both ensure that the right data is cached from run to run for incremental builds and will copy the results back out of the container. You can specify a different registry/name and version for `kube-cross` by setting `KUBE_CROSS_IMAGE` and `KUBE_CROSS_VERSION`, see [`common.sh`](common.sh) for more details.
+
+The `kube-build` container image is built by first creating a "context" directory in `_output/images/build-image`.  It is done there instead of at the root of the OpenIM repo to minimize the amount of data we need to package up when building the image.
+
+There are 3 different containers instances that are run from this image.  The first is a "data" container to store all data that needs to persist across to support incremental builds. Next there is an "rsync" container that is used to transfer data in and out to the data container.  Lastly there is a "build" container that is used for actually doing build actions.  The data container persists across runs while the rsync and build containers are deleted after each use.
+
+`rsync` is used transparently behind the scenes to efficiently move data in and out of the container.  This will use an ephemeral port picked by Docker.  You can modify this by setting the `KUBE_RSYNC_PORT` env variable.
+
+All Docker names are suffixed with a hash derived from the file path (to allow concurrent usage on things like CI machines) and a version number.  When the version number changes all state is cleared and clean build is started.  This allows the build infrastructure to be changed and signal to CI systems that old artifacts need to be deleted.
+
+## Build artifacts
+The build system output all its products to a top level directory in the source repository named `_output`.
+These include the binary compiled packages (e.g. kubectl, kube-scheduler etc.) and archived Docker images.
+If you intend to run a component with a docker image you will need to import it from this directory with

build/goreleaser.yaml

@@ -255,6 +255,132 @@ builds:
       - "6"
       - "7"
 
+  - binary: openim-rpc-user
+    id: openim-rpc-user
+    main: ./tools/infra/infra.go
+    goos:
+      - darwin
+      - windows
+      - linux
+    goarch:
+      - s390x
+      - mips64
+      - mips64le
+      - amd64
+      - ppc64le
+      - arm64
+    goarm:
+      - "6"
+      - "7"
+
+  - binary: openim-rpc-user
+    id: openim-rpc-user
+    main: ./tools/ncpu/ncpu.go
+    goos:
+      - darwin
+      - windows
+      - linux
+    goarch:
+      - s390x
+      - mips64
+      - mips64le
+      - amd64
+      - ppc64le
+      - arm64
+    goarm:
+      - "6"
+      - "7"
+
+  - binary: ncpu
+    id: ncpu
+    main: ./tools/ncpu/ncpu.go
+    goos:
+      - darwin
+      - windows
+      - linux
+    goarch:
+      - s390x
+      - mips64
+      - mips64le
+      - amd64
+      - ppc64le
+      - arm64
+    goarm:
+      - "6"
+      - "7"
+
+  - binary: component
+    id: component
+    main: ./tools/component/component.go
+    goos:
+      - darwin
+      - windows
+      - linux
+    goarch:
+      - s390x
+      - mips64
+      - mips64le
+      - amd64
+      - ppc64le
+      - arm64
+    goarm:
+      - "6"
+      - "7"
+    
+  - binary: versionchecker
+    id: versionchecker
+    main: ./tools/versionchecker/versionchecker.go
+    goos:
+      - darwin
+      - windows
+      - linux
+    goarch:
+      - s390x
+      - mips64
+      - mips64le
+      - amd64
+      - ppc64le
+      - arm64
+    goarm:
+      - "6"
+      - "7"
+
+  - binary: changelog
+    id: changelog
+    main: ./tools/changelog/changelog.go
+    goos:
+      - darwin
+      - windows
+      - linux
+    goarch:
+      - s390x
+      - mips64
+      - mips64le
+      - amd64
+      - ppc64le
+      - arm64
+    goarm:
+      - "6"
+      - "7"
+
+  - binary: yamlfmt
+    id: yamlfmt
+    main: ./tools/yamlfmt/yamlfmt.go
+    goos:
+      - darwin
+      - windows
+      - linux
+    goarch:
+      - s390x
+      - mips64
+      - mips64le
+      - amd64
+      - ppc64le
+      - arm64
+    goarm:
+      - "6"
+      - "7"
+
 archives:
   - format: tar.gz
     # this name template makes the OS and Arch compatible with the results of uname.
@@ -269,7 +395,11 @@ archives:
     files:
       - LICENSE
       - README.md
+      - README-zh_CN.md
+      - CODE_OF_CONDUCT.md
       - CHANGELOG/*
+      - scripts/*
+      - Makefile
       - CONTRIBUTING.md
       - docs/*
       - src: "*.md"
@@ -339,7 +469,9 @@ changelog:
 #   - image_templates:
 #       - "openimsdk/open-im-server:{{ .Tag }}-amd64"
 #       - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-amd64"
-#     dockerfile: Dockerfile
+#     dockerfile: build/images/openim-api/Dockerfile.release
+#     ids: 
+#       - openim-api
 #     use: buildx
 #     build_flag_templates:
 #       - "--pull"
@@ -359,7 +491,7 @@ changelog:
 #   - image_templates:
 #       - "goreleaser/goreleaser:{{ .Tag }}-arm64"
 #       - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-arm64"
-#     dockerfile: Dockerfile
+#     dockerfile: build/images/openim-api/Dockerfile.release
 #     use: buildx
 #     build_flag_templates:
 #       - "--pull"

build/images/openim-api/Dockerfile

@@ -43,7 +43,10 @@ COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-s
 COPY --from=builder /openim/openim-server/config /openim/openim-server/config
 
 ENV PORT 10002
+ENV CONFIG=/openim/openim-server/config
 
-EXPOSE ${PORT}
+EXPOSE $PORT
 
-CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-api --port ${PORT} -c ${SERVER_WORKDIR}/config"]
+RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-api /usr/bin/openim-api
+
+CMD ["bash", "-c", "openim-api -c $CONFIG --port $PORT"]

build/images/openim-api/Dockerfile.release

@@ -0,0 +1,8 @@
+FROM ghcr.io/openim-sigs/openim-bash-image:latest
+
+COPY openim-api /usr/bin/
+
+# nosemgrep: dockerfile.security.missing-user.missing-user
+ENTRYPOINT ["/usr/bin/openim-api"]
+# nosemgrep: dockerfile.security.missing-user.missing-user
+CMD ["--help"]

build/images/openim-cmdutils/Dockerfile

@@ -42,4 +42,8 @@ WORKDIR /openim/openim-server
 COPY --from=builder $OPENIM_SERVER_BINDIR/platforms /openim/openim-server/_output/bin/platforms
 COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config
 
-CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-cmdutils"]
+RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-cmdutils /usr/bin/openim-cmdutils
+
+ENTRYPOINT ["openim-cmdutils"]
+
+CMD ["--help"]

build/images/openim-crontask/Dockerfile

@@ -41,4 +41,8 @@ WORKDIR /openim/openim-server
 COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms
 COPY --from=builder /openim/openim-server/config /openim/openim-server/config
 
-CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-crontask"]
+ENV CONFIG=/openim/openim-server/config
+
+RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-crontask /usr/bin/openim-crontask
+
+CMD ["bash", "-c", "openim-crontask -c $CONFIG"]

build/images/openim-msggateway/Dockerfile

@@ -41,10 +41,13 @@ WORKDIR /openim/openim-server
 COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms
 COPY --from=builder /openim/openim-server/config /openim/openim-server/config
 
-ENV OS ${OS}
-ENV ARCH ${ARCH}
+ENV PORT 10140
+ENV WS_PORT 10001
+ENV CONFIG=/openim/openim-server/config
 
-EXPOSE 10140
-EXPOSE 10001
+EXPOSE $PORT
+EXPOSE $WS_PORT
 
-CMD ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-msggateway --port 10140 --ws_port 10001
+RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-msggateway /usr/bin/openim-msggateway
+
+CMD ["bash", "-c", "openim-msggateway -c $CONFIG --port $PORT --ws_port $WS_PORT"]

build/images/openim-msgtransfer/Dockerfile

@@ -36,12 +36,11 @@ RUN make build BINS=openim-msgtransfer
 
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
-ENV OS ${OS}
-ENV ARCH ${ARCH}
-
 WORKDIR /openim/openim-server
 
 COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms
 COPY --from=builder /openim/openim-server/config /openim/openim-server/config
 
-CMD ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-msgtransfer
+RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-msgtransfer /usr/bin/openim-msgtransfer
+
+ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then openim-msgtransfer -c $CONFIG --prometheus_port $PROMETHEUS_PORT; else openim-msgtransfer -c $CONFIG; fi"]

build/images/openim-push/Dockerfile

@@ -15,6 +15,7 @@
 # OpenIM base image: https://github.com/openim-sigs/openim-base-image
 
 # Set go mod installation source and proxy
+# docker run -e "PORT=10003" -e "PROMETHEUSORT=4321"  --network host  -it 67ef891ad1ff
 
 FROM golang:1.20 AS builder
 
@@ -38,12 +39,20 @@ FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-ENV OS ${OS}
-ENV ARCH ${ARCH}
-
 COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms
 COPY --from=builder /openim/openim-server/config /openim/openim-server/config
 
 EXPOSE 10170
+ENV PROMETHEUS_PORT 20170
 
-CMD ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-push --port 10170
+CMD ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-push --port 10170
+
+ENV PORT 10170
+
+ENV CONFIG=/openim/openim-server/config
+
+EXPOSE $PORT
+
+RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-push /usr/bin/openim-push
+
+ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then openim-push -c $CONFIG --port $PORT --prometheus_port $PROMETHEUS_PORT; else openim-push -c $CONFIG --port $PORT; fi"]

build/images/openim-rpc-auth/Dockerfile

@@ -35,18 +35,28 @@ RUN make clean
 
 # RUN make build BINS=openim-rpc
 
-RUN CGO_ENABLED=0 go build -ldflags="-w -s" -o ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-auth ./cmd/openim-rpc/openim-rpc-auth
+RUN make build BINS=openim-rpc
+# RUN CGO_ENABLED=0 go build -ldflags="-w -s" -o ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-auth ./cmd/openim-rpc/openim-rpc-auth
+
+RUN rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-friend && \
+    rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-group && \
+    rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-msg && \
+    rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-third && \
+    rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-user && \
+    rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-conversation
 
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-ENV OS ${OS}
-ENV ARCH ${ARCH}
-
 COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
 COPY --from=builder /openim/openim-server/config /openim/openim-server/config
 
-EXPOSE 10160
+ENV PORT 10160
+ENV CONFIG=/openim/openim-server/config
 
-CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-auth --port 10160 -c ${SERVER_WORKDIR}/config"]
+EXPOSE $PORT
+
+RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-auth /usr/bin/openim-rpc-auth
+
+ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-auth --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-auth --port $PORT -c $CONFIG"; fi"]

build/images/openim-rpc-conversation/Dockerfile

@@ -47,13 +47,16 @@ FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-ENV OS ${OS}
-ENV ARCH ${ARCH}
-
 COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
 COPY --from=builder /openim/openim-server/config /openim/openim-server/config
 
-EXPOSE 10230
-EXPOSE 20230
+ENV PORT 10230 \
+    PROMETHEUS_PORT 20230 \
+    CONFIG=/openim/openim-server/config
 
-CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-conversation --port 10230 --prometheus_port 20230 -c ${SERVER_WORKDIR}/config"]
+EXPOSE $PORT
+EXPOSE $PROMETHEUS_PORT
+
+RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-conversation /usr/bin/openim-rpc-conversation
+
+ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-conversation --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-conversation --port $PORT -c $CONFIG"; fi"]

build/images/openim-rpc-friend/Dockerfile

@@ -47,13 +47,16 @@ FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-ENV OS ${OS}
-ENV ARCH ${ARCH}
-
 COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
 COPY --from=builder /openim/openim-server/config /openim/openim-server/config
 
-EXPOSE 10120
-EXPOSE 20120
+ENV PORT 10120 \
+    PROMETHEUS_PORT 20120 \
+    CONFIG=/openim/openim-server/config
 
-CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-friend --port 10120 --prometheus_port 20120 -c ${SERVER_WORKDIR}/config"]
+EXPOSE $PORT
+EXPOSE $PROMETHEUS_PORT
+
+RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-friend /usr/bin/openim-rpc-friend
+
+ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-friend --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-friend --port $PORT -c $CONFIG"; fi"]

build/images/openim-rpc-group/Dockerfile

@@ -47,13 +47,16 @@ FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-ENV OS ${OS}
-ENV ARCH ${ARCH}
-
 COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
 COPY --from=builder /openim/openim-server/config /openim/openim-server/config
 
-EXPOSE 10150
-EXPOSE 20150
+ENV PORT 10150 \
+    PROMETHEUS_PORT 20150 \
+    CONFIG=/openim/openim-server/config
 
-CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-group --port 10150 --prometheus_port 20150 -c ${SERVER_WORKDIR}/config"]
+EXPOSE $PORT
+EXPOSE $PROMETHEUS_PORT
+
+RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-group /usr/bin/openim-rpc-group
+
+ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-group --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-group --port $PORT -c $CONFIG"; fi"]

build/images/openim-rpc-msg/Dockerfile

@@ -47,13 +47,16 @@ FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-ENV OS ${OS}
-ENV ARCH ${ARCH}
-
 COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
 COPY --from=builder /openim/openim-server/config /openim/openim-server/config
 
-EXPOSE 10130
-EXPOSE 20130
+ENV PORT 10130 \
+    PROMETHEUS_PORT 20130 \
+    CONFIG=/openim/openim-server/config
 
-CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-msg --port 10130 --prometheus_port 20130 -c ${SERVER_WORKDIR}/config"]
+EXPOSE $PORT
+EXPOSE $PROMETHEUS_PORT
+
+RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-msg /usr/bin/openim-rpc-msg
+
+ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-msg --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-msg --port $PORT -c $CONFIG"; fi"]

build/images/openim-rpc-third/Dockerfile

@@ -47,12 +47,14 @@ FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-ENV OS ${OS}
-ENV ARCH ${ARCH}
-
 COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
 COPY --from=builder /openim/openim-server/config /openim/openim-server/config
 
-EXPOSE 10200
+ENV PORT 10200 \
+    CONFIG=/openim/openim-server/config
 
-CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-third --port 10200 -c ${SERVER_WORKDIR}/config"]
+EXPOSE $PORT
+
+RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-third /usr/bin/openim-rpc-third
+
+ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-third --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-third --port $PORT -c $CONFIG"; fi"]

build/images/openim-rpc-user/Dockerfile

@@ -47,12 +47,14 @@ FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-ENV OS ${OS}
-ENV ARCH ${ARCH}
-
 COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
 COPY --from=builder /openim/openim-server/config /openim/openim-server/config
 
-EXPOSE 10110
+ENV PORT 10110 \
+    CONFIG=/openim/openim-server/config
 
-CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-user --port 10110 -c ${SERVER_WORKDIR}/config"]
+EXPOSE $PORT
+
+RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-user /usr/bin/openim-rpc-user
+
+ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-user --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-user --port $PORT -c $CONFIG"; fi"]

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 /openim/openim-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 ["/openim/openim-server/logs","/openim/openim-server/config"]
-
-CMD ["./openim-api","--port", "10002"]

cmd/openim-api/main.go

@@ -28,7 +28,7 @@ import (
 
 	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
-	openKeeper "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper"
+	openkeeper "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper"
 	"github.com/OpenIMSDK/tools/log"
 
 	"github.com/OpenIMSDK/Open-IM-Server/internal/api"
@@ -66,11 +66,11 @@ 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(
+	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.WithRoundRobin(), openkeeper.WithTimeout(10), openkeeper.WithLogger(log.NewZkLogger()))
 	if err != nil {
 		return err
 	}

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 /openim/openim-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 ["/openim/openim-server/logs","/openim/openim-server/config"]
-
-CMD ["./openim-crontask"]

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 /openim/openim-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 ["/openim/openim-server/logs","/openim/openim-server/config"]
-
-CMD ["./openim-rpc-msg_gateway","--port", "10140" "--ws_port", "10001", "--prometheus_port", "20240"]

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 /openim/openim-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 ["/openim/openim-server/logs","/openim/openim-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 /openim/openim-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 ["/openim/openim-server/logs","/openim/openim-server/config"]
-
-CMD ["./openim-push", "--port", "10170", "--prometheus_port", "20170"]

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 /openim/openim-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 ["/openim/openim-server/logs","/openim/openim-server/config"]
-
-CMD ["./openim-rpc-auth", "--port", "10160"]

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 /openim/openim-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 ["/openim/openim-server/logs","/openim/openim-server/config"]
-
-CMD ["./openim-rpc-conversation", "--port", "10230", "--prometheus_port","20230"]

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 /openim/openim-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 ["/openim/openim-server/logs","/openim/openim-server/config"]
-
-CMD ["./openim-rpc-friend", "--port", "10120", "--prometheus_port","20120"]

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 /openim/openim-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 ["/openim/openim-server/logs","/openim/openim-server/config"]
-
-CMD ["./openim-rpc-group", "--port", "10150", "--prometheus_port","20150"]

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 /openim/openim-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 ["/openim/openim-server/logs","/openim/openim-server/config"]
-
-CMD ["./openim-rpc-msg", "--port", "10130", "--prometheus_port","20130"]

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 /openim/openim-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 ["/openim/openim-server/logs","/openim/openim-server/config"]
-
-CMD ["./openim-rpc-third", "--port", "10200"]

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 /openim/openim-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 ["/openim/openim-server/logs","/openim/openim-server/config"]
-
-CMD ["./openim-rpc-user", "--port", "10110"]

config/config.yaml

@@ -1,6 +1,6 @@
 # Copyright © 2023 OpenIM. All rights reserved.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# 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
 #
@@ -13,7 +13,10 @@
 # limitations under the License.
 
 # -----------------------------------------------------------------
-# Infrastructural configurations, please modify based on your setup
+# TODO: This config file is the template file
+# --| source: deployments/templates/openim.yaml
+# --| env: scripts/install/environment
+# --| target: config/config.yaml
 # -----------------------------------------------------------------
 
 ###################### Zookeeper ######################
@@ -64,7 +67,7 @@ mongo:
   password: openIM123
   maxPoolSize: 100
 
-###################### Redis ######################
+###################### Redis configuration information ######################
 # Redis configuration
 #
 # Username is required only for Redis version 6.0+
@@ -73,7 +76,7 @@ redis:
   username:
   password: openIM123
 
-###################### Kafka ######################
+###################### Kafka configuration information ######################
 # Kafka configuration
 #
 # Kafka username
@@ -96,7 +99,7 @@ kafka:
     msgToMySql: mysql
     msgToPush: push
 
-###################### RPC ######################
+###################### RPC configuration information ######################
 # RPC configuration
 #
 # IP address to register with zookeeper when starting RPC, the IP and corresponding rpcPort should be accessible by api/gateway
@@ -105,7 +108,7 @@ rpc:
   registerIP:
   listenIP: 0.0.0.0
 
-###################### API ######################
+###################### API configuration information ######################
 # API configuration
 #
 # API service port
@@ -114,7 +117,7 @@ api:
   openImApiPort: [ 10002 ]
   listenIP: 0.0.0.0
 
-###################### Gateway ######################
+###################### Object configuration information ######################
 # Object storage configuration
 #
 # Use minio for object storage
@@ -150,11 +153,12 @@ object:
     accessKeySecret: ""
     sessionToken: ""
 
+###################### RPC Port Configuration ######################
 # RPC service ports
 # These ports are passed into the program by the script and are not recommended to modify
 # For launching multiple programs, just fill in multiple ports separated by commas
 # For example, [10110, 10111]
-rpcPort:
+rpcPort: 
   openImUserPort: [ 10110 ]
   openImFriendPort: [ 10120 ]
   openImMessagePort: [ 10130 ]
@@ -165,6 +169,7 @@ rpcPort:
   openImConversationPort: [ 10180 ]
   openImThirdPort: [ 10190 ]
 
+###################### RPC Register Name Configuration ######################
 # RPC service names for registration, it's not recommended to modify these
 rpcRegisterName:
   openImUserName: User
@@ -177,6 +182,7 @@ rpcRegisterName:
   openImConversationName: Conversation
   openImThirdName: Third
 
+###################### Log Configuration ######################
 # Log configuration
 #
 # Storage directory
@@ -191,10 +197,11 @@ log:
   rotationTime: 24
   remainRotationCount: 2
   remainLogLevel: 6
-  isStdout: false
+  isStdout: false 
   isJson: false
   withStack: false
 
+###################### Variables definition ######################
 # Long connection server configuration
 #
 # Websocket port for msg_gateway
@@ -236,8 +243,8 @@ push:
 # Built-in app manager user IDs
 # Built-in app manager nicknames
 manager:
-  userID: [ "openIM123456","openIM654321","openIMAdmin" ]
-  nickname: [ "system1","system2", "system3" ]
+  userID: [ "openIM123456", "openIM654321", "openIMAdmin" ]
+  nickname: [ "system1", "system2", "system3" ]
 
 # Multi-platform login policy
 # For each platform(Android, iOS, Windows, Mac, web), only one can be online at a time
@@ -291,6 +298,7 @@ iosPush:
   badgeCount: true
   production: false
 
+###################### Third-party service configuration ######################
 # Callback configuration
 #
 # Callback URL
@@ -360,7 +368,7 @@ callback:
     failedContinue: true
 
 ###################### Prometheus ######################
-# Prometheus configuration
+# Prometheus configuration for various services
 # The number of Prometheus ports per service needs to correspond to rpcPort
 # The number of ports needs to be consistent with msg_transfer_service_num in script/path_info.sh
 prometheus:
@@ -375,4 +383,4 @@ prometheus:
   conversationPrometheusPort: [ 20230 ]
   rtcPrometheusPort: [ 21300 ]
   thirdPrometheusPort: [ 21301 ]
-  messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ]
+  messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ] # List of ports

deployments/templates/openim.yaml

@@ -198,7 +198,7 @@ log:
   rotationTime: ${LOG_ROTATION_TIME}
   remainRotationCount: ${LOG_REMAIN_ROTATION_COUNT}
   remainLogLevel: ${LOG_REMAIN_LOG_LEVEL}
-  isStdout: ${LOG_IS_STDOUT} 
+  isStdout: ${LOG_IS_STDOUT}
   isJson: ${LOG_IS_JSON}
   withStack: ${LOG_WITH_STACK}
 

docker-compose.yml

@@ -90,8 +90,8 @@ services:
       - 9090:9090
     container_name: minio
     volumes:
-      - /mnt/data:/data
-      - /mnt/config:/root/.minio
+      - ${DATA_DIR}/components/mnt/data:/data
+      - ${DATA_DIR}/components/mnt/config:/root/.minio
     environment:
       MINIO_ROOT_USER: ${USER}
       MINIO_ROOT_PASSWORD: ${PASSWORD}
@@ -99,19 +99,19 @@ services:
     command: minio server /data --console-address ':9090'
 
   openim-server:
-    # image: ghcr.io/openimsdk/openim-server:release-v3.2
-    image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:release-v3.2
-    # image: openim/openim-server:release-v3.2
+    image: ghcr.io/openimsdk/openim-server:main
+    # image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:main
+    # image: openim/openim-server:main
     container_name: openim-server
-    # healthcheck:
-    #   test: ["CMD-SHELL", "./scripts/check-all.sh"]
-    #   interval: 30s
-    #   timeout: 10s
-    #   retries: 5
+    healthcheck:
+      test: ["CMD", "./scripts/check-all.sh"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
     volumes:
-      - ${DATA_DIR}/_output/openim/logs:/openim/openim-server/logs
-      - ${DATA_DIR}/config:/openim/openim-server/config
-      - ${DATA_DIR}/scripts:/openim/openim-server/scripts
+      - ./logs:/openim/openim-server/logs
+      - ./config:/openim/openim-server/config
+      - ./scripts:/openim/openim-server/scripts
     restart: always
     depends_on:
       - zookeeper
@@ -127,35 +127,6 @@ services:
         max-size: "1g"
         max-file: "2"
 
-  # openim-chat:
-  #   # image: ghcr.io/openimsdk/openim-server:release-v1.2
-  #   image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:release-v1.2
-  #   # image: openim/openim-server:release-v1.2
-  #   container_name: openim-chat
-  #   # healthcheck:
-  #   #   test: ["CMD-SHELL", "./scripts/check-all.sh"]
-  #   #   interval: 30s
-  #   #   timeout: 10s
-  #   #   retries: 5
-  #   volumes:
-  #     - openim-chat_logs:/openim/openim-chat/logs
-  #     - openim-chat_config:/openim/openim-chat/config
-  #     - openim-chat_scripts:/openim/openim-chat/scripts
-  #   restart: always
-  #   user: root:root
-  #   depends_on:
-  #     - mysql
-  #     - mongodb
-  #     - redis
-  #     - minio
-  #     - openim-server
-  #   network_mode: "host"
-  #   logging:
-  #     driver: json-file
-  #     options:
-  #       max-size: "1g"
-  #       max-file: "2"
-
   prometheus:
     image: prom/prometheus
     volumes:
@@ -179,14 +150,10 @@ services:
       - prometheus
     network_mode: "host"
 
-volumes:
-  openim-chat_logs:
-  openim-chat_config:
-  openim-chat_scripts:
 
   # node-exporter:
   #   image: quay.io/prometheus/node-exporter
   #   container_name: node-exporter
   #   restart: always
   #   ports:
-  #     - "9100:9100"
+  #     - "9100:9100"

docs/contrib/init_config.md

@@ -23,8 +23,8 @@ In the `scripts/init_config.sh` file, we defined some template files. These temp
 ```
 # Defines an associative array where the keys are the template files and the values are the corresponding output files.
 declare -A TEMPLATES=(
-  ["${OPENIM_ROOT}/scripts/template/config-tmpl/env.template"]="${OPENIM_OUTPUT_SUBPATH}/bin/.env"
-  ["${OPENIM_ROOT}/scripts/template/config-tmpl/config.yaml"]="${OPENIM_OUTPUT_SUBPATH}/bin/config.yaml"
+  [""${OPENIM_ROOT}"/scripts/template/config-tmpl/env.template"]="${OPENIM_OUTPUT_SUBPATH}/bin/.env"
+  [""${OPENIM_ROOT}"/scripts/template/config-tmpl/config.yaml"]="${OPENIM_OUTPUT_SUBPATH}/bin/config.yaml"
 )
 ```
 

docs/contrib/offline-deployment.md

@@ -0,0 +1,116 @@
+
+
+# OpenIM Offline Deployment Design
+
+## 1. Base Images
+
+Below are the base images and their versions you'll need:
+
+- wurstmeister/kafka
+- redis:7.0.0
+- mongo:6.0.2
+- mysql:5.7
+- wurstmeister/zookeeper
+- minio/minio
+
+Use the following commands to pull these base images:
+
+```
+docker pull wurstmeister/kafka
+docker pull redis:7.0.0
+docker pull mongo:6.0.2
+docker pull mysql:5.7
+docker pull wurstmeister/zookeeper
+docker pull minio/minio
+```
+
+## 2. OpenIM & Chat Images
+
+**For detailed understanding of version management and storage of OpenIM and Chat**: [version.md](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md)
+
+### OpenIM Image
+
+- Get image version info: [images.md](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/images.md)
+- Depending on the required version, execute the following command:
+
+```bash
+docker pull ghcr.io/openimsdk/openim-server:<version-name>
+```
+
+### Chat Image
+
+- Execute the following command to pull the image:
+
+```bash
+docker pull ghcr.io/openimsdk/openim-server:<version-name>
+```
+
+## 3. Image Storage Selection
+
+**Repositories**:
+
+- Alibaba Cloud: `registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server`
+- Docker Hub: `openim/openim-server`
+
+**Version Selection**:
+
+- Stable: e.g. release-v3.2 (or 3.1, 3.3)
+- Latest: latest
+- Latest of main: main
+
+## 4. Version Selection
+
+You can select from the following versions:
+
+- Stable: e.g. release-v3.2
+- Latest: latest
+- Latest from main branch: main
+
+## 5. Offline Deployment Steps
+
+1. **Pull images**: Execute the above `docker pull` commands to pull all required images locally.
+2. **Save images**:
+
+```
+docker save -o <tar-file-name>.tar <image-name>
+```
+
+1. **Fetch code**: Clone the repository:
+
+```
+git clone https://github.com/OpenIMSDK/openim-docker.git
+```
+
+Or download the code from [Releases](https://github.com/OpenIMSDK/openim-docker/releases/).
+
+1. **Transfer files**: Use `scp` to transfer all images and code to the intranet server.
+
+```
+scp <tar-file-name>.tar user@remote-ip:/path/on/remote/server
+```
+
+Or choose other transfer methods such as a hard drive.
+
+1. **Import images**: On the intranet server:
+
+```
+docker load -i <tar-file-name>.tar
+```
+
+1. **Deploy**: Navigate to the `openim-docker` repository directory and follow the README guide for deployment.
+2. **Deploy using Docker-compose**:
+
+```
+docker-compose up -d
+
+# Verify
+docker-compose ps
+```
+
+> **Note**: If you're using a version of Docker prior to 20, make sure you've installed `docker-compose`.
+
+## 6. Reference Links
+
+- [OpenIMSDK Issue #432](https://github.com/OpenIMSDK/Open-IM-Server/issues/432)
+- [Notion Link](https://nsddd.notion.site/435ee747c0bc44048da9300a2d745ad3?pvs=25)
+- [OpenIMSDK Issue #474](https://github.com/OpenIMSDK/Open-IM-Server/issues/474)

go.mod

@@ -37,8 +37,8 @@ require (
 require github.com/google/uuid v1.3.0
 
 require (
-	github.com/OpenIMSDK/protocol v0.0.14
-	github.com/OpenIMSDK/tools v0.0.13
+	github.com/OpenIMSDK/protocol v0.0.15
+	github.com/OpenIMSDK/tools v0.0.14
 	github.com/aliyun/aliyun-oss-go-sdk v2.2.8+incompatible
 	github.com/go-redis/redis v6.15.9+incompatible
 	github.com/go-sql-driver/mysql v1.7.1

go.sum

@@ -17,10 +17,10 @@ cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7Biccwk
 firebase.google.com/go v3.13.0+incompatible h1:3TdYC3DDi6aHn20qoRkxwGqNgdjtblwVAyRLQwGn/+4=
 firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIwjt8toICdV5Wh9ptHs=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/OpenIMSDK/protocol v0.0.14 h1:cvQ3f8MTcyYygAnZ7Exq6zIbvHGCEV0fWdpzjQEDDBQ=
-github.com/OpenIMSDK/protocol v0.0.14/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y=
-github.com/OpenIMSDK/tools v0.0.13 h1:rcw4HS8S2DPZR9UOBxD8/ol9UBMzXBypzOVEytDRIMo=
-github.com/OpenIMSDK/tools v0.0.13/go.mod h1:eg+q4A34Qmu73xkY0mt37FHGMCMfC6CtmOnm0kFEGFI=
+github.com/OpenIMSDK/protocol v0.0.15 h1:KrrvdHH9kFF/tFYL2FXRPAr2e5F5DctSHfHq6MQjUI4=
+github.com/OpenIMSDK/protocol v0.0.15/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y=
+github.com/OpenIMSDK/tools v0.0.14 h1:WLof/+WxyPyRST+QkoTKubYCiV73uCLiL8pgnpH/yKQ=
+github.com/OpenIMSDK/tools v0.0.14/go.mod h1:eg+q4A34Qmu73xkY0mt37FHGMCMfC6CtmOnm0kFEGFI=
 github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM=
 github.com/Shopify/sarama v1.29.0 h1:ARid8o8oieau9XrHI55f/L3EoRAhm9px6sonbD7yuUE=
 github.com/Shopify/sarama v1.29.0/go.mod h1:2QpgD79wpdAESqNQMxNc0KYMkycd4slxGdV3TWSVqrU=

go.work

@@ -1,4 +1,4 @@
-go 1.20
+go 1.18
 
 use (
 	.
@@ -7,5 +7,6 @@ use (
 	./tools/imctl
 	./tools/infra
 	./tools/ncpu
+	./tools/versionchecker
 	./tools/yamlfmt
 )

internal/api/msg.go

@@ -167,9 +167,15 @@ func (m *MessageApi) DeleteMsgPhysical(c *gin.Context) {
 
 func (m *MessageApi) getSendMsgReq(c *gin.Context, req apistruct.SendMsg) (sendMsgReq *msg.SendMsgReq, err error) {
 	var data interface{}
+	log.ZDebug(c, "getSendMsgReq", "req", req.Content)
 	switch req.ContentType {
 	case constant.Text:
-		data = apistruct.TextElem{}
+		text, ok := req.Content["text"].(string)
+		if !ok {
+			return nil, errs.ErrArgs.WithDetail("text is not string")
+		}
+		data = apistruct.TextContentElem{Content: text}
+		log.ZDebug(c, "getSendMsgReq", "data", data)
 	case constant.Picture:
 		data = apistruct.PictureElem{}
 	case constant.Voice:
@@ -195,7 +201,7 @@ func (m *MessageApi) getSendMsgReq(c *gin.Context, req apistruct.SendMsg) (sendM
 	if err := mapstructure.WeakDecode(req.Content, &data); err != nil {
 		return nil, err
 	}
-	log.ZDebug(c, "getSendMsgReq", "data", data)
+	log.ZDebug(c, "getSendMsgReq", "req", req.Content)
 	if err := m.validate.Struct(data); err != nil {
 		return nil, err
 	}
@@ -363,6 +369,7 @@ func (m *MessageApi) GetActiveGroup(c *gin.Context) {
 func (m *MessageApi) SearchMsg(c *gin.Context) {
 	a2r.Call(msg.MsgClient.SearchMessage, m.Client, c)
 }
+
 func (m *MessageApi) GetServerTime(c *gin.Context) {
 	a2r.Call(msg.MsgClient.GetServerTime, m.Client, c)
 }

internal/msggateway/callback.go

@@ -26,7 +26,7 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/http"
 )
 
-func url() string {
+func callBackURL() string {
 	return config.Config.Callback.CallbackUrl
 }
 
@@ -49,7 +49,7 @@ func CallbackUserOnline(ctx context.Context, userID string, platformID int, isAp
 		ConnID:          connID,
 	}
 	resp := cbapi.CommonCallbackResp{}
-	return http.CallBackPostReturn(ctx, url(), &req, &resp, config.Config.Callback.CallbackUserOnline)
+	return http.CallBackPostReturn(ctx, callBackURL(), &req, &resp, config.Config.Callback.CallbackUserOnline)
 }
 
 func CallbackUserOffline(ctx context.Context, userID string, platformID int, connID string) error {
@@ -70,7 +70,7 @@ func CallbackUserOffline(ctx context.Context, userID string, platformID int, con
 		ConnID: connID,
 	}
 	resp := &cbapi.CallbackUserOfflineResp{}
-	return http.CallBackPostReturn(ctx, url(), req, resp, config.Config.Callback.CallbackUserOffline)
+	return http.CallBackPostReturn(ctx, callBackURL(), req, resp, config.Config.Callback.CallbackUserOffline)
 }
 
 func CallbackUserKickOff(ctx context.Context, userID string, platformID int) error {
@@ -90,7 +90,7 @@ func CallbackUserKickOff(ctx context.Context, userID string, platformID int) err
 		Seq: time.Now().UnixMilli(),
 	}
 	resp := &cbapi.CommonCallbackResp{}
-	return http.CallBackPostReturn(ctx, url(), req, resp, config.Config.Callback.CallbackUserOffline)
+	return http.CallBackPostReturn(ctx, callBackURL(), req, resp, config.Config.Callback.CallbackUserOffline)
 }
 
 // func callbackUserOnline(operationID, userID string, platformID int, token string, isAppBackground bool, connID

internal/msggateway/context.go

@@ -16,6 +16,7 @@ package msggateway
 
 import (
 	"net/http"
+	"net/url"
 	"strconv"
 	"time"
 
@@ -71,6 +72,11 @@ func newContext(respWriter http.ResponseWriter, req *http.Request) *UserConnCont
 		ConnID:     utils.Md5(req.RemoteAddr + "_" + strconv.Itoa(int(utils.GetCurrentTimestampByMill()))),
 	}
 }
+func newTempContext() *UserConnContext {
+	return &UserConnContext{
+		Req: &http.Request{URL: &url.URL{}},
+	}
+}
 
 func (c *UserConnContext) GetRemoteAddr() string {
 	return c.RemoteAddr
@@ -116,9 +122,15 @@ func (c *UserConnContext) GetOperationID() string {
 	return c.Req.URL.Query().Get(OperationID)
 }
 
+func (c *UserConnContext) SetOperationID(operationID string) {
+	c.Req.URL.Query().Set(OperationID, operationID)
+}
 func (c *UserConnContext) GetToken() string {
 	return c.Req.URL.Query().Get(Token)
 }
+func (c *UserConnContext) SetToken(token string) {
+	c.Req.URL.RawQuery = Token + "=" + token
+}
 
 func (c *UserConnContext) GetBackground() bool {
 	b, err := strconv.ParseBool(c.Req.URL.Query().Get(BackgroundStatus))

internal/msggateway/hub_server.go

@@ -17,6 +17,8 @@ package msggateway
 import (
 	"context"
 
+	"github.com/OpenIMSDK/tools/mcontext"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
 
 	"github.com/OpenIMSDK/tools/errs"
@@ -35,13 +37,13 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/startrpc"
 )
 
-func (s *Server) InitServer(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error {
+func (s *Server) InitServer(disCov discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error {
 	rdb, err := cache.NewRedis()
 	if err != nil {
 		return err
 	}
 	msgModel := cache.NewMsgCacheModel(rdb)
-	s.LongConnServer.SetDiscoveryRegistry(client)
+	s.LongConnServer.SetDiscoveryRegistry(disCov)
 	s.LongConnServer.SetCacheHandler(msgModel)
 	msggateway.RegisterMsgGatewayServer(server, s)
 	return nil
@@ -198,6 +200,20 @@ func (s *Server) MultiTerminalLoginCheck(
 	ctx context.Context,
 	req *msggateway.MultiTerminalLoginCheckReq,
 ) (*msggateway.MultiTerminalLoginCheckResp, error) {
-	// TODO implement me
-	panic("implement me")
+	if oldClients, userOK, clientOK := s.LongConnServer.GetUserPlatformCons(req.UserID, int(req.PlatformID)); userOK {
+		tempUserCtx := newTempContext()
+		tempUserCtx.SetToken(req.Token)
+		tempUserCtx.SetOperationID(mcontext.GetOperationID(ctx))
+		client := &Client{}
+		client.ctx = tempUserCtx
+		client.UserID = req.UserID
+		client.PlatformID = int(req.PlatformID)
+		i := &kickHandler{
+			clientOK:   clientOK,
+			oldClients: oldClients,
+			newClient:  client,
+		}
+		s.LongConnServer.SetKickHandlerInfo(i)
+	}
+	return &msggateway.MultiTerminalLoginCheckResp{}, nil
 }

internal/msggateway/n_ws_server.go

@@ -23,6 +23,8 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/OpenIMSDK/protocol/msggateway"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 
@@ -52,6 +54,7 @@ type LongConnServer interface {
 	SetDiscoveryRegistry(client discoveryregistry.SvcDiscoveryRegistry)
 	KickUserConn(client *Client) error
 	UnRegister(c *Client)
+	SetKickHandlerInfo(i *kickHandler)
 	Compressor
 	Encoder
 	MessageHandler
@@ -78,6 +81,7 @@ type WsServer struct {
 	validate          *validator.Validate
 	cache             cache.MsgModel
 	userClient        *rpcclient.UserRpcClient
+	disCov            discoveryregistry.SvcDiscoveryRegistry
 	Compressor
 	Encoder
 	MessageHandler
@@ -88,10 +92,11 @@ type kickHandler struct {
 	newClient  *Client
 }
 
-func (ws *WsServer) SetDiscoveryRegistry(client discoveryregistry.SvcDiscoveryRegistry) {
-	ws.MessageHandler = NewGrpcHandler(ws.validate, client)
-	u := rpcclient.NewUserRpcClient(client)
+func (ws *WsServer) SetDiscoveryRegistry(disCov discoveryregistry.SvcDiscoveryRegistry) {
+	ws.MessageHandler = NewGrpcHandler(ws.validate, disCov)
+	u := rpcclient.NewUserRpcClient(disCov)
 	ws.userClient = &u
+	ws.disCov = disCov
 }
 
 func (ws *WsServer) SetUserOnlineStatus(ctx context.Context, client *Client, status int32) {
@@ -180,6 +185,31 @@ func (ws *WsServer) Run() error {
 	return http.ListenAndServe(":"+utils.IntToString(ws.port), nil) // Start listening
 }
 
+func (ws *WsServer) sendUserOnlineInfoToOtherNode(ctx context.Context, client *Client) error {
+	conns, err := ws.disCov.GetConns(ctx, config.Config.RpcRegisterName.OpenImMessageGatewayName)
+	if err != nil {
+		return err
+	}
+	// Online push user online message to other node
+	for _, v := range conns {
+		if v.Target() == ws.disCov.GetSelfConnTarget() {
+			log.ZDebug(ctx, "Filter out this node", "node", v.Target())
+			continue
+		}
+		msgClient := msggateway.NewMsgGatewayClient(v)
+		_, err := msgClient.MultiTerminalLoginCheck(ctx, &msggateway.MultiTerminalLoginCheckReq{UserID: client.UserID,
+			PlatformID: int32(client.PlatformID), Token: client.token})
+		if err != nil {
+			log.ZWarn(ctx, "MultiTerminalLoginCheck err", err, "node", v.Target())
+			continue
+		}
+	}
+	return nil
+}
+func (ws *WsServer) SetKickHandlerInfo(i *kickHandler) {
+	ws.kickHandlerChan <- i
+}
+
 func (ws *WsServer) registerClient(client *Client) {
 	var (
 		userOK     bool
@@ -211,6 +241,7 @@ func (ws *WsServer) registerClient(client *Client) {
 			atomic.AddInt64(&ws.onlineUserConnNum, 1)
 		}
 	}
+	ws.sendUserOnlineInfoToOtherNode(client.ctx, client)
 	ws.SetUserOnlineStatus(client.ctx, client, constant.Online)
 	log.ZInfo(
 		client.ctx,
@@ -249,7 +280,10 @@ func (ws *WsServer) multiTerminalLoginChecker(clientOK bool, oldClients []*Clien
 		fallthrough
 	case constant.AllLoginButSameTermKick:
 		if clientOK {
-			ws.clients.deleteClients(newClient.UserID, oldClients)
+			isDeleteUser := ws.clients.deleteClients(newClient.UserID, oldClients)
+			if isDeleteUser {
+				atomic.AddInt64(&ws.onlineUserNum, -1)
+			}
 			for _, c := range oldClients {
 				err := c.KickOnlineMessage()
 				if err != nil {
@@ -301,7 +335,8 @@ func (ws *WsServer) multiTerminalLoginChecker(clientOK bool, oldClients []*Clien
 					m[k] = constant.KickedToken
 				}
 			}
-			log.ZDebug(newClient.ctx, "set token map is ", "token map", m, "userID", newClient.UserID)
+			log.ZDebug(newClient.ctx, "set token map is ", "token map", m, "userID",
+				newClient.UserID, "token", newClient.ctx.GetToken())
 			err = ws.cache.SetTokenMapByUidPid(newClient.ctx, newClient.UserID, newClient.PlatformID, m)
 			if err != nil {
 				log.ZWarn(newClient.ctx, "SetTokenMapByUidPid err", err, "userID", newClient.UserID, "platformID", newClient.PlatformID)

internal/msgtransfer/init.go

@@ -22,7 +22,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
-	openKeeper "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper"
+	openkeeper "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/mw"
 
@@ -30,7 +30,7 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation"
-	relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
@@ -48,7 +48,7 @@ func StartTransfer(prometheusPort int) error {
 	if err != nil {
 		return err
 	}
-	if err := db.AutoMigrate(&relationTb.ChatLogModel{}); err != nil {
+	if err := db.AutoMigrate(&relationtb.ChatLogModel{}); err != nil {
 		fmt.Printf("gorm: AutoMigrate ChatLogModel err: %v\n", err)
 	}
 	rdb, err := cache.NewRedis()
@@ -62,9 +62,9 @@ func StartTransfer(prometheusPort int) error {
 	if err := mongo.CreateMsgIndex(); err != nil {
 		return err
 	}
-	client, err := openKeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema,
-		openKeeper.WithFreq(time.Hour), openKeeper.WithRoundRobin(), openKeeper.WithUserNameAndPassword(config.Config.Zookeeper.Username,
-			config.Config.Zookeeper.Password), openKeeper.WithTimeout(10), openKeeper.WithLogger(log.NewZkLogger()))
+	client, err := openkeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema,
+		openkeeper.WithFreq(time.Hour), openkeeper.WithRoundRobin(), openkeeper.WithUserNameAndPassword(config.Config.Zookeeper.Username,
+			config.Config.Zookeeper.Password), openkeeper.WithTimeout(10), openkeeper.WithLogger(log.NewZkLogger()))
 	if err != nil {
 		return err
 	}

internal/msgtransfer/online_msg_to_mongo_handler.go

@@ -20,7 +20,7 @@ import (
 	"github.com/Shopify/sarama"
 	"google.golang.org/protobuf/proto"
 
-	pbMsg "github.com/OpenIMSDK/protocol/msg"
+	pbmsg "github.com/OpenIMSDK/protocol/msg"
 	"github.com/OpenIMSDK/tools/log"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
@@ -52,7 +52,7 @@ func (mc *OnlineHistoryMongoConsumerHandler) handleChatWs2Mongo(
 	session sarama.ConsumerGroupSession,
 ) {
 	msg := cMsg.Value
-	msgFromMQ := pbMsg.MsgDataToMongoByMQ{}
+	msgFromMQ := pbmsg.MsgDataToMongoByMQ{}
 	err := proto.Unmarshal(msg, &msgFromMQ)
 	if err != nil {
 		log.ZError(ctx, "unmarshall failed", err, "key", key, "len", len(msg))

internal/msgtransfer/persistent_msg_handler.go

@@ -18,7 +18,7 @@ import (
 	"context"
 
 	"github.com/OpenIMSDK/protocol/constant"
-	pbMsg "github.com/OpenIMSDK/protocol/msg"
+	pbmsg "github.com/OpenIMSDK/protocol/msg"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/utils"
 
@@ -54,7 +54,7 @@ func (pc *PersistentConsumerHandler) handleChatWs2Mysql(
 ) {
 	msg := cMsg.Value
 	var tag bool
-	msgFromMQ := pbMsg.MsgDataToMQ{}
+	msgFromMQ := pbmsg.MsgDataToMQ{}
 	err := proto.Unmarshal(msg, &msgFromMQ)
 	if err != nil {
 		log.ZError(ctx, "msg_transfer Unmarshal msg err", err)

internal/push/push_handler.go

@@ -21,8 +21,8 @@ import (
 	"google.golang.org/protobuf/proto"
 
 	"github.com/OpenIMSDK/protocol/constant"
-	pbChat "github.com/OpenIMSDK/protocol/msg"
-	pbPush "github.com/OpenIMSDK/protocol/push"
+	pbchat "github.com/OpenIMSDK/protocol/msg"
+	pbpush "github.com/OpenIMSDK/protocol/push"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/utils"
 
@@ -47,12 +47,12 @@ func NewConsumerHandler(pusher *Pusher) *ConsumerHandler {
 }
 
 func (c *ConsumerHandler) handleMs2PsChat(ctx context.Context, msg []byte) {
-	msgFromMQ := pbChat.PushMsgDataToMQ{}
+	msgFromMQ := pbchat.PushMsgDataToMQ{}
 	if err := proto.Unmarshal(msg, &msgFromMQ); err != nil {
 		log.ZError(ctx, "push Unmarshal msg err", err, "msg", string(msg))
 		return
 	}
-	pbData := &pbPush.PushMsgReq{
+	pbData := &pbpush.PushMsgReq{
 		MsgData:        msgFromMQ.MsgData,
 		ConversationID: msgFromMQ.ConversationID,
 	}

internal/push/push_rpc_server.go

@@ -21,7 +21,7 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/OpenIMSDK/protocol/constant"
-	pbPush "github.com/OpenIMSDK/protocol/push"
+	pbpush "github.com/OpenIMSDK/protocol/push"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 	"github.com/OpenIMSDK/tools/log"
 
@@ -60,7 +60,7 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 	wg.Add(2)
 	go func() {
 		defer wg.Done()
-		pbPush.RegisterPushMsgServiceServer(server, &pushServer{
+		pbpush.RegisterPushMsgServiceServer(server, &pushServer{
 			pusher: pusher,
 		})
 	}()
@@ -74,7 +74,7 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 	return nil
 }
 
-func (r *pushServer) PushMsg(ctx context.Context, pbData *pbPush.PushMsgReq) (resp *pbPush.PushMsgResp, err error) {
+func (r *pushServer) PushMsg(ctx context.Context, pbData *pbpush.PushMsgReq) (resp *pbpush.PushMsgResp, err error) {
 	switch pbData.MsgData.SessionType {
 	case constant.SuperGroupChatType:
 		err = r.pusher.Push2SuperGroup(ctx, pbData.MsgData.GroupID, pbData.MsgData)
@@ -88,15 +88,15 @@ func (r *pushServer) PushMsg(ctx context.Context, pbData *pbPush.PushMsgReq) (re
 			log.ZWarn(ctx, "offline push failed", err, "msg", pbData.String())
 		}
 	}
-	return &pbPush.PushMsgResp{}, nil
+	return &pbpush.PushMsgResp{}, nil
 }
 
 func (r *pushServer) DelUserPushToken(
 	ctx context.Context,
-	req *pbPush.DelUserPushTokenReq,
-) (resp *pbPush.DelUserPushTokenResp, err error) {
+	req *pbpush.DelUserPushTokenReq,
+) (resp *pbpush.DelUserPushTokenResp, err error) {
 	if err = r.pusher.database.DelFcmToken(ctx, req.UserID, int(req.PlatformID)); err != nil {
 		return nil, err
 	}
-	return &pbPush.DelUserPushTokenResp{}, nil
+	return &pbpush.DelUserPushTokenResp{}, nil
 }

internal/rpc/auth/auth.go

@@ -21,7 +21,7 @@ import (
 
 	"google.golang.org/grpc"
 
-	pbAuth "github.com/OpenIMSDK/protocol/auth"
+	pbauth "github.com/OpenIMSDK/protocol/auth"
 	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/msggateway"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
@@ -49,7 +49,7 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 		return err
 	}
 	userRpcClient := rpcclient.NewUserRpcClient(client)
-	pbAuth.RegisterAuthServer(server, &authServer{
+	pbauth.RegisterAuthServer(server, &authServer{
 		userRpcClient:  &userRpcClient,
 		RegisterCenter: client,
 		authDatabase: controller.NewAuthDatabase(
@@ -61,8 +61,8 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 	return nil
 }
 
-func (s *authServer) UserToken(ctx context.Context, req *pbAuth.UserTokenReq) (*pbAuth.UserTokenResp, error) {
-	resp := pbAuth.UserTokenResp{}
+func (s *authServer) UserToken(ctx context.Context, req *pbauth.UserTokenReq) (*pbauth.UserTokenResp, error) {
+	resp := pbauth.UserTokenResp{}
 	if req.Secret != config.Config.Secret {
 		return nil, errs.ErrNoPermission.Wrap("secret invalid")
 	}
@@ -105,9 +105,9 @@ func (s *authServer) parseToken(ctx context.Context, tokensString string) (claim
 
 func (s *authServer) ParseToken(
 	ctx context.Context,
-	req *pbAuth.ParseTokenReq,
-) (resp *pbAuth.ParseTokenResp, err error) {
-	resp = &pbAuth.ParseTokenResp{}
+	req *pbauth.ParseTokenReq,
+) (resp *pbauth.ParseTokenResp, err error) {
+	resp = &pbauth.ParseTokenResp{}
 	claims, err := s.parseToken(ctx, req.Token)
 	if err != nil {
 		return nil, err
@@ -118,14 +118,14 @@ func (s *authServer) ParseToken(
 	return resp, nil
 }
 
-func (s *authServer) ForceLogout(ctx context.Context, req *pbAuth.ForceLogoutReq) (*pbAuth.ForceLogoutResp, error) {
+func (s *authServer) ForceLogout(ctx context.Context, req *pbauth.ForceLogoutReq) (*pbauth.ForceLogoutResp, error) {
 	if err := authverify.CheckAdmin(ctx); err != nil {
 		return nil, err
 	}
 	if err := s.forceKickOff(ctx, req.UserID, req.PlatformID, mcontext.GetOperationID(ctx)); err != nil {
 		return nil, err
 	}
-	return &pbAuth.ForceLogoutResp{}, nil
+	return &pbauth.ForceLogoutResp{}, nil
 }
 
 func (s *authServer) forceKickOff(ctx context.Context, userID string, platformID int32, operationID string) error {
@@ -134,7 +134,7 @@ func (s *authServer) forceKickOff(ctx context.Context, userID string, platformID
 		return err
 	}
 	for _, v := range conns {
-		log.ZDebug(ctx, "forceKickOff", "conn", v.(*grpc.ClientConn).Target())
+		log.ZDebug(ctx, "forceKickOff", "conn", v.Target())
 	}
 	for _, v := range conns {
 		client := msggateway.NewMsgGatewayClient(v)

internal/rpc/conversation/conversaion.go

@@ -22,7 +22,7 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/OpenIMSDK/protocol/constant"
-	pbConversation "github.com/OpenIMSDK/protocol/conversation"
+	pbconversation "github.com/OpenIMSDK/protocol/conversation"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
@@ -33,7 +33,7 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation"
-	tableRelation "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	tablerelation "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification"
 )
@@ -49,7 +49,7 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 	if err != nil {
 		return err
 	}
-	if err := db.AutoMigrate(&tableRelation.ConversationModel{}); err != nil {
+	if err := db.AutoMigrate(&tablerelation.ConversationModel{}); err != nil {
 		return err
 	}
 	rdb, err := cache.NewRedis()
@@ -59,7 +59,7 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 	conversationDB := relation.NewConversationGorm(db)
 	groupRpcClient := rpcclient.NewGroupRpcClient(client)
 	msgRpcClient := rpcclient.NewMessageRpcClient(client)
-	pbConversation.RegisterConversationServer(server, &conversationServer{
+	pbconversation.RegisterConversationServer(server, &conversationServer{
 		conversationNotificationSender: notification.NewConversationNotificationSender(&msgRpcClient),
 		groupRpcClient:                 &groupRpcClient,
 		conversationDatabase:           controller.NewConversationDatabase(conversationDB, cache.NewConversationRedis(rdb, cache.GetDefaultOpt(), conversationDB), tx.NewGorm(db)),
@@ -67,7 +67,7 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 	return nil
 }
 
-func (c *conversationServer) GetConversation(ctx context.Context, req *pbConversation.GetConversationReq) (*pbConversation.GetConversationResp, error) {
+func (c *conversationServer) GetConversation(ctx context.Context, req *pbconversation.GetConversationReq) (*pbconversation.GetConversationResp, error) {
 	conversations, err := c.conversationDatabase.FindConversations(ctx, req.OwnerUserID, []string{req.ConversationID})
 	if err != nil {
 		return nil, err
@@ -75,46 +75,46 @@ func (c *conversationServer) GetConversation(ctx context.Context, req *pbConvers
 	if len(conversations) < 1 {
 		return nil, errs.ErrRecordNotFound.Wrap("conversation not found")
 	}
-	resp := &pbConversation.GetConversationResp{Conversation: &pbConversation.Conversation{}}
+	resp := &pbconversation.GetConversationResp{Conversation: &pbconversation.Conversation{}}
 	resp.Conversation = convert.ConversationDB2Pb(conversations[0])
 	return resp, nil
 }
 
-func (c *conversationServer) GetAllConversations(ctx context.Context, req *pbConversation.GetAllConversationsReq) (*pbConversation.GetAllConversationsResp, error) {
+func (c *conversationServer) GetAllConversations(ctx context.Context, req *pbconversation.GetAllConversationsReq) (*pbconversation.GetAllConversationsResp, error) {
 	conversations, err := c.conversationDatabase.GetUserAllConversation(ctx, req.OwnerUserID)
 	if err != nil {
 		return nil, err
 	}
-	resp := &pbConversation.GetAllConversationsResp{Conversations: []*pbConversation.Conversation{}}
+	resp := &pbconversation.GetAllConversationsResp{Conversations: []*pbconversation.Conversation{}}
 	resp.Conversations = convert.ConversationsDB2Pb(conversations)
 	return resp, nil
 }
 
-func (c *conversationServer) GetConversations(ctx context.Context, req *pbConversation.GetConversationsReq) (*pbConversation.GetConversationsResp, error) {
+func (c *conversationServer) GetConversations(ctx context.Context, req *pbconversation.GetConversationsReq) (*pbconversation.GetConversationsResp, error) {
 	conversations, err := c.conversationDatabase.FindConversations(ctx, req.OwnerUserID, req.ConversationIDs)
 	if err != nil {
 		return nil, err
 	}
-	resp := &pbConversation.GetConversationsResp{Conversations: []*pbConversation.Conversation{}}
+	resp := &pbconversation.GetConversationsResp{Conversations: []*pbconversation.Conversation{}}
 	resp.Conversations = convert.ConversationsDB2Pb(conversations)
 	return resp, nil
 }
 
-func (c *conversationServer) SetConversation(ctx context.Context, req *pbConversation.SetConversationReq) (*pbConversation.SetConversationResp, error) {
-	var conversation tableRelation.ConversationModel
+func (c *conversationServer) SetConversation(ctx context.Context, req *pbconversation.SetConversationReq) (*pbconversation.SetConversationResp, error) {
+	var conversation tablerelation.ConversationModel
 	if err := utils.CopyStructFields(&conversation, req.Conversation); err != nil {
 		return nil, err
 	}
-	err := c.conversationDatabase.SetUserConversations(ctx, req.Conversation.OwnerUserID, []*tableRelation.ConversationModel{&conversation})
+	err := c.conversationDatabase.SetUserConversations(ctx, req.Conversation.OwnerUserID, []*tablerelation.ConversationModel{&conversation})
 	if err != nil {
 		return nil, err
 	}
 	_ = c.conversationNotificationSender.ConversationChangeNotification(ctx, req.Conversation.OwnerUserID, []string{req.Conversation.ConversationID})
-	resp := &pbConversation.SetConversationResp{}
+	resp := &pbconversation.SetConversationResp{}
 	return resp, nil
 }
 
-func (c *conversationServer) SetConversations(ctx context.Context, req *pbConversation.SetConversationsReq) (*pbConversation.SetConversationsResp, error) {
+func (c *conversationServer) SetConversations(ctx context.Context, req *pbconversation.SetConversationsReq) (*pbconversation.SetConversationsResp, error) {
 	if req.Conversation == nil {
 		return nil, errs.ErrArgs.Wrap("conversation must not be nil")
 	}
@@ -133,7 +133,7 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbConver
 		// 	}
 		// }
 	}
-	var conversation tableRelation.ConversationModel
+	var conversation tablerelation.ConversationModel
 	conversation.ConversationID = req.Conversation.ConversationID
 	conversation.ConversationType = req.Conversation.ConversationType
 	conversation.UserID = req.Conversation.UserID
@@ -161,7 +161,7 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbConver
 		m["is_msg_destruct"] = req.Conversation.IsMsgDestruct.Value
 	}
 	if req.Conversation.IsPrivateChat != nil && req.Conversation.ConversationType != constant.SuperGroupChatType {
-		var conversations []*tableRelation.ConversationModel
+		var conversations []*tablerelation.ConversationModel
 		for _, ownerUserID := range req.UserIDs {
 			conversation2 := conversation
 			conversation2.OwnerUserID = ownerUserID
@@ -185,26 +185,26 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbConver
 	for _, v := range req.UserIDs {
 		c.conversationNotificationSender.ConversationChangeNotification(ctx, v, []string{req.Conversation.ConversationID})
 	}
-	return &pbConversation.SetConversationsResp{}, nil
+	return &pbconversation.SetConversationsResp{}, nil
 }
 
 // 获取超级大群开启免打扰的用户ID.
-func (c *conversationServer) GetRecvMsgNotNotifyUserIDs(ctx context.Context, req *pbConversation.GetRecvMsgNotNotifyUserIDsReq) (*pbConversation.GetRecvMsgNotNotifyUserIDsResp, error) {
+func (c *conversationServer) GetRecvMsgNotNotifyUserIDs(ctx context.Context, req *pbconversation.GetRecvMsgNotNotifyUserIDsReq) (*pbconversation.GetRecvMsgNotNotifyUserIDsResp, error) {
 	userIDs, err := c.conversationDatabase.FindRecvMsgNotNotifyUserIDs(ctx, req.GroupID)
 	if err != nil {
 		return nil, err
 	}
-	return &pbConversation.GetRecvMsgNotNotifyUserIDsResp{UserIDs: userIDs}, nil
+	return &pbconversation.GetRecvMsgNotNotifyUserIDsResp{UserIDs: userIDs}, nil
 }
 
 // create conversation without notification for msg redis transfer.
-func (c *conversationServer) CreateSingleChatConversations(ctx context.Context, req *pbConversation.CreateSingleChatConversationsReq) (*pbConversation.CreateSingleChatConversationsResp, error) {
-	var conversation tableRelation.ConversationModel
+func (c *conversationServer) CreateSingleChatConversations(ctx context.Context, req *pbconversation.CreateSingleChatConversationsReq) (*pbconversation.CreateSingleChatConversationsResp, error) {
+	var conversation tablerelation.ConversationModel
 	conversation.ConversationID = msgprocessor.GetConversationIDBySessionType(constant.SingleChatType, req.RecvID, req.SendID)
 	conversation.ConversationType = constant.SingleChatType
 	conversation.OwnerUserID = req.SendID
 	conversation.UserID = req.RecvID
-	err := c.conversationDatabase.CreateConversation(ctx, []*tableRelation.ConversationModel{&conversation})
+	err := c.conversationDatabase.CreateConversation(ctx, []*tablerelation.ConversationModel{&conversation})
 	if err != nil {
 		log.ZWarn(ctx, "create conversation failed", err, "conversation", conversation)
 	}
@@ -212,52 +212,52 @@ func (c *conversationServer) CreateSingleChatConversations(ctx context.Context,
 	conversation2 := conversation
 	conversation2.OwnerUserID = req.RecvID
 	conversation2.UserID = req.SendID
-	err = c.conversationDatabase.CreateConversation(ctx, []*tableRelation.ConversationModel{&conversation2})
+	err = c.conversationDatabase.CreateConversation(ctx, []*tablerelation.ConversationModel{&conversation2})
 	if err != nil {
 		log.ZWarn(ctx, "create conversation failed", err, "conversation2", conversation)
 	}
-	return &pbConversation.CreateSingleChatConversationsResp{}, nil
+	return &pbconversation.CreateSingleChatConversationsResp{}, nil
 }
 
-func (c *conversationServer) CreateGroupChatConversations(ctx context.Context, req *pbConversation.CreateGroupChatConversationsReq) (*pbConversation.CreateGroupChatConversationsResp, error) {
+func (c *conversationServer) CreateGroupChatConversations(ctx context.Context, req *pbconversation.CreateGroupChatConversationsReq) (*pbconversation.CreateGroupChatConversationsResp, error) {
 	err := c.conversationDatabase.CreateGroupChatConversation(ctx, req.GroupID, req.UserIDs)
 	if err != nil {
 		return nil, err
 	}
-	return &pbConversation.CreateGroupChatConversationsResp{}, nil
+	return &pbconversation.CreateGroupChatConversationsResp{}, nil
 }
 
-func (c *conversationServer) SetConversationMaxSeq(ctx context.Context, req *pbConversation.SetConversationMaxSeqReq) (*pbConversation.SetConversationMaxSeqResp, error) {
+func (c *conversationServer) SetConversationMaxSeq(ctx context.Context, req *pbconversation.SetConversationMaxSeqReq) (*pbconversation.SetConversationMaxSeqResp, error) {
 	if err := c.conversationDatabase.UpdateUsersConversationFiled(ctx, req.OwnerUserID, req.ConversationID,
 		map[string]interface{}{"max_seq": req.MaxSeq}); err != nil {
 		return nil, err
 	}
-	return &pbConversation.SetConversationMaxSeqResp{}, nil
+	return &pbconversation.SetConversationMaxSeqResp{}, nil
 }
 
-func (c *conversationServer) GetConversationIDs(ctx context.Context, req *pbConversation.GetConversationIDsReq) (*pbConversation.GetConversationIDsResp, error) {
+func (c *conversationServer) GetConversationIDs(ctx context.Context, req *pbconversation.GetConversationIDsReq) (*pbconversation.GetConversationIDsResp, error) {
 	conversationIDs, err := c.conversationDatabase.GetConversationIDs(ctx, req.UserID)
 	if err != nil {
 		return nil, err
 	}
-	return &pbConversation.GetConversationIDsResp{ConversationIDs: conversationIDs}, nil
+	return &pbconversation.GetConversationIDsResp{ConversationIDs: conversationIDs}, nil
 }
 
-func (c *conversationServer) GetUserConversationIDsHash(ctx context.Context, req *pbConversation.GetUserConversationIDsHashReq) (*pbConversation.GetUserConversationIDsHashResp, error) {
+func (c *conversationServer) GetUserConversationIDsHash(ctx context.Context, req *pbconversation.GetUserConversationIDsHashReq) (*pbconversation.GetUserConversationIDsHashResp, error) {
 	hash, err := c.conversationDatabase.GetUserConversationIDsHash(ctx, req.OwnerUserID)
 	if err != nil {
 		return nil, err
 	}
-	return &pbConversation.GetUserConversationIDsHashResp{Hash: hash}, nil
+	return &pbconversation.GetUserConversationIDsHashResp{Hash: hash}, nil
 }
 
 func (c *conversationServer) GetConversationsByConversationID(
 	ctx context.Context,
-	req *pbConversation.GetConversationsByConversationIDReq,
-) (*pbConversation.GetConversationsByConversationIDResp, error) {
+	req *pbconversation.GetConversationsByConversationIDReq,
+) (*pbconversation.GetConversationsByConversationIDResp, error) {
 	conversations, err := c.conversationDatabase.GetConversationsByConversationID(ctx, req.ConversationIDs)
 	if err != nil {
 		return nil, err
 	}
-	return &pbConversation.GetConversationsByConversationIDResp{Conversations: convert.ConversationsDB2Pb(conversations)}, nil
+	return &pbconversation.GetConversationsByConversationIDResp{Conversations: convert.ConversationsDB2Pb(conversations)}, nil
 }

internal/rpc/friend/black.go

@@ -20,7 +20,7 @@ import (
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
 
-	pbFriend "github.com/OpenIMSDK/protocol/friend"
+	pbfriend "github.com/OpenIMSDK/protocol/friend"
 	"github.com/OpenIMSDK/tools/mcontext"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert"
@@ -29,8 +29,8 @@ import (
 
 func (s *friendServer) GetPaginationBlacks(
 	ctx context.Context,
-	req *pbFriend.GetPaginationBlacksReq,
-) (resp *pbFriend.GetPaginationBlacksResp, err error) {
+	req *pbfriend.GetPaginationBlacksReq,
+) (resp *pbfriend.GetPaginationBlacksResp, err error) {
 	if err := s.userRpcClient.Access(ctx, req.UserID); err != nil {
 		return nil, err
 	}
@@ -43,7 +43,7 @@ func (s *friendServer) GetPaginationBlacks(
 	if err != nil {
 		return nil, err
 	}
-	resp = &pbFriend.GetPaginationBlacksResp{}
+	resp = &pbfriend.GetPaginationBlacksResp{}
 	resp.Blacks, err = convert.BlackDB2Pb(ctx, blacks, s.userRpcClient.GetUsersInfoMap)
 	if err != nil {
 		return nil, err
@@ -52,12 +52,12 @@ func (s *friendServer) GetPaginationBlacks(
 	return resp, nil
 }
 
-func (s *friendServer) IsBlack(ctx context.Context, req *pbFriend.IsBlackReq) (*pbFriend.IsBlackResp, error) {
+func (s *friendServer) IsBlack(ctx context.Context, req *pbfriend.IsBlackReq) (*pbfriend.IsBlackResp, error) {
 	in1, in2, err := s.blackDatabase.CheckIn(ctx, req.UserID1, req.UserID2)
 	if err != nil {
 		return nil, err
 	}
-	resp := &pbFriend.IsBlackResp{}
+	resp := &pbfriend.IsBlackResp{}
 	resp.InUser1Blacks = in1
 	resp.InUser2Blacks = in2
 	return resp, nil
@@ -65,8 +65,8 @@ func (s *friendServer) IsBlack(ctx context.Context, req *pbFriend.IsBlackReq) (*
 
 func (s *friendServer) RemoveBlack(
 	ctx context.Context,
-	req *pbFriend.RemoveBlackReq,
-) (*pbFriend.RemoveBlackResp, error) {
+	req *pbfriend.RemoveBlackReq,
+) (*pbfriend.RemoveBlackResp, error) {
 	if err := s.userRpcClient.Access(ctx, req.OwnerUserID); err != nil {
 		return nil, err
 	}
@@ -74,10 +74,10 @@ func (s *friendServer) RemoveBlack(
 		return nil, err
 	}
 	s.notificationSender.BlackDeletedNotification(ctx, req)
-	return &pbFriend.RemoveBlackResp{}, nil
+	return &pbfriend.RemoveBlackResp{}, nil
 }
 
-func (s *friendServer) AddBlack(ctx context.Context, req *pbFriend.AddBlackReq) (*pbFriend.AddBlackResp, error) {
+func (s *friendServer) AddBlack(ctx context.Context, req *pbfriend.AddBlackReq) (*pbfriend.AddBlackResp, error) {
 	if err := authverify.CheckAccessV3(ctx, req.OwnerUserID); err != nil {
 		return nil, err
 	}
@@ -95,5 +95,5 @@ func (s *friendServer) AddBlack(ctx context.Context, req *pbFriend.AddBlackReq)
 		return nil, err
 	}
 	s.notificationSender.BlackAddedNotification(ctx, req)
-	return &pbFriend.AddBlackResp{}, nil
+	return &pbfriend.AddBlackResp{}, nil
 }

internal/rpc/friend/friend.go

@@ -41,11 +41,12 @@ import (
 )
 
 type friendServer struct {
-	friendDatabase     controller.FriendDatabase
-	blackDatabase      controller.BlackDatabase
-	userRpcClient      *rpcclient.UserRpcClient
-	notificationSender *notification.FriendNotificationSender
-	RegisterCenter     registry.SvcDiscoveryRegistry
+	friendDatabase        controller.FriendDatabase
+	blackDatabase         controller.BlackDatabase
+	userRpcClient         *rpcclient.UserRpcClient
+	notificationSender    *notification.FriendNotificationSender
+	conversationRpcClient rpcclient.ConversationRpcClient
+	RegisterCenter        registry.SvcDiscoveryRegistry
 }
 
 func Start(client registry.SvcDiscoveryRegistry, server *grpc.Server) error {
@@ -79,9 +80,10 @@ func Start(client registry.SvcDiscoveryRegistry, server *grpc.Server) error {
 			blackDB,
 			cache.NewBlackCacheRedis(rdb, blackDB, cache.GetDefaultOpt()),
 		),
-		userRpcClient:      &userRpcClient,
-		notificationSender: notificationSender,
-		RegisterCenter:     client,
+		userRpcClient:         &userRpcClient,
+		notificationSender:    notificationSender,
+		RegisterCenter:        client,
+		conversationRpcClient: rpcclient.NewConversationRpcClient(client),
 	})
 	return nil
 }
@@ -131,17 +133,22 @@ func (s *friendServer) ImportFriends(
 	if _, err := s.userRpcClient.GetUsersInfo(ctx, append([]string{req.OwnerUserID}, req.FriendUserIDs...)); err != nil {
 		return nil, err
 	}
-
 	if utils.Contain(req.OwnerUserID, req.FriendUserIDs...) {
 		return nil, errs.ErrCanNotAddYourself.Wrap()
 	}
 	if utils.Duplicate(req.FriendUserIDs) {
 		return nil, errs.ErrArgs.Wrap("friend userID repeated")
 	}
-
 	if err := s.friendDatabase.BecomeFriends(ctx, req.OwnerUserID, req.FriendUserIDs, constant.BecomeFriendByImport); err != nil {
 		return nil, err
 	}
+	for _, userID := range req.FriendUserIDs {
+		s.notificationSender.FriendApplicationAgreedNotification(ctx, &pbfriend.RespondFriendApplyReq{
+			FromUserID:   req.OwnerUserID,
+			ToUserID:     userID,
+			HandleResult: constant.FriendResponseAgree,
+		})
+	}
 	return &pbfriend.ImportFriendResp{}, nil
 }
 

internal/rpc/group/cache.go

@@ -17,31 +17,31 @@ package group
 import (
 	"context"
 
-	pbGroup "github.com/OpenIMSDK/protocol/group"
+	pbgroup "github.com/OpenIMSDK/protocol/group"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert"
 )
 
 func (s *groupServer) GetGroupInfoCache(
 	ctx context.Context,
-	req *pbGroup.GetGroupInfoCacheReq,
-) (resp *pbGroup.GetGroupInfoCacheResp, err error) {
+	req *pbgroup.GetGroupInfoCacheReq,
+) (resp *pbgroup.GetGroupInfoCacheResp, err error) {
 	group, err := s.GroupDatabase.TakeGroup(ctx, req.GroupID)
 	if err != nil {
 		return nil, err
 	}
-	resp = &pbGroup.GetGroupInfoCacheResp{GroupInfo: convert.Db2PbGroupInfo(group, "", 0)}
+	resp = &pbgroup.GetGroupInfoCacheResp{GroupInfo: convert.Db2PbGroupInfo(group, "", 0)}
 	return resp, nil
 }
 
 func (s *groupServer) GetGroupMemberCache(
 	ctx context.Context,
-	req *pbGroup.GetGroupMemberCacheReq,
-) (resp *pbGroup.GetGroupMemberCacheResp, err error) {
+	req *pbgroup.GetGroupMemberCacheReq,
+) (resp *pbgroup.GetGroupMemberCacheResp, err error) {
 	members, err := s.GroupDatabase.TakeGroupMember(ctx, req.GroupID, req.GroupMemberID)
 	if err != nil {
 		return nil, err
 	}
-	resp = &pbGroup.GetGroupMemberCacheResp{Member: convert.Db2PbGroupMember(members)}
+	resp = &pbgroup.GetGroupMemberCacheResp{Member: convert.Db2PbGroupMember(members)}
 	return resp, nil
 }

internal/rpc/group/db_map.go

@@ -20,7 +20,7 @@ import (
 
 	"github.com/OpenIMSDK/tools/mcontext"
 
-	pbGroup "github.com/OpenIMSDK/protocol/group"
+	pbgroup "github.com/OpenIMSDK/protocol/group"
 	"github.com/OpenIMSDK/protocol/sdkws"
 )
 
@@ -49,6 +49,9 @@ func UpdateGroupInfoMap(ctx context.Context, group *sdkws.GroupInfoForSet) map[s
 	if group.ApplyMemberFriend != nil {
 		m["apply_member_friend"] = group.ApplyMemberFriend.Value
 	}
+	if group.Ex != nil {
+		m["ex"] = group.Ex.Value
+	}
 	return m
 }
 
@@ -64,7 +67,7 @@ func UpdateGroupMemberMutedTimeMap(t time.Time) map[string]any {
 	}
 }
 
-func UpdateGroupMemberMap(req *pbGroup.SetGroupMemberInfo) map[string]any {
+func UpdateGroupMemberMap(req *pbgroup.SetGroupMemberInfo) map[string]any {
 	m := make(map[string]any)
 	if req.Nickname != nil {
 		m["nickname"] = req.Nickname.Value

internal/rpc/group/fill.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/OpenIMSDK/tools/utils"
 
-	relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 )
 
 func (s *groupServer) FindGroupMember(
@@ -27,7 +27,7 @@ func (s *groupServer) FindGroupMember(
 	groupIDs []string,
 	userIDs []string,
 	roleLevels []int32,
-) ([]*relationTb.GroupMemberModel, error) {
+) ([]*relationtb.GroupMemberModel, error) {
 	members, err := s.GroupDatabase.FindGroupMember(ctx, groupIDs, userIDs, roleLevels)
 	if err != nil {
 		return nil, err
@@ -63,7 +63,7 @@ func (s *groupServer) TakeGroupMember(
 	ctx context.Context,
 	groupID string,
 	userID string,
-) (*relationTb.GroupMemberModel, error) {
+) (*relationtb.GroupMemberModel, error) {
 	member, err := s.GroupDatabase.TakeGroupMember(ctx, groupID, userID)
 	if err != nil {
 		return nil, err
@@ -83,7 +83,7 @@ func (s *groupServer) TakeGroupMember(
 	return member, nil
 }
 
-func (s *groupServer) TakeGroupOwner(ctx context.Context, groupID string) (*relationTb.GroupMemberModel, error) {
+func (s *groupServer) TakeGroupOwner(ctx context.Context, groupID string) (*relationtb.GroupMemberModel, error) {
 	owner, err := s.GroupDatabase.TakeGroupOwner(ctx, groupID)
 	if err != nil {
 		return nil, err
@@ -107,7 +107,7 @@ func (s *groupServer) PageGetGroupMember(
 	ctx context.Context,
 	groupID string,
 	pageNumber, showNumber int32,
-) (uint32, []*relationTb.GroupMemberModel, error) {
+) (uint32, []*relationtb.GroupMemberModel, error) {
 	total, members, err := s.GroupDatabase.PageGetGroupMember(ctx, groupID, pageNumber, showNumber)
 	if err != nil {
 		return 0, nil, err

internal/rpc/group/group.go

@@ -29,7 +29,7 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor"
 
-	pbConversation "github.com/OpenIMSDK/protocol/conversation"
+	pbconversation "github.com/OpenIMSDK/protocol/conversation"
 	"github.com/OpenIMSDK/protocol/wrapperspb"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification"
@@ -42,7 +42,7 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/OpenIMSDK/protocol/constant"
-	pbGroup "github.com/OpenIMSDK/protocol/group"
+	pbgroup "github.com/OpenIMSDK/protocol/group"
 	"github.com/OpenIMSDK/protocol/sdkws"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 	"github.com/OpenIMSDK/tools/errs"
@@ -53,7 +53,7 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation"
-	relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation"
 )
 
@@ -62,7 +62,7 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 	if err != nil {
 		return err
 	}
-	if err := db.AutoMigrate(&relationTb.GroupModel{}, &relationTb.GroupMemberModel{}, &relationTb.GroupRequestModel{}); err != nil {
+	if err := db.AutoMigrate(&relationtb.GroupModel{}, &relationtb.GroupMemberModel{}, &relationtb.GroupRequestModel{}); err != nil {
 		return err
 	}
 	mongo, err := unrelation.NewMongo()
@@ -89,8 +89,8 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 	})
 	gs.conversationRpcClient = conversationRpcClient
 	gs.msgRpcClient = msgRpcClient
-	pbGroup.RegisterGroupServer(server, &gs)
-	//pbGroup.RegisterGroupServer(server, &groupServer{
+	pbgroup.RegisterGroupServer(server, &gs)
+	//pbgroup.RegisterGroupServer(server, &groupServer{
 	//	GroupDatabase: database,
 	//	User:          userRpcClient,
 	//	Notification: notification.NewGroupNotificationSender(database, &msgRpcClient, &userRpcClient, func(ctx context.Context, userIDs []string) ([]notification.CommonUser, error) {
@@ -173,7 +173,7 @@ func (s *groupServer) GenGroupID(ctx context.Context, groupID *string) error {
 	return errs.ErrData.Wrap("group id gen error")
 }
 
-func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupReq) (*pbGroup.CreateGroupResp, error) {
+func (s *groupServer) CreateGroup(ctx context.Context, req *pbgroup.CreateGroupReq) (*pbgroup.CreateGroupResp, error) {
 	if req.OwnerUserID == "" {
 		return nil, errs.ErrArgs.Wrap("no group owner")
 	}
@@ -201,7 +201,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
 	if err := CallbackBeforeCreateGroup(ctx, req); err != nil {
 		return nil, err
 	}
-	var groupMembers []*relationTb.GroupMemberModel
+	var groupMembers []*relationtb.GroupMemberModel
 	group := convert.Pb2DBGroupInfo(req.GroupInfo)
 	if err := s.GenGroupID(ctx, &group.GroupID); err != nil {
 		return nil, err
@@ -241,10 +241,10 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
 			}
 		}
 	}
-	if err := s.GroupDatabase.CreateGroup(ctx, []*relationTb.GroupModel{group}, groupMembers); err != nil {
+	if err := s.GroupDatabase.CreateGroup(ctx, []*relationtb.GroupModel{group}, groupMembers); err != nil {
 		return nil, err
 	}
-	resp := &pbGroup.CreateGroupResp{GroupInfo: &sdkws.GroupInfo{}}
+	resp := &pbgroup.CreateGroupResp{GroupInfo: &sdkws.GroupInfo{}}
 	resp.GroupInfo = convert.Db2PbGroupInfo(group, req.OwnerUserID, uint32(len(userIDs)))
 	resp.GroupInfo.MemberCount = uint32(len(userIDs))
 	if req.GroupInfo.GroupType == constant.SuperGroup {
@@ -273,8 +273,8 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
 	return resp, nil
 }
 
-func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbGroup.GetJoinedGroupListReq) (*pbGroup.GetJoinedGroupListResp, error) {
-	resp := &pbGroup.GetJoinedGroupListResp{}
+func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbgroup.GetJoinedGroupListReq) (*pbgroup.GetJoinedGroupListResp, error) {
+	resp := &pbgroup.GetJoinedGroupListResp{}
 	if err := authverify.CheckAccessV3(ctx, req.FromUserID); err != nil {
 		return nil, err
 	}
@@ -292,7 +292,7 @@ func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbGroup.GetJo
 	if len(members) == 0 {
 		return resp, nil
 	}
-	groupIDs := utils.Slice(members, func(e *relationTb.GroupMemberModel) string {
+	groupIDs := utils.Slice(members, func(e *relationtb.GroupMemberModel) string {
 		return e.GroupID
 	})
 	groups, err := s.GroupDatabase.FindGroup(ctx, groupIDs)
@@ -307,12 +307,12 @@ func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbGroup.GetJo
 	if err != nil {
 		return nil, err
 	}
-	ownerMap := utils.SliceToMap(owners, func(e *relationTb.GroupMemberModel) string {
+	ownerMap := utils.SliceToMap(owners, func(e *relationtb.GroupMemberModel) string {
 		return e.GroupID
 	})
-	resp.Groups = utils.Slice(utils.Order(groupIDs, groups, func(group *relationTb.GroupModel) string {
+	resp.Groups = utils.Slice(utils.Order(groupIDs, groups, func(group *relationtb.GroupModel) string {
 		return group.GroupID
-	}), func(group *relationTb.GroupModel) *sdkws.GroupInfo {
+	}), func(group *relationtb.GroupModel) *sdkws.GroupInfo {
 		var userID string
 		if user := ownerMap[group.GroupID]; user != nil {
 			userID = user.UserID
@@ -322,8 +322,8 @@ func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbGroup.GetJo
 	return resp, nil
 }
 
-func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.InviteUserToGroupReq) (*pbGroup.InviteUserToGroupResp, error) {
-	resp := &pbGroup.InviteUserToGroupResp{}
+func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbgroup.InviteUserToGroupReq) (*pbgroup.InviteUserToGroupResp, error) {
+	resp := &pbgroup.InviteUserToGroupResp{}
 	if len(req.InvitedUserIDs) == 0 {
 		return nil, errs.ErrArgs.Wrap("user empty")
 	}
@@ -341,7 +341,7 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
 	if err != nil {
 		return nil, err
 	}
-	var groupMember *relationTb.GroupMemberModel
+	var groupMember *relationtb.GroupMemberModel
 	var opUserID string
 	if !authverify.IsAppManagerUid(ctx) {
 		opUserID = mcontext.GetOpUserID(ctx)
@@ -357,9 +357,9 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
 	if group.NeedVerification == constant.AllNeedVerification {
 		if !authverify.IsAppManagerUid(ctx) {
 			if !(groupMember.RoleLevel == constant.GroupOwner || groupMember.RoleLevel == constant.GroupAdmin) {
-				var requests []*relationTb.GroupRequestModel
+				var requests []*relationtb.GroupRequestModel
 				for _, userID := range req.InvitedUserIDs {
-					requests = append(requests, &relationTb.GroupRequestModel{
+					requests = append(requests, &relationtb.GroupRequestModel{
 						UserID:        userID,
 						GroupID:       req.GroupID,
 						JoinSource:    constant.JoinByInvitation,
@@ -372,7 +372,7 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
 					return nil, err
 				}
 				for _, request := range requests {
-					s.Notification.JoinGroupApplicationNotification(ctx, &pbGroup.JoinGroupReq{
+					s.Notification.JoinGroupApplicationNotification(ctx, &pbgroup.JoinGroupReq{
 						GroupID:       request.GroupID,
 						ReqMessage:    request.ReqMsg,
 						JoinSource:    request.JoinSource,
@@ -396,7 +396,7 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
 		}
 	} else {
 		opUserID := mcontext.GetOpUserID(ctx)
-		var groupMembers []*relationTb.GroupMemberModel
+		var groupMembers []*relationtb.GroupMemberModel
 		for _, userID := range req.InvitedUserIDs {
 			member := convert.Pb2DbGroupMember(userMap[userID])
 			member.Nickname = ""
@@ -423,8 +423,8 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
 	return resp, nil
 }
 
-func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbGroup.GetGroupAllMemberReq) (*pbGroup.GetGroupAllMemberResp, error) {
-	resp := &pbGroup.GetGroupAllMemberResp{}
+func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbgroup.GetGroupAllMemberReq) (*pbgroup.GetGroupAllMemberResp, error) {
+	resp := &pbgroup.GetGroupAllMemberResp{}
 	group, err := s.GroupDatabase.TakeGroup(ctx, req.GroupID)
 	if err != nil {
 		return nil, err
@@ -436,13 +436,13 @@ func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbGroup.GetGro
 	if err != nil {
 		return nil, err
 	}
-	nameMap, err := s.GetUsernameMap(ctx, utils.Filter(members, func(e *relationTb.GroupMemberModel) (string, bool) {
+	nameMap, err := s.GetUsernameMap(ctx, utils.Filter(members, func(e *relationtb.GroupMemberModel) (string, bool) {
 		return e.UserID, e.Nickname == ""
 	}), true)
 	if err != nil {
 		return nil, err
 	}
-	resp.Members = utils.Slice(members, func(e *relationTb.GroupMemberModel) *sdkws.GroupMemberFullInfo {
+	resp.Members = utils.Slice(members, func(e *relationtb.GroupMemberModel) *sdkws.GroupMemberFullInfo {
 		if e.Nickname == "" {
 			e.Nickname = nameMap[e.UserID]
 		}
@@ -451,8 +451,8 @@ func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbGroup.GetGro
 	return resp, nil
 }
 
-func (s *groupServer) GetGroupMemberList(ctx context.Context, req *pbGroup.GetGroupMemberListReq) (*pbGroup.GetGroupMemberListResp, error) {
-	resp := &pbGroup.GetGroupMemberListResp{}
+func (s *groupServer) GetGroupMemberList(ctx context.Context, req *pbgroup.GetGroupMemberListReq) (*pbgroup.GetGroupMemberListResp, error) {
+	resp := &pbgroup.GetGroupMemberListResp{}
 	total, members, err := s.PageGetGroupMember(ctx, req.GroupID, req.Pagination.PageNumber, req.Pagination.ShowNumber)
 	log.ZDebug(ctx, "GetGroupMemberList", "total", total, "members", members, "length", len(members))
 	if err != nil {
@@ -464,8 +464,8 @@ func (s *groupServer) GetGroupMemberList(ctx context.Context, req *pbGroup.GetGr
 	return resp, nil
 }
 
-func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGroupMemberReq) (*pbGroup.KickGroupMemberResp, error) {
-	resp := &pbGroup.KickGroupMemberResp{}
+func (s *groupServer) KickGroupMember(ctx context.Context, req *pbgroup.KickGroupMemberReq) (*pbgroup.KickGroupMemberResp, error) {
+	resp := &pbgroup.KickGroupMemberResp{}
 	group, err := s.GroupDatabase.TakeGroup(ctx, req.GroupID)
 	if err != nil {
 		return nil, err
@@ -494,7 +494,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou
 		if err != nil {
 			return nil, err
 		}
-		memberMap := make(map[string]*relationTb.GroupMemberModel)
+		memberMap := make(map[string]*relationtb.GroupMemberModel)
 		for i, member := range members {
 			memberMap[member.UserID] = members[i]
 		}
@@ -572,8 +572,8 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou
 	return resp, nil
 }
 
-func (s *groupServer) GetGroupMembersInfo(ctx context.Context, req *pbGroup.GetGroupMembersInfoReq) (*pbGroup.GetGroupMembersInfoResp, error) {
-	resp := &pbGroup.GetGroupMembersInfoResp{}
+func (s *groupServer) GetGroupMembersInfo(ctx context.Context, req *pbgroup.GetGroupMembersInfoReq) (*pbgroup.GetGroupMembersInfoResp, error) {
+	resp := &pbgroup.GetGroupMembersInfoResp{}
 	if len(req.UserIDs) == 0 {
 		return nil, errs.ErrArgs.Wrap("userIDs empty")
 	}
@@ -584,13 +584,13 @@ func (s *groupServer) GetGroupMembersInfo(ctx context.Context, req *pbGroup.GetG
 	if err != nil {
 		return nil, err
 	}
-	nameMap, err := s.GetUsernameMap(ctx, utils.Filter(members, func(e *relationTb.GroupMemberModel) (string, bool) {
+	nameMap, err := s.GetUsernameMap(ctx, utils.Filter(members, func(e *relationtb.GroupMemberModel) (string, bool) {
 		return e.UserID, e.Nickname == ""
 	}), true)
 	if err != nil {
 		return nil, err
 	}
-	resp.Members = utils.Slice(members, func(e *relationTb.GroupMemberModel) *sdkws.GroupMemberFullInfo {
+	resp.Members = utils.Slice(members, func(e *relationtb.GroupMemberModel) *sdkws.GroupMemberFullInfo {
 		if e.Nickname == "" {
 			e.Nickname = nameMap[e.UserID]
 		}
@@ -599,12 +599,12 @@ func (s *groupServer) GetGroupMembersInfo(ctx context.Context, req *pbGroup.GetG
 	return resp, nil
 }
 
-func (s *groupServer) GetGroupApplicationList(ctx context.Context, req *pbGroup.GetGroupApplicationListReq) (*pbGroup.GetGroupApplicationListResp, error) {
+func (s *groupServer) GetGroupApplicationList(ctx context.Context, req *pbgroup.GetGroupApplicationListReq) (*pbgroup.GetGroupApplicationListResp, error) {
 	groupIDs, err := s.GroupDatabase.FindUserManagedGroupID(ctx, req.FromUserID)
 	if err != nil {
 		return nil, err
 	}
-	resp := &pbGroup.GetGroupApplicationListResp{}
+	resp := &pbgroup.GetGroupApplicationListResp{}
 	if len(groupIDs) == 0 {
 		return resp, nil
 	}
@@ -630,7 +630,7 @@ func (s *groupServer) GetGroupApplicationList(ctx context.Context, req *pbGroup.
 	if err != nil {
 		return nil, err
 	}
-	groupMap := utils.SliceToMap(groups, func(e *relationTb.GroupModel) string {
+	groupMap := utils.SliceToMap(groups, func(e *relationtb.GroupModel) string {
 		return e.GroupID
 	})
 	if ids := utils.Single(utils.Keys(groupMap), groupIDs); len(ids) > 0 {
@@ -644,17 +644,17 @@ func (s *groupServer) GetGroupApplicationList(ctx context.Context, req *pbGroup.
 	if err != nil {
 		return nil, err
 	}
-	ownerMap := utils.SliceToMap(owners, func(e *relationTb.GroupMemberModel) string {
+	ownerMap := utils.SliceToMap(owners, func(e *relationtb.GroupMemberModel) string {
 		return e.GroupID
 	})
-	resp.GroupRequests = utils.Slice(groupRequests, func(e *relationTb.GroupRequestModel) *sdkws.GroupRequest {
+	resp.GroupRequests = utils.Slice(groupRequests, func(e *relationtb.GroupRequestModel) *sdkws.GroupRequest {
 		return convert.Db2PbGroupRequest(e, userMap[e.UserID], convert.Db2PbGroupInfo(groupMap[e.GroupID], ownerMap[e.GroupID].UserID, groupMemberNumMap[e.GroupID]))
 	})
 	return resp, nil
 }
 
-func (s *groupServer) GetGroupsInfo(ctx context.Context, req *pbGroup.GetGroupsInfoReq) (*pbGroup.GetGroupsInfoResp, error) {
-	resp := &pbGroup.GetGroupsInfoResp{}
+func (s *groupServer) GetGroupsInfo(ctx context.Context, req *pbgroup.GetGroupsInfoReq) (*pbgroup.GetGroupsInfoResp, error) {
+	resp := &pbgroup.GetGroupsInfoResp{}
 	if len(req.GroupIDs) == 0 {
 		return nil, errs.ErrArgs.Wrap("groupID is empty")
 	}
@@ -670,10 +670,10 @@ func (s *groupServer) GetGroupsInfo(ctx context.Context, req *pbGroup.GetGroupsI
 	if err != nil {
 		return nil, err
 	}
-	ownerMap := utils.SliceToMap(owners, func(e *relationTb.GroupMemberModel) string {
+	ownerMap := utils.SliceToMap(owners, func(e *relationtb.GroupMemberModel) string {
 		return e.GroupID
 	})
-	resp.GroupInfos = utils.Slice(groups, func(e *relationTb.GroupModel) *sdkws.GroupInfo {
+	resp.GroupInfos = utils.Slice(groups, func(e *relationtb.GroupModel) *sdkws.GroupInfo {
 		var ownerUserID string
 		if owner, ok := ownerMap[e.GroupID]; ok {
 			ownerUserID = owner.UserID
@@ -683,7 +683,7 @@ func (s *groupServer) GetGroupsInfo(ctx context.Context, req *pbGroup.GetGroupsI
 	return resp, nil
 }
 
-func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup.GroupApplicationResponseReq) (*pbGroup.GroupApplicationResponseResp, error) {
+func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbgroup.GroupApplicationResponseReq) (*pbgroup.GroupApplicationResponseResp, error) {
 	defer log.ZInfo(ctx, utils.GetFuncName()+" Return")
 	if !utils.Contain(req.HandleResult, constant.GroupResponseAgree, constant.GroupResponseRefuse) {
 		return nil, errs.ErrArgs.Wrap("HandleResult unknown")
@@ -717,9 +717,9 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup
 	if _, err := s.User.GetPublicUserInfo(ctx, req.FromUserID); err != nil {
 		return nil, err
 	}
-	var member *relationTb.GroupMemberModel
+	var member *relationtb.GroupMemberModel
 	if (!inGroup) && req.HandleResult == constant.GroupResponseAgree {
-		member = &relationTb.GroupMemberModel{
+		member = &relationtb.GroupMemberModel{
 			GroupID:        req.GroupID,
 			UserID:         req.FromUserID,
 			Nickname:       "",
@@ -754,10 +754,10 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup
 	case constant.GroupResponseRefuse:
 		s.Notification.GroupApplicationRejectedNotification(ctx, req)
 	}
-	return &pbGroup.GroupApplicationResponseResp{}, nil
+	return &pbgroup.GroupApplicationResponseResp{}, nil
 }
 
-func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) (resp *pbGroup.JoinGroupResp, err error) {
+func (s *groupServer) JoinGroup(ctx context.Context, req *pbgroup.JoinGroupReq) (resp *pbgroup.JoinGroupResp, err error) {
 	defer log.ZInfo(ctx, "JoinGroup.Return")
 	user, err := s.User.GetUserInfo(ctx, req.InviterUserID)
 	if err != nil {
@@ -777,7 +777,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq)
 		return nil, err
 	}
 	log.ZInfo(ctx, "JoinGroup.groupInfo", "group", group, "eq", group.NeedVerification == constant.Directly)
-	resp = &pbGroup.JoinGroupResp{}
+	resp = &pbgroup.JoinGroupResp{}
 	if group.NeedVerification == constant.Directly {
 		if group.GroupType == constant.SuperGroup {
 			return nil, errs.ErrGroupTypeNotSupport.Wrap()
@@ -793,7 +793,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq)
 		if err := CallbackBeforeMemberJoinGroup(ctx, groupMember, group.Ex); err != nil {
 			return nil, err
 		}
-		if err := s.GroupDatabase.CreateGroup(ctx, nil, []*relationTb.GroupMemberModel{groupMember}); err != nil {
+		if err := s.GroupDatabase.CreateGroup(ctx, nil, []*relationtb.GroupMemberModel{groupMember}); err != nil {
 			return nil, err
 		}
 		if err := s.conversationRpcClient.GroupChatFirstCreateConversation(ctx, req.GroupID, []string{req.InviterUserID}); err != nil {
@@ -802,7 +802,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq)
 		s.Notification.MemberEnterNotification(ctx, req.GroupID, req.InviterUserID)
 		return resp, nil
 	}
-	groupRequest := relationTb.GroupRequestModel{
+	groupRequest := relationtb.GroupRequestModel{
 		UserID:      req.InviterUserID,
 		ReqMsg:      req.ReqMessage,
 		GroupID:     req.GroupID,
@@ -810,15 +810,15 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq)
 		ReqTime:     time.Now(),
 		HandledTime: time.Unix(0, 0),
 	}
-	if err := s.GroupDatabase.CreateGroupRequest(ctx, []*relationTb.GroupRequestModel{&groupRequest}); err != nil {
+	if err := s.GroupDatabase.CreateGroupRequest(ctx, []*relationtb.GroupRequestModel{&groupRequest}); err != nil {
 		return nil, err
 	}
 	s.Notification.JoinGroupApplicationNotification(ctx, req)
 	return resp, nil
 }
 
-func (s *groupServer) QuitGroup(ctx context.Context, req *pbGroup.QuitGroupReq) (*pbGroup.QuitGroupResp, error) {
-	resp := &pbGroup.QuitGroupResp{}
+func (s *groupServer) QuitGroup(ctx context.Context, req *pbgroup.QuitGroupReq) (*pbgroup.QuitGroupResp, error) {
+	resp := &pbgroup.QuitGroupResp{}
 	group, err := s.GroupDatabase.TakeGroup(ctx, req.GroupID)
 	if err != nil {
 		return nil, err
@@ -857,8 +857,8 @@ func (s *groupServer) deleteMemberAndSetConversationSeq(ctx context.Context, gro
 	return s.conversationRpcClient.SetConversationMaxSeq(ctx, userIDs, conevrsationID, maxSeq)
 }
 
-func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInfoReq) (*pbGroup.SetGroupInfoResp, error) {
-	var opMember *relationTb.GroupMemberModel
+func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbgroup.SetGroupInfoReq) (*pbgroup.SetGroupInfoResp, error) {
+	var opMember *relationtb.GroupMemberModel
 	if !authverify.IsAppManagerUid(ctx) {
 		var err error
 		opMember, err = s.TakeGroupMember(ctx, req.GroupInfoForSet.GroupID, mcontext.GetOpUserID(ctx))
@@ -876,7 +876,7 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf
 	if group.Status == constant.GroupStatusDismissed {
 		return nil, utils.Wrap(errs.ErrDismissedAlready, "")
 	}
-	resp := &pbGroup.SetGroupInfoResp{}
+	resp := &pbgroup.SetGroupInfoResp{}
 	count, err := s.GroupDatabase.FindGroupMemberNum(ctx, group.GroupID)
 	if err != nil {
 		return nil, err
@@ -908,12 +908,12 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf
 	if req.GroupInfoForSet.Notification != "" {
 		go func() {
 			nctx := mcontext.NewCtx("@@@" + mcontext.GetOperationID(ctx))
-			conversation := &pbConversation.ConversationReq{
+			conversation := &pbconversation.ConversationReq{
 				ConversationID:   msgprocessor.GetConversationIDBySessionType(constant.SuperGroupChatType, req.GroupInfoForSet.GroupID),
 				ConversationType: constant.SuperGroupChatType,
 				GroupID:          req.GroupInfoForSet.GroupID,
 			}
-			resp, err := s.GetGroupMemberUserIDs(nctx, &pbGroup.GetGroupMemberUserIDsReq{GroupID: req.GroupInfoForSet.GroupID})
+			resp, err := s.GetGroupMemberUserIDs(nctx, &pbgroup.GetGroupMemberUserIDsReq{GroupID: req.GroupInfoForSet.GroupID})
 			if err != nil {
 				log.ZWarn(ctx, "GetGroupMemberIDs", err)
 				return
@@ -940,8 +940,8 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf
 	return resp, nil
 }
 
-func (s *groupServer) TransferGroupOwner(ctx context.Context, req *pbGroup.TransferGroupOwnerReq) (*pbGroup.TransferGroupOwnerResp, error) {
-	resp := &pbGroup.TransferGroupOwnerResp{}
+func (s *groupServer) TransferGroupOwner(ctx context.Context, req *pbgroup.TransferGroupOwnerReq) (*pbgroup.TransferGroupOwnerResp, error) {
+	resp := &pbgroup.TransferGroupOwnerResp{}
 	group, err := s.GroupDatabase.TakeGroup(ctx, req.GroupID)
 	if err != nil {
 		return nil, err
@@ -956,7 +956,7 @@ func (s *groupServer) TransferGroupOwner(ctx context.Context, req *pbGroup.Trans
 	if err != nil {
 		return nil, err
 	}
-	memberMap := utils.SliceToMap(members, func(e *relationTb.GroupMemberModel) string { return e.UserID })
+	memberMap := utils.SliceToMap(members, func(e *relationtb.GroupMemberModel) string { return e.UserID })
 	if ids := utils.Single([]string{req.OldOwnerUserID, req.NewOwnerUserID}, utils.Keys(memberMap)); len(ids) > 0 {
 		return nil, errs.ErrArgs.Wrap("user not in group " + strings.Join(ids, ","))
 	}
@@ -980,10 +980,10 @@ func (s *groupServer) TransferGroupOwner(ctx context.Context, req *pbGroup.Trans
 	return resp, nil
 }
 
-func (s *groupServer) GetGroups(ctx context.Context, req *pbGroup.GetGroupsReq) (*pbGroup.GetGroupsResp, error) {
-	resp := &pbGroup.GetGroupsResp{}
+func (s *groupServer) GetGroups(ctx context.Context, req *pbgroup.GetGroupsReq) (*pbgroup.GetGroupsResp, error) {
+	resp := &pbgroup.GetGroupsResp{}
 	var (
-		groups []*relationTb.GroupModel
+		groups []*relationtb.GroupModel
 		err    error
 	)
 	if req.GroupID != "" {
@@ -995,14 +995,14 @@ func (s *groupServer) GetGroups(ctx context.Context, req *pbGroup.GetGroupsReq)
 	if err != nil {
 		return nil, err
 	}
-	groupIDs := utils.Slice(groups, func(e *relationTb.GroupModel) string {
+	groupIDs := utils.Slice(groups, func(e *relationtb.GroupModel) string {
 		return e.GroupID
 	})
 	ownerMembers, err := s.FindGroupMember(ctx, groupIDs, nil, []int32{constant.GroupOwner})
 	if err != nil {
 		return nil, err
 	}
-	ownerMemberMap := utils.SliceToMap(ownerMembers, func(e *relationTb.GroupMemberModel) string {
+	ownerMemberMap := utils.SliceToMap(ownerMembers, func(e *relationtb.GroupMemberModel) string {
 		return e.GroupID
 	})
 	if ids := utils.Single(groupIDs, utils.Keys(ownerMemberMap)); len(ids) > 0 {
@@ -1012,27 +1012,27 @@ func (s *groupServer) GetGroups(ctx context.Context, req *pbGroup.GetGroupsReq)
 	if err != nil {
 		return nil, err
 	}
-	resp.Groups = utils.Slice(groups, func(group *relationTb.GroupModel) *pbGroup.CMSGroup {
+	resp.Groups = utils.Slice(groups, func(group *relationtb.GroupModel) *pbgroup.CMSGroup {
 		member := ownerMemberMap[group.GroupID]
 		return convert.Db2PbCMSGroup(group, member.UserID, member.Nickname, uint32(groupMemberNumMap[group.GroupID]))
 	})
 	return resp, nil
 }
 
-func (s *groupServer) GetGroupMembersCMS(ctx context.Context, req *pbGroup.GetGroupMembersCMSReq) (*pbGroup.GetGroupMembersCMSResp, error) {
-	resp := &pbGroup.GetGroupMembersCMSResp{}
+func (s *groupServer) GetGroupMembersCMS(ctx context.Context, req *pbgroup.GetGroupMembersCMSReq) (*pbgroup.GetGroupMembersCMSResp, error) {
+	resp := &pbgroup.GetGroupMembersCMSResp{}
 	total, members, err := s.GroupDatabase.SearchGroupMember(ctx, req.UserName, []string{req.GroupID}, nil, nil, req.Pagination.PageNumber, req.Pagination.ShowNumber)
 	if err != nil {
 		return nil, err
 	}
 	resp.Total = total
-	nameMap, err := s.GetUsernameMap(ctx, utils.Filter(members, func(e *relationTb.GroupMemberModel) (string, bool) {
+	nameMap, err := s.GetUsernameMap(ctx, utils.Filter(members, func(e *relationtb.GroupMemberModel) (string, bool) {
 		return e.UserID, e.Nickname == ""
 	}), true)
 	if err != nil {
 		return nil, err
 	}
-	resp.Members = utils.Slice(members, func(e *relationTb.GroupMemberModel) *sdkws.GroupMemberFullInfo {
+	resp.Members = utils.Slice(members, func(e *relationtb.GroupMemberModel) *sdkws.GroupMemberFullInfo {
 		if e.Nickname == "" {
 			e.Nickname = nameMap[e.UserID]
 		}
@@ -1041,8 +1041,8 @@ func (s *groupServer) GetGroupMembersCMS(ctx context.Context, req *pbGroup.GetGr
 	return resp, nil
 }
 
-func (s *groupServer) GetUserReqApplicationList(ctx context.Context, req *pbGroup.GetUserReqApplicationListReq) (*pbGroup.GetUserReqApplicationListResp, error) {
-	resp := &pbGroup.GetUserReqApplicationListResp{}
+func (s *groupServer) GetUserReqApplicationList(ctx context.Context, req *pbgroup.GetUserReqApplicationListReq) (*pbgroup.GetUserReqApplicationListResp, error) {
+	resp := &pbgroup.GetUserReqApplicationListResp{}
 	user, err := s.User.GetPublicUserInfo(ctx, req.UserID)
 	if err != nil {
 		return nil, err
@@ -1060,14 +1060,14 @@ func (s *groupServer) GetUserReqApplicationList(ctx context.Context, req *pbGrou
 	if len(requests) == 0 {
 		return resp, nil
 	}
-	groupIDs := utils.Distinct(utils.Slice(requests, func(e *relationTb.GroupRequestModel) string {
+	groupIDs := utils.Distinct(utils.Slice(requests, func(e *relationtb.GroupRequestModel) string {
 		return e.GroupID
 	}))
 	groups, err := s.GroupDatabase.FindNotDismissedGroup(ctx, groupIDs)
 	if err != nil {
 		return nil, err
 	}
-	groupMap := utils.SliceToMap(groups, func(e *relationTb.GroupModel) string {
+	groupMap := utils.SliceToMap(groups, func(e *relationtb.GroupModel) string {
 		return e.GroupID
 	})
 	if ids := utils.Single(groupIDs, utils.Keys(groupMap)); len(ids) > 0 {
@@ -1077,7 +1077,7 @@ func (s *groupServer) GetUserReqApplicationList(ctx context.Context, req *pbGrou
 	if err != nil {
 		return nil, err
 	}
-	ownerMap := utils.SliceToMap(owners, func(e *relationTb.GroupMemberModel) string {
+	ownerMap := utils.SliceToMap(owners, func(e *relationtb.GroupMemberModel) string {
 		return e.GroupID
 	})
 	if ids := utils.Single(groupIDs, utils.Keys(ownerMap)); len(ids) > 0 {
@@ -1087,15 +1087,15 @@ func (s *groupServer) GetUserReqApplicationList(ctx context.Context, req *pbGrou
 	if err != nil {
 		return nil, err
 	}
-	resp.GroupRequests = utils.Slice(requests, func(e *relationTb.GroupRequestModel) *sdkws.GroupRequest {
+	resp.GroupRequests = utils.Slice(requests, func(e *relationtb.GroupRequestModel) *sdkws.GroupRequest {
 		return convert.Db2PbGroupRequest(e, user, convert.Db2PbGroupInfo(groupMap[e.GroupID], ownerMap[e.GroupID].UserID, uint32(groupMemberNum[e.GroupID])))
 	})
 	return resp, nil
 }
 
-func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGroupReq) (*pbGroup.DismissGroupResp, error) {
+func (s *groupServer) DismissGroup(ctx context.Context, req *pbgroup.DismissGroupReq) (*pbgroup.DismissGroupResp, error) {
 	defer log.ZInfo(ctx, "DismissGroup.return")
-	resp := &pbGroup.DismissGroupResp{}
+	resp := &pbgroup.DismissGroupResp{}
 	owner, err := s.TakeGroupOwner(ctx, req.GroupID)
 	if err != nil {
 		return nil, err
@@ -1142,8 +1142,8 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou
 	return resp, nil
 }
 
-func (s *groupServer) MuteGroupMember(ctx context.Context, req *pbGroup.MuteGroupMemberReq) (*pbGroup.MuteGroupMemberResp, error) {
-	resp := &pbGroup.MuteGroupMemberResp{}
+func (s *groupServer) MuteGroupMember(ctx context.Context, req *pbgroup.MuteGroupMemberReq) (*pbgroup.MuteGroupMemberResp, error) {
+	resp := &pbgroup.MuteGroupMemberResp{}
 	//if err := tokenverify.CheckAccessV3(ctx, req.UserID); err != nil {
 	//	return nil, err
 	//}
@@ -1177,8 +1177,8 @@ func (s *groupServer) MuteGroupMember(ctx context.Context, req *pbGroup.MuteGrou
 	return resp, nil
 }
 
-func (s *groupServer) CancelMuteGroupMember(ctx context.Context, req *pbGroup.CancelMuteGroupMemberReq) (*pbGroup.CancelMuteGroupMemberResp, error) {
-	resp := &pbGroup.CancelMuteGroupMemberResp{}
+func (s *groupServer) CancelMuteGroupMember(ctx context.Context, req *pbgroup.CancelMuteGroupMemberReq) (*pbgroup.CancelMuteGroupMemberResp, error) {
+	resp := &pbgroup.CancelMuteGroupMemberResp{}
 	//member, err := s.GroupDatabase.TakeGroupMember(ctx, req.GroupID, req.UserID)
 	//if err != nil {
 	//	return nil, err
@@ -1225,8 +1225,8 @@ func (s *groupServer) CancelMuteGroupMember(ctx context.Context, req *pbGroup.Ca
 	return resp, nil
 }
 
-func (s *groupServer) MuteGroup(ctx context.Context, req *pbGroup.MuteGroupReq) (*pbGroup.MuteGroupResp, error) {
-	resp := &pbGroup.MuteGroupResp{}
+func (s *groupServer) MuteGroup(ctx context.Context, req *pbgroup.MuteGroupReq) (*pbgroup.MuteGroupResp, error) {
+	resp := &pbgroup.MuteGroupResp{}
 	if err := s.CheckGroupAdmin(ctx, req.GroupID); err != nil {
 		return nil, err
 	}
@@ -1237,8 +1237,8 @@ func (s *groupServer) MuteGroup(ctx context.Context, req *pbGroup.MuteGroupReq)
 	return resp, nil
 }
 
-func (s *groupServer) CancelMuteGroup(ctx context.Context, req *pbGroup.CancelMuteGroupReq) (*pbGroup.CancelMuteGroupResp, error) {
-	resp := &pbGroup.CancelMuteGroupResp{}
+func (s *groupServer) CancelMuteGroup(ctx context.Context, req *pbgroup.CancelMuteGroupReq) (*pbgroup.CancelMuteGroupResp, error) {
+	resp := &pbgroup.CancelMuteGroupResp{}
 	if err := s.CheckGroupAdmin(ctx, req.GroupID); err != nil {
 		return nil, err
 	}
@@ -1249,8 +1249,8 @@ func (s *groupServer) CancelMuteGroup(ctx context.Context, req *pbGroup.CancelMu
 	return resp, nil
 }
 
-func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbGroup.SetGroupMemberInfoReq) (*pbGroup.SetGroupMemberInfoResp, error) {
-	resp := &pbGroup.SetGroupMemberInfoResp{}
+func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbgroup.SetGroupMemberInfoReq) (*pbgroup.SetGroupMemberInfoResp, error) {
+	resp := &pbgroup.SetGroupMemberInfoResp{}
 	if len(req.Members) == 0 {
 		return nil, errs.ErrArgs.Wrap("members empty")
 	}
@@ -1280,7 +1280,7 @@ func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbGroup.SetGr
 			return fmt.Sprintf("[group: %s user: %s]", e[0], e[1])
 		}), ","))
 	}
-	memberMap := utils.SliceToMap(members, func(e *relationTb.GroupMemberModel) [2]string {
+	memberMap := utils.SliceToMap(members, func(e *relationtb.GroupMemberModel) [2]string {
 		return [...]string{e.GroupID, e.UserID}
 	})
 	if !authverify.IsAppManagerUid(ctx) {
@@ -1349,8 +1349,8 @@ func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbGroup.SetGr
 			return nil, err
 		}
 	}
-	if err = s.GroupDatabase.UpdateGroupMembers(ctx, utils.Slice(req.Members, func(e *pbGroup.SetGroupMemberInfo) *relationTb.BatchUpdateGroupMember {
-		return &relationTb.BatchUpdateGroupMember{
+	if err = s.GroupDatabase.UpdateGroupMembers(ctx, utils.Slice(req.Members, func(e *pbgroup.SetGroupMemberInfo) *relationtb.BatchUpdateGroupMember {
+		return &relationtb.BatchUpdateGroupMember{
 			GroupID: e.GroupID,
 			UserID:  e.UserID,
 			Map:     UpdateGroupMemberMap(e),
@@ -1377,8 +1377,8 @@ func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbGroup.SetGr
 	return resp, nil
 }
 
-func (s *groupServer) GetGroupAbstractInfo(ctx context.Context, req *pbGroup.GetGroupAbstractInfoReq) (*pbGroup.GetGroupAbstractInfoResp, error) {
-	resp := &pbGroup.GetGroupAbstractInfoResp{}
+func (s *groupServer) GetGroupAbstractInfo(ctx context.Context, req *pbgroup.GetGroupAbstractInfoReq) (*pbgroup.GetGroupAbstractInfoResp, error) {
+	resp := &pbgroup.GetGroupAbstractInfoResp{}
 	if len(req.GroupIDs) == 0 {
 		return nil, errs.ErrArgs.Wrap("groupIDs empty")
 	}
@@ -1389,7 +1389,7 @@ func (s *groupServer) GetGroupAbstractInfo(ctx context.Context, req *pbGroup.Get
 	if err != nil {
 		return nil, err
 	}
-	if ids := utils.Single(req.GroupIDs, utils.Slice(groups, func(group *relationTb.GroupModel) string {
+	if ids := utils.Single(req.GroupIDs, utils.Slice(groups, func(group *relationtb.GroupModel) string {
 		return group.GroupID
 	})); len(ids) > 0 {
 		return nil, errs.ErrGroupIDNotFound.Wrap("not found group " + strings.Join(ids, ","))
@@ -1401,15 +1401,15 @@ func (s *groupServer) GetGroupAbstractInfo(ctx context.Context, req *pbGroup.Get
 	if ids := utils.Single(req.GroupIDs, utils.Keys(groupUserMap)); len(ids) > 0 {
 		return nil, errs.ErrGroupIDNotFound.Wrap(fmt.Sprintf("group %s not found member", strings.Join(ids, ",")))
 	}
-	resp.GroupAbstractInfos = utils.Slice(groups, func(group *relationTb.GroupModel) *pbGroup.GroupAbstractInfo {
+	resp.GroupAbstractInfos = utils.Slice(groups, func(group *relationtb.GroupModel) *pbgroup.GroupAbstractInfo {
 		users := groupUserMap[group.GroupID]
 		return convert.Db2PbGroupAbstractInfo(group.GroupID, users.MemberNum, users.Hash)
 	})
 	return resp, nil
 }
 
-func (s *groupServer) GetUserInGroupMembers(ctx context.Context, req *pbGroup.GetUserInGroupMembersReq) (*pbGroup.GetUserInGroupMembersResp, error) {
-	resp := &pbGroup.GetUserInGroupMembersResp{}
+func (s *groupServer) GetUserInGroupMembers(ctx context.Context, req *pbgroup.GetUserInGroupMembersReq) (*pbgroup.GetUserInGroupMembersResp, error) {
+	resp := &pbgroup.GetUserInGroupMembersResp{}
 	if len(req.GroupIDs) == 0 {
 		return nil, errs.ErrArgs.Wrap("groupIDs empty")
 	}
@@ -1417,13 +1417,13 @@ func (s *groupServer) GetUserInGroupMembers(ctx context.Context, req *pbGroup.Ge
 	if err != nil {
 		return nil, err
 	}
-	nameMap, err := s.GetUsernameMap(ctx, utils.Filter(members, func(e *relationTb.GroupMemberModel) (string, bool) {
+	nameMap, err := s.GetUsernameMap(ctx, utils.Filter(members, func(e *relationtb.GroupMemberModel) (string, bool) {
 		return e.UserID, e.Nickname == ""
 	}), true)
 	if err != nil {
 		return nil, err
 	}
-	resp.Members = utils.Slice(members, func(e *relationTb.GroupMemberModel) *sdkws.GroupMemberFullInfo {
+	resp.Members = utils.Slice(members, func(e *relationtb.GroupMemberModel) *sdkws.GroupMemberFullInfo {
 		if e.Nickname == "" {
 			e.Nickname = nameMap[e.UserID]
 		}
@@ -1432,8 +1432,8 @@ func (s *groupServer) GetUserInGroupMembers(ctx context.Context, req *pbGroup.Ge
 	return resp, nil
 }
 
-func (s *groupServer) GetGroupMemberUserIDs(ctx context.Context, req *pbGroup.GetGroupMemberUserIDsReq) (resp *pbGroup.GetGroupMemberUserIDsResp, err error) {
-	resp = &pbGroup.GetGroupMemberUserIDsResp{}
+func (s *groupServer) GetGroupMemberUserIDs(ctx context.Context, req *pbgroup.GetGroupMemberUserIDsReq) (resp *pbgroup.GetGroupMemberUserIDsResp, err error) {
+	resp = &pbgroup.GetGroupMemberUserIDsResp{}
 	resp.UserIDs, err = s.GroupDatabase.FindGroupMemberUserID(ctx, req.GroupID)
 	if err != nil {
 		return nil, err
@@ -1441,8 +1441,8 @@ func (s *groupServer) GetGroupMemberUserIDs(ctx context.Context, req *pbGroup.Ge
 	return resp, nil
 }
 
-func (s *groupServer) GetGroupMemberRoleLevel(ctx context.Context, req *pbGroup.GetGroupMemberRoleLevelReq) (*pbGroup.GetGroupMemberRoleLevelResp, error) {
-	resp := &pbGroup.GetGroupMemberRoleLevelResp{}
+func (s *groupServer) GetGroupMemberRoleLevel(ctx context.Context, req *pbgroup.GetGroupMemberRoleLevelReq) (*pbgroup.GetGroupMemberRoleLevelResp, error) {
+	resp := &pbgroup.GetGroupMemberRoleLevelResp{}
 	if len(req.RoleLevels) == 0 {
 		return nil, errs.ErrArgs.Wrap("RoleLevels empty")
 	}
@@ -1450,13 +1450,13 @@ func (s *groupServer) GetGroupMemberRoleLevel(ctx context.Context, req *pbGroup.
 	if err != nil {
 		return nil, err
 	}
-	nameMap, err := s.GetUsernameMap(ctx, utils.Filter(members, func(e *relationTb.GroupMemberModel) (string, bool) {
+	nameMap, err := s.GetUsernameMap(ctx, utils.Filter(members, func(e *relationtb.GroupMemberModel) (string, bool) {
 		return e.UserID, e.Nickname == ""
 	}), true)
 	if err != nil {
 		return nil, err
 	}
-	resp.Members = utils.Slice(members, func(e *relationTb.GroupMemberModel) *sdkws.GroupMemberFullInfo {
+	resp.Members = utils.Slice(members, func(e *relationtb.GroupMemberModel) *sdkws.GroupMemberFullInfo {
 		if e.Nickname == "" {
 			e.Nickname = nameMap[e.UserID]
 		}
@@ -1465,8 +1465,8 @@ func (s *groupServer) GetGroupMemberRoleLevel(ctx context.Context, req *pbGroup.
 	return resp, nil
 }
 
-func (s *groupServer) GetGroupUsersReqApplicationList(ctx context.Context, req *pbGroup.GetGroupUsersReqApplicationListReq) (*pbGroup.GetGroupUsersReqApplicationListResp, error) {
-	resp := &pbGroup.GetGroupUsersReqApplicationListResp{}
+func (s *groupServer) GetGroupUsersReqApplicationList(ctx context.Context, req *pbgroup.GetGroupUsersReqApplicationListReq) (*pbgroup.GetGroupUsersReqApplicationListResp, error) {
+	resp := &pbgroup.GetGroupUsersReqApplicationListResp{}
 	total, requests, err := s.GroupDatabase.FindGroupRequests(ctx, req.GroupID, req.UserIDs)
 	if err != nil {
 		return nil, err
@@ -1474,14 +1474,14 @@ func (s *groupServer) GetGroupUsersReqApplicationList(ctx context.Context, req *
 	if len(requests) == 0 {
 		return resp, nil
 	}
-	groupIDs := utils.Distinct(utils.Slice(requests, func(e *relationTb.GroupRequestModel) string {
+	groupIDs := utils.Distinct(utils.Slice(requests, func(e *relationtb.GroupRequestModel) string {
 		return e.GroupID
 	}))
 	groups, err := s.GroupDatabase.FindGroup(ctx, groupIDs)
 	if err != nil {
 		return nil, err
 	}
-	groupMap := utils.SliceToMap(groups, func(e *relationTb.GroupModel) string {
+	groupMap := utils.SliceToMap(groups, func(e *relationtb.GroupModel) string {
 		return e.GroupID
 	})
 	if ids := utils.Single(groupIDs, utils.Keys(groupMap)); len(ids) > 0 {
@@ -1491,7 +1491,7 @@ func (s *groupServer) GetGroupUsersReqApplicationList(ctx context.Context, req *
 	if err != nil {
 		return nil, err
 	}
-	ownerMap := utils.SliceToMap(owners, func(e *relationTb.GroupMemberModel) string {
+	ownerMap := utils.SliceToMap(owners, func(e *relationtb.GroupMemberModel) string {
 		return e.GroupID
 	})
 	if ids := utils.Single(groupIDs, utils.Keys(ownerMap)); len(ids) > 0 {
@@ -1501,7 +1501,7 @@ func (s *groupServer) GetGroupUsersReqApplicationList(ctx context.Context, req *
 	if err != nil {
 		return nil, err
 	}
-	resp.GroupRequests = utils.Slice(requests, func(e *relationTb.GroupRequestModel) *sdkws.GroupRequest {
+	resp.GroupRequests = utils.Slice(requests, func(e *relationtb.GroupRequestModel) *sdkws.GroupRequest {
 		return convert.Db2PbGroupRequest(e, nil, convert.Db2PbGroupInfo(groupMap[e.GroupID], ownerMap[e.GroupID].UserID, uint32(groupMemberNum[e.GroupID])))
 	})
 	resp.Total = total
@@ -1515,7 +1515,7 @@ func (s *groupServer) groupMemberHashCode(ctx context.Context, groupID string) (
 	}
 	var members []*sdkws.GroupMemberFullInfo
 	if len(userIDs) > 0 {
-		resp, err := s.GetGroupMembersInfo(ctx, &pbGroup.GetGroupMembersInfoReq{GroupID: groupID, UserIDs: userIDs})
+		resp, err := s.GetGroupMembersInfo(ctx, &pbgroup.GetGroupMembersInfoReq{GroupID: groupID, UserIDs: userIDs})
 		if err != nil {
 			return 0, err
 		}

internal/rpc/group/super_group.go

@@ -20,7 +20,7 @@ import (
 	"strings"
 
 	"github.com/OpenIMSDK/protocol/constant"
-	pbGroup "github.com/OpenIMSDK/protocol/group"
+	pbgroup "github.com/OpenIMSDK/protocol/group"
 	sdkws "github.com/OpenIMSDK/protocol/sdkws"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/utils"
@@ -32,9 +32,9 @@ import (
 
 func (s *groupServer) GetJoinedSuperGroupList(
 	ctx context.Context,
-	req *pbGroup.GetJoinedSuperGroupListReq,
-) (*pbGroup.GetJoinedSuperGroupListResp, error) {
-	resp := &pbGroup.GetJoinedSuperGroupListResp{}
+	req *pbgroup.GetJoinedSuperGroupListReq,
+) (*pbgroup.GetJoinedSuperGroupListResp, error) {
+	resp := &pbgroup.GetJoinedSuperGroupListResp{}
 	groupIDs, err := s.GroupDatabase.FindJoinSuperGroup(ctx, req.UserID)
 	if err != nil {
 		return nil, err
@@ -80,9 +80,9 @@ func (s *groupServer) GetJoinedSuperGroupList(
 
 func (s *groupServer) GetSuperGroupsInfo(
 	ctx context.Context,
-	req *pbGroup.GetSuperGroupsInfoReq,
-) (resp *pbGroup.GetSuperGroupsInfoResp, err error) {
-	resp = &pbGroup.GetSuperGroupsInfoResp{}
+	req *pbgroup.GetSuperGroupsInfoReq,
+) (resp *pbgroup.GetSuperGroupsInfoResp, err error) {
+	resp = &pbgroup.GetSuperGroupsInfoResp{}
 	if len(req.GroupIDs) == 0 {
 		return nil, errs.ErrArgs.Wrap("groupIDs empty")
 	}

internal/rpc/msg/callback.go

@@ -21,7 +21,7 @@ import (
 	"google.golang.org/protobuf/proto"
 
 	"github.com/OpenIMSDK/protocol/constant"
-	pbChat "github.com/OpenIMSDK/protocol/msg"
+	pbchat "github.com/OpenIMSDK/protocol/msg"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/mcontext"
@@ -36,7 +36,7 @@ func cbURL() string {
 	return config.Config.Callback.CallbackUrl
 }
 
-func toCommonCallback(ctx context.Context, msg *pbChat.SendMsgReq, command string) cbapi.CommonCallbackReq {
+func toCommonCallback(ctx context.Context, msg *pbchat.SendMsgReq, command string) cbapi.CommonCallbackReq {
 	return cbapi.CommonCallbackReq{
 		SendID:           msg.MsgData.SendID,
 		ServerMsgID:      msg.MsgData.ServerMsgID,
@@ -69,7 +69,7 @@ func GetContent(msg *sdkws.MsgData) string {
 	}
 }
 
-func callbackBeforeSendSingleMsg(ctx context.Context, msg *pbChat.SendMsgReq) error {
+func callbackBeforeSendSingleMsg(ctx context.Context, msg *pbchat.SendMsgReq) error {
 	if !config.Config.Callback.CallbackBeforeSendSingleMsg.Enable {
 		return nil
 	}
@@ -87,7 +87,7 @@ func callbackBeforeSendSingleMsg(ctx context.Context, msg *pbChat.SendMsgReq) er
 	return nil
 }
 
-func callbackAfterSendSingleMsg(ctx context.Context, msg *pbChat.SendMsgReq) error {
+func callbackAfterSendSingleMsg(ctx context.Context, msg *pbchat.SendMsgReq) error {
 	if !config.Config.Callback.CallbackAfterSendSingleMsg.Enable {
 		return nil
 	}
@@ -105,7 +105,7 @@ func callbackAfterSendSingleMsg(ctx context.Context, msg *pbChat.SendMsgReq) err
 	return nil
 }
 
-func callbackBeforeSendGroupMsg(ctx context.Context, msg *pbChat.SendMsgReq) error {
+func callbackBeforeSendGroupMsg(ctx context.Context, msg *pbchat.SendMsgReq) error {
 	if !config.Config.Callback.CallbackAfterSendSingleMsg.Enable {
 		return nil
 	}
@@ -123,7 +123,7 @@ func callbackBeforeSendGroupMsg(ctx context.Context, msg *pbChat.SendMsgReq) err
 	return nil
 }
 
-func callbackAfterSendGroupMsg(ctx context.Context, msg *pbChat.SendMsgReq) error {
+func callbackAfterSendGroupMsg(ctx context.Context, msg *pbchat.SendMsgReq) error {
 	if !config.Config.Callback.CallbackAfterSendGroupMsg.Enable {
 		return nil
 	}
@@ -141,7 +141,7 @@ func callbackAfterSendGroupMsg(ctx context.Context, msg *pbChat.SendMsgReq) erro
 	return nil
 }
 
-func callbackMsgModify(ctx context.Context, msg *pbChat.SendMsgReq) error {
+func callbackMsgModify(ctx context.Context, msg *pbchat.SendMsgReq) error {
 	if !config.Config.Callback.CallbackMsgModify.Enable || msg.MsgData.ContentType != constant.Text {
 		return nil
 	}

internal/rpc/msg/msg_status.go

@@ -18,15 +18,15 @@ import (
 	"context"
 
 	"github.com/OpenIMSDK/protocol/constant"
-	pbMsg "github.com/OpenIMSDK/protocol/msg"
+	pbmsg "github.com/OpenIMSDK/protocol/msg"
 	"github.com/OpenIMSDK/tools/mcontext"
 )
 
 func (m *msgServer) SetSendMsgStatus(
 	ctx context.Context,
-	req *pbMsg.SetSendMsgStatusReq,
-) (*pbMsg.SetSendMsgStatusResp, error) {
-	resp := &pbMsg.SetSendMsgStatusResp{}
+	req *pbmsg.SetSendMsgStatusReq,
+) (*pbmsg.SetSendMsgStatusResp, error) {
+	resp := &pbmsg.SetSendMsgStatusResp{}
 	if err := m.MsgDatabase.SetSendMsgStatus(ctx, mcontext.GetOperationID(ctx), req.Status); err != nil {
 		return nil, err
 	}
@@ -35,9 +35,9 @@ func (m *msgServer) SetSendMsgStatus(
 
 func (m *msgServer) GetSendMsgStatus(
 	ctx context.Context,
-	req *pbMsg.GetSendMsgStatusReq,
-) (*pbMsg.GetSendMsgStatusResp, error) {
-	resp := &pbMsg.GetSendMsgStatusResp{}
+	req *pbmsg.GetSendMsgStatusReq,
+) (*pbmsg.GetSendMsgStatusResp, error) {
+	resp := &pbmsg.GetSendMsgStatusResp{}
 	status, err := m.MsgDatabase.GetSendMsgStatus(ctx, mcontext.GetOperationID(ctx))
 	if IsNotFound(err) {
 		resp.Status = constant.MsgStatusNotExist

internal/rpc/msg/revoke.go

@@ -30,7 +30,7 @@ import (
 	"github.com/OpenIMSDK/tools/utils"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
-	unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
+	unrelationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
 )
 
 func (m *msgServer) RevokeMsg(ctx context.Context, req *msg.RevokeMsgReq) (*msg.RevokeMsgResp, error) {
@@ -100,7 +100,7 @@ func (m *msgServer) RevokeMsg(ctx context.Context, req *msg.RevokeMsgReq) (*msg.
 		}
 	}
 	now := time.Now().UnixMilli()
-	err = m.MsgDatabase.RevokeMsg(ctx, req.ConversationID, req.Seq, &unRelationTb.RevokeModel{
+	err = m.MsgDatabase.RevokeMsg(ctx, req.ConversationID, req.Seq, &unrelationtb.RevokeModel{
 		Role:     role,
 		UserID:   req.UserID,
 		Nickname: user.Nickname,

internal/rpc/msg/send.go

@@ -20,8 +20,8 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor"
 
 	"github.com/OpenIMSDK/protocol/constant"
-	pbConversation "github.com/OpenIMSDK/protocol/conversation"
-	pbMsg "github.com/OpenIMSDK/protocol/msg"
+	pbconversation "github.com/OpenIMSDK/protocol/conversation"
+	pbmsg "github.com/OpenIMSDK/protocol/msg"
 	"github.com/OpenIMSDK/protocol/sdkws"
 	"github.com/OpenIMSDK/protocol/wrapperspb"
 	"github.com/OpenIMSDK/tools/errs"
@@ -29,11 +29,11 @@ import (
 	"github.com/OpenIMSDK/tools/mcontext"
 	"github.com/OpenIMSDK/tools/utils"
 
-	promePkg "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome"
+	promepkg "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome"
 )
 
-func (m *msgServer) SendMsg(ctx context.Context, req *pbMsg.SendMsgReq) (resp *pbMsg.SendMsgResp, error error) {
-	resp = &pbMsg.SendMsgResp{}
+func (m *msgServer) SendMsg(ctx context.Context, req *pbmsg.SendMsgReq) (resp *pbmsg.SendMsgResp, error error) {
+	resp = &pbmsg.SendMsgResp{}
 	if req.MsgData != nil {
 		flag := isMessageHasReadEnabled(req.MsgData)
 		if !flag {
@@ -57,11 +57,11 @@ func (m *msgServer) SendMsg(ctx context.Context, req *pbMsg.SendMsgReq) (resp *p
 
 func (m *msgServer) sendMsgSuperGroupChat(
 	ctx context.Context,
-	req *pbMsg.SendMsgReq,
-) (resp *pbMsg.SendMsgResp, err error) {
-	promePkg.Inc(promePkg.WorkSuperGroupChatMsgRecvSuccessCounter)
+	req *pbmsg.SendMsgReq,
+) (resp *pbmsg.SendMsgResp, err error) {
+	promepkg.Inc(promepkg.WorkSuperGroupChatMsgRecvSuccessCounter)
 	if err = m.messageVerification(ctx, req); err != nil {
-		promePkg.Inc(promePkg.WorkSuperGroupChatMsgProcessFailedCounter)
+		promepkg.Inc(promepkg.WorkSuperGroupChatMsgProcessFailedCounter)
 		return nil, err
 	}
 	if err = callbackBeforeSendGroupMsg(ctx, req); err != nil {
@@ -80,8 +80,8 @@ func (m *msgServer) sendMsgSuperGroupChat(
 	if err = callbackAfterSendGroupMsg(ctx, req); err != nil {
 		log.ZWarn(ctx, "CallbackAfterSendGroupMsg", err)
 	}
-	promePkg.Inc(promePkg.WorkSuperGroupChatMsgProcessSuccessCounter)
-	resp = &pbMsg.SendMsgResp{}
+	promepkg.Inc(promepkg.WorkSuperGroupChatMsgProcessSuccessCounter)
+	resp = &pbmsg.SendMsgResp{}
 	resp.SendTime = req.MsgData.SendTime
 	resp.ServerMsgID = req.MsgData.ServerMsgID
 	resp.ClientMsgID = req.MsgData.ClientMsgID
@@ -92,7 +92,7 @@ func (m *msgServer) setConversationAtInfo(nctx context.Context, msg *sdkws.MsgDa
 	log.ZDebug(nctx, "setConversationAtInfo", "msg", msg)
 	ctx := mcontext.NewCtx("@@@" + mcontext.GetOperationID(nctx))
 	var atUserID []string
-	conversation := &pbConversation.ConversationReq{
+	conversation := &pbconversation.ConversationReq{
 		ConversationID:   msgprocessor.GetConversationIDByMsg(msg),
 		ConversationType: msg.SessionType,
 		GroupID:          msg.GroupID,
@@ -131,14 +131,14 @@ func (m *msgServer) setConversationAtInfo(nctx context.Context, msg *sdkws.MsgDa
 
 func (m *msgServer) sendMsgNotification(
 	ctx context.Context,
-	req *pbMsg.SendMsgReq,
-) (resp *pbMsg.SendMsgResp, err error) {
-	promePkg.Inc(promePkg.SingleChatMsgRecvSuccessCounter)
+	req *pbmsg.SendMsgReq,
+) (resp *pbmsg.SendMsgResp, err error) {
+	promepkg.Inc(promepkg.SingleChatMsgRecvSuccessCounter)
 	if err := m.MsgDatabase.MsgToMQ(ctx, utils.GenConversationUniqueKeyForSingle(req.MsgData.SendID, req.MsgData.RecvID), req.MsgData); err != nil {
-		promePkg.Inc(promePkg.SingleChatMsgProcessFailedCounter)
+		promepkg.Inc(promepkg.SingleChatMsgProcessFailedCounter)
 		return nil, err
 	}
-	resp = &pbMsg.SendMsgResp{
+	resp = &pbmsg.SendMsgResp{
 		ServerMsgID: req.MsgData.ServerMsgID,
 		ClientMsgID: req.MsgData.ClientMsgID,
 		SendTime:    req.MsgData.SendTime,
@@ -146,8 +146,8 @@ func (m *msgServer) sendMsgNotification(
 	return resp, nil
 }
 
-func (m *msgServer) sendMsgSingleChat(ctx context.Context, req *pbMsg.SendMsgReq) (resp *pbMsg.SendMsgResp, err error) {
-	promePkg.Inc(promePkg.SingleChatMsgRecvSuccessCounter)
+func (m *msgServer) sendMsgSingleChat(ctx context.Context, req *pbmsg.SendMsgReq) (resp *pbmsg.SendMsgResp, err error) {
+	promepkg.Inc(promepkg.SingleChatMsgRecvSuccessCounter)
 	if err := m.messageVerification(ctx, req); err != nil {
 		return nil, err
 	}
@@ -166,7 +166,7 @@ func (m *msgServer) sendMsgSingleChat(ctx context.Context, req *pbMsg.SendMsgReq
 		}
 	}
 	if !isSend {
-		promePkg.Inc(promePkg.SingleChatMsgProcessFailedCounter)
+		promepkg.Inc(promepkg.SingleChatMsgProcessFailedCounter)
 		return nil, nil
 	} else {
 		if err = callbackBeforeSendSingleMsg(ctx, req); err != nil {
@@ -176,23 +176,23 @@ func (m *msgServer) sendMsgSingleChat(ctx context.Context, req *pbMsg.SendMsgReq
 			return nil, err
 		}
 		if err := m.MsgDatabase.MsgToMQ(ctx, utils.GenConversationUniqueKeyForSingle(req.MsgData.SendID, req.MsgData.RecvID), req.MsgData); err != nil {
-			promePkg.Inc(promePkg.SingleChatMsgProcessFailedCounter)
+			promepkg.Inc(promepkg.SingleChatMsgProcessFailedCounter)
 			return nil, err
 		}
 		err = callbackAfterSendSingleMsg(ctx, req)
 		if err != nil {
 			log.ZWarn(ctx, "CallbackAfterSendSingleMsg", err, "req", req)
 		}
-		resp = &pbMsg.SendMsgResp{
+		resp = &pbmsg.SendMsgResp{
 			ServerMsgID: req.MsgData.ServerMsgID,
 			ClientMsgID: req.MsgData.ClientMsgID,
 			SendTime:    req.MsgData.SendTime,
 		}
-		promePkg.Inc(promePkg.SingleChatMsgProcessSuccessCounter)
+		promepkg.Inc(promepkg.SingleChatMsgProcessSuccessCounter)
 		return resp, nil
 	}
 }
 
-func (m *msgServer) BatchSendMsg(ctx context.Context, in *pbMsg.BatchSendMessageReq) (*pbMsg.BatchSendMessageResp, error) {
+func (m *msgServer) BatchSendMsg(ctx context.Context, in *pbmsg.BatchSendMessageReq) (*pbmsg.BatchSendMessageResp, error) {
 	return nil, nil
 }

internal/rpc/msg/seq.go

@@ -17,16 +17,16 @@ package msg
 import (
 	"context"
 
-	pbMsg "github.com/OpenIMSDK/protocol/msg"
+	pbmsg "github.com/OpenIMSDK/protocol/msg"
 )
 
 func (m *msgServer) GetConversationMaxSeq(
 	ctx context.Context,
-	req *pbMsg.GetConversationMaxSeqReq,
-) (resp *pbMsg.GetConversationMaxSeqResp, err error) {
+	req *pbmsg.GetConversationMaxSeqReq,
+) (resp *pbmsg.GetConversationMaxSeqResp, err error) {
 	maxSeq, err := m.MsgDatabase.GetMaxSeq(ctx, req.ConversationID)
 	if err != nil {
 		return nil, err
 	}
-	return &pbMsg.GetConversationMaxSeqResp{MaxSeq: maxSeq}, nil
+	return &pbmsg.GetConversationMaxSeqResp{MaxSeq: maxSeq}, nil
 }

internal/rpc/msg/statistics.go

@@ -80,7 +80,7 @@ func (m *msgServer) GetActiveGroup(ctx context.Context, req *msg.GetActiveGroupR
 	if err != nil {
 		return nil, err
 	}
-	var pbGroups []*msg.ActiveGroup
+	var pbgroups []*msg.ActiveGroup
 	if len(groups) > 0 {
 		groupIDs := utils.Slice(groups, func(e *unrelation.GroupCount) string { return e.GroupID })
 		resp, err := m.Group.GetGroupInfos(ctx, groupIDs, false)
@@ -91,17 +91,17 @@ func (m *msgServer) GetActiveGroup(ctx context.Context, req *msg.GetActiveGroupR
 		for i, group := range groups {
 			groupMap[group.GroupID] = resp[i]
 		}
-		pbGroups = make([]*msg.ActiveGroup, 0, len(groups))
+		pbgroups = make([]*msg.ActiveGroup, 0, len(groups))
 		for _, group := range groups {
-			pbGroup := groupMap[group.GroupID]
-			if pbGroup == nil {
-				pbGroup = &sdkws.GroupInfo{
+			pbgroup := groupMap[group.GroupID]
+			if pbgroup == nil {
+				pbgroup = &sdkws.GroupInfo{
 					GroupID:   group.GroupID,
 					GroupName: group.GroupID,
 				}
 			}
-			pbGroups = append(pbGroups, &msg.ActiveGroup{
-				Group: pbGroup,
+			pbgroups = append(pbgroups, &msg.ActiveGroup{
+				Group: pbgroup,
 				Count: group.Count,
 			})
 		}
@@ -110,6 +110,6 @@ func (m *msgServer) GetActiveGroup(ctx context.Context, req *msg.GetActiveGroupR
 		MsgCount:   msgCount,
 		GroupCount: groupCount,
 		DateCount:  dateCount,
-		Groups:     pbGroups,
+		Groups:     pbgroups,
 	}, nil
 }

internal/rpc/msg/sync_msg.go

@@ -164,30 +164,31 @@ func (m *msgServer) SearchMessage(ctx context.Context, req *msg.SearchMessageReq
 		}
 	}
 	for _, chatLog := range chatLogs {
-		pbChatLog := &msg.ChatLog{}
-		utils.CopyStructFields(pbChatLog, chatLog)
-		pbChatLog.SendTime = chatLog.SendTime
-		pbChatLog.CreateTime = chatLog.CreateTime
+		pbchatLog := &msg.ChatLog{}
+		utils.CopyStructFields(pbchatLog, chatLog)
+		pbchatLog.SendTime = chatLog.SendTime
+		pbchatLog.CreateTime = chatLog.CreateTime
 		if chatLog.SenderNickname == "" {
-			pbChatLog.SenderNickname = sendMap[chatLog.SendID]
+			pbchatLog.SenderNickname = sendMap[chatLog.SendID]
 		}
 		switch chatLog.SessionType {
 		case constant.SingleChatType:
-			pbChatLog.RecvNickname = recvMap[chatLog.RecvID]
+			pbchatLog.RecvNickname = recvMap[chatLog.RecvID]
 
 		case constant.GroupChatType, constant.SuperGroupChatType:
-			pbChatLog.SenderFaceURL = groupMap[chatLog.GroupID].FaceURL
-			pbChatLog.GroupMemberCount = groupMap[chatLog.GroupID].MemberCount
-			pbChatLog.RecvID = groupMap[chatLog.GroupID].GroupID
-			pbChatLog.GroupName = groupMap[chatLog.GroupID].GroupName
-			pbChatLog.GroupOwner = groupMap[chatLog.GroupID].OwnerUserID
-			pbChatLog.GroupType = groupMap[chatLog.GroupID].GroupType
+			pbchatLog.SenderFaceURL = groupMap[chatLog.GroupID].FaceURL
+			pbchatLog.GroupMemberCount = groupMap[chatLog.GroupID].MemberCount
+			pbchatLog.RecvID = groupMap[chatLog.GroupID].GroupID
+			pbchatLog.GroupName = groupMap[chatLog.GroupID].GroupName
+			pbchatLog.GroupOwner = groupMap[chatLog.GroupID].OwnerUserID
+			pbchatLog.GroupType = groupMap[chatLog.GroupID].GroupType
 		}
-		resp.ChatLogs = append(resp.ChatLogs, pbChatLog)
+		resp.ChatLogs = append(resp.ChatLogs, pbchatLog)
 	}
 	resp.ChatLogsNum = total
 	return resp, nil
 }
+
 func (m *msgServer) GetServerTime(ctx context.Context, _ *msg.GetServerTimeReq) (*msg.GetServerTimeResp, error) {
 	return &msg.GetServerTimeResp{ServerTime: utils.GetCurrentTimestampByMill()}, nil
 }

internal/rpc/third/third.go

@@ -34,7 +34,7 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation"
-	relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 )
 
@@ -58,7 +58,7 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 	if err != nil {
 		return err
 	}
-	if err := db.AutoMigrate(&relationTb.ObjectModel{}); err != nil {
+	if err := db.AutoMigrate(&relationtb.ObjectModel{}); err != nil {
 		return err
 	}
 	// 根据配置文件策略选择 oss 方式

pkg/apistruct/msg.go

@@ -76,6 +76,10 @@ type TextElem struct {
 	Text string `mapstructure:"text" validate:"required"`
 }
 
+type TextContentElem struct {
+	Content string `json:"content" validate:"required"`
+}
+
 type RevokeElem struct {
 	RevokeMsgClientID string `mapstructure:"revokeMsgClientID" validate:"required"`
 }

pkg/common/config/config.go

@@ -81,9 +81,16 @@ type configStruct struct {
 	} `yaml:"redis"`
 
 	Kafka struct {
-		Username         string   `yaml:"username"`
-		Password         string   `yaml:"password"`
-		Addr             []string `yaml:"addr"`
+		Username string   `yaml:"username"`
+		Password string   `yaml:"password"`
+		Addr     []string `yaml:"addr"`
+		TLS      *struct {
+			CACrt              string `yaml:"caCrt"`
+			ClientCrt          string `yaml:"clientCrt"`
+			ClientKey          string `yaml:"clientKey"`
+			ClientKeyPwd       string `yaml:"clientKeyPwd"`
+			InsecureSkipVerify bool   `yaml:"insecureSkipVerify"`
+		} `yaml:"tls"`
 		LatestMsgToRedis struct {
 			Topic string `yaml:"topic"`
 		} `yaml:"latestMsgToRedis"`

pkg/common/config/version

@@ -1 +1 @@
-v3.1.0
+v3.2.0

pkg/common/convert/group.go

@@ -17,7 +17,7 @@ package convert
 import (
 	"time"
 
-	pbGroup "github.com/OpenIMSDK/protocol/group"
+	pbgroup "github.com/OpenIMSDK/protocol/group"
 	sdkws "github.com/OpenIMSDK/protocol/sdkws"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
@@ -45,7 +45,7 @@ func Db2PbGroupInfo(m *relation.GroupModel, ownerUserID string, memberCount uint
 	}
 }
 
-func Pb2DbGroupRequest(req *pbGroup.GroupApplicationResponseReq, handleUserID string) *relation.GroupRequestModel {
+func Pb2DbGroupRequest(req *pbgroup.GroupApplicationResponseReq, handleUserID string) *relation.GroupRequestModel {
 	return &relation.GroupRequestModel{
 		UserID:       req.FromUserID,
 		GroupID:      req.GroupID,
@@ -61,8 +61,8 @@ func Db2PbCMSGroup(
 	ownerUserID string,
 	ownerUserName string,
 	memberCount uint32,
-) *pbGroup.CMSGroup {
-	return &pbGroup.CMSGroup{
+) *pbgroup.CMSGroup {
+	return &pbgroup.CMSGroup{
 		GroupInfo:          Db2PbGroupInfo(m, ownerUserID, memberCount),
 		GroupOwnerUserID:   ownerUserID,
 		GroupOwnerUserName: ownerUserName,
@@ -110,8 +110,8 @@ func Db2PbGroupAbstractInfo(
 	groupID string,
 	groupMemberNumber uint32,
 	groupMemberListHash uint64,
-) *pbGroup.GroupAbstractInfo {
-	return &pbGroup.GroupAbstractInfo{
+) *pbgroup.GroupAbstractInfo {
+	return &pbgroup.GroupAbstractInfo{
 		GroupID:             groupID,
 		GroupMemberNumber:   groupMemberNumber,
 		GroupMemberListHash: groupMemberListHash,

pkg/common/convert/user.go

@@ -19,10 +19,10 @@ import (
 
 	"github.com/OpenIMSDK/protocol/sdkws"
 
-	relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 )
 
-func UsersDB2Pb(users []*relationTb.UserModel) (result []*sdkws.UserInfo) {
+func UsersDB2Pb(users []*relationtb.UserModel) (result []*sdkws.UserInfo) {
 	for _, user := range users {
 		var userPb sdkws.UserInfo
 		userPb.UserID = user.UserID
@@ -37,8 +37,8 @@ func UsersDB2Pb(users []*relationTb.UserModel) (result []*sdkws.UserInfo) {
 	return result
 }
 
-func UserPb2DB(user *sdkws.UserInfo) *relationTb.UserModel {
-	var userDB relationTb.UserModel
+func UserPb2DB(user *sdkws.UserInfo) *relationtb.UserModel {
+	var userDB relationtb.UserModel
 	userDB.UserID = user.UserID
 	userDB.Nickname = user.Nickname
 	userDB.FaceURL = user.FaceURL

pkg/common/db/cache/black.go

@@ -21,7 +21,7 @@ import (
 	"github.com/dtm-labs/rockscache"
 	"github.com/redis/go-redis/v9"
 
-	relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 )
 
 const (
@@ -43,12 +43,12 @@ type BlackCacheRedis struct {
 	metaCache
 	expireTime time.Duration
 	rcClient   *rockscache.Client
-	blackDB    relationTb.BlackModelInterface
+	blackDB    relationtb.BlackModelInterface
 }
 
 func NewBlackCacheRedis(
 	rdb redis.UniversalClient,
-	blackDB relationTb.BlackModelInterface,
+	blackDB relationtb.BlackModelInterface,
 	options rockscache.Options,
 ) BlackCache {
 	rcClient := rockscache.NewClient(rdb, options)

pkg/common/db/cache/conversation.go

@@ -27,7 +27,7 @@ import (
 	"github.com/OpenIMSDK/tools/utils"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation"
-	relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 )
 
 const (
@@ -54,7 +54,7 @@ type ConversationCache interface {
 	DelUserConversationIDsHash(ownerUserIDs ...string) ConversationCache
 
 	// get one conversation from msgCache
-	GetConversation(ctx context.Context, ownerUserID, conversationID string) (*relationTb.ConversationModel, error)
+	GetConversation(ctx context.Context, ownerUserID, conversationID string) (*relationtb.ConversationModel, error)
 	DelConversations(ownerUserID string, conversationIDs ...string) ConversationCache
 	DelUsersConversation(conversationID string, ownerUserIDs ...string) ConversationCache
 	// get one conversation from msgCache
@@ -62,9 +62,9 @@ type ConversationCache interface {
 		ctx context.Context,
 		ownerUserID string,
 		conversationIDs []string,
-	) ([]*relationTb.ConversationModel, error)
+	) ([]*relationtb.ConversationModel, error)
 	// get one user's all conversations from msgCache
-	GetUserAllConversations(ctx context.Context, ownerUserID string) ([]*relationTb.ConversationModel, error)
+	GetUserAllConversations(ctx context.Context, ownerUserID string) ([]*relationtb.ConversationModel, error)
 	// get user conversation recv msg from msgCache
 	GetUserRecvMsgOpt(ctx context.Context, ownerUserID, conversationID string) (opt int, err error)
 	DelUserRecvMsgOpt(ownerUserID, conversationID string) ConversationCache
@@ -81,14 +81,14 @@ type ConversationCache interface {
 	GetConversationsByConversationID(
 		ctx context.Context,
 		conversationIDs []string,
-	) ([]*relationTb.ConversationModel, error)
+	) ([]*relationtb.ConversationModel, error)
 	DelConversationByConversationID(conversationIDs ...string) ConversationCache
 }
 
 func NewConversationRedis(
 	rdb redis.UniversalClient,
 	opts rockscache.Options,
-	db relationTb.ConversationModelInterface,
+	db relationtb.ConversationModelInterface,
 ) ConversationCache {
 	rcClient := rockscache.NewClient(rdb, opts)
 	return &ConversationRedisCache{
@@ -102,7 +102,7 @@ func NewConversationRedis(
 type ConversationRedisCache struct {
 	metaCache
 	rcClient       *rockscache.Client
-	conversationDB relationTb.ConversationModelInterface
+	conversationDB relationtb.ConversationModelInterface
 	expireTime     time.Duration
 }
 
@@ -214,13 +214,13 @@ func (c *ConversationRedisCache) DelUserConversationIDsHash(ownerUserIDs ...stri
 func (c *ConversationRedisCache) GetConversation(
 	ctx context.Context,
 	ownerUserID, conversationID string,
-) (*relationTb.ConversationModel, error) {
+) (*relationtb.ConversationModel, error) {
 	return getCache(
 		ctx,
 		c.rcClient,
 		c.getConversationKey(ownerUserID, conversationID),
 		c.expireTime,
-		func(ctx context.Context) (*relationTb.ConversationModel, error) {
+		func(ctx context.Context) (*relationtb.ConversationModel, error) {
 			return c.conversationDB.Take(ctx, ownerUserID, conversationID)
 		},
 	)
@@ -237,7 +237,7 @@ func (c *ConversationRedisCache) DelConversations(ownerUserID string, conversati
 }
 
 func (c *ConversationRedisCache) getConversationIndex(
-	convsation *relationTb.ConversationModel,
+	convsation *relationtb.ConversationModel,
 	keys []string,
 ) (int, error) {
 	key := c.getConversationKey(convsation.OwnerUserID, convsation.ConversationID)
@@ -253,7 +253,7 @@ func (c *ConversationRedisCache) GetConversations(
 	ctx context.Context,
 	ownerUserID string,
 	conversationIDs []string,
-) ([]*relationTb.ConversationModel, error) {
+) ([]*relationtb.ConversationModel, error) {
 	var keys []string
 	for _, conversarionID := range conversationIDs {
 		keys = append(keys, c.getConversationKey(ownerUserID, conversarionID))
@@ -264,7 +264,7 @@ func (c *ConversationRedisCache) GetConversations(
 		keys,
 		c.expireTime,
 		c.getConversationIndex,
-		func(ctx context.Context) ([]*relationTb.ConversationModel, error) {
+		func(ctx context.Context) ([]*relationtb.ConversationModel, error) {
 			return c.conversationDB.Find(ctx, ownerUserID, conversationIDs)
 		},
 	)
@@ -273,7 +273,7 @@ func (c *ConversationRedisCache) GetConversations(
 func (c *ConversationRedisCache) GetUserAllConversations(
 	ctx context.Context,
 	ownerUserID string,
-) ([]*relationTb.ConversationModel, error) {
+) ([]*relationtb.ConversationModel, error) {
 	conversationIDs, err := c.GetUserConversationIDs(ctx, ownerUserID)
 	if err != nil {
 		return nil, err
@@ -288,7 +288,7 @@ func (c *ConversationRedisCache) GetUserAllConversations(
 		keys,
 		c.expireTime,
 		c.getConversationIndex,
-		func(ctx context.Context) ([]*relationTb.ConversationModel, error) {
+		func(ctx context.Context) ([]*relationtb.ConversationModel, error) {
 			return c.conversationDB.FindUserIDAllConversations(ctx, ownerUserID)
 		},
 	)
@@ -425,7 +425,7 @@ func (c *ConversationRedisCache) DelUserAllHasReadSeqs(
 func (c *ConversationRedisCache) GetConversationsByConversationID(
 	ctx context.Context,
 	conversationIDs []string,
-) ([]*relationTb.ConversationModel, error) {
+) ([]*relationtb.ConversationModel, error) {
 	panic("implement me")
 }
 

pkg/common/db/cache/friend.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/OpenIMSDK/tools/utils"
 
-	relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 )
 
 const (
@@ -41,21 +41,21 @@ type FriendCache interface {
 	// call when friendID List changed
 	DelFriendIDs(ownerUserID ...string) FriendCache
 	// get single friendInfo from msgCache
-	GetFriend(ctx context.Context, ownerUserID, friendUserID string) (friend *relationTb.FriendModel, err error)
+	GetFriend(ctx context.Context, ownerUserID, friendUserID string) (friend *relationtb.FriendModel, err error)
 	// del friend when friend info changed
 	DelFriend(ownerUserID, friendUserID string) FriendCache
 }
 
 type FriendCacheRedis struct {
 	metaCache
-	friendDB   relationTb.FriendModelInterface
+	friendDB   relationtb.FriendModelInterface
 	expireTime time.Duration
 	rcClient   *rockscache.Client
 }
 
 func NewFriendCacheRedis(
 	rdb redis.UniversalClient,
-	friendDB relationTb.FriendModelInterface,
+	friendDB relationtb.FriendModelInterface,
 	options rockscache.Options,
 ) FriendCache {
 	rcClient := rockscache.NewClient(rdb, options)
@@ -140,13 +140,13 @@ func (f *FriendCacheRedis) DelTwoWayFriendIDs(ctx context.Context, ownerUserID s
 func (f *FriendCacheRedis) GetFriend(
 	ctx context.Context,
 	ownerUserID, friendUserID string,
-) (friend *relationTb.FriendModel, err error) {
+) (friend *relationtb.FriendModel, err error) {
 	return getCache(
 		ctx,
 		f.rcClient,
 		f.getFriendKey(ownerUserID, friendUserID),
 		f.expireTime,
-		func(ctx context.Context) (*relationTb.FriendModel, error) {
+		func(ctx context.Context) (*relationtb.FriendModel, error) {
 			return f.friendDB.Take(ctx, ownerUserID, friendUserID)
 		},
 	)

pkg/common/db/cache/group.go

@@ -25,8 +25,8 @@ import (
 
 	"github.com/OpenIMSDK/tools/utils"
 
-	relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
-	unrelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
+	relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	unrelationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
 )
 
 const (
@@ -44,17 +44,17 @@ const (
 type GroupCache interface {
 	metaCache
 	NewCache() GroupCache
-	GetGroupsInfo(ctx context.Context, groupIDs []string) (groups []*relationTb.GroupModel, err error)
-	GetGroupInfo(ctx context.Context, groupID string) (group *relationTb.GroupModel, err error)
+	GetGroupsInfo(ctx context.Context, groupIDs []string) (groups []*relationtb.GroupModel, err error)
+	GetGroupInfo(ctx context.Context, groupID string) (group *relationtb.GroupModel, err error)
 	DelGroupsInfo(groupIDs ...string) GroupCache
 
 	GetJoinedSuperGroupIDs(ctx context.Context, userID string) (joinedSuperGroupIDs []string, err error)
 	DelJoinedSuperGroupIDs(userIDs ...string) GroupCache
-	GetSuperGroupMemberIDs(ctx context.Context, groupIDs ...string) (models []*unrelationTb.SuperGroupModel, err error)
+	GetSuperGroupMemberIDs(ctx context.Context, groupIDs ...string) (models []*unrelationtb.SuperGroupModel, err error)
 	DelSuperGroupMemberIDs(groupIDs ...string) GroupCache
 
 	GetGroupMembersHash(ctx context.Context, groupID string) (hashCode uint64, err error)
-	GetGroupMemberHashMap(ctx context.Context, groupIDs []string) (map[string]*relationTb.GroupSimpleUserID, error)
+	GetGroupMemberHashMap(ctx context.Context, groupIDs []string) (map[string]*relationtb.GroupSimpleUserID, error)
 	DelGroupMembersHash(groupID string) GroupCache
 
 	GetGroupMemberIDs(ctx context.Context, groupID string) (groupMemberIDs []string, err error)
@@ -68,19 +68,19 @@ type GroupCache interface {
 	GetGroupMemberInfo(
 		ctx context.Context,
 		groupID, userID string,
-	) (groupMember *relationTb.GroupMemberModel, err error)
+	) (groupMember *relationtb.GroupMemberModel, err error)
 	GetGroupMembersInfo(
 		ctx context.Context,
 		groupID string,
 		userID []string,
-	) (groupMembers []*relationTb.GroupMemberModel, err error)
-	GetAllGroupMembersInfo(ctx context.Context, groupID string) (groupMembers []*relationTb.GroupMemberModel, err error)
+	) (groupMembers []*relationtb.GroupMemberModel, err error)
+	GetAllGroupMembersInfo(ctx context.Context, groupID string) (groupMembers []*relationtb.GroupMemberModel, err error)
 	GetGroupMembersPage(
 		ctx context.Context,
 		groupID string,
 		userID []string,
 		showNumber, pageNumber int32,
-	) (total uint32, groupMembers []*relationTb.GroupMemberModel, err error)
+	) (total uint32, groupMembers []*relationtb.GroupMemberModel, err error)
 
 	DelGroupMembersInfo(groupID string, userID ...string) GroupCache
 
@@ -90,10 +90,10 @@ type GroupCache interface {
 
 type GroupCacheRedis struct {
 	metaCache
-	groupDB        relationTb.GroupModelInterface
-	groupMemberDB  relationTb.GroupMemberModelInterface
-	groupRequestDB relationTb.GroupRequestModelInterface
-	mongoDB        unrelationTb.SuperGroupModelInterface
+	groupDB        relationtb.GroupModelInterface
+	groupMemberDB  relationtb.GroupMemberModelInterface
+	groupRequestDB relationtb.GroupRequestModelInterface
+	mongoDB        unrelationtb.SuperGroupModelInterface
 	expireTime     time.Duration
 	rcClient       *rockscache.Client
 	hashCode       func(ctx context.Context, groupID string) (uint64, error)
@@ -101,10 +101,10 @@ type GroupCacheRedis struct {
 
 func NewGroupCacheRedis(
 	rdb redis.UniversalClient,
-	groupDB relationTb.GroupModelInterface,
-	groupMemberDB relationTb.GroupMemberModelInterface,
-	groupRequestDB relationTb.GroupRequestModelInterface,
-	mongoClient unrelationTb.SuperGroupModelInterface,
+	groupDB relationtb.GroupModelInterface,
+	groupMemberDB relationtb.GroupMemberModelInterface,
+	groupRequestDB relationtb.GroupRequestModelInterface,
+	mongoClient unrelationtb.SuperGroupModelInterface,
 	hashCode func(ctx context.Context, groupID string) (uint64, error),
 	opts rockscache.Options,
 ) GroupCache {
@@ -162,7 +162,7 @@ func (g *GroupCacheRedis) getGroupMemberNumKey(groupID string) string {
 	return groupMemberNumKey + groupID
 }
 
-func (g *GroupCacheRedis) GetGroupIndex(group *relationTb.GroupModel, keys []string) (int, error) {
+func (g *GroupCacheRedis) GetGroupIndex(group *relationtb.GroupModel, keys []string) (int, error) {
 	key := g.getGroupInfoKey(group.GroupID)
 	for i, _key := range keys {
 		if _key == key {
@@ -172,7 +172,7 @@ func (g *GroupCacheRedis) GetGroupIndex(group *relationTb.GroupModel, keys []str
 	return 0, errIndex
 }
 
-func (g *GroupCacheRedis) GetGroupMemberIndex(groupMember *relationTb.GroupMemberModel, keys []string) (int, error) {
+func (g *GroupCacheRedis) GetGroupMemberIndex(groupMember *relationtb.GroupMemberModel, keys []string) (int, error) {
 	key := g.getGroupMemberInfoKey(groupMember.GroupID, groupMember.UserID)
 	for i, _key := range keys {
 		if _key == key {
@@ -186,7 +186,7 @@ func (g *GroupCacheRedis) GetGroupMemberIndex(groupMember *relationTb.GroupMembe
 func (g *GroupCacheRedis) GetGroupsInfo(
 	ctx context.Context,
 	groupIDs []string,
-) (groups []*relationTb.GroupModel, err error) {
+) (groups []*relationtb.GroupModel, err error) {
 	var keys []string
 	for _, group := range groupIDs {
 		keys = append(keys, g.getGroupInfoKey(group))
@@ -197,19 +197,19 @@ func (g *GroupCacheRedis) GetGroupsInfo(
 		keys,
 		g.expireTime,
 		g.GetGroupIndex,
-		func(ctx context.Context) ([]*relationTb.GroupModel, error) {
+		func(ctx context.Context) ([]*relationtb.GroupModel, error) {
 			return g.groupDB.Find(ctx, groupIDs)
 		},
 	)
 }
 
-func (g *GroupCacheRedis) GetGroupInfo(ctx context.Context, groupID string) (group *relationTb.GroupModel, err error) {
+func (g *GroupCacheRedis) GetGroupInfo(ctx context.Context, groupID string) (group *relationtb.GroupModel, err error) {
 	return getCache(
 		ctx,
 		g.rcClient,
 		g.getGroupInfoKey(groupID),
 		g.expireTime,
-		func(ctx context.Context) (*relationTb.GroupModel, error) {
+		func(ctx context.Context) (*relationtb.GroupModel, error) {
 			return g.groupDB.Take(ctx, groupID)
 		},
 	)
@@ -247,7 +247,7 @@ func (g *GroupCacheRedis) GetJoinedSuperGroupIDs(
 func (g *GroupCacheRedis) GetSuperGroupMemberIDs(
 	ctx context.Context,
 	groupIDs ...string,
-) (models []*unrelationTb.SuperGroupModel, err error) {
+) (models []*unrelationtb.SuperGroupModel, err error) {
 	var keys []string
 	for _, group := range groupIDs {
 		keys = append(keys, g.getSuperGroupMemberIDsKey(group))
@@ -257,7 +257,7 @@ func (g *GroupCacheRedis) GetSuperGroupMemberIDs(
 		g.rcClient,
 		keys,
 		g.expireTime,
-		func(model *unrelationTb.SuperGroupModel, keys []string) (int, error) {
+		func(model *unrelationtb.SuperGroupModel, keys []string) (int, error) {
 			for i, key := range keys {
 				if g.getSuperGroupMemberIDsKey(model.GroupID) == key {
 					return i, nil
@@ -265,7 +265,7 @@ func (g *GroupCacheRedis) GetSuperGroupMemberIDs(
 			}
 			return 0, errIndex
 		},
-		func(ctx context.Context) ([]*unrelationTb.SuperGroupModel, error) {
+		func(ctx context.Context) ([]*unrelationtb.SuperGroupModel, error) {
 			return g.mongoDB.FindSuperGroup(ctx, groupIDs)
 		},
 	)
@@ -305,7 +305,7 @@ func (g *GroupCacheRedis) GetGroupMembersHash(ctx context.Context, groupID strin
 	//			return 0, err
 	//		}
 	//		log.ZInfo(ctx, "GetGroupMembersHash", "groupID", groupID, "userIDs", userIDs)
-	//		var members []*relationTb.GroupMemberModel
+	//		var members []*relationtb.GroupMemberModel
 	//		if len(userIDs) > 0 {
 	//			members, err = g.GetGroupMembersInfo(ctx, groupID, userIDs)
 	//			if err != nil {
@@ -313,7 +313,7 @@ func (g *GroupCacheRedis) GetGroupMembersHash(ctx context.Context, groupID strin
 	//			}
 	//			utils.Sort(userIDs, true)
 	//		}
-	//		memberMap := make(map[string]*relationTb.GroupMemberModel)
+	//		memberMap := make(map[string]*relationtb.GroupMemberModel)
 	//		for i, member := range members {
 	//			memberMap[member.UserID] = members[i]
 	//		}
@@ -354,8 +354,8 @@ func (g *GroupCacheRedis) GetGroupMembersHash(ctx context.Context, groupID strin
 func (g *GroupCacheRedis) GetGroupMemberHashMap(
 	ctx context.Context,
 	groupIDs []string,
-) (map[string]*relationTb.GroupSimpleUserID, error) {
-	res := make(map[string]*relationTb.GroupSimpleUserID)
+) (map[string]*relationtb.GroupSimpleUserID, error) {
+	res := make(map[string]*relationtb.GroupSimpleUserID)
 	for _, groupID := range groupIDs {
 		hash, err := g.GetGroupMembersHash(ctx, groupID)
 		if err != nil {
@@ -366,7 +366,7 @@ func (g *GroupCacheRedis) GetGroupMemberHashMap(
 		if err != nil {
 			return nil, err
 		}
-		res[groupID] = &relationTb.GroupSimpleUserID{Hash: hash, MemberNum: uint32(num)}
+		res[groupID] = &relationtb.GroupSimpleUserID{Hash: hash, MemberNum: uint32(num)}
 	}
 	return res, nil
 }
@@ -433,13 +433,13 @@ func (g *GroupCacheRedis) DelJoinedGroupID(userIDs ...string) GroupCache {
 func (g *GroupCacheRedis) GetGroupMemberInfo(
 	ctx context.Context,
 	groupID, userID string,
-) (groupMember *relationTb.GroupMemberModel, err error) {
+) (groupMember *relationtb.GroupMemberModel, err error) {
 	return getCache(
 		ctx,
 		g.rcClient,
 		g.getGroupMemberInfoKey(groupID, userID),
 		g.expireTime,
-		func(ctx context.Context) (*relationTb.GroupMemberModel, error) {
+		func(ctx context.Context) (*relationtb.GroupMemberModel, error) {
 			return g.groupMemberDB.Take(ctx, groupID, userID)
 		},
 	)
@@ -449,7 +449,7 @@ func (g *GroupCacheRedis) GetGroupMembersInfo(
 	ctx context.Context,
 	groupID string,
 	userIDs []string,
-) ([]*relationTb.GroupMemberModel, error) {
+) ([]*relationtb.GroupMemberModel, error) {
 	var keys []string
 	for _, userID := range userIDs {
 		keys = append(keys, g.getGroupMemberInfoKey(groupID, userID))
@@ -460,7 +460,7 @@ func (g *GroupCacheRedis) GetGroupMembersInfo(
 		keys,
 		g.expireTime,
 		g.GetGroupMemberIndex,
-		func(ctx context.Context) ([]*relationTb.GroupMemberModel, error) {
+		func(ctx context.Context) ([]*relationtb.GroupMemberModel, error) {
 			return g.groupMemberDB.Find(ctx, []string{groupID}, userIDs, nil)
 		},
 	)
@@ -471,7 +471,7 @@ func (g *GroupCacheRedis) GetGroupMembersPage(
 	groupID string,
 	userIDs []string,
 	showNumber, pageNumber int32,
-) (total uint32, groupMembers []*relationTb.GroupMemberModel, err error) {
+) (total uint32, groupMembers []*relationtb.GroupMemberModel, err error) {
 	groupMemberIDs, err := g.GetGroupMemberIDs(ctx, groupID)
 	if err != nil {
 		return 0, nil, err
@@ -488,7 +488,7 @@ func (g *GroupCacheRedis) GetGroupMembersPage(
 func (g *GroupCacheRedis) GetAllGroupMembersInfo(
 	ctx context.Context,
 	groupID string,
-) (groupMembers []*relationTb.GroupMemberModel, err error) {
+) (groupMembers []*relationtb.GroupMemberModel, err error) {
 	groupMemberIDs, err := g.GetGroupMemberIDs(ctx, groupID)
 	if err != nil {
 		return nil, err
@@ -499,7 +499,7 @@ func (g *GroupCacheRedis) GetAllGroupMembersInfo(
 func (g *GroupCacheRedis) GetAllGroupMemberInfo(
 	ctx context.Context,
 	groupID string,
-) ([]*relationTb.GroupMemberModel, error) {
+) ([]*relationtb.GroupMemberModel, error) {
 	groupMemberIDs, err := g.GetGroupMemberIDs(ctx, groupID)
 	if err != nil {
 		return nil, err
@@ -514,7 +514,7 @@ func (g *GroupCacheRedis) GetAllGroupMemberInfo(
 		keys,
 		g.expireTime,
 		g.GetGroupMemberIndex,
-		func(ctx context.Context) ([]*relationTb.GroupMemberModel, error) {
+		func(ctx context.Context) ([]*relationtb.GroupMemberModel, error) {
 			return g.groupMemberDB.Find(ctx, []string{groupID}, groupMemberIDs, nil)
 		},
 	)

pkg/common/db/cache/msg.go

@@ -33,7 +33,7 @@ import (
 	"github.com/OpenIMSDK/tools/utils"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
-	unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
+	unrelationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
 
 	"github.com/redis/go-redis/v9"
 )
@@ -143,7 +143,7 @@ type msgCache struct {
 	rdb            redis.UniversalClient
 	expireTime     time.Duration
 	rcClient       *rockscache.Client
-	msgDocDatabase unRelationTb.MsgDocModelInterface
+	msgDocDatabase unrelationtb.MsgDocModelInterface
 }
 
 func (c *msgCache) getMaxSeqKey(conversationID string) string {

pkg/common/db/cache/user.go

@@ -29,7 +29,7 @@ import (
 	"github.com/dtm-labs/rockscache"
 	"github.com/redis/go-redis/v9"
 
-	relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 )
 
 const (
@@ -45,8 +45,8 @@ const (
 type UserCache interface {
 	metaCache
 	NewCache() UserCache
-	GetUserInfo(ctx context.Context, userID string) (userInfo *relationTb.UserModel, err error)
-	GetUsersInfo(ctx context.Context, userIDs []string) ([]*relationTb.UserModel, error)
+	GetUserInfo(ctx context.Context, userID string) (userInfo *relationtb.UserModel, err error)
+	GetUsersInfo(ctx context.Context, userIDs []string) ([]*relationtb.UserModel, error)
 	DelUsersInfo(userIDs ...string) UserCache
 	GetUserGlobalRecvMsgOpt(ctx context.Context, userID string) (opt int, err error)
 	DelUsersGlobalRecvMsgOpt(userIDs ...string) UserCache
@@ -57,14 +57,14 @@ type UserCache interface {
 type UserCacheRedis struct {
 	metaCache
 	rdb        redis.UniversalClient
-	userDB     relationTb.UserModelInterface
+	userDB     relationtb.UserModelInterface
 	expireTime time.Duration
 	rcClient   *rockscache.Client
 }
 
 func NewUserCacheRedis(
 	rdb redis.UniversalClient,
-	userDB relationTb.UserModelInterface,
+	userDB relationtb.UserModelInterface,
 	options rockscache.Options,
 ) UserCache {
 	rcClient := rockscache.NewClient(rdb, options)
@@ -99,19 +99,19 @@ func (u *UserCacheRedis) getUserStatusHashKey(userID string, Id int32) string {
 	return userID + "_" + string(Id) + platformID
 }
 
-func (u *UserCacheRedis) GetUserInfo(ctx context.Context, userID string) (userInfo *relationTb.UserModel, err error) {
+func (u *UserCacheRedis) GetUserInfo(ctx context.Context, userID string) (userInfo *relationtb.UserModel, err error) {
 	return getCache(
 		ctx,
 		u.rcClient,
 		u.getUserInfoKey(userID),
 		u.expireTime,
-		func(ctx context.Context) (*relationTb.UserModel, error) {
+		func(ctx context.Context) (*relationtb.UserModel, error) {
 			return u.userDB.Take(ctx, userID)
 		},
 	)
 }
 
-func (u *UserCacheRedis) GetUsersInfo(ctx context.Context, userIDs []string) ([]*relationTb.UserModel, error) {
+func (u *UserCacheRedis) GetUsersInfo(ctx context.Context, userIDs []string) ([]*relationtb.UserModel, error) {
 	var keys []string
 	for _, userID := range userIDs {
 		keys = append(keys, u.getUserInfoKey(userID))
@@ -121,7 +121,7 @@ func (u *UserCacheRedis) GetUsersInfo(ctx context.Context, userIDs []string) ([]
 		u.rcClient,
 		keys,
 		u.expireTime,
-		func(user *relationTb.UserModel, keys []string) (int, error) {
+		func(user *relationtb.UserModel, keys []string) (int, error) {
 			for i, key := range keys {
 				if key == u.getUserInfoKey(user.UserID) {
 					return i, nil
@@ -129,7 +129,7 @@ func (u *UserCacheRedis) GetUsersInfo(ctx context.Context, userIDs []string) ([]
 			}
 			return 0, errIndex
 		},
-		func(ctx context.Context) ([]*relationTb.UserModel, error) {
+		func(ctx context.Context) ([]*relationtb.UserModel, error) {
 			return u.userDB.Find(ctx, userIDs)
 		},
 	)

pkg/common/db/controller/chatlog.go

@@ -15,23 +15,23 @@
 package controller
 
 import (
-	pbMsg "github.com/OpenIMSDK/protocol/msg"
+	pbmsg "github.com/OpenIMSDK/protocol/msg"
 
-	relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 )
 
 type ChatLogDatabase interface {
-	CreateChatLog(msg *pbMsg.MsgDataToMQ) error
+	CreateChatLog(msg *pbmsg.MsgDataToMQ) error
 }
 
-func NewChatLogDatabase(chatLogModelInterface relationTb.ChatLogModelInterface) ChatLogDatabase {
+func NewChatLogDatabase(chatLogModelInterface relationtb.ChatLogModelInterface) ChatLogDatabase {
 	return &chatLogDatabase{chatLogModel: chatLogModelInterface}
 }
 
 type chatLogDatabase struct {
-	chatLogModel relationTb.ChatLogModelInterface
+	chatLogModel relationtb.ChatLogModelInterface
 }
 
-func (c *chatLogDatabase) CreateChatLog(msg *pbMsg.MsgDataToMQ) error {
+func (c *chatLogDatabase) CreateChatLog(msg *pbmsg.MsgDataToMQ) error {
 	return c.chatLogModel.Create(msg)
 }

pkg/common/db/controller/conversation.go

@@ -26,36 +26,36 @@ import (
 	"github.com/OpenIMSDK/tools/utils"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
-	relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	relationtb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 )
 
 type ConversationDatabase interface {
 	// UpdateUserConversationFiled 更新用户该会话的属性信息
 	UpdateUsersConversationFiled(ctx context.Context, userIDs []string, conversationID string, args map[string]interface{}) error
 	// CreateConversation 创建一批新的会话
-	CreateConversation(ctx context.Context, conversations []*relationTb.ConversationModel) error
+	CreateConversation(ctx context.Context, conversations []*relationtb.ConversationModel) error
 	// SyncPeerUserPrivateConversation 同步对端私聊会话内部保证事务操作
-	SyncPeerUserPrivateConversationTx(ctx context.Context, conversation []*relationTb.ConversationModel) error
+	SyncPeerUserPrivateConversationTx(ctx context.Context, conversation []*relationtb.ConversationModel) error
 	// FindConversations 根据会话ID获取某个用户的多个会话
-	FindConversations(ctx context.Context, ownerUserID string, conversationIDs []string) ([]*relationTb.ConversationModel, error)
+	FindConversations(ctx context.Context, ownerUserID string, conversationIDs []string) ([]*relationtb.ConversationModel, error)
 	// FindRecvMsgNotNotifyUserIDs 获取超级大群开启免打扰的用户ID
 	FindRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) ([]string, error)
 	// GetUserAllConversation 获取一个用户在服务器上所有的会话
-	GetUserAllConversation(ctx context.Context, ownerUserID string) ([]*relationTb.ConversationModel, error)
+	GetUserAllConversation(ctx context.Context, ownerUserID string) ([]*relationtb.ConversationModel, error)
 	// SetUserConversations 设置用户多个会话属性，如果会话不存在则创建，否则更新,内部保证原子性
-	SetUserConversations(ctx context.Context, ownerUserID string, conversations []*relationTb.ConversationModel) error
+	SetUserConversations(ctx context.Context, ownerUserID string, conversations []*relationtb.ConversationModel) error
 	// SetUsersConversationFiledTx 设置多个用户会话关于某个字段的更新操作，如果会话不存在则创建，否则更新，内部保证事务操作
-	SetUsersConversationFiledTx(ctx context.Context, userIDs []string, conversation *relationTb.ConversationModel, filedMap map[string]interface{}) error
+	SetUsersConversationFiledTx(ctx context.Context, userIDs []string, conversation *relationtb.ConversationModel, filedMap map[string]interface{}) error
 	CreateGroupChatConversation(ctx context.Context, groupID string, userIDs []string) error
 	GetConversationIDs(ctx context.Context, userID string) ([]string, error)
 	GetUserConversationIDsHash(ctx context.Context, ownerUserID string) (hash uint64, err error)
 	GetAllConversationIDs(ctx context.Context) ([]string, error)
 	GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (map[string]int64, error)
-	GetConversationsByConversationID(ctx context.Context, conversationIDs []string) ([]*relationTb.ConversationModel, error)
-	GetConversationIDsNeedDestruct(ctx context.Context) ([]*relationTb.ConversationModel, error)
+	GetConversationsByConversationID(ctx context.Context, conversationIDs []string) ([]*relationtb.ConversationModel, error)
+	GetConversationIDsNeedDestruct(ctx context.Context) ([]*relationtb.ConversationModel, error)
 }
 
-func NewConversationDatabase(conversation relationTb.ConversationModelInterface, cache cache.ConversationCache, tx tx.Tx) ConversationDatabase {
+func NewConversationDatabase(conversation relationtb.ConversationModelInterface, cache cache.ConversationCache, tx tx.Tx) ConversationDatabase {
 	return &conversationDatabase{
 		conversationDB: conversation,
 		cache:          cache,
@@ -64,12 +64,12 @@ func NewConversationDatabase(conversation relationTb.ConversationModelInterface,
 }
 
 type conversationDatabase struct {
-	conversationDB relationTb.ConversationModelInterface
+	conversationDB relationtb.ConversationModelInterface
 	cache          cache.ConversationCache
 	tx             tx.Tx
 }
 
-func (c *conversationDatabase) SetUsersConversationFiledTx(ctx context.Context, userIDs []string, conversation *relationTb.ConversationModel, filedMap map[string]interface{}) (err error) {
+func (c *conversationDatabase) SetUsersConversationFiledTx(ctx context.Context, userIDs []string, conversation *relationtb.ConversationModel, filedMap map[string]interface{}) (err error) {
 	cache := c.cache.NewCache()
 	if err := c.tx.Transaction(func(tx any) error {
 		conversationTx := c.conversationDB.NewTx(tx)
@@ -91,10 +91,10 @@ func (c *conversationDatabase) SetUsersConversationFiledTx(ctx context.Context,
 		}
 		NotUserIDs := utils.DifferenceString(haveUserIDs, userIDs)
 		log.ZDebug(ctx, "SetUsersConversationFiledTx", "NotUserIDs", NotUserIDs, "haveUserIDs", haveUserIDs, "userIDs", userIDs)
-		var conversations []*relationTb.ConversationModel
+		var conversations []*relationtb.ConversationModel
 		now := time.Now()
 		for _, v := range NotUserIDs {
-			temp := new(relationTb.ConversationModel)
+			temp := new(relationtb.ConversationModel)
 			if err := utils.CopyStructFields(temp, conversation); err != nil {
 				return err
 			}
@@ -124,7 +124,7 @@ func (c *conversationDatabase) UpdateUsersConversationFiled(ctx context.Context,
 	return c.cache.DelUsersConversation(conversationID, userIDs...).ExecDel(ctx)
 }
 
-func (c *conversationDatabase) CreateConversation(ctx context.Context, conversations []*relationTb.ConversationModel) error {
+func (c *conversationDatabase) CreateConversation(ctx context.Context, conversations []*relationtb.ConversationModel) error {
 	if err := c.conversationDB.Create(ctx, conversations); err != nil {
 		return err
 	}
@@ -137,7 +137,7 @@ func (c *conversationDatabase) CreateConversation(ctx context.Context, conversat
 	return cache.DelConversationIDs(userIDs...).DelUserConversationIDsHash(userIDs...).ExecDel(ctx)
 }
 
-func (c *conversationDatabase) SyncPeerUserPrivateConversationTx(ctx context.Context, conversations []*relationTb.ConversationModel) error {
+func (c *conversationDatabase) SyncPeerUserPrivateConversationTx(ctx context.Context, conversations []*relationtb.ConversationModel) error {
 	cache := c.cache.NewCache()
 	if err := c.tx.Transaction(func(tx any) error {
 		conversationTx := c.conversationDB.NewTx(tx)
@@ -161,7 +161,7 @@ func (c *conversationDatabase) SyncPeerUserPrivateConversationTx(ctx context.Con
 					newConversation.UserID = userID
 					newConversation.ConversationID = conversation.ConversationID
 					newConversation.IsPrivateChat = conversation.IsPrivateChat
-					if err := conversationTx.Create(ctx, []*relationTb.ConversationModel{&newConversation}); err != nil {
+					if err := conversationTx.Create(ctx, []*relationtb.ConversationModel{&newConversation}); err != nil {
 						return err
 					}
 					cache = cache.DelConversationIDs(ownerUserID).DelUserConversationIDsHash(ownerUserID)
@@ -175,19 +175,19 @@ func (c *conversationDatabase) SyncPeerUserPrivateConversationTx(ctx context.Con
 	return cache.ExecDel(ctx)
 }
 
-func (c *conversationDatabase) FindConversations(ctx context.Context, ownerUserID string, conversationIDs []string) ([]*relationTb.ConversationModel, error) {
+func (c *conversationDatabase) FindConversations(ctx context.Context, ownerUserID string, conversationIDs []string) ([]*relationtb.ConversationModel, error) {
 	return c.cache.GetConversations(ctx, ownerUserID, conversationIDs)
 }
 
-func (c *conversationDatabase) GetConversation(ctx context.Context, ownerUserID string, conversationID string) (*relationTb.ConversationModel, error) {
+func (c *conversationDatabase) GetConversation(ctx context.Context, ownerUserID string, conversationID string) (*relationtb.ConversationModel, error) {
 	return c.cache.GetConversation(ctx, ownerUserID, conversationID)
 }
 
-func (c *conversationDatabase) GetUserAllConversation(ctx context.Context, ownerUserID string) ([]*relationTb.ConversationModel, error) {
+func (c *conversationDatabase) GetUserAllConversation(ctx context.Context, ownerUserID string) ([]*relationtb.ConversationModel, error) {
 	return c.cache.GetUserAllConversations(ctx, ownerUserID)
 }
 
-func (c *conversationDatabase) SetUserConversations(ctx context.Context, ownerUserID string, conversations []*relationTb.ConversationModel) error {
+func (c *conversationDatabase) SetUserConversations(ctx context.Context, ownerUserID string, conversations []*relationtb.ConversationModel) error {
 	cache := c.cache.NewCache()
 	if err := c.tx.Transaction(func(tx any) error {
 		var conversationIDs []string
@@ -213,7 +213,7 @@ func (c *conversationDatabase) SetUserConversations(ctx context.Context, ownerUs
 			existConversationIDs = append(existConversationIDs, conversation.ConversationID)
 		}
 
-		var notExistConversations []*relationTb.ConversationModel
+		var notExistConversations []*relationtb.ConversationModel
 		for _, conversation := range conversations {
 			if !utils.IsContain(conversation.ConversationID, existConversationIDs) {
 				notExistConversations = append(notExistConversations, conversation)
@@ -246,9 +246,9 @@ func (c *conversationDatabase) CreateGroupChatConversation(ctx context.Context,
 			return err
 		}
 		notExistUserIDs := utils.DifferenceString(userIDs, existConversationUserIDs)
-		var conversations []*relationTb.ConversationModel
+		var conversations []*relationtb.ConversationModel
 		for _, v := range notExistUserIDs {
-			conversation := relationTb.ConversationModel{ConversationType: constant.SuperGroupChatType, GroupID: groupID, OwnerUserID: v, ConversationID: conversationID}
+			conversation := relationtb.ConversationModel{ConversationType: constant.SuperGroupChatType, GroupID: groupID, OwnerUserID: v, ConversationID: conversationID}
 			conversations = append(conversations, &conversation)
 			cache = cache.DelConversations(v, conversationID)
 		}
@@ -289,10 +289,10 @@ func (c *conversationDatabase) GetUserAllHasReadSeqs(ctx context.Context, ownerU
 	return c.cache.GetUserAllHasReadSeqs(ctx, ownerUserID)
 }
 
-func (c *conversationDatabase) GetConversationsByConversationID(ctx context.Context, conversationIDs []string) ([]*relationTb.ConversationModel, error) {
+func (c *conversationDatabase) GetConversationsByConversationID(ctx context.Context, conversationIDs []string) ([]*relationtb.ConversationModel, error) {
 	return c.conversationDB.GetConversationsByConversationID(ctx, conversationIDs)
 }
 
-func (c *conversationDatabase) GetConversationIDsNeedDestruct(ctx context.Context) ([]*relationTb.ConversationModel, error) {
+func (c *conversationDatabase) GetConversationIDsNeedDestruct(ctx context.Context) ([]*relationtb.ConversationModel, error) {
 	return c.conversationDB.GetConversationIDsNeedDestruct(ctx)
 }