fix: cicd bug

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

.dockerignore

@@ -0,0 +1,31 @@
+# Ignore files and directories starting with a dot
+
+# Ignore specific files
+.dockerignore
+
+# Ignore build artifacts
+_output/
+logs/
+
+# Ignore non-essential documentation
+README.md
+README-zh_CN.md
+CONTRIBUTING.md
+CHANGELOG/
+# LICENSE
+
+# Ignore testing and linting configuration
+.golangci.yml
+
+# Ignore deployment-related files
+docker-compose.yaml
+deployments/
+
+# Ignore assets
+assets/
+
+# Ignore components
+components/
+
+# Ignore tools and scripts
+.github/

.env

@@ -1,4 +1,5 @@
 USER=root
 PASSWORD=openIM123
 MINIO_ENDPOINT=http://127.0.0.1:10005
+API_URL=http://127.0.0.1:10002/object/
 DATA_DIR=./

.github/workflows/build-docker-image.yml

@@ -0,0 +1,36 @@
+name: OpenIM Build Docker Images
+on:
+  push:
+    tags:
+      - v*
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        bin:
+          - ssserver
+          - sslocal
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Docker metadata
+        id: metadata
+        uses: docker/metadata-action@v4
+        with:
+          images: ghcr.io/${{ github.repository_owner }}/openim-${{ matrix.bin }}
+      - name: Build and release Docker images
+        uses: docker/build-push-action@v3
+        with:
+          platforms: linux/386,linux/amd64,linux/arm64/v8
+          target: ${{ matrix.bin }}
+          tags: ${{ steps.metadata.outputs.tags }}
+          push: true

.github/workflows/golangci-link.yml

@@ -45,7 +45,7 @@ jobs:
             # args: --timeout=30m --config=/my/path/.golangci.yml --issues-exit-code=0
 
             # Optional: show only new issues if it's a pull request. The default value is `false`.
-            only-new-issues: true
+            # only-new-issues: true
 
             # Optional:The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
             install-mode: "goinstall"

.github/workflows/openim-ci.yml

@@ -66,6 +66,7 @@ jobs:
         run: |
           make format
           echo "Run go format successfully"
+        continue-on-error: true
 
     #   - name: Generate all necessary files, such as error code files
     #     run: |
@@ -82,7 +83,7 @@ jobs:
 
       - name: Build source code for host platform
         run: |
-          make multiarch
+          make build
           echo "Build source code for host platform successfully"
 
     #   - name: Collect Test Coverage File
@@ -131,22 +132,3 @@ jobs:
 #       - name: Test docker image
 #         run: |
 #           docker build -t openim:ci-build .
-
-#   goreleaser-test:
-#     runs-on: ubuntu-20.04
-#     steps:
-#       - name: Checkout
-#         uses: actions/checkout@v3
-#         with:
-#           fetch-depth: 0
-
-#       - name: Set up Go
-#         uses: actions/setup-go@v3
-#         with:
-#           go-version: ${{ env.GO_VERSION }}
-
-#       - name: Run GoReleaser
-#         uses: goreleaser/goreleaser-action@v4
-#         with:
-#           version: latest
-#           args: release --clean --skip-publish --snapshot

.github/workflows/release.yml

@@ -0,0 +1,37 @@
+name: goreleaser
+
+on:
+  push:
+    # run only against tags
+    tags:
+      - '*'
+
+permissions:
+  contents: write
+  # packages: write
+  # issues: write
+
+jobs:
+  goreleaser:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - run: git fetch --force --tags
+      - uses: actions/setup-go@v4
+        with:
+          go-version: stable
+      # More assembly might be required: Docker logins, GPG, etc. It all depends
+      # on your needs.
+      - uses: goreleaser/goreleaser-action@v4
+        with:
+          # either 'goreleaser' (default) or 'goreleaser-pro':
+          distribution: goreleaser
+          version: latest
+          args: release --clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
+          # Your GoReleaser Pro key, if you are using the 'goreleaser-pro'
+          # distribution:
+          # GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}

.github/workflows/scripts-test.yml

@@ -28,28 +28,33 @@ jobs:
 
     - name: Start Docker Compose
       run: |
-        docker-compose stop
+        docker compose stop
-        docker-compose up -d
+        sleep 30
+        docker compose up -d
         sleep 60
+      continue-on-error: true
 
     - name: Stop all services
       run: |
         chmod +x ./scripts/stop_all.sh
         ./scripts/stop_all.sh
+        cat logs/openIM.log 2>/dev/null
       shell: bash
+      continue-on-error: true
 
     - name: Build all services
       run: |
         chmod +x ./scripts/build_all_service.sh
         ./scripts/build_all_service.sh
-        cat logs/openIM.log
+        cat logs/openIM.log 2>/dev/null
       shell: bash
+      continue-on-error: true
 
     - name: Start all services
       run: |
         chmod +x ./scripts/start_all.sh
         ./scripts/start_all.sh
-        cat logs/openIM.log
+        cat logs/openIM.log 2>/dev/null
       continue-on-error: true
       shell: bash
 
@@ -57,13 +62,12 @@ jobs:
       run: |
         chmod +x ./scripts/check_all.sh
         ./scripts/check_all.sh
-        cat logs/openIM.log
+        cat logs/openIM.log 2>/dev/null
       shell: bash
-      continue-on-error: true
 
     - name: Print openIM.log
       run: |
-        cat logs/openIM.log
+        cat logs/* 2>/dev/null
-        cat logs/openIM.log  >> "$GITHUB_OUTPUT"
+        cat logs/* 2>/dev/null >> "$GITHUB_OUTPUT"
       shell: bash
       continue-on-error: true

.gitignore

@@ -163,7 +163,6 @@ go.work
 
 # User-specific stuff
 .idea/
-.idea
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 .idea/**/usage.statistics.xml
@@ -353,7 +352,6 @@ cscope.po.out
 *testsdir
 *testsfile
 *testsfiles
-*test
 *testdir
 *testfile
 *testfiles
@@ -391,3 +389,4 @@ Sessionx.vim
 [._]*.un~
 
 # End of https://www.toptal.com/developers/gitignore/api/go,git,vim,tags,test,emacs,backup,jetbrains
+.idea

.golangci.yml

@@ -1,10 +1,27 @@
+# Copyright © 2023 OpenIMSDK open source community. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file contains all available configuration options
+# with their default values.
+
 # options for analysis running
 run:
   # default concurrency is a available CPU number
   concurrency: 4
 
   # timeout for analysis, e.g. 30s, 5m, default is 1m
-  timeout: 1m
+  timeout: 5m
 
   # exit code when at least one issue was found, default is 1
   issues-exit-code: 1
@@ -12,10 +29,36 @@ run:
   # include test files or not, default is true
   tests: true
 
+  # list of build tags, all linters use it. Default is empty list.
+  build-tags:
+    - mytag
+
+  # which dirs to skip: issues from them won't be reported;
+  # can use regexp here: generated.*, regexp is applied on full path;
+  # default value is empty list, but default dirs are skipped independently
+  # from this option's value (see skip-dirs-use-default).
+  # "/" will be replaced by current OS file path separator to properly work
+  # on Windows.
+  skip-dirs:
+    - util
+    - .*~
+    - api/swagger/docs
+    - server/docs
+
   # default is true. Enables skipping of directories:
   #   vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
   skip-dirs-use-default: true
 
+  # which files to skip: they will be analyzed, but issues from them
+  # won't be reported. Default value is empty list, but there is
+  # no need to include all autogenerated files, we confidently recognize
+  # autogenerated files. If it's not please let us know.
+  # "/" will be replaced by current OS file path separator to properly work
+  # on Windows.
+  skip-files:
+    - ".*\\.my\\.go$"
+    - _test.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
   # automatic updating of go.mod described above. Instead, it fails when any changes
@@ -30,6 +73,7 @@ run:
   # If false (default) - golangci-lint acquires file lock on start.
   allow-parallel-runners: true
 
+
 # output configuration options
 output:
   # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
@@ -44,9 +88,26 @@ output:
   # make issues output unique by line, default is true
   uniq-by-line: true
 
+  # add a prefix to the output file references; default is no prefix
+  path-prefix: ""
+
+  # sorts results by: filepath, line and column
+  sort-results: true
 
 # all available settings of specific linters
 linters-settings:
+  bidichk:
+    # The following configurations check for all mentioned invisible unicode
+    # runes. It can be omitted because all runes are enabled by default.
+    left-to-right-embedding: true
+    right-to-left-embedding: true
+    pop-directional-formatting: true
+    left-to-right-override: true
+    right-to-left-override: true
+    left-to-right-isolate: true
+    right-to-left-isolate: true
+    first-strong-isolate: true
+    pop-directional-isolate: true
   dogsled:
     # checks assignments with too many blank identifiers; default is 2
     max-blank-identifiers: 2
@@ -62,47 +123,217 @@ linters-settings:
     # default is false: such cases aren't reported by default.
     check-blank: false
 
+    # [deprecated] comma-separated list of pairs of the form pkg:regex
+    # the regex is used to ignore names within pkg. (default "fmt:.*").
+    # see https://github.com/kisielk/errcheck#the-deprecated-method for details
+    #ignore: GenMarkdownTree,os:.*,BindPFlags,WriteTo,Help
+    #ignore: (os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*print(f|ln)?|os\.(Un)?Setenv
+
     # path to a file containing a list of functions to exclude from checking
     # see https://github.com/kisielk/errcheck#excluding-functions for details
     #exclude: errcheck.txt
+    
+  errorlint:
+    # Check whether fmt.Errorf uses the %w verb for formatting errors. See the readme for caveats
+    errorf: true
+    # Check for plain type assertions and type switches
+    asserts: true
+    # Check for plain error comparisons
+    comparison: true
+
   exhaustive:
+    # check switch statements in generated files also
+    check-generated: false
     # indicates that switch statements are to be considered exhaustive if a
     # 'default' case is present, even if all enum members aren't listed in the
     # switch
     default-signifies-exhaustive: false
+    # enum members matching the supplied regex do not have to be listed in
+    # switch statements to satisfy exhaustiveness
+    ignore-enum-members: ""
+    # consider enums only in package scopes, not in inner scopes
+    package-scope-only: false
+  exhaustivestruct:
+    struct-patterns:
+      - '*.Test'
+      - '*.Test2'
+      - '*.Embedded'
+      - '*.External'
+
+  # forbidigo:
+  #   # Forbid the following identifiers (identifiers are written using regexp):
+  #   forbid:
+  #     - ^print.*$
+  #     - 'fmt\.Print.*'
+  #     - fmt.Println.* # too much log noise
+  #     - ginkgo\\.F.* # these are used just for local development
+  #   # Exclude godoc examples from forbidigo checks.  Default is true.
+  #   exclude_godoc_examples: false
   funlen:
     lines: 150
-    statements: 40
+    statements: 50
+  gci:
+    # 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
   gocognit:
     # minimal code complexity to report, 30 by default (but we recommend 10-20)
     min-complexity: 30
-  nestif:
-    # minimal complexity of if statements to report, 5 by default
-    min-complexity: 4
   goconst:
     # minimal length of string constant, 3 by default
-    min-len: 5
+    min-len: 3
     # minimal occurrences count to trigger, 3 by default
-    min-occurrences: 5
+    min-occurrences: 3
+    # ignore test files, false by default
+    ignore-tests: false
+    # look for existing constants matching the values, true by default
+    match-constant: true
+    # search also for duplicated numbers, false by default
+    numbers: false
+    # minimum value, only works with goconst.numbers, 3 by default
+    min: 3
+    # maximum value, only works with goconst.numbers, 3 by default
+    max: 3
+    # ignore when constant is not used as function argument, true by default
+    ignore-calls: true
+
+  gocritic:
+    # Which checks should be enabled; can't be combined with 'disabled-checks';
+    # See https://go-critic.github.io/overview#checks-overview
+    # To check which checks are enabled run `GL_DEBUG=gocritic golangci-lint run`
+    # By default list of stable checks is used.
+    enabled-checks:
+      #- rangeValCopy
+      - nestingreduce
+      - truncatecmp
+      - unnamedresult
+      - ruleguard
+
+    # Which checks should be disabled; can't be combined with 'enabled-checks'; default is empty
+    disabled-checks:
+      - regexpMust
+      - ifElseChain
+      #- exitAfterDefer
+
+    # Enable multiple checks by tags, run `GL_DEBUG=gocritic golangci-lint run` to see all tags and checks.
+    # Empty list by default. See https://github.com/go-critic/go-critic#usage -> section "Tags".
+    enabled-tags:
+      - performance
+    disabled-tags:
+      - experimental
+
+    # Settings passed to gocritic.
+    # The settings key is the name of a supported gocritic checker.
+    # The list of supported checkers can be find in https://go-critic.github.io/overview.
+    settings:
+      captLocal: # must be valid enabled check name
+        # whether to restrict checker to params only (default true)
+        paramsOnly: true
+      elseif:
+        # whether to skip balanced if-else pairs (default true)
+        skipBalanced: true
+      hugeParam:
+        # size in bytes that makes the warning trigger (default 80)
+        sizeThreshold: 80
+      nestingReduce:
+        # min number of statements inside a branch to trigger a warning (default 5)
+        bodyWidth: 5
+      rangeExprCopy:
+        # size in bytes that makes the warning trigger (default 512)
+        sizeThreshold: 512
+        # whether to check test functions (default true)
+        skipTestFuncs: true
+      rangeValCopy:
+        # size in bytes that makes the warning trigger (default 128)
+        sizeThreshold: 32
+        # whether to check test functions (default true)
+        skipTestFuncs: true
+      ruleguard:
+        # path to a gorules file for the ruleguard checker
+        rules: ''
+      truncateCmp:
+        # whether to skip int/uint/uintptr types (default true)
+        skipArchDependent: true
+      underef:
+        # whether to skip (*x).method() calls where x is a pointer receiver (default true)
+        skipRecvDeref: true
+      unnamedResult:
+        # whether to check exported functions
+        checkExported: true
   gocyclo:
     # minimal code complexity to report, 30 by default (but we recommend 10-20)
     min-complexity: 30
+  cyclop:
+    # the maximal code complexity to report
+    max-complexity: 50
+    # the maximal average package complexity. If it's higher than 0.0 (float) the check is enabled (default 0.0)
+    package-average: 0.0
+    # should ignore tests (default false)
+    skip-tests: false
   godot:
-    # check all top-level comments, not only declarations
+    # comments to be checked: `declarations`, `toplevel`, or `all`
-    check-all: false
+    scope: declarations
+    # list of regexps for excluding particular comment lines from check
+    exclude:
+      # example: exclude comments which contain numbers
+      # - '[0-9]+'
+    # check that each sentence starts with a capital letter
+    capital: false
   godox:
     # report any comments starting with keywords, this is useful for TODO or FIXME comments that
     # might be left in the code accidentally and should be resolved before merging
     keywords: # default keywords are TODO, BUG, and FIXME, these can be overwritten by this setting
+      #- TODO
+      - BUG
+      - FIXME
+      #- NOTE
       - OPTIMIZE # marks code that should be optimized before merging
       - HACK # marks hack-arounds that should be removed before merging
   gofmt:
     # simplify code: gofmt with `-s` option, true by default
     simplify: true
+
+  gofumpt:
+    # Select the Go version to target. The default is `1.18`.
+    lang-version: "1.20"
+
+    # Choose whether or not to use the extra rules that are disabled
+    # by default
+    extra-rules: false
+
+  goheader:
+    values:
+      const:
+        # define here const type values in format k:v, for example:
+        # COMPANY: MY COMPANY
+      regexp:
+        # define here regexp type values, for example
+        # AUTHOR: .*@mycompany\.com
+    template: # |-
+      # put here copyright header template for source code files, for example:
+      # Note: {{ YEAR }} is a builtin value that returns the year relative to the current machine time.
+      #
+      # {{ AUTHOR }} {{ COMPANY }} {{ YEAR }}
+      # SPDX-License-Identifier: Apache-2.0
+
+      # 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.
+    template-path:
+      # also as alternative of directive 'template' you may put the path to file with the template source
   goimports:
     # put imports beginning with prefix after 3rd-party packages;
     # it's a comma-separated list of prefixes
-    local-prefixes: github.com/org/project
+    local-prefixes: github.com/OpenIMSDK/OpenKF
   golint:
     # minimal confidence for issues, default is 0.8
     min-confidence: 0.9
@@ -111,16 +342,91 @@ linters-settings:
       mnd:
         # the list of enabled checks, see https://github.com/tommy-muehle/go-mnd/#checks for description.
         checks: argument,case,condition,operation,return,assign
+        # ignored-numbers: 1000
+        # ignored-files: magic_.*.go
+        # ignored-functions: math.*
+  gomoddirectives:
+    # Allow local `replace` directives. Default is false.
+    replace-local: true
+    # List of allowed `replace` directives. Default is empty.
+    replace-allow-list:
+      - google.golang.org/grpc
+
+    # Allow to not explain why the version has been retracted in the `retract` directives. Default is false.
+    retract-allow-no-explanation: false
+    # Forbid the use of the `exclude` directives. Default is false.
+    exclude-forbidden: false
   gomodguard:
     allowed:
-      modules:                                                        # List of allowed modules
+      modules:    
+        - gorm.io/gen                                                    # List of allowed modules
+        - gorm.io/gorm
+        - gorm.io/driver/mysql
+        - k8s.io/klog
         # - gopkg.in/yaml.v2
       domains:                                                        # List of allowed module domains
-        # - golang.org
+        - google.golang.org
+        - gopkg.in
+        - golang.org
+        - github.com
+        - go.uber.org
+        - go.etcd.io
+    blocked:
+      versions:
+        - github.com/MakeNowJust/heredoc:
+            version: "> 2.0.9"
+            reason: "use the latest version"
+      local_replace_directives: false     # Set to true to raise lint issues for packages that are loaded from a local path via replace directive
+
+  gosec:
+    # To select a subset of rules to run.
+    # Available rules: https://github.com/securego/gosec#available-rules
+    includes:
+      - G401
+      - G306
+      - G101
+    # To specify a set of rules to explicitly exclude.
+    # Available rules: https://github.com/securego/gosec#available-rules
+    excludes:
+      - G204
+    # Exclude generated files
+    exclude-generated: true
+    # Filter out the issues with a lower severity than the given value. Valid options are: low, medium, high.
+    severity: "low"
+    # Filter out the issues with a lower confidence than the given value. Valid options are: low, medium, high.
+    confidence: "low"
+    # To specify the configuration of rules.
+    # The configuration of rules is not fully documented by gosec:
+    # https://github.com/securego/gosec#configuration
+    # https://github.com/securego/gosec/blob/569328eade2ccbad4ce2d0f21ee158ab5356a5cf/rules/rulelist.go#L60-L102
+    config:
+      G306: "0600"
+      G101:
+        pattern: "(?i)example"
+        ignore_entropy: false
+        entropy_threshold: "80.0"
+        per_char_threshold: "3.0"
+        truncate: "32"
+
+  gosimple:
+    # Select the Go version to target. The default is '1.13'.
+    go: "1.20"
+    # https://staticcheck.io/docs/options#checks
+    checks: [ "all" ]
+
   govet:
     # report about shadowed variables
     check-shadowing: true
 
+    # settings per analyzer
+    settings:
+      printf: # analyzer name, run `go tool vet help` to see all analyzers
+        funcs: # run `go tool vet help printf` to see available settings for `printf` analyzer
+          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
+          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
+          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
+          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
+
     # enable or disable analyzers by name
     enable:
       - atomicalign
@@ -128,17 +434,69 @@ linters-settings:
     disable:
       - shadow
     disable-all: false
-  depguard:
+  # depguard:
-    list-type: blacklist
+  #   list-type: blacklist
-    include-go-root: false
+  #   include-go-root: false
-    packages:
+  #   packages:
-    packages-with-error-message:
+  #     - github.com/Sirupsen/logrus
+  #   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.
+    no-unaliased: true
+    # List of aliases
+    alias:
+      # using `servingv1` alias for `knative.dev/serving/pkg/apis/serving/v1` package
+      - pkg: knative.dev/serving/pkg/apis/serving/v1
+        alias: servingv1
+      # using `autoscalingv1alpha1` alias for `knative.dev/serving/pkg/apis/autoscaling/v1alpha1` package
+      - pkg: knative.dev/serving/pkg/apis/autoscaling/v1alpha1
+        alias: autoscalingv1alpha1
+      # You can specify the package path by regular expression,
+      # and alias by regular expression expansion syntax like below.
+      # see https://github.com/julz/importas#use-regular-expression for details
+      - pkg: knative.dev/serving/pkg/apis/(\w+)/(v[\w\d]+)
+        alias: $1$2
+    # using `jwt` alias for `github.com/appleboy/gin-jwt/v2` package
+    jwt: github.com/appleboy/gin-jwt/v2
+
+  ireturn:
+    # ireturn allows using `allow` and `reject` settings at the same time.
+    # Both settings are lists of the keywords and regular expressions matched to interface or package names.
+    # keywords:
+    # - `empty` for `interface{}`
+    # - `error` for errors
+    # - `stdlib` for standard library
+    # - `anon` for anonymous interfaces
+
+    # By default, it allows using errors, empty interfaces, anonymous interfaces,
+    # and interfaces provided by the standard library.
+    allow:
+    - anon
+    - error
+    - empty
+    - stdlib
+    # You can specify idiomatic endings for interface
+    - (or|er)$
+
+    # Reject patterns
+    reject:
+    - github.com\/user\/package\/v4\.Type
+
   lll:
     # max line length, lines longer will be reported. Default is 120.
     # '\t' is counted as 1 character by default, and can be changed with the tab-width option
-    line-length: 120
+    line-length: 240
     # tab width in spaces. Default to 1.
-    tab-width: 1
+    tab-width: 4
   maligned:
     # print struct with more effective memory layout or not, false by default
     suggest-new: true
@@ -152,6 +510,37 @@ linters-settings:
   nakedret:
     # make an issue if func has more lines of code than this setting and it has naked returns; default is 30
     max-func-lines: 30
+
+  nestif:
+    # minimal complexity of if statements to report, 5 by default
+    min-complexity: 4
+
+  nilnil:
+    # By default, nilnil checks all returned types below.
+    checked-types:
+      - ptr
+      - func
+      - iface
+      - map
+      - chan
+
+  nlreturn:
+    # size of the block (including return statement that is still "OK")
+    # so no return split required.
+    block-size: 1
+
+  nolintlint:
+    # Disable to ensure that all nolint directives actually have an effect. Default is true.
+    allow-unused: false
+    # Disable to ensure that nolint directives don't have a leading space. Default is true.
+    allow-leading-space: true
+    # Exclude following linters from requiring an explanation.  Default is [].
+    allow-no-explanation: [ ]
+    # Enable to require an explanation of nonzero length after each nolint directive. Default is false.
+    require-explanation: false
+    # Enable to require nolint directives to mention the specific linter being suppressed. Default is false.
+    require-specific: true
+
   prealloc:
     # XXX: we don't recommend using this linter before doing performance profiling.
     # For most programs usage of prealloc will be a premature optimization.
@@ -161,17 +550,97 @@ linters-settings:
     simple: true
     range-loops: true # Report preallocation suggestions on range loops, true by default
     for-loops: false # Report preallocation suggestions on for loops, false by default
-  nolintlint:
+
-    # Enable to ensure that nolint directives are all used. Default is true.
+  promlinter:
-    allow-unused: false
+    # Promlinter cannot infer all metrics name in static analysis.
-    # Disable to ensure that nolint directives don't have a leading space. Default is true.
+    # Enable strict mode will also include the errors caused by failing to parse the args.
-    allow-leading-space: true
+    strict: false
-    # Exclude following linters from requiring an explanation.  Default is [].
+    # Please refer to https://github.com/yeya24/promlinter#usage for detailed usage.
-    allow-no-explanation: []
+    disabled-linters:
-    # Enable to require an explanation of nonzero length after each nolint directive. Default is false.
+    #  - "Help"
-    require-explanation: true
+    #  - "MetricUnits"
-    # Enable to require nolint directives to mention the specific linter being suppressed. Default is false.
+    #  - "Counter"
-    require-specific: true
+    #  - "HistogramSummaryReserved"
+    #  - "MetricTypeInName"
+    #  - "ReservedChars"
+    #  - "CamelCase"
+    #  - "lintUnitAbbreviations"
+    
+  predeclared:
+    # comma-separated list of predeclared identifiers to not report on
+    ignore: ""
+    # include method names and field names (i.e., qualified names) in checks
+    q: false
+  rowserrcheck:
+    packages:
+      - github.com/jmoiron/sqlx
+  revive:
+    # see https://github.com/mgechev/revive#available-rules for details.
+    ignore-generated-header: true
+    severity: warning
+    rules:
+      - name: indent-error-flow
+        severity: warning
+  staticcheck:
+    # Select the Go version to target. The default is '1.13'.
+    go: "1.16"
+    # https://staticcheck.io/docs/options#checks
+    checks: [ "all" ]
+
+  stylecheck:
+    # Select the Go version to target. The default is '1.13'.
+    go: "1.16"
+
+    # https://staticcheck.io/docs/options#checks
+    checks: [ "all", "-ST1000", "-ST1003", "-ST1016", "-ST1020", "-ST1021", "-ST1022" ]
+    # https://staticcheck.io/docs/options#dot_import_whitelist
+    dot-import-whitelist:
+      - fmt
+    # https://staticcheck.io/docs/options#initialisms
+    initialisms: [ "ACL", "API", "ASCII", "CPU", "CSS", "DNS", "EOF", "GUID", "HTML", "HTTP", "HTTPS", "ID", "IP", "JSON", "QPS", "RAM", "RPC", "SLA", "SMTP", "SQL", "SSH", "TCP", "TLS", "TTL", "UDP", "UI", "GID", "UID", "UUID", "URI", "URL", "UTF8", "VM", "XML", "XMPP", "XSRF", "XSS" ]
+    # https://staticcheck.io/docs/options#http_status_code_whitelist
+    http-status-code-whitelist: [ "200", "400", "404", "500" ]
+
+
+  tagliatelle:
+    # check the struck tag name case
+    case:
+      # use the struct field name to check the name of the struct tag
+      use-field-name: true
+      rules:
+        # any struct tag type can be used.
+        # support string case: `camel`, `pascal`, `kebab`, `snake`, `goCamel`, `goPascal`, `goKebab`, `goSnake`, `upper`, `lower`
+        json: camel
+        yaml: camel
+        xml: camel
+        bson: camel
+        avro: snake
+        mapstructure: kebab
+
+  testpackage:
+    # regexp pattern to skip files
+    skip-regexp: (id|export|internal)_test\.go
+  thelper:
+    # The following configurations enable all checks. It can be omitted because all checks are enabled by default.
+    # You can enable only required checks deleting unnecessary checks.
+    test:
+      first: true
+      name: true
+      begin: true
+    benchmark:
+      first: true
+      name: true
+      begin: true
+    tb:
+      first: true
+      name: true
+      begin: true
+
+  tenv:
+    # The option `all` will run against whole test files (`_test.go`) regardless of method/function signatures.
+    # By default, only methods that take `*testing.T`, `*testing.B`, and `testing.TB` as arguments are checked.
+    all: false
+
   unparam:
     # Inspect exported functions, default is false. Set to true if no external program/library imports your code.
     # XXX: if you enable this setting, unparam will report a lot of false-positives in text editors:
@@ -187,6 +656,24 @@ linters-settings:
   whitespace:
     multi-if: false   # Enforces newlines (or comments) after every multi-line if statement
     multi-func: false # Enforces newlines (or comments) after every multi-line function signature
+
+  wrapcheck:
+    # An array of strings that specify substrings of signatures to ignore.
+    # If this set, it will override the default set of ignored signatures.
+    # See https://github.com/tomarrell/wrapcheck#configuration for more information.
+    ignoreSigs:
+      - .Errorf(
+      - errors.New(
+      - errors.Unwrap(
+      - .Wrap(
+      - .Wrapf(
+      - .WithMessage(
+      - .WithMessagef(
+      - .WithStack(
+    ignorePackageGlobs:
+        - encoding/*
+        - github.com/pkg/*
+
   wsl:
     # If true append is only allowed to be cuddled if appending value is
     # matching variables, fields or types on line above. Default is true.
@@ -194,6 +681,8 @@ linters-settings:
     # Allow calls and assignments to be cuddled as long as the lines have any
     # matching variables, fields or types. Default is true.
     allow-assign-and-call: true
+    # Allow assignments to be cuddled with anything. Default is false.
+    allow-assign-and-anything: false
     # Allow multiline assignments to be cuddled. Default is true.
     allow-multiline-assign: true
     # Allow declarations (var) to be cuddled.
@@ -206,65 +695,181 @@ linters-settings:
     force-err-cuddling: false
     # Allow leading comments to be separated with empty liens
     allow-separated-leading-comment: false
+  makezero:
+    # Allow only slices initialized with a length of zero. Default is false.
+    always: false
+
+
+  # The custom section can be used to define linter plugins to be loaded at runtime. See README doc
+  #  for more info.
+  #custom:
+    # Each custom linter should have a unique name.
+    #example:
+      # The path to the plugin *.so. Can be absolute or local. Required for each custom linter
+      #path: /path/to/example.so
+      # The description of the linter. Optional, just for documentation purposes.
+      #description: This is an example usage of a plugin linter.
+      # Intended to point to the repo location of the linter. Optional, just for documentation purposes.
+      #original-url: github.com/golangci/example-linter
 
 linters:
   # please, do not use `enable-all`: it's deprecated and will be removed soon.
   # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
+  # enable-all: true
   disable-all: true
   enable:
+    - typecheck
+    - asciicheck
     - bodyclose
+    - cyclop
     - deadcode
-    - depguard
+    # - depguard
     - dogsled
     - dupl
+    - durationcheck
     - errcheck
+    - errorlint
+    - exhaustive
+    - exportloopref
+    # - forbidigo
     - funlen
-    - gochecknoinits
+    # - gci
+    # - gochecknoinits
+    - gocognit
     - goconst
-    - gocritic
     - gocyclo
+    - godot
+    - godox
     - gofmt
+    - gofumpt
+    - goheader
     - goimports
-    - golint
+    - gomoddirectives
+    - gomodguard
     - goprintffuncname
     - gosec
     - gosimple
     - govet
+    - ifshort
+    - importas
     - ineffassign
-    - interfacer
     - lll
+    - makezero
     - misspell
     - nakedret
+    - nestif
+    - nilerr
+    - nlreturn
+    - noctx
     - nolintlint
+    - paralleltest
+    - prealloc
+    - predeclared
+    - promlinter
+    - revive
     - rowserrcheck
-    - scopelint
+    - sqlclosecheck
     - staticcheck
     - structcheck
     - stylecheck
-    - typecheck
+    - thelper
+    - tparallel
     - unconvert
     - unparam
     - unused
     - varcheck
+    - wastedassign
     - whitespace
-    - asciicheck
+    - bidichk
-    - gocognit
+    - wastedassign
-    - godot
+    - golint
-    - godox
+    - execinquery
-    - maligned
+    - nosprintfhostport
-    - nestif
+    - grouper
-    - prealloc
+    - decorder
-    - gomodguard
+    - errchkjson
-  # don't enable:
+    - maintidx
-      #- goerr113
+      #- containedctx
-      #- wsl
+      #- tagliatelle
-      #- testpackage
+      #- nonamedreturns
-      #- exhaustive (TODO: enable after next release; current release at time of writing is v1.27)
+      #- nilnil
-      #- gochecknoglobals
+      #- tenv
-      #- gomnd
+      #- varnamelen
+      #- contextcheck
+      #- errname
+      #- ForceTypeAssert
+      #- nilassign
+  fast: false
 
 issues:
+  # List of regexps of issue texts to exclude, empty list by default.
+  # But independently from this option we use default exclude patterns,
+  # it can be disabled by `exclude-use-default: false`. To list all
+  # excluded by default patterns execute `golangci-lint run --help`
+  exclude:
+    - tools/.*
+    - test/.*
+    - third_party/.*
+
   # 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
+
+    - linters:
+      - wrapcheck
+      path: (cmd/.*|pkg/.*)\.go
+
+    - linters:
+      - typecheck
+        #path: (pkg/storage/.*)\.go
+      path: (internal/.*|pkg/.*)\.go
+
+    - path: (cmd/.*|test/.*|tools/.*|internal/pump/pumps/.*)\.go
+      linters:
+        - forbidigo
+
+    - path: (cmd/[a-z]*/.*|store/.*)\.go
+      linters:
+        - dupl
+
+    - linters:
+        - gocritic
+      text: (hugeParam:|rangeValCopy:)
+
+    - path: (cmd/[a-z]*/.*)\.go
+      linters:
+        - lll
+
+    - path: (validator/.*|code/.*|validator/.*|watcher/watcher/.*)
+      linters:
+        - gochecknoinits
+
+    - path: (internal/.*/options|internal/pump|pkg/log/options.go|internal/authzserver|tools/)
+      linters:
+        - tagliatelle
+
+    - path: (pkg/app/.*)\.go
+      linters:
+        - deadcode
+        - unused
+        - varcheck
+        - forbidigo
+
+    # Exclude some staticcheck messages
+    - linters:
+        - staticcheck
+      text: "SA9003:"
+
+    # Exclude lll issues for long lines with go:generate
+    - linters:
+        - lll
+      source: "^//go:generate "
 
   # Independently from option `exclude` we use default exclude patterns,
   # it can be disabled by this option. To list all
@@ -300,24 +905,27 @@ issues:
   # Show only new issues created in git patch with set file path.
   #new-from-patch: path/to/patch/file
 
+  # Fix found issues (if it's supported by the linter)
+  fix: true
+
 severity:
   # Default value is empty string.
-  # Set the default severity for issues. If severity rules are defined and the issues 
+  # Set the default severity for issues. If severity rules are defined and the issues
-  # do not match or no severity is provided to the rule this will be the default 
+  # do not match or no severity is provided to the rule this will be the default
-  # severity applied. Severities should match the supported severity names of the 
+  # severity applied. Severities should match the supported severity names of the
   # selected out format.
   # - Code climate: https://docs.codeclimate.com/docs/issues#issue-severity
   # -   Checkstyle: https://checkstyle.sourceforge.io/property_types.html#severity
   # -       Github: https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-error-message
   default-severity: error
 
-  # The default value is false. 
+  # The default value is false.
   # If set to true severity-rules regular expressions become case sensitive.
   case-sensitive: false
 
   # Default value is empty list.
   # When a list of severity rules are provided, severity information will be added to lint
-  # issues. Severity rules have the same filtering capability as exclude rules except you 
+  # issues. Severity rules have the same filtering capability as exclude rules except you
   # are allowed to specify one matcher per severity rule.
   # Only affects out formats that support setting severity information.
   rules:

CHANGELOG/CHANGELOG-3.0.md

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

CHANGELOG/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+- [Changelog](#changelog)
+  - [command](#command)
+  - [create next tag](#create-next-tag)
+  - [Release version logs](#release-version-logs)
+  - [Introduction](#introduction)
+  - [Naming Format](#naming-format)
+  - [Examples](#examples)
+  - [Version Modifiers](#version-modifiers)
+  - [Versioning Strategy](#versioning-strategy)
+
+
 All notable changes to this project will be documented in this file.
 
 + [https://github.com/OpenIMSDK/Open-IM-Server/releases](https://github.com/OpenIMSDK/Open-IM-Server/releases)
@@ -18,6 +29,14 @@ git commit -am "release 2.0.0"
 git tag 2.0.0
 ```
 
+| Query          | Description                                    | Example                     |
+| -------------- | ---------------------------------------------- | --------------------------- |
+| `<old>..<new>` | Commit contained in `<new>` tags from `<old>`. | `$ git-chglog 1.0.0..2.0.0` |
+| `<name>..`     | Commit from the `<name>` to the latest tag.    | `$ git-chglog 1.0.0..`      |
+| `..<name>`     | Commit from the oldest tag to `<name>`.        | `$ git-chglog ..2.0.0`      |
+| `<name>`       | Commit contained in `<name>`.                  | `$ git-chglog 1.0.0`        |
+
+
 ## Release version logs
 
 + [OpenIM CHANGELOG-V1.0](CHANGELOG-1.0.md)
@@ -26,4 +45,60 @@ git tag 2.0.0
 + [OpenIM CHANGELOG-V2.2](CHANGELOG-2.2.md)
 + [OpenIM CHANGELOG-V2.3](CHANGELOG-2.3.md)
 + [OpenIM CHANGELOG-V2.9](CHANGELOG-2.9.md)
-+ [OpenIM CHANGELOG-V3.0](CHANGELOG-3.0.md)
++ [OpenIM CHANGELOG-V3.0](CHANGELOG-3.0.md)
+
+## Introduction
+
+In both the open-source and closed-source software development communities, it is important to follow a consistent and understandable versioning scheme for software projects. This ensures clear communication of changes, compatibility, and stability across different releases. One widely adopted naming convention is the Semantic Versioning 2.0.0.
+
+## Naming Format
+
+The most common format for version numbers is as follows:
+
+```
+major.minor[.patch[.build]]
+```
+
+Let's take a closer look at each component:
+
+1. **Major Version**: This is the first number in the versioning scheme and indicates significant changes that may not be backward compatible (specific to each project).
+2. **Minor Version**: The second number signifies the addition of new features while maintaining backward compatibility.
+3. **Patch Version**: The third number represents bug fixes or code optimizations without introducing new features. It is generally backward compatible.
+4. **Build Version**: Typically an automatically generated number that increments with each code commit.
+
+## Examples
+
+Here are a few examples to illustrate the versioning scheme:
+
+1. `1.0`
+2. `2.14.0.1478`
+3. `3.2.1 build-354`
+
+## Version Modifiers
+
+Apart from the version numbers, there are also version modifiers used to indicate specific stages or statuses of a release. Some commonly used version modifiers include:
+
+- **alpha**: An internal testing version with numerous known bugs. It is primarily used for communication among developers.
+- **beta**: A testing version released to enthusiastic users for feedback and bug detection.
+- **rc (release candidate)**: The final testing version before the official release.
+- **ga (general availability)**: The initial stable release for public distribution.
+- **r/release** (or no modifier at all): The final released version intended for general users.
+- **lts (long-term support)**: Designates a version that will receive extended maintenance and bug fixes for a specified number of years.
+
+## Versioning Strategy
+
+To effectively manage version numbers, the following strategies are commonly employed:
+
+- The initial version of a project can be either `0.1` or `1.0`.
+- When fixing bugs, the patch version is incremented by 1.
+- When adding new features, the minor version is incremented by 1, and the patch version is reset to 0.
+- In the case of significant modifications, the major version is incremented by 1.
+- The build version is usually automatically generated by the compilation process and follows a defined format. It does not require manual control.
+
+By adhering to these strategies and guidelines, developers can maintain consistency and clarity in versioning their software projects. This enables users and collaborators to understand the nature of changes between different releases and ensure compatibility with their systems.
+
+(Note: Markdown formatting has been used to structure this article. Markdown is a lightweight markup language used to format text on platforms like GitHub.)
+
+------
+
+**Note**: The above article is based on the given content and aims to provide a Markdown-formatted English article explaining the naming conventions for software project versions, specifically focusing on the Semantic Versioning 2.0.0.

Dockerfile

@@ -1,38 +1,31 @@
+# Build Stage
 FROM golang as build
 
-# go mod Installation source, container environment variable addition will override the default variable value
+# Set go mod installation source and proxy
-ENV GO111MODULE=on
+ARG GO111MODULE=on
-ENV GOPROXY=https://goproxy.cn,direct
+ARG GOPROXY=https://goproxy.cn,direct
+ENV GO111MODULE=$GO111MODULE
+ENV GOPROXY=$GOPROXY
 
 # Set up the working directory
 WORKDIR /Open-IM-Server
-# add all files to the container
-COPY . .
 
-WORKDIR /Open-IM-Server/scripts
+# Copy all files to the container
-RUN chmod +x *.sh
+ADD . .
 
-RUN /bin/sh -c ./build_all_service.sh
+RUN /bin/sh -c "make build"
 
-#Blank image Multi-Stage Build
+# Production Stage
-FROM ubuntu
+FROM alpine
 
-RUN rm -rf /var/lib/apt/lists/*
+RUN apk --no-cache add tzdata
-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
 
+# Set directory to map logs, config files, scripts, and SDK
+VOLUME ["/Open-IM-Server/logs", "/Open-IM-Server/config", "/Open-IM-Server/scripts", "/Open-IM-Server/db/sdk"]
 
-#set directory to map logs,config file,scripts file.
+# Copy scripts and binary files to the production image
-VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts","/Open-IM-Server/db/sdk"]
-
-#Copy scripts files and binary files to the blank image
 COPY --from=build /Open-IM-Server/scripts /Open-IM-Server/scripts
-COPY --from=build /Open-IM-Server/_output/bin/platforms/linux/amd64 /Open-IM-Server/_output/bin/platforms/linux/amd64  
+COPY --from=build /Open-IM-Server/_output/bin/platforms/linux/arm64 /Open-IM-Server/_output/bin/platforms/linux/arm64
 
 WORKDIR /Open-IM-Server/scripts
 

cmd/openim-api/main.go

@@ -76,7 +76,6 @@ func run(port int) error {
 	if err := client.CreateRpcRootNodes(config.GetServiceNames()); err != nil {
 		return err
 	}
-	fmt.Println("api init discov client success")
 	fmt.Println("api register public config to discov")
 	if err := client.RegisterConf2Registry(constant.OpenIMCommonConfigKey, config.EncodeConfig()); err != nil {
 		return err

cmd/openim-msgtransfer/main.go

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

config/config.yaml

@@ -117,10 +117,10 @@ rpcRegisterName: #rpc注册服务名，不建议修改
   openImThirdName: Third
 
 log:
-  storageLocation: ../logs/           #存放目录
+  storageLocation: ../../../../../logs/   #存放目录
-  rotationTime: 24                    #日志旋转时间
+  rotationTime: 24                        #日志旋转时间
-  remainRotationCount: 2              #日志数量
+  remainRotationCount: 2                  #日志数量
-  remainLogLevel: 6                   #日志级别 6表示全都打印，
+  remainLogLevel: 6                       #日志级别 6表示全都打印，
   isStdout: false
   isJson: false
   withStack: false

docker-compose.yaml

@@ -100,7 +100,7 @@ services:
 
 
   openim_server:
-    image: ghcr.io/openimsdk/openim-server:v3.0.0
+    image: ghcr.io/openimsdk/openim-server:v3.0.0-rc.2
     container_name: openim-server
     volumes:
       - ./logs:/Open-IM-Server/logs

install_im_server.sh

@@ -9,6 +9,10 @@ source .env
 echo $MINIO_ENDPOINT
 
 # Replace local IP address with the public IP address in .env file
+if [ $API_URL == "http://127.0.0.1:10002/object/" ]; then
+    sed -i "s/127.0.0.1/${internet_ip}/" .env
+fi
+
 if [ $MINIO_ENDPOINT == "http://127.0.0.1:10005" ]; then
     sed -i "s/127.0.0.1/${internet_ip}/" .env
 fi

internal/api/group.go

@@ -132,3 +132,6 @@ func (o *GroupApi) GetSuperGroupsInfo(c *gin.Context) {
 func (o *GroupApi) GroupCreateCount(c *gin.Context) {
 	a2r.Call(group.GroupClient.GroupCreateCount, o.Client, c)
 }
+func (o *GroupApi) GetGroups(c *gin.Context) {
+	a2r.Call(group.GroupClient.GetGroups, o.Client, c)
+}

internal/api/msg.go

@@ -204,7 +204,7 @@ func (m *MessageApi) SendMessage(c *gin.Context) {
 	if err := mapstructure.WeakDecode(params.Content, &data); err != nil {
 		apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
 		return
-	} else if err := m.validate.Struct(data); err != nil {
+	} else if err := m.validate.Struct(params); err != nil {
 		apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
 		return
 	}
@@ -227,7 +227,107 @@ func (m *MessageApi) SendMessage(c *gin.Context) {
 }
 
 func (m *MessageApi) ManagementBatchSendMsg(c *gin.Context) {
-	a2r.Call(msg.MsgClient.SendMsg, m.Client, c)
+	params := apistruct.ManagementBatchSendMsgReq{}
+	resp := apistruct.ManagementBatchSendMsgResp{}
+	var msgSendFailedFlag bool
+	if err := c.BindJSON(&params); err != nil {
+		apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
+		return
+	}
+	if !tokenverify.IsAppManagerUid(c) {
+		apiresp.GinError(c, errs.ErrNoPermission.Wrap("only app manager can send message"))
+		return
+	}
+
+	var data interface{}
+	switch params.ContentType {
+	case constant.Text:
+		data = apistruct.TextElem{}
+	case constant.Picture:
+		data = apistruct.PictureElem{}
+	case constant.Voice:
+		data = apistruct.SoundElem{}
+	case constant.Video:
+		data = apistruct.VideoElem{}
+	case constant.File:
+		data = apistruct.FileElem{}
+	case constant.Custom:
+		data = apistruct.CustomElem{}
+	case constant.Revoke:
+		data = apistruct.RevokeElem{}
+	case constant.OANotification:
+		data = apistruct.OANotificationElem{}
+		params.SessionType = constant.NotificationChatType
+	case constant.CustomNotTriggerConversation:
+		data = apistruct.CustomElem{}
+	case constant.CustomOnlineOnly:
+		data = apistruct.CustomElem{}
+	default:
+		apiresp.GinError(c, errs.ErrArgs.WithDetail("not support err contentType").Wrap())
+		return
+	}
+	if err := mapstructure.WeakDecode(params.Content, &data); err != nil {
+		apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
+		return
+	} else if err := m.validate.Struct(params); err != nil {
+		apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
+		return
+	}
+
+	t := &apistruct.ManagementSendMsgReq{
+		SendID:           params.SendID,
+		GroupID:          params.GroupID,
+		SenderNickname:   params.SenderNickname,
+		SenderFaceURL:    params.SenderFaceURL,
+		SenderPlatformID: params.SenderPlatformID,
+		Content:          params.Content,
+		ContentType:      params.ContentType,
+		SessionType:      params.SessionType,
+		IsOnlineOnly:     params.IsOnlineOnly,
+		NotOfflinePush:   params.NotOfflinePush,
+		OfflinePushInfo:  params.OfflinePushInfo,
+	}
+	pbReq := m.newUserSendMsgReq(c, t)
+	var recvList []string
+	if params.IsSendAll {
+		// req2 := &user.GetAllUserIDReq{}
+		// resp2, err := m.Message.GetAllUserID(c, req2)
+		// if err != nil {
+		// 	apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
+		// 	return
+		// }
+		// recvList = resp2.UserIDs
+	} else {
+		recvList = params.RecvIDList
+	}
+
+	for _, recvID := range recvList {
+		pbReq.MsgData.RecvID = recvID
+		rpcResp, err := m.Client.SendMsg(c, pbReq)
+		if err != nil {
+			resp.Data.FailedIDList = append(resp.Data.FailedIDList, recvID)
+			msgSendFailedFlag = true
+			continue
+		}
+		resp.Data.ResultList = append(resp.Data.ResultList, &apistruct.SingleReturnResult{
+			ServerMsgID: rpcResp.ServerMsgID,
+			ClientMsgID: rpcResp.ClientMsgID,
+			SendTime:    rpcResp.SendTime,
+			RecvID:      recvID,
+		})
+	}
+	var status int32
+	if msgSendFailedFlag {
+		status = constant.MsgSendFailed
+	} else {
+		status = constant.MsgSendSuccessed
+	}
+	_, err := m.Client.SetSendMsgStatus(c, &msg.SetSendMsgStatusReq{Status: status})
+	if err != nil {
+		apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
+		return
+	}
+	apiresp.GinSuccess(c, resp)
 }
 
 func (m *MessageApi) CheckMsgIsSendSuccess(c *gin.Context) {
@@ -245,3 +345,7 @@ func (m *MessageApi) GetActiveUser(c *gin.Context) {
 func (m *MessageApi) GetActiveGroup(c *gin.Context) {
 	a2r.Call(msg.MsgClient.GetActiveGroup, m.Client, c)
 }
+
+func (m *MessageApi) SearchMsg(c *gin.Context) {
+	a2r.Call(msg.MsgClient.SearchMessage, m.Client, c)
+}

internal/api/route.go

@@ -103,6 +103,7 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 		groupRouterGroup.POST("/cancel_mute_group", g.CancelMuteGroup)
 		groupRouterGroup.POST("/set_group_member_info", g.SetGroupMemberInfo)
 		groupRouterGroup.POST("/get_group_abstract_info", g.GetGroupAbstractInfo)
+		groupRouterGroup.POST("/get_groups", g.GetGroups)
 	}
 	superGroupRouterGroup := r.Group("/super_group", ParseToken)
 	{
@@ -138,6 +139,7 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 	msgGroup := r.Group("/msg", ParseToken)
 	{
 		msgGroup.POST("/newest_seq", m.GetSeq)
+		msgGroup.POST("/search_msg", m.SearchMsg)
 		msgGroup.POST("/send_msg", m.SendMessage)
 		msgGroup.POST("/pull_msg_by_seq", m.PullMsgBySeqs)
 		msgGroup.POST("/revoke_msg", m.RevokeMsg)

internal/api/third.go

@@ -1,16 +1,32 @@
+// Copyright © 2023 OpenIM. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package api
 
 import (
+	"math/rand"
+	"net/http"
+	"strconv"
+
+	"github.com/gin-gonic/gin"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/a2r"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/third"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
-	"github.com/gin-gonic/gin"
-	"math/rand"
-	"net/http"
-	"strconv"
 )
 
 type ThirdApi rpcclient.Third

internal/api/user.go

@@ -107,7 +107,7 @@ func (u *UserApi) GetUsersOnlineStatus(c *gin.Context) {
 		}
 		if !flag {
 			res.UserID = v1
-			res.Status = constant.OnlineStatus
+			res.Status = constant.OfflineStatus
 		}
 		respResult = append(respResult, res)
 	}

internal/msggateway/client.go

@@ -21,13 +21,14 @@ import (
 	"runtime/debug"
 	"sync"
 
+	"google.golang.org/protobuf/proto"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/apiresp"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
-	"google.golang.org/protobuf/proto"
 )
 
 var ErrConnClosed = errors.New("conn has closed")
@@ -80,7 +81,14 @@ func newClient(ctx *UserConnContext, conn LongConn, isCompress bool) *Client {
 		ctx:        ctx,
 	}
 }
-func (c *Client) ResetClient(ctx *UserConnContext, conn LongConn, isBackground, isCompress bool, longConnServer LongConnServer, token string) {
+
+func (c *Client) ResetClient(
+	ctx *UserConnContext,
+	conn LongConn,
+	isBackground, isCompress bool,
+	longConnServer LongConnServer,
+	token string,
+) {
 	c.w = new(sync.Mutex)
 	c.conn = conn
 	c.PlatformID = utils.StringToInt(ctx.GetPlatformID())
@@ -161,7 +169,9 @@ func (c *Client) handleMessage(message []byte) error {
 	if binaryReq.SendID != c.UserID {
 		return utils.Wrap(errors.New("exception conn userID not same to req userID"), binaryReq.String())
 	}
-	ctx := mcontext.WithMustInfoCtx([]string{binaryReq.OperationID, binaryReq.SendID, constant.PlatformIDToName(c.PlatformID), c.ctx.GetConnID()})
+	ctx := mcontext.WithMustInfoCtx(
+		[]string{binaryReq.OperationID, binaryReq.SendID, constant.PlatformIDToName(c.PlatformID), c.ctx.GetConnID()},
+	)
 	log.ZDebug(ctx, "gateway req message", "req", binaryReq.String())
 	var messageErr error
 	var resp []byte
@@ -179,7 +189,12 @@ func (c *Client) handleMessage(message []byte) error {
 	case WsSetBackgroundStatus:
 		resp, messageErr = c.setAppBackgroundStatus(ctx, binaryReq)
 	default:
-		return fmt.Errorf("ReqIdentifier failed,sendID:%s,msgIncr:%s,reqIdentifier:%d", binaryReq.SendID, binaryReq.MsgIncr, binaryReq.ReqIdentifier)
+		return fmt.Errorf(
+			"ReqIdentifier failed,sendID:%s,msgIncr:%s,reqIdentifier:%d",
+			binaryReq.SendID,
+			binaryReq.MsgIncr,
+			binaryReq.ReqIdentifier,
+		)
 	}
 	c.replyMessage(ctx, &binaryReq, messageErr, resp)
 	return nil

internal/msgtransfer/init.go

@@ -1,3 +1,17 @@
+// Copyright © 2023 OpenIM. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package msgtransfer
 
 import (
@@ -58,8 +72,9 @@ func StartTransfer(prometheusPort int) error {
 	client.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	msgModel := cache.NewMsgCacheModel(rdb)
 	msgDocModel := unrelation.NewMsgMongoDriver(mongo.GetDatabase())
-	chatLogDatabase := controller.NewChatLogDatabase(relation.NewChatLogGorm(db))
+	msgMysModel := relation.NewChatLogGorm(db)
-	msgDatabase := controller.NewCommonMsgDatabase(msgDocModel, msgModel)
+	chatLogDatabase := controller.NewChatLogDatabase(msgMysModel)
+	msgDatabase := controller.NewCommonMsgDatabase(msgDocModel, msgModel, msgMysModel)
 	conversationRpcClient := rpcclient.NewConversationRpcClient(client)
 	groupRpcClient := rpcclient.NewGroupRpcClient(client)
 	msgTransfer := NewMsgTransfer(chatLogDatabase, msgDatabase, &conversationRpcClient, &groupRpcClient)

internal/push/push_to_client.go

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

internal/rpc/conversation/conversaion.go

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

internal/rpc/friend/friend.go

@@ -246,7 +246,6 @@ func (s *friendServer) GetPaginationFriendsApplyTo(
 	req *pbfriend.GetPaginationFriendsApplyToReq,
 ) (resp *pbfriend.GetPaginationFriendsApplyToResp, err error) {
 	defer log.ZInfo(ctx, utils.GetFuncName()+" Return")
-	resp = &pbfriend.GetPaginationFriendsApplyToResp{}
 	if err := s.userRpcClient.Access(ctx, req.UserID); err != nil {
 		return nil, err
 	}
@@ -255,6 +254,7 @@ func (s *friendServer) GetPaginationFriendsApplyTo(
 	if err != nil {
 		return nil, err
 	}
+	resp = &pbfriend.GetPaginationFriendsApplyToResp{}
 	resp.FriendRequests, err = convert.FriendRequestDB2Pb(ctx, friendRequests, s.userRpcClient.GetUsersInfoMap)
 	if err != nil {
 		return nil, err

internal/rpc/group/db_map.go

@@ -16,9 +16,10 @@ package group
 
 import (
 	"context"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext"
 	"time"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext"
+
 	pbGroup "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/group"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 )

internal/rpc/group/group.go

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

internal/rpc/group/statistics.go

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

internal/rpc/msg/as_read.go

@@ -26,10 +26,7 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 )
 
-func (m *msgServer) GetConversationsHasReadAndMaxSeq(
+func (m *msgServer) GetConversationsHasReadAndMaxSeq(ctx context.Context, req *msg.GetConversationsHasReadAndMaxSeqReq) (*msg.GetConversationsHasReadAndMaxSeqResp, error) {
-	ctx context.Context,
-	req *msg.GetConversationsHasReadAndMaxSeqReq,
-) (*msg.GetConversationsHasReadAndMaxSeqResp, error) {
 	conversationIDs, err := m.ConversationLocalCache.GetConversationIDs(ctx, req.UserID)
 	if err != nil {
 		return nil, err

internal/rpc/msg/server.go

@@ -1,7 +1,24 @@
+// Copyright © 2023 OpenIM. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package msg
 
 import (
 	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation"
+
+	"google.golang.org/grpc"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
@@ -13,7 +30,6 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
-	"google.golang.org/grpc"
 )
 
 type MessageInterceptorChain []MessageInterceptorFunc
@@ -60,11 +76,16 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 	}
 	cacheModel := cache.NewMsgCacheModel(rdb)
 	msgDocModel := unrelation.NewMsgMongoDriver(mongo.GetDatabase())
-	msgDatabase := controller.NewCommonMsgDatabase(msgDocModel, cacheModel)
 	conversationClient := rpcclient.NewConversationRpcClient(client)
 	userRpcClient := rpcclient.NewUserRpcClient(client)
 	groupRpcClient := rpcclient.NewGroupRpcClient(client)
 	friendRpcClient := rpcclient.NewFriendRpcClient(client)
+	mysql, err := relation.NewGormDB()
+	if err != nil {
+		return err
+	}
+	msgMysModel := relation.NewChatLogGorm(mysql)
+	msgDatabase := controller.NewCommonMsgDatabase(msgDocModel, cacheModel, msgMysModel)
 	s := &msgServer{
 		Conversation:           &conversationClient,
 		User:                   &userRpcClient,
@@ -100,7 +121,8 @@ func (m *msgServer) initPrometheus() {
 }
 
 func (m *msgServer) conversationAndGetRecvID(conversation *conversation.Conversation, userID string) (recvID string) {
-	if conversation.ConversationType == constant.SingleChatType || conversation.ConversationType == constant.NotificationChatType {
+	if conversation.ConversationType == constant.SingleChatType ||
+		conversation.ConversationType == constant.NotificationChatType {
 		if userID == conversation.OwnerUserID {
 			recvID = conversation.UserID
 		} else {

internal/rpc/msg/statistics.go

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

internal/rpc/msg/sync_msg.go

@@ -16,6 +16,8 @@ package msg
 
 import (
 	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/tokenverify"
@@ -102,3 +104,50 @@ func (m *msgServer) GetMaxSeq(ctx context.Context, req *sdkws.GetMaxSeqReq) (*sd
 	resp.MaxSeqs = maxSeqs
 	return resp, nil
 }
+
+func (m *msgServer) SearchMessage(ctx context.Context, req *msg.SearchMessageReq) (resp *msg.SearchMessageResp, err error) {
+	var chatLogs []*sdkws.MsgData
+	resp = &msg.SearchMessageResp{}
+	if chatLogs, err = m.MsgDatabase.SearchMessage(ctx, req); err != nil {
+		return nil, err
+	}
+	var num int
+	for _, chatLog := range chatLogs {
+		pbChatLog := &msg.ChatLog{}
+		utils.CopyStructFields(pbChatLog, chatLog)
+		pbChatLog.SendTime = chatLog.SendTime
+		pbChatLog.CreateTime = chatLog.CreateTime
+		if chatLog.SenderNickname == "" {
+			sendUser, err := m.User.GetUserInfo(ctx, chatLog.SendID)
+			if err != nil {
+				return nil, err
+			}
+			pbChatLog.SenderNickname = sendUser.Nickname
+		}
+		switch chatLog.SessionType {
+		case constant.SingleChatType:
+			recvUser, err := m.User.GetUserInfo(ctx, chatLog.RecvID)
+			if err != nil {
+				return nil, err
+			}
+			pbChatLog.SenderNickname = recvUser.Nickname
+
+		case constant.GroupChatType, constant.SuperGroupChatType:
+			group, err := m.Group.GetGroupInfo(ctx, chatLog.GroupID)
+			if err != nil {
+				return nil, err
+			}
+			pbChatLog.SenderFaceURL = group.FaceURL
+			pbChatLog.GroupMemberCount = group.MemberCount
+			pbChatLog.RecvID = group.GroupID
+			pbChatLog.GroupName = group.GroupName
+			pbChatLog.GroupOwner = group.OwnerUserID
+			pbChatLog.GroupType = group.GroupType
+		}
+		resp.ChatLogs = append(resp.ChatLogs, pbChatLog)
+		num++
+	}
+
+	resp.ChatLogsNum = int32(num)
+	return resp, nil
+}

internal/rpc/third/s3.go

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

internal/rpc/third/third.go

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

internal/rpc/third/tool.go

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

internal/rpc/user/user.go

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

internal/tools/conversation.go

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

internal/tools/msg.go

@@ -1,3 +1,17 @@
+// Copyright © 2023 OpenIM. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package tools
 
 import (
@@ -65,8 +79,12 @@ func InitMsgTool() (*MsgTool, error) {
 	}
 	discov.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	userDB := relation.NewUserGorm(db)
-	msgDatabase := controller.InitCommonMsgDatabase(rdb, mongo.GetDatabase())
+	msgDatabase := controller.InitCommonMsgDatabase(rdb, mongo.GetDatabase(), db)
-	userDatabase := controller.NewUserDatabase(userDB, cache.NewUserCacheRedis(rdb, relation.NewUserGorm(db), cache.GetDefaultOpt()), tx.NewGorm(db))
+	userDatabase := controller.NewUserDatabase(
+		userDB,
+		cache.NewUserCacheRedis(rdb, relation.NewUserGorm(db), cache.GetDefaultOpt()),
+		tx.NewGorm(db),
+	)
 	groupDatabase := controller.InitGroupDatabase(db, rdb, mongo.GetDatabase())
 	conversationDatabase := controller.NewConversationDatabase(relation.NewConversationGorm(db), cache.NewConversationRedis(rdb, cache.GetDefaultOpt(), relation.NewConversationGorm(db)), tx.NewGorm(db))
 	msgRpcClient := rpcclient.NewMessageRpcClient(discov)

pkg/apiresp/format.go

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

pkg/apistruct/auth.go

@@ -47,8 +47,7 @@ type ForceLogoutReq struct {
 	OperationID string `json:"operationID" binding:"required"`
 }
 
-type ForceLogoutResp struct {
+type ForceLogoutResp struct{}
-}
 
 type ParseTokenReq struct {
 	OperationID string `json:"operationID" binding:"required"`

pkg/apistruct/conversation.go

@@ -68,16 +68,14 @@ type SetConversationReq struct {
 	OperationID      string `json:"operationID"      binding:"required"`
 }
 
-type SetConversationResp struct {
+type SetConversationResp struct{}
-}
 type ModifyConversationFieldReq struct {
 	Conversation
 	FieldType   int32    `json:"fieldType"   binding:"required"`
 	UserIDList  []string `json:"userIDList"  binding:"required"`
 	OperationID string   `json:"operationID" binding:"required"`
 }
-type ModifyConversationFieldResp struct {
+type ModifyConversationFieldResp struct{}
-}
 
 type BatchSetConversationsReq struct {
 	Conversations    []Conversation `json:"conversations"    binding:"required"`
@@ -130,5 +128,4 @@ type SetRecvMsgOptReq struct {
 	NotificationType int32  `json:"notificationType"`
 }
 
-type SetRecvMsgOptResp struct {
+type SetRecvMsgOptResp struct{}
-}

pkg/apistruct/friend.go

@@ -185,8 +185,7 @@ type AddBlacklistReq struct {
 	ToUserID   string `json:"toUserID"   binding:"required"`
 	FromUserID string `json:"fromUserID" binding:"required"`
 }
-type AddBlacklistResp struct {
+type AddBlacklistResp struct{}
-}
 
 type ImportFriendReq struct {
 	FriendUserIDList []string `json:"friendUserIDList" binding:"required"`
@@ -212,15 +211,13 @@ type AddFriendResponseReq struct {
 	HandleResult int32  `json:"flag"       binding:"required,oneof=-1 0 1"`
 	HandleMsg    string `json:"handleMsg"`
 }
-type AddFriendResponseResp struct {
+type AddFriendResponseResp struct{}
-}
 
 type DeleteFriendReq struct {
 	ToUserID   string `json:"toUserID"   binding:"required"`
 	FromUserID string `json:"fromUserID" binding:"required"`
 }
-type DeleteFriendResp struct {
+type DeleteFriendResp struct{}
-}
 
 type GetBlackListReq struct {
 	FromUserID string `json:"fromUserID" binding:"required"`
@@ -234,15 +231,13 @@ type SetFriendRemarkReq struct {
 	FromUserID string `json:"fromUserID" binding:"required"`
 	Remark     string `json:"remark"`
 }
-type SetFriendRemarkResp struct {
+type SetFriendRemarkResp struct{}
-}
 
 type RemoveBlacklistReq struct {
 	ToUserID   string `json:"toUserID"   binding:"required"`
 	FromUserID string `json:"fromUserID" binding:"required"`
 }
-type RemoveBlacklistResp struct {
+type RemoveBlacklistResp struct{}
-}
 
 type IsFriendReq struct {
 	ToUserID   string `json:"toUserID"   binding:"required"`
@@ -266,7 +261,7 @@ type GetFriendListResp struct {
 	AddSource      int32  `json:"addSource"`
 	OperatorUserID string `json:"operatorUserID"`
 	Ex             string `json:"ex"`
-	//FriendUser           *UserInfo // TODO
+	// FriendUser           *UserInfo // TODO
 }
 
 type GetFriendApplyListReq struct {

pkg/apistruct/group.go

@@ -25,8 +25,7 @@ type KickGroupMemberReq struct {
 	OperationID      string   `json:"operationID"      binding:"required"`
 }
 type KickGroupMemberResp struct {
-
+	// UserIDResultList []*UserIDResult `json:"data"`
-	//UserIDResultList []*UserIDResult `json:"data"`
 }
 
 type GetGroupMembersInfoReq struct {
@@ -46,8 +45,7 @@ type InviteUserToGroupReq struct {
 	OperationID       string   `json:"operationID"       binding:"required"`
 }
 type InviteUserToGroupResp struct {
-
+	// UserIDResultList []*UserIDResult `json:"data"`
-	//UserIDResultList []*UserIDResult `json:"data"`
 }
 
 type GetJoinedGroupListReq struct {
@@ -114,8 +112,9 @@ type CreateGroupResp struct {
 
 type GetGroupApplicationListReq struct {
 	OperationID string `json:"operationID" binding:"required"`
-	FromUserID  string `json:"fromUserID"  binding:"required"` //作为管理员或群主收到的 进群申请
+	FromUserID  string `json:"fromUserID"  binding:"required"` // 作为管理员或群主收到的 进群申请
 }
+
 type GetGroupApplicationListResp struct {
 	GroupRequestList []*sdkws.GroupRequest    `json:"-"`
 	Data             []map[string]interface{} `json:"data" swaggerignore:"true"`
@@ -163,12 +162,11 @@ type GetGroupInfoResp struct {
 type ApplicationGroupResponseReq struct {
 	OperationID  string `json:"operationID"  binding:"required"`
 	GroupID      string `json:"groupID"      binding:"required"`
-	FromUserID   string `json:"fromUserID"   binding:"required"` //application from FromUserID
+	FromUserID   string `json:"fromUserID"   binding:"required"` // application from FromUserID
 	HandledMsg   string `json:"handledMsg"`
 	HandleResult int32  `json:"handleResult" binding:"required,oneof=-1 1"`
 }
-type ApplicationGroupResponseResp struct {
+type ApplicationGroupResponseResp struct{}
-}
 
 type JoinGroupReq struct {
 	GroupID       string `json:"groupID"       binding:"required"`
@@ -178,15 +176,13 @@ type JoinGroupReq struct {
 	InviterUserID string `json:"inviterUserID"`
 }
 
-type JoinGroupResp struct {
+type JoinGroupResp struct{}
-}
 
 type QuitGroupReq struct {
 	GroupID     string `json:"groupID"     binding:"required"`
 	OperationID string `json:"operationID" binding:"required"`
 }
-type QuitGroupResp struct {
+type QuitGroupResp struct{}
-}
 
 type SetGroupInfoReq struct {
 	GroupID           string `json:"groupID"           binding:"required"`
@@ -201,8 +197,7 @@ type SetGroupInfoReq struct {
 	ApplyMemberFriend *int32 `json:"applyMemberFriend"`
 }
 
-type SetGroupInfoResp struct {
+type SetGroupInfoResp struct{}
-}
 
 type TransferGroupOwnerReq struct {
 	GroupID        string `json:"groupID"        binding:"required"`
@@ -210,15 +205,13 @@ type TransferGroupOwnerReq struct {
 	NewOwnerUserID string `json:"newOwnerUserID" binding:"required"`
 	OperationID    string `json:"operationID"    binding:"required"`
 }
-type TransferGroupOwnerResp struct {
+type TransferGroupOwnerResp struct{}
-}
 
 type DismissGroupReq struct {
 	GroupID     string `json:"groupID"     binding:"required"`
 	OperationID string `json:"operationID" binding:"required"`
 }
-type DismissGroupResp struct {
+type DismissGroupResp struct{}
-}
 
 type MuteGroupMemberReq struct {
 	OperationID  string `json:"operationID"  binding:"required"`
@@ -226,30 +219,26 @@ type MuteGroupMemberReq struct {
 	UserID       string `json:"userID"       binding:"required"`
 	MutedSeconds uint32 `json:"mutedSeconds" binding:"required"`
 }
-type MuteGroupMemberResp struct {
+type MuteGroupMemberResp struct{}
-}
 
 type CancelMuteGroupMemberReq struct {
 	OperationID string `json:"operationID" binding:"required"`
 	GroupID     string `json:"groupID"     binding:"required"`
 	UserID      string `json:"userID"      binding:"required"`
 }
-type CancelMuteGroupMemberResp struct {
+type CancelMuteGroupMemberResp struct{}
-}
 
 type MuteGroupReq struct {
 	OperationID string `json:"operationID" binding:"required"`
 	GroupID     string `json:"groupID"     binding:"required"`
 }
-type MuteGroupResp struct {
+type MuteGroupResp struct{}
-}
 
 type CancelMuteGroupReq struct {
 	OperationID string `json:"operationID" binding:"required"`
 	GroupID     string `json:"groupID"     binding:"required"`
 }
-type CancelMuteGroupResp struct {
+type CancelMuteGroupResp struct{}
-}
 
 type SetGroupMemberNicknameReq struct {
 	OperationID string `json:"operationID" binding:"required"`
@@ -258,8 +247,7 @@ type SetGroupMemberNicknameReq struct {
 	Nickname    string `json:"nickname"`
 }
 
-type SetGroupMemberNicknameResp struct {
+type SetGroupMemberNicknameResp struct{}
-}
 
 type SetGroupMemberInfoReq struct {
 	OperationID string  `json:"operationID"      binding:"required"`
@@ -271,8 +259,7 @@ type SetGroupMemberInfoReq struct {
 	Ex          *string `json:"ex"`
 }
 
-type SetGroupMemberInfoResp struct {
+type SetGroupMemberInfoResp struct{}
-}
 
 type GetGroupAbstractInfoReq struct {
 	OperationID string `json:"operationID"`

pkg/apistruct/manage.go

@@ -36,15 +36,14 @@ type GetUsersOnlineStatusReq struct {
 	UserIDList  []string `json:"userIDList"  binding:"required,lte=200"`
 }
 type GetUsersOnlineStatusResp struct {
-
+	// SuccessResult []*msggateway.GetUsersOnlineStatusResp_SuccessResult `json:"data"`
-	//SuccessResult []*msggateway.GetUsersOnlineStatusResp_SuccessResult `json:"data"`
 }
+
 type AccountCheckReq struct {
 	OperationID     string   `json:"operationID"     binding:"required"`
 	CheckUserIDList []string `json:"checkUserIDList" binding:"required,lte=100"`
 }
-type AccountCheckResp struct {
+type AccountCheckResp struct{}
-}
 
 type ManagementSendMsg struct {
 	SendID           string                 `json:"sendID"           binding:"required"`

pkg/apistruct/msg.go

@@ -1,32 +1,43 @@
+// Copyright © 2023 OpenIM. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package apistruct
 
 type DelMsgReq struct {
-	UserID      string   `json:"userID,omitempty" binding:"required"`
+	UserID      string   `json:"userID,omitempty"      binding:"required"`
-	SeqList     []uint32 `json:"seqList,omitempty" binding:"required"`
+	SeqList     []uint32 `json:"seqList,omitempty"     binding:"required"`
 	OperationID string   `json:"operationID,omitempty" binding:"required"`
 }
 
-type DelMsgResp struct {
+type DelMsgResp struct{}
-}
 
 type CleanUpMsgReq struct {
-	UserID      string `json:"userID"  binding:"required"`
+	UserID      string `json:"userID"      binding:"required"`
-	OperationID string `json:"operationID"  binding:"required"`
+	OperationID string `json:"operationID" binding:"required"`
 }
 
-type CleanUpMsgResp struct {
+type CleanUpMsgResp struct{}
-}
 
 type DelSuperGroupMsgReq struct {
-	UserID      string   `json:"userID" binding:"required"`
+	UserID      string   `json:"userID"            binding:"required"`
-	GroupID     string   `json:"groupID" binding:"required"`
+	GroupID     string   `json:"groupID"           binding:"required"`
 	SeqList     []uint32 `json:"seqList,omitempty"`
 	IsAllDelete bool     `json:"isAllDelete"`
-	OperationID string   `json:"operationID" binding:"required"`
+	OperationID string   `json:"operationID"       binding:"required"`
 }
 
-type DelSuperGroupMsgResp struct {
+type DelSuperGroupMsgResp struct{}
-}
 
 type MsgDeleteNotificationElem struct {
 	GroupID     string   `json:"groupID"`
@@ -35,28 +46,27 @@ type MsgDeleteNotificationElem struct {
 }
 
 type SetMsgMinSeqReq struct {
-	UserID      string `json:"userID"  binding:"required"`
+	UserID      string `json:"userID"      binding:"required"`
 	GroupID     string `json:"groupID"`
-	MinSeq      uint32 `json:"minSeq"  binding:"required"`
+	MinSeq      uint32 `json:"minSeq"      binding:"required"`
-	OperationID string `json:"operationID"  binding:"required"`
+	OperationID string `json:"operationID" binding:"required"`
 }
 
-type SetMsgMinSeqResp struct {
+type SetMsgMinSeqResp struct{}
-}
 
 type PictureBaseInfo struct {
 	UUID   string `mapstructure:"uuid"`
-	Type   string `mapstructure:"type" `
+	Type   string `mapstructure:"type"`
-	Size   int64  `mapstructure:"size" `
+	Size   int64  `mapstructure:"size"`
-	Width  int32  `mapstructure:"width" `
+	Width  int32  `mapstructure:"width"`
 	Height int32  `mapstructure:"height"`
-	Url    string `mapstructure:"url" `
+	Url    string `mapstructure:"url"`
 }
 
 type PictureElem struct {
 	SourcePath      string          `mapstructure:"sourcePath"`
 	SourcePicture   PictureBaseInfo `mapstructure:"sourcePicture"`
-	BigPicture      PictureBaseInfo `mapstructure:"bigPicture" `
+	BigPicture      PictureBaseInfo `mapstructure:"bigPicture"`
 	SnapshotPicture PictureBaseInfo `mapstructure:"snapshotPicture"`
 }
 type SoundElem struct {
@@ -98,7 +108,7 @@ type LocationElem struct {
 	Latitude    float64 `mapstructure:"latitude"`
 }
 type CustomElem struct {
-	Data        string `mapstructure:"data" validate:"required"`
+	Data        string `mapstructure:"data"        validate:"required"`
 	Description string `mapstructure:"description"`
 	Extension   string `mapstructure:"extension"`
 }
@@ -110,23 +120,23 @@ type RevokeElem struct {
 	RevokeMsgClientID string `mapstructure:"revokeMsgClientID" validate:"required"`
 }
 type OANotificationElem struct {
-	NotificationName    string      `mapstructure:"notificationName" json:"notificationName" validate:"required"`
+	NotificationName    string      `mapstructure:"notificationName"    json:"notificationName"    validate:"required"`
 	NotificationFaceURL string      `mapstructure:"notificationFaceURL" json:"notificationFaceURL"`
-	NotificationType    int32       `mapstructure:"notificationType" json:"notificationType" validate:"required"`
+	NotificationType    int32       `mapstructure:"notificationType"    json:"notificationType"    validate:"required"`
-	Text                string      `mapstructure:"text" json:"text" validate:"required"`
+	Text                string      `mapstructure:"text"                json:"text"                validate:"required"`
-	Url                 string      `mapstructure:"url" json:"url"`
+	Url                 string      `mapstructure:"url"                 json:"url"`
-	MixType             int32       `mapstructure:"mixType" json:"mixType"`
+	MixType             int32       `mapstructure:"mixType"             json:"mixType"`
-	PictureElem         PictureElem `mapstructure:"pictureElem" json:"pictureElem"`
+	PictureElem         PictureElem `mapstructure:"pictureElem"         json:"pictureElem"`
-	SoundElem           SoundElem   `mapstructure:"soundElem" json:"soundElem"`
+	SoundElem           SoundElem   `mapstructure:"soundElem"           json:"soundElem"`
-	VideoElem           VideoElem   `mapstructure:"videoElem" json:"videoElem"`
+	VideoElem           VideoElem   `mapstructure:"videoElem"           json:"videoElem"`
-	FileElem            FileElem    `mapstructure:"fileElem" json:"fileElem"`
+	FileElem            FileElem    `mapstructure:"fileElem"            json:"fileElem"`
-	Ex                  string      `mapstructure:"ex" json:"ex"`
+	Ex                  string      `mapstructure:"ex"                  json:"ex"`
 }
 type MessageRevoked struct {
-	RevokerID       string `mapstructure:"revokerID" json:"revokerID" validate:"required"`
+	RevokerID       string `mapstructure:"revokerID"       json:"revokerID"       validate:"required"`
-	RevokerRole     int32  `mapstructure:"revokerRole" json:"revokerRole" validate:"required"`
+	RevokerRole     int32  `mapstructure:"revokerRole"     json:"revokerRole"     validate:"required"`
-	ClientMsgID     string `mapstructure:"clientMsgID" json:"clientMsgID" validate:"required"`
+	ClientMsgID     string `mapstructure:"clientMsgID"     json:"clientMsgID"     validate:"required"`
 	RevokerNickname string `mapstructure:"revokerNickname" json:"revokerNickname"`
-	SessionType     int32  `mapstructure:"sessionType" json:"sessionType" validate:"required"`
+	SessionType     int32  `mapstructure:"sessionType"     json:"sessionType"     validate:"required"`
-	Seq             uint32 `mapstructure:"seq" json:"seq" validate:"required"`
+	Seq             uint32 `mapstructure:"seq"             json:"seq"             validate:"required"`
 }

pkg/apistruct/third.go

@@ -58,8 +58,7 @@ type UploadUpdateAppReq struct {
 	UpdateLog   string                `form:"updateLog"   binding:"required"`
 }
 
-type UploadUpdateAppResp struct {
+type UploadUpdateAppResp struct{}
-}
 
 type GetDownloadURLReq struct {
 	OperationID string `json:"operationID" binding:"required"`
@@ -111,21 +110,19 @@ type GetRTCInvitationInfoStartAppResp struct {
 }
 
 /**
- * FCM第三方上报Token
+ * FCM第三方上报Token.
  */
 type FcmUpdateTokenReq struct {
 	OperationID string `json:"operationID" binding:"required"`
-	Platform    int    `json:"platform"    binding:"required,min=1,max=2"` //only for ios + android
+	Platform    int    `json:"platform"    binding:"required,min=1,max=2"` // only for ios + android
 	FcmToken    string `json:"fcmToken"    binding:"required"`
 }
 
-type FcmUpdateTokenResp struct {
+type FcmUpdateTokenResp struct{}
-}
 type SetAppBadgeReq struct {
 	OperationID    string `json:"operationID"    binding:"required"`
 	FromUserID     string `json:"fromUserID"     binding:"required"`
 	AppUnreadCount int32  `json:"appUnreadCount"`
 }
 
-type SetAppBadgeResp struct {
+type SetAppBadgeResp struct{}
-}

pkg/callbackstruct/msg_gateway.go

@@ -16,7 +16,7 @@ package callbackstruct
 
 type CallbackUserOnlineReq struct {
 	UserStatusCallbackReq
-	//Token           string `json:"token"`
+	// Token           string `json:"token"`
 	Seq             int64  `json:"seq"`
 	IsAppBackground bool   `json:"isAppBackground"`
 	ConnID          string `json:"connID"`

pkg/common/cmd/rpc.go

@@ -1,12 +1,27 @@
+// Copyright © 2023 OpenIM. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package cmd
 
 import (
 	"errors"
 
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/startrpc"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
+
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/startrpc"
 )
 
 type RpcCmd struct {
@@ -26,7 +41,10 @@ func (a *RpcCmd) Exec() error {
 	return a.Execute()
 }
 
-func (a *RpcCmd) StartSvr(name string, rpcFn func(discov discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) error {
+func (a *RpcCmd) StartSvr(
+	name string,
+	rpcFn func(discov discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error,
+) error {
 	if a.GetPortFlag() == 0 {
 		return errors.New("port is required")
 	}

pkg/common/constant/constant.go

@@ -17,20 +17,21 @@ package constant
 const (
 
 	///ContentType
-	//UserRelated
+	//UserRelated.
-	Text     = 101
+	ContentTypeBegin = 100
-	Picture  = 102
+	Text             = 101
-	Voice    = 103
+	Picture          = 102
-	Video    = 104
+	Voice            = 103
-	File     = 105
+	Video            = 104
-	AtText   = 106
+	File             = 105
-	Merger   = 107
+	AtText           = 106
-	Card     = 108
+	Merger           = 107
-	Location = 109
+	Card             = 108
-	Custom   = 110
+	Location         = 109
-	Revoke   = 111
+	Custom           = 110
-	Typing   = 113
+	Revoke           = 111
-	Quote    = 114
+	Typing           = 113
+	Quote            = 114
 
 	AdvancedText = 117
 
@@ -44,23 +45,23 @@ const (
 	SignalMsg          = 202
 	CustomNotification = 203
 
-	//SysRelated
+	//SysRelated.
 	NotificationBegin = 1000
 
-	FriendApplicationApprovedNotification = 1201 //add_friend_response
+	FriendApplicationApprovedNotification = 1201 // add_friend_response
-	FriendApplicationRejectedNotification = 1202 //add_friend_response
+	FriendApplicationRejectedNotification = 1202 // add_friend_response
-	FriendApplicationNotification         = 1203 //add_friend
+	FriendApplicationNotification         = 1203 // add_friend
 	FriendAddedNotification               = 1204
-	FriendDeletedNotification             = 1205 //delete_friend
+	FriendDeletedNotification             = 1205 // delete_friend
-	FriendRemarkSetNotification           = 1206 //set_friend_remark?
+	FriendRemarkSetNotification           = 1206 // set_friend_remark?
-	BlackAddedNotification                = 1207 //add_black
+	BlackAddedNotification                = 1207 // add_black
-	BlackDeletedNotification              = 1208 //remove_black
+	BlackDeletedNotification              = 1208 // remove_black
 	FriendInfoUpdatedNotification         = 1209
 
 	ConversationChangeNotification = 1300 // change conversation opt
 
 	UserNotificationBegin       = 1301
-	UserInfoUpdatedNotification = 1303 //SetSelfInfoTip              = 204
+	UserInfoUpdatedNotification = 1303 // SetSelfInfoTip              = 204
 	UserNotificationEnd         = 1399
 	OANotification              = 1400
 
@@ -112,37 +113,37 @@ const (
 
 	NotificationEnd = 5000
 
-	//status
+	//status.
 	MsgNormal  = 1
 	MsgDeleted = 4
 
-	//MsgFrom
+	//MsgFrom.
 	UserMsgType = 100
 	SysMsgType  = 200
 
-	//SessionType
+	//SessionType.
 	SingleChatType       = 1
 	GroupChatType        = 2
 	SuperGroupChatType   = 3
 	NotificationChatType = 4
-	//token
+	//token.
 	NormalToken  = 0
 	InValidToken = 1
 	KickedToken  = 2
 	ExpiredToken = 3
 
-	//MultiTerminalLogin
+	//MultiTerminalLogin.
 	DefalutNotKick = 0
-	//Full-end login, but the same end is mutually exclusive
+	//Full-end login, but the same end is mutually exclusive.
 	AllLoginButSameTermKick = 1
-	//Only one of the endpoints can log in
+	//Only one of the endpoints can log in.
 	SingleTerminalLogin = 2
-	//The web side can be online at the same time, and the other side can only log in at one end
+	//The web side can be online at the same time, and the other side can only log in at one end.
 	WebAndOther = 3
 	// The PC side is mutually exclusive, and the mobile side is mutually exclusive, but the web side can be online at
-	// the same time
+	// the same time.
 	PcMobileAndWeb = 4
-	//The PC terminal can be online at the same time,but other terminal only one of the endpoints can login
+	//The PC terminal can be online at the same time,but other terminal only one of the endpoints can login.
 	PCAndOther = 5
 
 	OnlineStatus  = "online"
@@ -150,12 +151,12 @@ const (
 	Registered    = "registered"
 	UnRegistered  = "unregistered"
 
-	//MsgReceiveOpt
+	//MsgReceiveOpt.
 	ReceiveMessage          = 0
 	NotReceiveMessage       = 1
 	ReceiveNotNotifyMessage = 2
 
-	//OptionsKey
+	//OptionsKey.
 	IsHistory                  = "history"
 	IsPersistent               = "persistent"
 	IsOfflinePush              = "offlinePush"
@@ -169,13 +170,13 @@ const (
 	IsNotNotification          = "isNotNotification"
 	IsSendMsg                  = "isSendMsg"
 
-	//GroupStatus
+	//GroupStatus.
 	GroupOk              = 0
 	GroupBanChat         = 1
 	GroupStatusDismissed = 2
 	GroupStatusMuted     = 3
 
-	//GroupType
+	//GroupType.
 	NormalGroup  = 0
 	SuperGroup   = 1
 	WorkingGroup = 2
@@ -183,19 +184,19 @@ const (
 	GroupBaned          = 3
 	GroupBanPrivateChat = 4
 
-	//UserJoinGroupSource
+	//UserJoinGroupSource.
 	JoinByAdmin = 1
 
 	JoinByInvitation = 2
 	JoinBySearch     = 3
 	JoinByQRCode     = 4
 
-	//Minio
+	//Minio.
 	MinioDurationTimes = 3600
-	//Aws
+	//Aws.
 	AwsDurationTimes = 3600
 
-	//callbackCommand
+	//callbackCommand.
 	CallbackBeforeSendSingleMsgCommand                   = "callbackBeforeSendSingleMsgCommand"
 	CallbackAfterSendSingleMsgCommand                    = "callbackAfterSendSingleMsgCommand"
 	CallbackBeforeSendGroupMsgCommand                    = "callbackBeforeSendGroupMsgCommand"
@@ -216,19 +217,19 @@ const (
 	CallbackGetMessageListReactionExtensionsCommand      = "callbackGetMessageListReactionExtensionsCommand"
 	CallbackAddMessageListReactionExtensionsCommand      = "callbackAddMessageListReactionExtensionsCommand"
 
-	//callback actionCode
+	//callback actionCode.
 	ActionAllow     = 0
 	ActionForbidden = 1
-	//callback callbackHandleCode
+	//callback callbackHandleCode.
 	CallbackHandleSuccess = 0
 	CallbackHandleFailed  = 1
 
-	// minioUpload
+	// minioUpload.
 	OtherType = 1
 	VideoType = 2
 	ImageType = 3
 
-	// sendMsgStaus
+	// sendMsgStaus.
 	MsgStatusNotExist = 0
 	MsgIsSending      = 1
 	MsgSendSuccessed  = 2
@@ -290,32 +291,35 @@ const (
 	GroupResponseAgree  = 1
 	GroupResponseRefuse = -1
 
-	FriendResponseAgree  = 1
+	FriendResponseNotHandle = 0
-	FriendResponseRefuse = -1
+	FriendResponseAgree     = 1
+	FriendResponseRefuse    = -1
 
 	Male   = 1
 	Female = 2
 )
 
-const OperationID = "operationID"
+const (
-const OpUserID = "opUserID"
+	OperationID     = "operationID"
-const ConnID = "connID"
+	OpUserID        = "opUserID"
-const OpUserPlatform = "platform"
+	ConnID          = "connID"
-const Token = "token"
+	OpUserPlatform  = "platform"
-const RpcCustomHeader = "customHeader" // rpc中间件自定义ctx参数
+	Token           = "token"
-const CheckKey = "CheckKey"
+	RpcCustomHeader = "customHeader" // rpc中间件自定义ctx参数
-const TriggerID = "triggerID"
+	CheckKey        = "CheckKey"
-const RemoteAddr = "remoteAddr"
+	TriggerID       = "triggerID"
+	RemoteAddr      = "remoteAddr"
+)
 
 const (
-	BecomeFriendByImport = 1 //管理员导入
+	BecomeFriendByImport = 1 // 管理员导入
-	BecomeFriendByApply  = 2 //申请添加
+	BecomeFriendByApply  = 2 // 申请添加
 )
 
 const (
 	ApplyNeedVerificationInviteDirectly = 0 // 申请需要同意 邀请直接进
-	AllNeedVerification                 = 1 //所有人进群需要验证，除了群主管理员邀请进群
+	AllNeedVerification                 = 1 // 所有人进群需要验证，除了群主管理员邀请进群
-	Directly                            = 2 //直接进群
+	Directly                            = 2 // 直接进群
 )
 
 const (
@@ -343,7 +347,7 @@ const LogFileName = "OpenIM.log"
 
 const LocalHost = "0.0.0.0"
 
-// flag parse
+// flag parse.
 const (
 	FlagPort   = "port"
 	FlagWsPort = "ws_port"

pkg/common/constant/platform_id_to_name.go

@@ -15,10 +15,9 @@
 package constant
 
 // fixme 1<--->IOS 2<--->Android  3<--->Windows
-//fixme  4<--->OSX  5<--->Web  6<--->MiniWeb 7<--->Linux
+// fixme  4<--->OSX  5<--->Web  6<--->MiniWeb 7<--->Linux
-
 const (
-	//Platform ID
+	//Platform ID.
 	IOSPlatformID        = 1
 	AndroidPlatformID    = 2
 	WindowsPlatformID    = 3
@@ -30,7 +29,7 @@ const (
 	IPadPlatformID       = 9
 	AdminPlatformID      = 10
 
-	//Platform string match to Platform ID
+	//Platform string match to Platform ID.
 	IOSPlatformStr        = "IOS"
 	AndroidPlatformStr    = "Android"
 	WindowsPlatformStr    = "Windows"
@@ -42,7 +41,7 @@ const (
 	IPadPlatformStr       = "IPad"
 	AdminPlatformStr      = "Admin"
 
-	//terminal types
+	//terminal types.
 	TerminalPC     = "PC"
 	TerminalMobile = "Mobile"
 )
@@ -59,6 +58,7 @@ var PlatformID2Name = map[int]string{
 	IPadPlatformID:       IPadPlatformStr,
 	AdminPlatformID:      AdminPlatformStr,
 }
+
 var PlatformName2ID = map[string]int{
 	IOSPlatformStr:        IOSPlatformID,
 	AndroidPlatformStr:    AndroidPlatformID,
@@ -71,6 +71,7 @@ var PlatformName2ID = map[string]int{
 	IPadPlatformStr:       IPadPlatformID,
 	AdminPlatformStr:      AdminPlatformID,
 }
+
 var PlatformName2class = map[string]string{
 	IOSPlatformStr:     TerminalMobile,
 	AndroidPlatformStr: TerminalMobile,
@@ -80,6 +81,7 @@ var PlatformName2class = map[string]string{
 	OSXPlatformStr:     TerminalPC,
 	LinuxPlatformStr:   TerminalPC,
 }
+
 var PlatformID2class = map[int]string{
 	IOSPlatformID:     TerminalMobile,
 	AndroidPlatformID: TerminalMobile,
@@ -93,12 +95,15 @@ var PlatformID2class = map[int]string{
 func PlatformIDToName(num int) string {
 	return PlatformID2Name[num]
 }
+
 func PlatformNameToID(name string) int {
 	return PlatformName2ID[name]
 }
+
 func PlatformNameToClass(name string) string {
 	return PlatformName2class[name]
 }
+
 func PlatformIDToClass(num int) string {
 	return PlatformID2class[num]
 }

pkg/common/convert/black.go

@@ -27,6 +27,9 @@ func BlackDB2Pb(
 	blackDBs []*relation.BlackModel,
 	f func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error),
 ) (blackPbs []*sdk.BlackInfo, err error) {
+	if len(blackDBs) == 0 {
+		return nil, nil
+	}
 	var userIDs []string
 	for _, blackDB := range blackDBs {
 		userIDs = append(userIDs, blackDB.BlockUserID)

pkg/common/convert/friend.go

@@ -54,6 +54,9 @@ func FriendsDB2Pb(
 	friendsDB []*relation.FriendModel,
 	getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error),
 ) (friendsPb []*sdkws.FriendInfo, err error) {
+	if len(friendsDB) == 0 {
+		return nil, nil
+	}
 	var userID []string
 	for _, friendDB := range friendsDB {
 		userID = append(userID, friendDB.FriendUserID)
@@ -80,6 +83,9 @@ func FriendRequestDB2Pb(
 	friendRequests []*relation.FriendRequestModel,
 	getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error),
 ) ([]*sdkws.FriendRequest, error) {
+	if len(friendRequests) == 0 {
+		return nil, nil
+	}
 	userIDMap := make(map[string]struct{})
 	for _, friendRequest := range friendRequests {
 		userIDMap[friendRequest.ToUserID] = struct{}{}

pkg/common/db/cache/init_redis.go

@@ -27,6 +27,11 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
 )
 
+const (
+	maxRetry = 10 //number of retries
+)
+
+// NewRedis Initialize redis connection
 func NewRedis() (redis.UniversalClient, error) {
 	if len(config.Config.Redis.Address) == 0 {
 		return nil, errors.New("redis address is empty")
@@ -35,25 +40,29 @@ func NewRedis() (redis.UniversalClient, error) {
 	var rdb redis.UniversalClient
 	if len(config.Config.Redis.Address) > 1 {
 		rdb = redis.NewClusterClient(&redis.ClusterOptions{
-			Addrs:    config.Config.Redis.Address,
+			Addrs:      config.Config.Redis.Address,
-			Username: config.Config.Redis.Username,
+			Username:   config.Config.Redis.Username,
-			Password: config.Config.Redis.Password, // no password set
+			Password:   config.Config.Redis.Password, // no password set
-			PoolSize: 50,
+			PoolSize:   50,
+			MaxRetries: maxRetry,
 		})
 	} else {
 		rdb = redis.NewClient(&redis.Options{
-			Addr:     config.Config.Redis.Address[0],
+			Addr:       config.Config.Redis.Address[0],
-			Username: config.Config.Redis.Username,
+			Username:   config.Config.Redis.Username,
-			Password: config.Config.Redis.Password, // no password set
+			Password:   config.Config.Redis.Password, // no password set
-			DB:       0,                            // use default DB
+			DB:         0,                            // use default DB
-			PoolSize: 100,                          // 连接池大小
+			PoolSize:   100,                          // connection pool size
+			MaxRetries: maxRetry,
 		})
 	}
+
+	var err error = nil
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 	defer cancel()
-	err := rdb.Ping(ctx).Err()
+	err = rdb.Ping(ctx).Err()
 	if err != nil {
 		return nil, fmt.Errorf("redis ping %w", err)
 	}
-	return rdb, nil
+	return rdb, err
 }

pkg/common/db/cache/init_redis_test.go

@@ -12,30 +12,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package mw
+package cache
 
 import (
 	"fmt"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"testing"
 )
 
-func TestCheck(t *testing.T) {
+//TestNewRedis Test redis connection
-	// config.Config.TokenPolicy.Secret = "123456"
+func TestNewRedis(t *testing.T) {
-
+	err := config.InitConfig("config_folder_path")
-	args := []string{"1", "2", "3"}
+	if err != nil {
-
+		fmt.Println("config load error")
-	key := genReqKey(args)
+		return
-	fmt.Println("key:", key)
+	}
-	err := verifyReqKey(args, key)
+	redis, err := NewRedis()
-
+	if err != nil {
-	fmt.Println(err)
+		fmt.Println(err)
-
+		return
-	args = []string{"4", "5", "6"}
+	}
-
+	fmt.Println(redis)
-	key = genReqKey(args)
-	fmt.Println("key:", key)
-	err = verifyReqKey(args, key)
-
-	fmt.Println(err)
-
 }

pkg/common/db/controller/conversation.go

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

pkg/common/db/controller/friend.go

@@ -221,6 +221,7 @@ func (f *friendDatabase) AgreeFriendRequest(
 	friendRequest *relation.FriendRequestModel,
 ) (err error) {
 	return f.tx.Transaction(func(tx any) error {
+		now := time.Now()
 		fr, err := f.friendRequest.NewTx(tx).Take(ctx, friendRequest.FromUserID, friendRequest.ToUserID)
 		if err != nil {
 			return err
@@ -230,11 +231,25 @@ func (f *friendDatabase) AgreeFriendRequest(
 		}
 		friendRequest.HandlerUserID = mcontext.GetOpUserID(ctx)
 		friendRequest.HandleResult = constant.FriendResponseAgree
-		friendRequest.HandleTime = time.Now()
+		friendRequest.HandleTime = now
 		err = f.friendRequest.NewTx(tx).Update(ctx, friendRequest)
 		if err != nil {
 			return err
 		}
+
+		fr2, err := f.friendRequest.NewTx(tx).Take(ctx, friendRequest.ToUserID, friendRequest.FromUserID)
+		if err == nil && fr2.HandleResult == constant.FriendResponseNotHandle {
+			fr2.HandlerUserID = mcontext.GetOpUserID(ctx)
+			fr2.HandleResult = constant.FriendResponseAgree
+			fr2.HandleTime = now
+			err = f.friendRequest.NewTx(tx).Update(ctx, fr2)
+			if err != nil {
+				return err
+			}
+		} else if errs.Unwrap(err) != gorm.ErrRecordNotFound {
+			return err
+		}
+
 		exists, err := f.friend.NewTx(tx).FindUserState(ctx, friendRequest.FromUserID, friendRequest.ToUserID)
 		if err != nil {
 			return err

pkg/common/db/controller/msg.go

@@ -1,6 +1,23 @@
+// Copyright © 2023 OpenIM. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package controller
 
 import (
+	relation2 "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	"gorm.io/gorm"
 	"time"
 
 	"github.com/redis/go-redis/v9"
@@ -78,6 +95,7 @@ type CommonMsgDatabase interface {
 	GetConversationMinMaxSeqInMongoAndCache(ctx context.Context, conversationID string) (minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache int64, err error)
 	SetSendMsgStatus(ctx context.Context, id string, status int32) error
 	GetSendMsgStatus(ctx context.Context, id string) (int32, error)
+	SearchMessage(ctx context.Context, req *pbMsg.SearchMessageReq) (msgData []*sdkws.MsgData, err error)
 
 	// to mq
 	MsgToMQ(ctx context.Context, key string, msg2mq *sdkws.MsgData) error
@@ -89,8 +107,9 @@ type CommonMsgDatabase interface {
 	RangeGroupSendCount(ctx context.Context, start time.Time, end time.Time, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, groups []*unRelationTb.GroupCount, dateCount map[string]int64, err error)
 }
 
-func NewCommonMsgDatabase(msgDocModel unRelationTb.MsgDocModelInterface, cacheModel cache.MsgModel) CommonMsgDatabase {
+func NewCommonMsgDatabase(msgDocModel unRelationTb.MsgDocModelInterface, cacheModel cache.MsgModel, msgMyqModel relation.ChatLogModelInterface) CommonMsgDatabase {
 	return &commonMsgDatabase{
+		msgMyq:          msgMyqModel,
 		msgDocDatabase:  msgDocModel,
 		cache:           cacheModel,
 		producer:        kafka.NewKafkaProducer(config.Config.Kafka.Addr, config.Config.Kafka.LatestMsgToRedis.Topic),
@@ -99,16 +118,18 @@ func NewCommonMsgDatabase(msgDocModel unRelationTb.MsgDocModelInterface, cacheMo
 	}
 }
 
-func InitCommonMsgDatabase(rdb redis.UniversalClient, database *mongo.Database) CommonMsgDatabase {
+func InitCommonMsgDatabase(rdb redis.UniversalClient, database *mongo.Database, dbGrom *gorm.DB) CommonMsgDatabase {
 	cacheModel := cache.NewMsgCacheModel(rdb)
 	msgDocModel := unrelation.NewMsgMongoDriver(database)
-	CommonMsgDatabase := NewCommonMsgDatabase(msgDocModel, cacheModel)
+	msgMyqModel := relation2.NewChatLogGorm(dbGrom)
+	CommonMsgDatabase := NewCommonMsgDatabase(msgDocModel, cacheModel, msgMyqModel)
 	return CommonMsgDatabase
 }
 
 type commonMsgDatabase struct {
 	msgDocDatabase   unRelationTb.MsgDocModelInterface
 	msg              unRelationTb.MsgDocModel
+	msgMyq           relation.ChatLogModelInterface
 	cache            cache.MsgModel
 	producer         *kafka.Producer
 	producerToMongo  *kafka.Producer
@@ -870,3 +891,15 @@ func (db *commonMsgDatabase) RangeUserSendCount(ctx context.Context, start time.
 func (db *commonMsgDatabase) RangeGroupSendCount(ctx context.Context, start time.Time, end time.Time, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, groups []*unRelationTb.GroupCount, dateCount map[string]int64, err error) {
 	return db.msgDocDatabase.RangeGroupSendCount(ctx, start, end, ase, pageNumber, showNumber)
 }
+
+func (db *commonMsgDatabase) SearchMessage(ctx context.Context, req *pbMsg.SearchMessageReq) (msgData []*sdkws.MsgData, err error) {
+	var totalMsgs []*sdkws.MsgData
+	msgs, err := db.msgDocDatabase.SearchMessage(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+	for _, msg := range msgs {
+		totalMsgs = append(totalMsgs, convert.MsgDB2Pb(msg.Msg))
+	}
+	return totalMsgs, nil
+}

pkg/common/db/controller/s3.go

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

pkg/common/db/relation/conversation_model.go

@@ -1,12 +1,27 @@
+// Copyright © 2023 OpenIM. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package relation
 
 import (
 	"context"
 
+	"gorm.io/gorm"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
-	"gorm.io/gorm"
 )
 
 type ConversationGorm struct {
@@ -29,66 +44,172 @@ func (c *ConversationGorm) Delete(ctx context.Context, groupIDs []string) (err e
 	return utils.Wrap(c.db(ctx).Where("group_id in (?)", groupIDs).Delete(&relation.ConversationModel{}).Error, "")
 }
 
-func (c *ConversationGorm) UpdateByMap(ctx context.Context, userIDList []string, conversationID string, args map[string]interface{}) (rows int64, err error) {
+func (c *ConversationGorm) UpdateByMap(
+	ctx context.Context,
+	userIDList []string,
+	conversationID string,
+	args map[string]interface{},
+) (rows int64, err error) {
 	result := c.db(ctx).Where("owner_user_id IN (?) and  conversation_id=?", userIDList, conversationID).Updates(args)
 	return result.RowsAffected, utils.Wrap(result.Error, "")
 }
 
 func (c *ConversationGorm) Update(ctx context.Context, conversation *relation.ConversationModel) (err error) {
-	return utils.Wrap(c.db(ctx).Where("owner_user_id = ? and conversation_id = ?", conversation.OwnerUserID, conversation.ConversationID).Updates(conversation).Error, "")
+	return utils.Wrap(
+		c.db(ctx).
+			Where("owner_user_id = ? and conversation_id = ?", conversation.OwnerUserID, conversation.ConversationID).
+			Updates(conversation).
+			Error,
+		"",
+	)
 }
 
-func (c *ConversationGorm) Find(ctx context.Context, ownerUserID string, conversationIDs []string) (conversations []*relation.ConversationModel, err error) {
+func (c *ConversationGorm) Find(
-	err = utils.Wrap(c.db(ctx).Where("owner_user_id=? and conversation_id IN (?)", ownerUserID, conversationIDs).Find(&conversations).Error, "")
+	ctx context.Context,
+	ownerUserID string,
+	conversationIDs []string,
+) (conversations []*relation.ConversationModel, err error) {
+	err = utils.Wrap(
+		c.db(ctx).
+			Where("owner_user_id=? and conversation_id IN (?)", ownerUserID, conversationIDs).
+			Find(&conversations).
+			Error,
+		"",
+	)
 	return conversations, err
 }
 
-func (c *ConversationGorm) Take(ctx context.Context, userID, conversationID string) (conversation *relation.ConversationModel, err error) {
+func (c *ConversationGorm) Take(
+	ctx context.Context,
+	userID, conversationID string,
+) (conversation *relation.ConversationModel, err error) {
 	cc := &relation.ConversationModel{}
-	return cc, utils.Wrap(c.db(ctx).Where("conversation_id = ? And owner_user_id = ?", conversationID, userID).Take(cc).Error, "")
+	return cc, utils.Wrap(
+		c.db(ctx).Where("conversation_id = ? And owner_user_id = ?", conversationID, userID).Take(cc).Error,
+		"",
+	)
 }
 
-func (c *ConversationGorm) FindUserID(ctx context.Context, userIDs []string, conversationIDs []string) (existUserID []string, err error) {
+func (c *ConversationGorm) FindUserID(
-	return existUserID, utils.Wrap(c.db(ctx).Where(" owner_user_id IN (?) and conversation_id in (?)", userIDs, conversationIDs).Pluck("owner_user_id", &existUserID).Error, "")
+	ctx context.Context,
+	userIDs []string,
+	conversationIDs []string,
+) (existUserID []string, err error) {
+	return existUserID, utils.Wrap(
+		c.db(ctx).
+			Where(" owner_user_id IN (?) and conversation_id in (?)", userIDs, conversationIDs).
+			Pluck("owner_user_id", &existUserID).
+			Error,
+		"",
+	)
 }
 
-func (c *ConversationGorm) FindConversationID(ctx context.Context, userID string, conversationIDList []string) (existConversationID []string, err error) {
+func (c *ConversationGorm) FindConversationID(
-	return existConversationID, utils.Wrap(c.db(ctx).Where(" conversation_id IN (?) and owner_user_id=?", conversationIDList, userID).Pluck("conversation_id", &existConversationID).Error, "")
+	ctx context.Context,
+	userID string,
+	conversationIDList []string,
+) (existConversationID []string, err error) {
+	return existConversationID, utils.Wrap(
+		c.db(ctx).
+			Where(" conversation_id IN (?) and owner_user_id=?", conversationIDList, userID).
+			Pluck("conversation_id", &existConversationID).
+			Error,
+		"",
+	)
 }
 
-func (c *ConversationGorm) FindUserIDAllConversationID(ctx context.Context, userID string) (conversationIDList []string, err error) {
+func (c *ConversationGorm) FindUserIDAllConversationID(
-	return conversationIDList, utils.Wrap(c.db(ctx).Where("owner_user_id=?", userID).Pluck("conversation_id", &conversationIDList).Error, "")
+	ctx context.Context,
+	userID string,
+) (conversationIDList []string, err error) {
+	return conversationIDList, utils.Wrap(
+		c.db(ctx).Where("owner_user_id=?", userID).Pluck("conversation_id", &conversationIDList).Error,
+		"",
+	)
 }
 
-func (c *ConversationGorm) FindUserIDAllConversations(ctx context.Context, userID string) (conversations []*relation.ConversationModel, err error) {
+func (c *ConversationGorm) FindUserIDAllConversations(
+	ctx context.Context,
+	userID string,
+) (conversations []*relation.ConversationModel, err error) {
 	return conversations, utils.Wrap(c.db(ctx).Where("owner_user_id=?", userID).Find(&conversations).Error, "")
 }
 
-func (c *ConversationGorm) FindRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) (userIDs []string, err error) {
+func (c *ConversationGorm) FindRecvMsgNotNotifyUserIDs(
-	return userIDs, utils.Wrap(c.db(ctx).Where("group_id = ? and recv_msg_opt = ?", groupID, constant.ReceiveNotNotifyMessage).Pluck("user_id", &userIDs).Error, "")
+	ctx context.Context,
+	groupID string,
+) (userIDs []string, err error) {
+	return userIDs, utils.Wrap(
+		c.db(ctx).
+			Where("group_id = ? and recv_msg_opt = ?", groupID, constant.ReceiveNotNotifyMessage).
+			Pluck("user_id", &userIDs).
+			Error,
+		"",
+	)
 }
 
-func (c *ConversationGorm) FindSuperGroupRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) (userIDs []string, err error) {
+func (c *ConversationGorm) FindSuperGroupRecvMsgNotNotifyUserIDs(
-	return userIDs, utils.Wrap(c.db(ctx).Where("group_id = ? and recv_msg_opt = ? and conversation_type = ?", groupID, constant.ReceiveNotNotifyMessage, constant.SuperGroupChatType).Pluck("user_id", &userIDs).Error, "")
+	ctx context.Context,
+	groupID string,
+) (userIDs []string, err error) {
+	return userIDs, utils.Wrap(
+		c.db(ctx).
+			Where("group_id = ? and recv_msg_opt = ? and conversation_type = ?", groupID, constant.ReceiveNotNotifyMessage, constant.SuperGroupChatType).
+			Pluck("user_id", &userIDs).
+			Error,
+		"",
+	)
 }
 
-func (c *ConversationGorm) GetUserRecvMsgOpt(ctx context.Context, ownerUserID, conversationID string) (opt int, err error) {
+func (c *ConversationGorm) GetUserRecvMsgOpt(
+	ctx context.Context,
+	ownerUserID, conversationID string,
+) (opt int, err error) {
 	var conversation relation.ConversationModel
-	return int(conversation.RecvMsgOpt), utils.Wrap(c.db(ctx).Where("conversation_id = ? And owner_user_id = ?", conversationID, ownerUserID).Select("recv_msg_opt").Find(&conversation).Error, "")
+	return int(
+			conversation.RecvMsgOpt,
+		), utils.Wrap(
+			c.db(ctx).
+				Where("conversation_id = ? And owner_user_id = ?", conversationID, ownerUserID).
+				Select("recv_msg_opt").
+				Find(&conversation).
+				Error,
+			"",
+		)
 }
 
 func (c *ConversationGorm) GetAllConversationIDs(ctx context.Context) (conversationIDs []string, err error) {
-	return conversationIDs, utils.Wrap(c.db(ctx).Distinct("conversation_id").Pluck("conversation_id", &conversationIDs).Error, "")
+	return conversationIDs, utils.Wrap(
+		c.db(ctx).Distinct("conversation_id").Pluck("conversation_id", &conversationIDs).Error,
+		"",
+	)
 }
 
-func (c *ConversationGorm) GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (hasReadSeqs map[string]int64, err error) {
+func (c *ConversationGorm) GetUserAllHasReadSeqs(
+	ctx context.Context,
+	ownerUserID string,
+) (hasReadSeqs map[string]int64, err error) {
 	return nil, nil
 }
 
-func (c *ConversationGorm) GetConversationsByConversationID(ctx context.Context, conversationIDs []string) (conversations []*relation.ConversationModel, err error) {
+func (c *ConversationGorm) GetConversationsByConversationID(
-	return conversations, utils.Wrap(c.db(ctx).Where("conversation_id IN (?)", conversationIDs).Find(&conversations).Error, "")
+	ctx context.Context,
+	conversationIDs []string,
+) (conversations []*relation.ConversationModel, err error) {
+	return conversations, utils.Wrap(
+		c.db(ctx).Where("conversation_id IN (?)", conversationIDs).Find(&conversations).Error,
+		"",
+	)
 }
 
-func (c *ConversationGorm) GetConversationIDsNeedDestruct(ctx context.Context) (conversations []*relation.ConversationModel, err error) {
+func (c *ConversationGorm) GetConversationIDsNeedDestruct(
-	return conversations, utils.Wrap(c.db(ctx).Where("is_msg_destruct = 1 && UNIX_TIMESTAMP(NOW()) > (msg_destruct_time + UNIX_TIMESTAMP(latest_msg_destruct_time)) && msg_destruct_time != 0").Find(&conversations).Error, "")
+	ctx context.Context,
+) (conversations []*relation.ConversationModel, err error) {
+	return conversations, utils.Wrap(
+		c.db(ctx).
+			Where("is_msg_destruct = 1 && UNIX_TIMESTAMP(NOW()) > (msg_destruct_time + UNIX_TIMESTAMP(latest_msg_destruct_time)) && msg_destruct_time != 0").
+			Find(&conversations).
+			Error,
+		"",
+	)
 }

pkg/common/db/relation/group_model.go

@@ -1,13 +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.
+
 package relation
 
 import (
 	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
+	"time"
+
+	"gorm.io/gorm"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/ormutil"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
-	"gorm.io/gorm"
-	"time"
 )
 
 var _ relation.GroupModelInterface = (*GroupGorm)(nil)
@@ -46,9 +63,10 @@ func (g *GroupGorm) Take(ctx context.Context, groupID string) (group *relation.G
 }
 
 func (g *GroupGorm) Search(ctx context.Context, keyword string, pageNumber, showNumber int32) (total uint32, groups []*relation.GroupModel, err error) {
-	return ormutil.GormSearch[relation.GroupModel](g.DB, []string{"name"}, keyword, pageNumber, showNumber)
+	db := g.DB
+	db = db.WithContext(ctx).Where("status!=?", constant.GroupStatusDismissed)
+	return ormutil.GormSearch[relation.GroupModel](db, []string{"name"}, keyword, pageNumber, showNumber)
 }
-
 func (g *GroupGorm) GetGroupIDsByGroupType(ctx context.Context, groupType int) (groupIDs []string, err error) {
 	return groupIDs, utils.Wrap(g.DB.Model(&relation.GroupModel{}).Where("group_type = ? ", groupType).Pluck("group_id", &groupIDs).Error, "")
 }

pkg/common/db/relation/object_model.go

@@ -1,10 +1,26 @@
+// Copyright © 2023 OpenIM. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package relation
 
 import (
 	"context"
+
+	"gorm.io/gorm"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
-	"gorm.io/gorm"
 )
 
 type ObjectInfoGorm struct {

pkg/common/db/s3/cont/consts.go

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

pkg/common/db/s3/cont/controller.go

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

pkg/common/db/s3/cont/error.go

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

pkg/common/db/s3/cont/id.go

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

pkg/common/db/s3/cont/structs.go

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

pkg/common/db/s3/cos/cos.go

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

pkg/common/db/s3/minio/minio.go

@@ -1,3 +1,17 @@
+// Copyright © 2023 OpenIM. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package minio
 
 import (
@@ -40,6 +54,15 @@ func NewMinio() (s3.Interface, error) {
 	if err != nil {
 		return nil, err
 	}
+	exists, err := client.BucketExists(context.Background(), conf.Bucket)
+	if err != nil {
+		return nil, err
+	}
+	if !exists {
+		if err := client.MakeBucket(context.Background(), conf.Bucket, minio.MakeBucketOptions{}); err != nil {
+			return nil, err
+		}
+	}
 	return &Minio{
 		bucket:    conf.Bucket,
 		bucketURL: conf.Endpoint + "/" + conf.Bucket + "/",

pkg/common/db/s3/oss/oss.go

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

pkg/common/db/s3/oss/sign.go

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

pkg/common/db/s3/oss/sort.go

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

pkg/common/db/s3/s3.go

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

pkg/common/db/table/relation/conversation.go

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

pkg/common/db/table/relation/object.go

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

pkg/common/db/table/unrelation/msg.go

@@ -16,6 +16,7 @@ package unrelation
 
 import (
 	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg"
 	"strconv"
 	"time"
 
@@ -108,8 +109,24 @@ type MsgDocModelInterface interface {
 	GetMsgDocModelByIndex(ctx context.Context, conversationID string, index, sort int64) (*MsgDocModel, error)
 	DeleteMsgsInOneDocByIndex(ctx context.Context, docID string, indexes []int) error
 	MarkSingleChatMsgsAsRead(ctx context.Context, userID string, docID string, indexes []int64) error
-	RangeUserSendCount(ctx context.Context, start time.Time, end time.Time, group bool, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, users []*UserCount, dateCount map[string]int64, err error)
+	SearchMessage(ctx context.Context, req *msg.SearchMessageReq) ([]*MsgInfoModel, error)
-	RangeGroupSendCount(ctx context.Context, start time.Time, end time.Time, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, groups []*GroupCount, dateCount map[string]int64, err error)
+	RangeUserSendCount(
+		ctx context.Context,
+		start time.Time,
+		end time.Time,
+		group bool,
+		ase bool,
+		pageNumber int32,
+		showNumber int32,
+	) (msgCount int64, userCount int64, users []*UserCount, dateCount map[string]int64, err error)
+	RangeGroupSendCount(
+		ctx context.Context,
+		start time.Time,
+		end time.Time,
+		ase bool,
+		pageNumber int32,
+		showNumber int32,
+	) (msgCount int64, userCount int64, groups []*GroupCount, dateCount map[string]int64, err error)
 }
 
 func (MsgDocModel) TableName() string {

pkg/common/db/unrelation/mongo.go

@@ -31,19 +31,21 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
 )
 
+const (
+	maxRetry = 10 //number of retries
+)
+
 type Mongo struct {
 	db *mongo.Client
 }
 
+// NewMongo Initialize MongoDB connection
 func NewMongo() (*Mongo, error) {
 	specialerror.AddReplace(mongo.ErrNoDocuments, errs.ErrRecordNotFound)
 	uri := "mongodb://sample.host:27017/?maxPoolSize=20&w=majority"
 	if config.Config.Mongo.Uri != "" {
-		// example:
-		// mongodb://$user:$password@mongo1.mongo:27017,mongo2.mongo:27017,mongo3.mongo:27017/$DBDatabase/?replicaSet=rs0&readPreference=secondary&authSource=admin&maxPoolSize=$DBMaxPoolSize
 		uri = config.Config.Mongo.Uri
 	} else {
-		//mongodb://mongodb1.example.com:27317,mongodb2.example.com:27017/?replicaSet=mySet&authSource=authDB
 		mongodbHosts := ""
 		for i, v := range config.Config.Mongo.Address {
 			if i == len(config.Config.Mongo.Address)-1 {
@@ -63,13 +65,24 @@ func NewMongo() (*Mongo, error) {
 		}
 	}
 	fmt.Println("mongo:", uri)
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*60)
+	var mongoClient *mongo.Client
-	defer cancel()
+	var err error = nil
-	mongoClient, err := mongo.Connect(ctx, options.Client().ApplyURI(uri))
+	for i := 0; i <= maxRetry; i++ {
-	if err != nil {
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
-		return nil, err
+		defer cancel()
+		mongoClient, err = mongo.Connect(ctx, options.Client().ApplyURI(uri))
+		if err == nil {
+			return &Mongo{db: mongoClient}, nil
+		}
+		if cmdErr, ok := err.(mongo.CommandError); ok {
+			if cmdErr.Code == 13 || cmdErr.Code == 18 {
+				return nil, err
+			} else {
+				fmt.Printf("Failed to connect to MongoDB: %s\n", err)
+			}
+		}
 	}
-	return &Mongo{db: mongoClient}, nil
+	return nil, err
 }
 
 func (m *Mongo) GetClient() *mongo.Client {

pkg/common/db/unrelation/msg.go

@@ -19,6 +19,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg"
 	"time"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
@@ -555,7 +556,15 @@ func (m *MsgMongoDriver) MarkSingleChatMsgsAsRead(
 //	}
 //
 // ])
-func (m *MsgMongoDriver) RangeUserSendCount(ctx context.Context, start time.Time, end time.Time, group bool, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, users []*table.UserCount, dateCount map[string]int64, err error) {
+func (m *MsgMongoDriver) RangeUserSendCount(
+	ctx context.Context,
+	start time.Time,
+	end time.Time,
+	group bool,
+	ase bool,
+	pageNumber int32,
+	showNumber int32,
+) (msgCount int64, userCount int64, users []*table.UserCount, dateCount map[string]int64, err error) {
 	var sort int
 	if ase {
 		sort = 1
@@ -808,7 +817,14 @@ func (m *MsgMongoDriver) RangeUserSendCount(ctx context.Context, start time.Time
 	return result[0].MsgCount, result[0].UserCount, users, dateCount, nil
 }
 
-func (m *MsgMongoDriver) RangeGroupSendCount(ctx context.Context, start time.Time, end time.Time, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, groups []*table.GroupCount, dateCount map[string]int64, err error) {
+func (m *MsgMongoDriver) RangeGroupSendCount(
+	ctx context.Context,
+	start time.Time,
+	end time.Time,
+	ase bool,
+	pageNumber int32,
+	showNumber int32,
+) (msgCount int64, userCount int64, groups []*table.GroupCount, dateCount map[string]int64, err error) {
 	var sort int
 	if ase {
 		sort = 1
@@ -1049,3 +1065,136 @@ func (m *MsgMongoDriver) RangeGroupSendCount(ctx context.Context, start time.Tim
 	}
 	return result[0].MsgCount, result[0].UserCount, groups, dateCount, nil
 }
+
+func (m *MsgMongoDriver) SearchMessage(ctx context.Context, req *msg.SearchMessageReq) ([]*table.MsgInfoModel, error) {
+	msgs, err := m.searchMessage(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+	for _, msg1 := range msgs {
+		if msg1.IsRead {
+			msg1.Msg.IsRead = true
+		}
+	}
+	return msgs, nil
+}
+
+func (m *MsgMongoDriver) searchMessage(ctx context.Context, req *msg.SearchMessageReq) ([]*table.MsgInfoModel, error) {
+	var pipe mongo.Pipeline
+	conditon := bson.A{}
+	if req.SendTime != "" {
+		conditon = append(conditon, bson.M{"$eq": bson.A{bson.M{"$dateToString": bson.M{"format": "%Y-%m-%d", "date": bson.M{"$toDate": "$$item.msg.send_time"}}}, req.SendTime}})
+	}
+	if req.MsgType != 0 {
+		conditon = append(conditon, bson.M{"$eq": bson.A{"$$item.msg.content_type", req.MsgType}})
+	}
+	if req.SessionType != 0 {
+		conditon = append(conditon, bson.M{"$eq": bson.A{"$$item.msg.session_type", req.SessionType}})
+	}
+	if req.RecvID != "" {
+		conditon = append(conditon, bson.M{"$regexFind": bson.M{"input": "$$item.msg.recv_id", "regex": req.RecvID}})
+	}
+	if req.SendID != "" {
+		conditon = append(conditon, bson.M{"$regexFind": bson.M{"input": "$$item.msg.send_id", "regex": req.SendID}})
+	}
+
+	or := bson.A{
+		bson.M{
+			"doc_id": bson.M{
+				"$regex":   "^si_",
+				"$options": "i",
+			},
+		},
+	}
+	or = append(or,
+		bson.M{
+			"doc_id": bson.M{
+				"$regex":   "^g_",
+				"$options": "i",
+			},
+		},
+		bson.M{
+			"doc_id": bson.M{
+				"$regex":   "^sg_",
+				"$options": "i",
+			},
+		},
+	)
+
+	pipe = mongo.Pipeline{
+		{
+			{"$match", bson.D{
+				{
+					"$or", or,
+				},
+			}},
+		},
+		{
+			{"$project", bson.D{
+				{"msgs", bson.D{
+					{"$filter", bson.D{
+						{"input", "$msgs"},
+						{"as", "item"},
+						{"cond", bson.D{
+							{"$and", conditon},
+						},
+						}},
+					}},
+				},
+				{"doc_id", 1},
+			}},
+		},
+	}
+	cursor, err := m.MsgCollection.Aggregate(ctx, pipe)
+	if err != nil {
+		return nil, err
+	}
+
+	var msgsDocs []table.MsgDocModel
+	err = cursor.All(ctx, &msgsDocs)
+	if err != nil {
+		return nil, err
+	}
+	if len(msgsDocs) == 0 {
+		return nil, errs.Wrap(mongo.ErrNoDocuments)
+	}
+	msgs := make([]*table.MsgInfoModel, 0)
+	for index, _ := range msgsDocs {
+		for i := range msgsDocs[index].Msg {
+			msg := msgsDocs[index].Msg[i]
+			if msg == nil || msg.Msg == nil {
+				continue
+			}
+			if msg.Revoke != nil {
+				revokeContent := sdkws.MessageRevokedContent{
+					RevokerID:                   msg.Revoke.UserID,
+					RevokerRole:                 msg.Revoke.Role,
+					ClientMsgID:                 msg.Msg.ClientMsgID,
+					RevokerNickname:             msg.Revoke.Nickname,
+					RevokeTime:                  msg.Revoke.Time,
+					SourceMessageSendTime:       msg.Msg.SendTime,
+					SourceMessageSendID:         msg.Msg.SendID,
+					SourceMessageSenderNickname: msg.Msg.SenderNickname,
+					SessionType:                 msg.Msg.SessionType,
+					Seq:                         msg.Msg.Seq,
+					Ex:                          msg.Msg.Ex,
+				}
+				data, err := json.Marshal(&revokeContent)
+				if err != nil {
+					return nil, err
+				}
+				elem := sdkws.NotificationElem{
+					Detail: string(data),
+				}
+				content, err := json.Marshal(&elem)
+				if err != nil {
+					return nil, err
+				}
+				msg.Msg.ContentType = constant.MsgRevokeNotification
+				msg.Msg.Content = string(content)
+			}
+			msgs = append(msgs, msg)
+		}
+	}
+	return msgs, nil
+}

pkg/common/http/http_client.go

@@ -1,9 +1,18 @@
-/*
+// Copyright © 2023 OpenIM. All rights reserved.
-** description("").
+//
-** copyright('open-im,www.open-im.io').
+// Licensed under the Apache License, Version 2.0 (the "License");
-** author("fg,Gordon@tuoyun.net").
+// you may not use this file except in compliance with the License.
-** time(2021/5/27 10:31).
+// You may obtain a copy of the License at
- */package http
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package http
 
 import (
 	"bytes"

pkg/common/kafka/producer.go

@@ -17,12 +17,12 @@ package kafka
 import (
 	"context"
 	"errors"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	log "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
+	"time"
 
 	"github.com/Shopify/sarama"
 	"google.golang.org/protobuf/proto"
@@ -30,6 +30,10 @@ import (
 	prome "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome"
 )
 
+const (
+	maxRetry = 10 //number of retries
+)
+
 var errEmptyMsg = errors.New("binary msg is empty")
 
 type Producer struct {
@@ -39,6 +43,7 @@ type Producer struct {
 	producer sarama.SyncProducer
 }
 
+// NewKafkaProducer Initialize kafka producer
 func NewKafkaProducer(addr []string, topic string) *Producer {
 	p := Producer{}
 	p.config = sarama.NewConfig()             //Instantiate a sarama Config
@@ -53,7 +58,24 @@ func NewKafkaProducer(addr []string, topic string) *Producer {
 	}
 	p.addr = addr
 	p.topic = topic
-	producer, err := sarama.NewSyncProducer(p.addr, p.config) //Initialize the client
+	var producer sarama.SyncProducer
+	var err error
+	for i := 0; i <= maxRetry; i++ {
+		producer, err = sarama.NewSyncProducer(p.addr, p.config) //Initialize the client
+		if err == nil {
+			p.producer = producer
+			return &p
+		}
+		//TODO If the password is wrong, exit directly
+		//if packetErr, ok := err.(*sarama.PacketEncodingError); ok {
+		//if _, ok := packetErr.Err.(sarama.AuthenticationError); ok {
+		//	fmt.Println("Kafka password is wrong.")
+		//}
+		//} else {
+		//	fmt.Printf("Failed to create Kafka producer: %v\n", err)
+		//}
+		time.Sleep(time.Duration(1) * time.Second)
+	}
 	if err != nil {
 		panic(err.Error())
 	}

pkg/common/log/sql_logger.go

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

pkg/common/mcontext/ctx.go

@@ -26,12 +26,15 @@ var mapper = []string{constant.OperationID, constant.OpUserID, constant.OpUserPl
 func WithOpUserIDContext(ctx context.Context, opUserID string) context.Context {
 	return context.WithValue(ctx, constant.OpUserID, opUserID)
 }
+
 func WithOpUserPlatformContext(ctx context.Context, platform string) context.Context {
 	return context.WithValue(ctx, constant.OpUserPlatform, platform)
 }
+
 func WithTriggerIDContext(ctx context.Context, triggerID string) context.Context {
 	return context.WithValue(ctx, constant.TriggerID, triggerID)
 }
+
 func NewCtx(operationID string) context.Context {
 	c := context.Background()
 	ctx := context.WithValue(c, constant.OperationID, operationID)
@@ -59,6 +62,7 @@ func GetOperationID(ctx context.Context) string {
 	}
 	return ""
 }
+
 func GetOpUserID(ctx context.Context) string {
 	if ctx.Value(constant.OpUserID) != "" {
 		s, ok := ctx.Value(constant.OpUserID).(string)
@@ -68,6 +72,7 @@ func GetOpUserID(ctx context.Context) string {
 	}
 	return ""
 }
+
 func GetConnID(ctx context.Context) string {
 	if ctx.Value(constant.ConnID) != "" {
 		s, ok := ctx.Value(constant.ConnID).(string)
@@ -87,6 +92,7 @@ func GetTriggerID(ctx context.Context) string {
 	}
 	return ""
 }
+
 func GetOpUserPlatform(ctx context.Context) string {
 	if ctx.Value(constant.OpUserPlatform) != "" {
 		s, ok := ctx.Value(constant.OpUserPlatform).(string)
@@ -96,6 +102,7 @@ func GetOpUserPlatform(ctx context.Context) string {
 	}
 	return ""
 }
+
 func GetRemoteAddr(ctx context.Context) string {
 	if ctx.Value(constant.RemoteAddr) != "" {
 		s, ok := ctx.Value(constant.RemoteAddr).(string)
@@ -142,8 +149,6 @@ func WithMustInfoCtx(values []string) context.Context {
 	ctx := context.Background()
 	for i, v := range values {
 		ctx = context.WithValue(ctx, mapper[i], v)
-
 	}
 	return ctx
-
 }

pkg/common/mw/check.go

@@ -1,80 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package mw
-
-import (
-	"crypto/aes"
-	"crypto/cipher"
-	"crypto/md5"
-	"encoding/base64"
-	"errors"
-	"fmt"
-	"math/rand"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
-)
-
-var (
-	once  sync.Once
-	block cipher.Block
-)
-
-func init() {
-	rand.Seed(time.Now().UnixNano())
-}
-
-func initAesKey() {
-	once.Do(func() {
-		key := md5.Sum([]byte("openim:" + config.Config.Secret))
-		var err error
-		block, err = aes.NewCipher(key[:])
-		if err != nil {
-			panic(err)
-		}
-	})
-}
-
-func genReqKey(args []string) string {
-	initAesKey()
-	plaintext := md5.Sum([]byte(strings.Join(args, ":")))
-	iv := make([]byte, aes.BlockSize, aes.BlockSize+md5.Size)
-	if _, err := rand.Read(iv); err != nil {
-		panic(err)
-	}
-	ciphertext := make([]byte, md5.Size)
-	cipher.NewCBCEncrypter(block, iv).CryptBlocks(ciphertext, plaintext[:])
-	return base64.StdEncoding.EncodeToString(append(iv, ciphertext...))
-}
-
-func verifyReqKey(args []string, key string) error {
-	initAesKey()
-	k, err := base64.StdEncoding.DecodeString(key)
-	if err != nil {
-		return fmt.Errorf("invalid key %v", err)
-	}
-	if len(k) != aes.BlockSize+md5.Size {
-		return errors.New("invalid key")
-	}
-	plaintext := make([]byte, md5.Size)
-	cipher.NewCBCDecrypter(block, k[:aes.BlockSize]).CryptBlocks(plaintext, k[aes.BlockSize:])
-	sum := md5.Sum([]byte(strings.Join(args, ":")))
-	if string(plaintext) != string(sum[:]) {
-		return errors.New("mismatch key")
-	}
-	return nil
-}

pkg/common/mw/gin.go

@@ -31,6 +31,7 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
 )
 
+// CorsHandler gin cross-domain configuration.
 func CorsHandler() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		c.Writer.Header().Set("Access-Control-Allow-Origin", "*")
@@ -39,19 +40,19 @@ func CorsHandler() gin.HandlerFunc {
 		c.Header(
 			"Access-Control-Expose-Headers",
 			"Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers,Cache-Control,Content-Language,Content-Type,Expires,Last-Modified,Pragma,FooBar",
-		) // 跨域关键设置 让浏览器可以解析
+		) // Cross-domain key settings allow browsers to resolve.
 		c.Header(
 			"Access-Control-Max-Age",
 			"172800",
-		) // 缓存请求信息 单位为秒
+		) // Cache request information in seconds.
 		c.Header(
 			"Access-Control-Allow-Credentials",
 			"false",
-		) //  跨域请求是否需要带cookie信息 默认设置为true
+		) //  Whether cross-domain requests need to carry cookie information, the default setting is true.
 		c.Header(
 			"content-type",
 			"application/json",
-		) // 设置返回格式是json
+		) // Set the return format to json.
 		//Release all option pre-requests
 		if c.Request.Method == http.MethodOptions {
 			c.JSON(http.StatusOK, "Options Request!")

pkg/common/mw/rpc_client_interceptor.go

@@ -75,7 +75,6 @@ func RpcClientInterceptor(
 }
 
 func getRpcContext(ctx context.Context, method string) (context.Context, error) {
-	// ctx, _ = context.WithTimeout(ctx, time.Second*5)
 	md := metadata.Pairs()
 	if keys, _ := ctx.Value(constant.RpcCustomHeader).([]string); len(keys) > 0 {
 		for _, key := range keys {
@@ -111,6 +110,5 @@ func getRpcContext(ctx context.Context, method string) (context.Context, error)
 	if ok {
 		md.Set(constant.ConnID, connID)
 	}
-	md.Set(constant.CheckKey, genReqKey(checkArgs))
 	return metadata.NewOutgoingContext(ctx, md), nil
 }

pkg/common/mw/rpc_server_interceptor.go

@@ -106,13 +106,6 @@ func RpcServerInterceptor(
 	if opts := md.Get(constant.ConnID); len(opts) == 1 {
 		ctx = context.WithValue(ctx, constant.ConnID, opts[0])
 	}
-	if opts := md.Get(constant.CheckKey); len(opts) != 1 || opts[0] == "" {
-		return nil, status.New(codes.InvalidArgument, "check key empty").Err()
-	} else {
-		if err := verifyReqKey(args, opts[0]); err != nil {
-			return nil, status.New(codes.InvalidArgument, err.Error()).Err()
-		}
-	}
 	log.ZInfo(ctx, "rpc server req", "funcName", funcName, "req", rpcString(req))
 	resp, err = func() (interface{}, error) {
 		if err := checker.Validate(req); err != nil {

pkg/discoveryregistry/zookeeper/discover.go

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

pkg/errs/code.go

@@ -14,7 +14,7 @@
 
 package errs
 
-// UnknownCode 没有解析到code或解析的code=0
+// UnknownCode 没有解析到code或解析的code=0.
 const UnknownCode = 1000
 
 const (
@@ -34,47 +34,47 @@ const (
 	InvitationError      = 10014
 )
 
-// 通用错误码
+// 通用错误码.
 const (
-	NoError       = 0     //无错误
+	NoError       = 0     // 无错误
-	DatabaseError = 90002 //redis/mysql等db错误
+	DatabaseError = 90002 // redis/mysql等db错误
-	NetworkError  = 90004 //网络错误
+	NetworkError  = 90004 // 网络错误
-	DataError     = 90007 //数据错误
+	DataError     = 90007 // 数据错误
 
 	CallbackError = 80000
 
-	//通用错误码
+	//通用错误码.
 	ServerInternalError = 500  //服务器内部错误
 	ArgsError           = 1001 //输入参数错误
 	NoPermissionError   = 1002 //权限不足
 	DuplicateKeyError   = 1003
-	RecordNotFoundError = 1004 //记录不存在
+	RecordNotFoundError = 1004 // 记录不存在
 
-	// 账号错误码
+	// 账号错误码.
-	UserIDNotFoundError    = 1101 //UserID不存在 或未注册
+	UserIDNotFoundError    = 1101 // UserID不存在 或未注册
-	RegisteredAlreadyError = 1102 //用户已经注册过了
+	RegisteredAlreadyError = 1102 // 用户已经注册过了
 
-	// 群组错误码
+	// 群组错误码.
-	GroupIDNotFoundError  = 1201 //GroupID不存在
+	GroupIDNotFoundError  = 1201 // GroupID不存在
-	GroupIDExisted        = 1202 //GroupID已存在
+	GroupIDExisted        = 1202 // GroupID已存在
-	NotInGroupYetError    = 1203 //不在群组中
+	NotInGroupYetError    = 1203 // 不在群组中
-	DismissedAlreadyError = 1204 //群组已经解散
+	DismissedAlreadyError = 1204 // 群组已经解散
 	GroupTypeNotSupport   = 1205
 	GroupRequestHandled   = 1206
 
-	// 关系链错误码
+	// 关系链错误码.
-	CanNotAddYourselfError   = 1301 //不能添加自己为好友
+	CanNotAddYourselfError   = 1301 // 不能添加自己为好友
-	BlockedByPeer            = 1302 //被对方拉黑
+	BlockedByPeer            = 1302 // 被对方拉黑
-	NotPeersFriend           = 1303 //不是对方的好友
+	NotPeersFriend           = 1303 // 不是对方的好友
-	RelationshipAlreadyError = 1304 //已经是好友关系
+	RelationshipAlreadyError = 1304 // 已经是好友关系
 
-	// 消息错误码
+	// 消息错误码.
 	MessageHasReadDisable = 1401
-	MutedInGroup          = 1402 //群成员被禁言
+	MutedInGroup          = 1402 // 群成员被禁言
-	MutedGroup            = 1403 //群被禁言
+	MutedGroup            = 1403 // 群被禁言
-	MsgAlreadyRevoke      = 1404 //消息已撤回
+	MsgAlreadyRevoke      = 1404 // 消息已撤回
 
-	// token错误码
+	// token错误码.
 	TokenExpiredError     = 1501
 	TokenInvalidError     = 1502
 	TokenMalformedError   = 1503
@@ -83,10 +83,10 @@ const (
 	TokenKickedError      = 1506
 	TokenNotExistError    = 1507
 
-	// 长连接网关错误码
+	// 长连接网关错误码.
 	ConnOverMaxNumLimit = 1601
 	ConnArgsErr         = 1602
 
-	// S3错误码
+	// S3错误码.
 	FileUploadedExpiredError = 1701 // 上传过期
 )

pkg/errs/predefine.go

@@ -38,11 +38,11 @@ var (
 	ErrData             = NewCodeError(DataError, "DataError")
 	ErrTokenExpired     = NewCodeError(TokenExpiredError, "TokenExpiredError")
 	ErrTokenInvalid     = NewCodeError(TokenInvalidError, "TokenInvalidError")         //
-	ErrTokenMalformed   = NewCodeError(TokenMalformedError, "TokenMalformedError")     //格式错误
+	ErrTokenMalformed   = NewCodeError(TokenMalformedError, "TokenMalformedError")     // 格式错误
-	ErrTokenNotValidYet = NewCodeError(TokenNotValidYetError, "TokenNotValidYetError") //还未生效
+	ErrTokenNotValidYet = NewCodeError(TokenNotValidYetError, "TokenNotValidYetError") // 还未生效
-	ErrTokenUnknown     = NewCodeError(TokenUnknownError, "TokenUnknownError")         //未知错误
+	ErrTokenUnknown     = NewCodeError(TokenUnknownError, "TokenUnknownError")         // 未知错误
 	ErrTokenKicked      = NewCodeError(TokenKickedError, "TokenKickedError")
-	ErrTokenNotExist    = NewCodeError(TokenNotExistError, "TokenNotExistError") //在redis中不存在
+	ErrTokenNotExist    = NewCodeError(TokenNotExistError, "TokenNotExistError") // 在redis中不存在
 	ErrDuplicateKey     = NewCodeError(DuplicateKeyError, "DuplicateKeyError")
 
 	ErrMessageHasReadDisable = NewCodeError(MessageHasReadDisable, "MessageHasReadDisable")

pkg/proto/auth/auth.pb.go

@@ -1,3 +1,17 @@
+// 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.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.29.1
@@ -8,14 +22,13 @@ package auth
 
 import (
 	context "context"
-	reflect "reflect"
-	sync "sync"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (

pkg/proto/conversation/conversation.pb.go

@@ -1,3 +1,17 @@
+// 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.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.29.1
@@ -8,16 +22,14 @@ package conversation
 
 import (
 	context "context"
-	reflect "reflect"
+	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
-	sync "sync"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-
+	reflect "reflect"
-	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
+	sync "sync"
 )
 
 const (

pkg/proto/errinfo/errinfo.pb.go

@@ -1,3 +1,17 @@
+// 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.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.29.1
@@ -7,11 +21,10 @@
 package errinfo
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (

pkg/proto/friend/friend.pb.go

@@ -1,3 +1,17 @@
+// 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.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.29.1
@@ -8,16 +22,14 @@ package friend
 
 import (
 	context "context"
-	reflect "reflect"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
-	sync "sync"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-
+	reflect "reflect"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	sync "sync"
 )
 
 const (

pkg/proto/group/group.go

@@ -23,9 +23,6 @@ func (x *CreateGroupReq) Check() error {
 	if x.GroupInfo == nil {
 		return errs.ErrArgs.Wrap("groupInfo is empty")
 	}
-	if x.GroupInfo.OwnerUserID == "" {
-		return errs.ErrArgs.Wrap("GroupInfo.ownerUserID")
-	}
 	if x.GroupInfo.GroupType > 2 || x.GroupInfo.GroupType < 0 {
 		return errs.ErrArgs.Wrap("GroupType is invalid")
 	}

pkg/proto/group/group.pb.go

@@ -1,3 +1,17 @@
+// 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.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.29.1
@@ -8,17 +22,15 @@ package group
 
 import (
 	context "context"
-	reflect "reflect"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
-	sync "sync"
+	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-
+	reflect "reflect"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	sync "sync"
-	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
 )
 
 const (

pkg/proto/msg/msg.go

@@ -133,9 +133,6 @@ func (x *MarkConversationAsReadReq) Check() error {
 	if x.ConversationID == "" {
 		return errs.ErrArgs.Wrap("conversationID is empty")
 	}
-	if x.Seqs == nil {
-		return errs.ErrArgs.Wrap("seqs is empty")
-	}
 	if x.UserID == "" {
 		return errs.ErrArgs.Wrap("userID is empty")
 	}
@@ -165,9 +162,6 @@ func (x *ClearConversationsMsgReq) Check() error {
 	if x.UserID == "" {
 		return errs.ErrArgs.Wrap("userID is empty")
 	}
-	if x.DeleteSyncOpt == nil {
-		return errs.ErrArgs.Wrap("deleteSyncOpt is empty")
-	}
 	return nil
 }
 
@@ -175,9 +169,6 @@ func (x *UserClearAllMsgReq) Check() error {
 	if x.UserID == "" {
 		return errs.ErrArgs.Wrap("userID is empty")
 	}
-	if x.DeleteSyncOpt == nil {
-		return errs.ErrArgs.Wrap("deleteSyncOpt is empty")
-	}
 	return nil
 }
 
@@ -191,9 +182,6 @@ func (x *DeleteMsgsReq) Check() error {
 	if x.Seqs == nil {
 		return errs.ErrArgs.Wrap("seqs is empty")
 	}
-	if x.DeleteSyncOpt == nil {
-		return errs.ErrArgs.Wrap("deleteSyncOpt is empty")
-	}
 	return nil
 }
 

pkg/proto/msg/msg.pb.go

@@ -1,3 +1,17 @@
+// 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.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.29.1
@@ -2359,6 +2373,371 @@ func (x *GetActiveGroupResp) GetGroups() []*ActiveGroup {
 	return nil
 }
 
+type SearchMessageReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	SendID      string                   `protobuf:"bytes,1,opt,name=sendID,proto3" json:"sendID"` //发送者ID
+	RecvID      string                   `protobuf:"bytes,2,opt,name=recvID,proto3" json:"recvID"` //接收者ID
+	MsgType     int32                    `protobuf:"varint,3,opt,name=msgType,proto3" json:"msgType"`
+	SendTime    string                   `protobuf:"bytes,4,opt,name=sendTime,proto3" json:"sendTime"`
+	SessionType int32                    `protobuf:"varint,5,opt,name=sessionType,proto3" json:"sessionType"`
+	Pagination  *sdkws.RequestPagination `protobuf:"bytes,6,opt,name=pagination,proto3" json:"pagination"`
+}
+
+func (x *SearchMessageReq) Reset() {
+	*x = SearchMessageReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_msg_msg_proto_msgTypes[45]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SearchMessageReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SearchMessageReq) ProtoMessage() {}
+
+func (x *SearchMessageReq) ProtoReflect() protoreflect.Message {
+	mi := &file_msg_msg_proto_msgTypes[45]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SearchMessageReq.ProtoReflect.Descriptor instead.
+func (*SearchMessageReq) Descriptor() ([]byte, []int) {
+	return file_msg_msg_proto_rawDescGZIP(), []int{45}
+}
+
+func (x *SearchMessageReq) GetSendID() string {
+	if x != nil {
+		return x.SendID
+	}
+	return ""
+}
+
+func (x *SearchMessageReq) GetRecvID() string {
+	if x != nil {
+		return x.RecvID
+	}
+	return ""
+}
+
+func (x *SearchMessageReq) GetMsgType() int32 {
+	if x != nil {
+		return x.MsgType
+	}
+	return 0
+}
+
+func (x *SearchMessageReq) GetSendTime() string {
+	if x != nil {
+		return x.SendTime
+	}
+	return ""
+}
+
+func (x *SearchMessageReq) GetSessionType() int32 {
+	if x != nil {
+		return x.SessionType
+	}
+	return 0
+}
+
+func (x *SearchMessageReq) GetPagination() *sdkws.RequestPagination {
+	if x != nil {
+		return x.Pagination
+	}
+	return nil
+}
+
+type SearchMessageResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ChatLogs    []*ChatLog `protobuf:"bytes,1,rep,name=chatLogs,proto3" json:"chatLogs"`
+	ChatLogsNum int32      `protobuf:"varint,2,opt,name=chatLogsNum,proto3" json:"chatLogsNum"`
+}
+
+func (x *SearchMessageResp) Reset() {
+	*x = SearchMessageResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_msg_msg_proto_msgTypes[46]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SearchMessageResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SearchMessageResp) ProtoMessage() {}
+
+func (x *SearchMessageResp) ProtoReflect() protoreflect.Message {
+	mi := &file_msg_msg_proto_msgTypes[46]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SearchMessageResp.ProtoReflect.Descriptor instead.
+func (*SearchMessageResp) Descriptor() ([]byte, []int) {
+	return file_msg_msg_proto_rawDescGZIP(), []int{46}
+}
+
+func (x *SearchMessageResp) GetChatLogs() []*ChatLog {
+	if x != nil {
+		return x.ChatLogs
+	}
+	return nil
+}
+
+func (x *SearchMessageResp) GetChatLogsNum() int32 {
+	if x != nil {
+		return x.ChatLogsNum
+	}
+	return 0
+}
+
+type ChatLog struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ServerMsgID      string `protobuf:"bytes,1,opt,name=serverMsgID,proto3" json:"serverMsgID"`
+	ClientMsgID      string `protobuf:"bytes,2,opt,name=clientMsgID,proto3" json:"clientMsgID"`
+	SendID           string `protobuf:"bytes,3,opt,name=sendID,proto3" json:"sendID"`
+	RecvID           string `protobuf:"bytes,4,opt,name=recvID,proto3" json:"recvID"`
+	GroupID          string `protobuf:"bytes,5,opt,name=groupID,proto3" json:"groupID"`
+	RecvNickname     string `protobuf:"bytes,6,opt,name=recvNickname,proto3" json:"recvNickname"`
+	SenderPlatformID int32  `protobuf:"varint,7,opt,name=senderPlatformID,proto3" json:"senderPlatformID"`
+	SenderNickname   string `protobuf:"bytes,8,opt,name=senderNickname,proto3" json:"senderNickname"`
+	SenderFaceURL    string `protobuf:"bytes,9,opt,name=senderFaceURL,proto3" json:"senderFaceURL"`
+	GroupName        string `protobuf:"bytes,10,opt,name=groupName,proto3" json:"groupName"`
+	SessionType      int32  `protobuf:"varint,11,opt,name=sessionType,proto3" json:"sessionType"`
+	MsgFrom          int32  `protobuf:"varint,12,opt,name=msgFrom,proto3" json:"msgFrom"`
+	ContentType      int32  `protobuf:"varint,13,opt,name=contentType,proto3" json:"contentType"`
+	Content          string `protobuf:"bytes,14,opt,name=content,proto3" json:"content"`
+	Status           int32  `protobuf:"varint,15,opt,name=status,proto3" json:"status"`
+	SendTime         int64  `protobuf:"varint,16,opt,name=sendTime,proto3" json:"sendTime"`
+	CreateTime       int64  `protobuf:"varint,17,opt,name=createTime,proto3" json:"createTime"`
+	Ex               string `protobuf:"bytes,18,opt,name=ex,proto3" json:"ex"`
+	GroupFaceURL     string `protobuf:"bytes,19,opt,name=groupFaceURL,proto3" json:"groupFaceURL"`
+	GroupMemberCount uint32 `protobuf:"varint,20,opt,name=groupMemberCount,proto3" json:"groupMemberCount"`
+	Seq              int64  `protobuf:"varint,21,opt,name=seq,proto3" json:"seq"`
+	GroupOwner       string `protobuf:"bytes,22,opt,name=groupOwner,proto3" json:"groupOwner"`
+	GroupType        int32  `protobuf:"varint,23,opt,name=groupType,proto3" json:"groupType"`
+}
+
+func (x *ChatLog) Reset() {
+	*x = ChatLog{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_msg_msg_proto_msgTypes[47]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ChatLog) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ChatLog) ProtoMessage() {}
+
+func (x *ChatLog) ProtoReflect() protoreflect.Message {
+	mi := &file_msg_msg_proto_msgTypes[47]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ChatLog.ProtoReflect.Descriptor instead.
+func (*ChatLog) Descriptor() ([]byte, []int) {
+	return file_msg_msg_proto_rawDescGZIP(), []int{47}
+}
+
+func (x *ChatLog) GetServerMsgID() string {
+	if x != nil {
+		return x.ServerMsgID
+	}
+	return ""
+}
+
+func (x *ChatLog) GetClientMsgID() string {
+	if x != nil {
+		return x.ClientMsgID
+	}
+	return ""
+}
+
+func (x *ChatLog) GetSendID() string {
+	if x != nil {
+		return x.SendID
+	}
+	return ""
+}
+
+func (x *ChatLog) GetRecvID() string {
+	if x != nil {
+		return x.RecvID
+	}
+	return ""
+}
+
+func (x *ChatLog) GetGroupID() string {
+	if x != nil {
+		return x.GroupID
+	}
+	return ""
+}
+
+func (x *ChatLog) GetRecvNickname() string {
+	if x != nil {
+		return x.RecvNickname
+	}
+	return ""
+}
+
+func (x *ChatLog) GetSenderPlatformID() int32 {
+	if x != nil {
+		return x.SenderPlatformID
+	}
+	return 0
+}
+
+func (x *ChatLog) GetSenderNickname() string {
+	if x != nil {
+		return x.SenderNickname
+	}
+	return ""
+}
+
+func (x *ChatLog) GetSenderFaceURL() string {
+	if x != nil {
+		return x.SenderFaceURL
+	}
+	return ""
+}
+
+func (x *ChatLog) GetGroupName() string {
+	if x != nil {
+		return x.GroupName
+	}
+	return ""
+}
+
+func (x *ChatLog) GetSessionType() int32 {
+	if x != nil {
+		return x.SessionType
+	}
+	return 0
+}
+
+func (x *ChatLog) GetMsgFrom() int32 {
+	if x != nil {
+		return x.MsgFrom
+	}
+	return 0
+}
+
+func (x *ChatLog) GetContentType() int32 {
+	if x != nil {
+		return x.ContentType
+	}
+	return 0
+}
+
+func (x *ChatLog) GetContent() string {
+	if x != nil {
+		return x.Content
+	}
+	return ""
+}
+
+func (x *ChatLog) GetStatus() int32 {
+	if x != nil {
+		return x.Status
+	}
+	return 0
+}
+
+func (x *ChatLog) GetSendTime() int64 {
+	if x != nil {
+		return x.SendTime
+	}
+	return 0
+}
+
+func (x *ChatLog) GetCreateTime() int64 {
+	if x != nil {
+		return x.CreateTime
+	}
+	return 0
+}
+
+func (x *ChatLog) GetEx() string {
+	if x != nil {
+		return x.Ex
+	}
+	return ""
+}
+
+func (x *ChatLog) GetGroupFaceURL() string {
+	if x != nil {
+		return x.GroupFaceURL
+	}
+	return ""
+}
+
+func (x *ChatLog) GetGroupMemberCount() uint32 {
+	if x != nil {
+		return x.GroupMemberCount
+	}
+	return 0
+}
+
+func (x *ChatLog) GetSeq() int64 {
+	if x != nil {
+		return x.Seq
+	}
+	return 0
+}
+
+func (x *ChatLog) GetGroupOwner() string {
+	if x != nil {
+		return x.GroupOwner
+	}
+	return ""
+}
+
+func (x *ChatLog) GetGroupType() int32 {
+	if x != nil {
+		return x.GroupType
+	}
+	return 0
+}
+
 var File_msg_msg_proto protoreflect.FileDescriptor
 
 var file_msg_msg_proto_rawDesc = []byte{
@@ -2612,125 +2991,197 @@ var file_msg_msg_proto_rawDesc = []byte{
 	0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
 	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
-	0x38, 0x01, 0x32, 0xa8, 0x0e, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x50, 0x0a, 0x09, 0x47, 0x65,
+	0x38, 0x01, 0x22, 0xe1, 0x01, 0x0a, 0x10, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x65, 0x73,
-	0x74, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x71, 0x12, 0x20, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d,
+	0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x49,
-	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x73, 0x64, 0x6b, 0x77, 0x73, 0x2e, 0x47, 0x65, 0x74,
+	0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x49, 0x44, 0x12,
-	0x4d, 0x61, 0x78, 0x53, 0x65, 0x71, 0x52, 0x65, 0x71, 0x1a, 0x21, 0x2e, 0x4f, 0x70, 0x65, 0x6e,
+	0x16, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x76, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x73, 0x64, 0x6b, 0x77, 0x73, 0x2e, 0x47,
+	0x06, 0x72, 0x65, 0x63, 0x76, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79,
-	0x65, 0x74, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x71, 0x52, 0x65, 0x73, 0x70, 0x12, 0x70, 0x0a, 0x15,
+	0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70,
-	0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d,
+	0x65, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20,
-	0x61, 0x78, 0x53, 0x65, 0x71, 0x12, 0x2a, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x20, 0x0a,
+	0x0b, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x0b, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12,
+	0x45, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76,
+	0x65, 0x72, 0x2e, 0x73, 0x64, 0x6b, 0x77, 0x73, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69,
+	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x6c, 0x0a, 0x11, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68,
+	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x35, 0x0a, 0x08, 0x63,
+	0x68, 0x61, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e,
+	0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67,
+	0x2e, 0x43, 0x68, 0x61, 0x74, 0x4c, 0x6f, 0x67, 0x52, 0x08, 0x63, 0x68, 0x61, 0x74, 0x4c, 0x6f,
+	0x67, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x68, 0x61, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x4e, 0x75,
+	0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x68, 0x61, 0x74, 0x4c, 0x6f, 0x67,
+	0x73, 0x4e, 0x75, 0x6d, 0x22, 0xcf, 0x05, 0x0a, 0x07, 0x43, 0x68, 0x61, 0x74, 0x4c, 0x6f, 0x67,
+	0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4d, 0x73, 0x67, 0x49, 0x44, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4d, 0x73, 0x67,
+	0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x4d, 0x73, 0x67, 0x49,
+	0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x4d,
+	0x73, 0x67, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x49, 0x44, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06,
+	0x72, 0x65, 0x63, 0x76, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65,
+	0x63, 0x76, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x44, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x44, 0x12, 0x22,
+	0x0a, 0x0c, 0x72, 0x65, 0x63, 0x76, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x06,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x63, 0x76, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61,
+	0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x50, 0x6c, 0x61, 0x74,
+	0x66, 0x6f, 0x72, 0x6d, 0x49, 0x44, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x73, 0x65,
+	0x6e, 0x64, 0x65, 0x72, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x49, 0x44, 0x12, 0x26,
+	0x0a, 0x0e, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4e, 0x69,
+	0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72,
+	0x46, 0x61, 0x63, 0x65, 0x55, 0x52, 0x4c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73,
+	0x65, 0x6e, 0x64, 0x65, 0x72, 0x46, 0x61, 0x63, 0x65, 0x55, 0x52, 0x4c, 0x12, 0x1c, 0x0a, 0x09,
+	0x67, 0x72, 0x6f, 0x75, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x09, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65,
+	0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0b, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07,
+	0x6d, 0x73, 0x67, 0x46, 0x72, 0x6f, 0x6d, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d,
+	0x73, 0x67, 0x46, 0x72, 0x6f, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e,
+	0x74, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x6f, 0x6e,
+	0x74, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74,
+	0x65, 0x6e, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65,
+	0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x0f, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65,
+	0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x65,
+	0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x54, 0x69, 0x6d, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61,
+	0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x65, 0x78, 0x18, 0x12, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x02, 0x65, 0x78, 0x12, 0x22, 0x0a, 0x0c, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x46,
+	0x61, 0x63, 0x65, 0x55, 0x52, 0x4c, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x67, 0x72,
+	0x6f, 0x75, 0x70, 0x46, 0x61, 0x63, 0x65, 0x55, 0x52, 0x4c, 0x12, 0x2a, 0x0a, 0x10, 0x67, 0x72,
+	0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x14,
+	0x20, 0x01, 0x28, 0x0d, 0x52, 0x10, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65,
+	0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x71, 0x18, 0x15, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x67, 0x72, 0x6f, 0x75,
+	0x70, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x67, 0x72,
+	0x6f, 0x75, 0x70, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x67, 0x72, 0x6f, 0x75,
+	0x70, 0x54, 0x79, 0x70, 0x65, 0x18, 0x17, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x67, 0x72, 0x6f,
+	0x75, 0x70, 0x54, 0x79, 0x70, 0x65, 0x32, 0x82, 0x0f, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x50,
+	0x0a, 0x09, 0x47, 0x65, 0x74, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x71, 0x12, 0x20, 0x2e, 0x4f, 0x70,
+	0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x73, 0x64, 0x6b, 0x77, 0x73,
+	0x2e, 0x47, 0x65, 0x74, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x71, 0x52, 0x65, 0x71, 0x1a, 0x21, 0x2e,
+	0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x73, 0x64, 0x6b,
+	0x77, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x71, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x70, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x71, 0x12, 0x2a, 0x2e, 0x4f, 0x70, 0x65, 0x6e,
+	0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x47, 0x65, 0x74,
+	0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x61, 0x78, 0x53,
+	0x65, 0x71, 0x52, 0x65, 0x71, 0x1a, 0x2b, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65,
 	0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x76,
 	0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x71, 0x52, 0x65,
-	0x71, 0x1a, 0x2b, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
+	0x73, 0x70, 0x12, 0x68, 0x0a, 0x11, 0x50, 0x75, 0x6c, 0x6c, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61,
+	0x65, 0x42, 0x79, 0x53, 0x65, 0x71, 0x73, 0x12, 0x28, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d,
-	0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x71, 0x52, 0x65, 0x73, 0x70, 0x12, 0x68,
+	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x73, 0x64, 0x6b, 0x77, 0x73, 0x2e, 0x50, 0x75, 0x6c,
-	0x0a, 0x11, 0x50, 0x75, 0x6c, 0x6c, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x79, 0x53,
+	0x6c, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x79, 0x53, 0x65, 0x71, 0x73, 0x52, 0x65,
-	0x65, 0x71, 0x73, 0x12, 0x28, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76,
+	0x71, 0x1a, 0x29, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x65, 0x72, 0x2e, 0x73, 0x64, 0x6b, 0x77, 0x73, 0x2e, 0x50, 0x75, 0x6c, 0x6c, 0x4d, 0x65, 0x73,
+	0x2e, 0x73, 0x64, 0x6b, 0x77, 0x73, 0x2e, 0x50, 0x75, 0x6c, 0x6c, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x73, 0x61, 0x67, 0x65, 0x42, 0x79, 0x53, 0x65, 0x71, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x29, 0x2e,
+	0x67, 0x65, 0x42, 0x79, 0x53, 0x65, 0x71, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x58, 0x0a, 0x0d,
-	0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x73, 0x64, 0x6b,
+	0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x22, 0x2e,
-	0x77, 0x73, 0x2e, 0x50, 0x75, 0x6c, 0x6c, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x79,
-	0x53, 0x65, 0x71, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x46, 0x0a, 0x07, 0x53, 0x65, 0x6e, 0x64,
-	0x4d, 0x73, 0x67, 0x12, 0x1c, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76,
-	0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52, 0x65,
-	0x71, 0x1a, 0x1d, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x73, 0x70,
-	0x12, 0x70, 0x0a, 0x15, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x4d, 0x73, 0x67, 0x12, 0x2a, 0x2e, 0x4f, 0x70, 0x65, 0x6e,
-	0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x43, 0x6c, 0x65,
-	0x61, 0x72, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x4d,
-	0x73, 0x67, 0x52, 0x65, 0x71, 0x1a, 0x2b, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x43, 0x6f,
-	0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x4d, 0x73, 0x67, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x5e, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x41,
-	0x6c, 0x6c, 0x4d, 0x73, 0x67, 0x12, 0x24, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6c, 0x65,
-	0x61, 0x72, 0x41, 0x6c, 0x6c, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x1a, 0x25, 0x2e, 0x4f, 0x70,
-	0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x55,
-	0x73, 0x65, 0x72, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x41, 0x6c, 0x6c, 0x4d, 0x73, 0x67, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x4f, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x73, 0x67, 0x73,
-	0x12, 0x1f, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e,
-	0x6d, 0x73, 0x67, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x73, 0x67, 0x73, 0x52, 0x65,
-	0x71, 0x1a, 0x20, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x73, 0x67, 0x73, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x73, 0x0a, 0x16, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x73, 0x67,
-	0x50, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x42, 0x79, 0x53, 0x65, 0x71, 0x12, 0x2b, 0x2e,
 	0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67,
-	0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x73, 0x67, 0x50, 0x68, 0x79, 0x73, 0x69, 0x63,
+	0x2e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65,
-	0x61, 0x6c, 0x42, 0x79, 0x53, 0x65, 0x71, 0x52, 0x65, 0x71, 0x1a, 0x2c, 0x2e, 0x4f, 0x70, 0x65,
+	0x71, 0x1a, 0x23, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x44, 0x65,
+	0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x6c, 0x65, 0x74, 0x65, 0x4d, 0x73, 0x67, 0x50, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x42,
+	0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x46, 0x0a, 0x07, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73,
-	0x79, 0x53, 0x65, 0x71, 0x52, 0x65, 0x73, 0x70, 0x12, 0x64, 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x65,
+	0x67, 0x12, 0x1c, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x74, 0x65, 0x4d, 0x73, 0x67, 0x50, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x12, 0x26, 0x2e,
+	0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x1a,
-	0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67,
+	0x1d, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d,
-	0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x73, 0x67, 0x50, 0x68, 0x79, 0x73, 0x69, 0x63,
+	0x73, 0x67, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x70,
-	0x61, 0x6c, 0x52, 0x65, 0x71, 0x1a, 0x27, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65,
+	0x0a, 0x15, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74,
-	0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d,
+	0x69, 0x6f, 0x6e, 0x73, 0x4d, 0x73, 0x67, 0x12, 0x2a, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d,
-	0x73, 0x67, 0x50, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x61,
+	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x43, 0x6c, 0x65, 0x61, 0x72,
-	0x0a, 0x10, 0x53, 0x65, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x53, 0x74, 0x61, 0x74,
+	0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x4d, 0x73, 0x67,
-	0x75, 0x73, 0x12, 0x25, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65,
+	0x52, 0x65, 0x71, 0x1a, 0x2b, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76,
-	0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x53, 0x65, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67,
+	0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x43, 0x6f, 0x6e, 0x76,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x26, 0x2e, 0x4f, 0x70, 0x65, 0x6e,
+	0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x73, 0x70,
-	0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x53, 0x65, 0x74,
+	0x12, 0x5e, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x41, 0x6c, 0x6c,
-	0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73,
+	0x4d, 0x73, 0x67, 0x12, 0x24, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76,
-	0x70, 0x12, 0x61, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x53,
+	0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6c, 0x65, 0x61, 0x72,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x25, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65,
+	0x41, 0x6c, 0x6c, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x1a, 0x25, 0x2e, 0x4f, 0x70, 0x65, 0x6e,
-	0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x65, 0x6e, 0x64,
+	0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x55, 0x73, 0x65,
-	0x4d, 0x73, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x26, 0x2e, 0x4f,
+	0x72, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x41, 0x6c, 0x6c, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x73, 0x70,
-	0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e,
+	0x12, 0x4f, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x73, 0x67, 0x73, 0x12, 0x1f,
-	0x47, 0x65, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x4c, 0x0a, 0x09, 0x52, 0x65, 0x76, 0x6f, 0x6b, 0x65, 0x4d, 0x73,
-	0x67, 0x12, 0x1e, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x52, 0x65, 0x76, 0x6f, 0x6b, 0x65, 0x4d, 0x73, 0x67, 0x52, 0x65,
-	0x71, 0x1a, 0x1f, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x52, 0x65, 0x76, 0x6f, 0x6b, 0x65, 0x4d, 0x73, 0x67, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x5b, 0x0a, 0x0e, 0x4d, 0x61, 0x72, 0x6b, 0x4d, 0x73, 0x67, 0x73, 0x41, 0x73,
-	0x52, 0x65, 0x61, 0x64, 0x12, 0x23, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72,
-	0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x4d, 0x61, 0x72, 0x6b, 0x4d, 0x73, 0x67, 0x73,
-	0x41, 0x73, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x24, 0x2e, 0x4f, 0x70, 0x65, 0x6e,
-	0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x4d, 0x61, 0x72,
-	0x6b, 0x4d, 0x73, 0x67, 0x73, 0x41, 0x73, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x73, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x6b, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x41, 0x73, 0x52, 0x65, 0x61, 0x64, 0x12, 0x2b, 0x2e, 0x4f, 0x70, 0x65, 0x6e,
-	0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x4d, 0x61, 0x72,
-	0x6b, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x73, 0x52,
-	0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x2c, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53,
-	0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x4d, 0x61, 0x72, 0x6b, 0x43, 0x6f,
-	0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x73, 0x52, 0x65, 0x61, 0x64,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x7c, 0x0a, 0x19, 0x53, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x76, 0x65,
-	0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x61, 0x73, 0x52, 0x65, 0x61, 0x64, 0x53, 0x65,
-	0x71, 0x12, 0x2e, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x48, 0x61, 0x73, 0x52, 0x65, 0x61, 0x64, 0x53, 0x65, 0x71, 0x52, 0x65,
-	0x71, 0x1a, 0x2f, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x48, 0x61, 0x73, 0x52, 0x65, 0x61, 0x64, 0x53, 0x65, 0x71, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x91, 0x01, 0x0a, 0x20, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72,
-	0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x48, 0x61, 0x73, 0x52, 0x65, 0x61, 0x64, 0x41, 0x6e,
-	0x64, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x71, 0x12, 0x35, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d,
-	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f,
-	0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x48, 0x61, 0x73, 0x52, 0x65,
-	0x61, 0x64, 0x41, 0x6e, 0x64, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x71, 0x52, 0x65, 0x71, 0x1a, 0x36,
 	0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73,
-	0x67, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f,
+	0x67, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x73, 0x67, 0x73, 0x52, 0x65, 0x71, 0x1a,
-	0x6e, 0x73, 0x48, 0x61, 0x73, 0x52, 0x65, 0x61, 0x64, 0x41, 0x6e, 0x64, 0x4d, 0x61, 0x78, 0x53,
+	0x20, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d,
-	0x65, 0x71, 0x52, 0x65, 0x73, 0x70, 0x12, 0x58, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74,
+	0x73, 0x67, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x73, 0x67, 0x73, 0x52, 0x65, 0x73,
-	0x69, 0x76, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x22, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d,
+	0x70, 0x12, 0x73, 0x0a, 0x16, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x73, 0x67, 0x50, 0x68,
-	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x63,
+	0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x42, 0x79, 0x53, 0x65, 0x71, 0x12, 0x2b, 0x2e, 0x4f, 0x70,
-	0x74, 0x69, 0x76, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x1a, 0x23, 0x2e, 0x4f, 0x70,
+	0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x44,
-	0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x47,
+	0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x73, 0x67, 0x50, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c,
-	0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
+	0x42, 0x79, 0x53, 0x65, 0x71, 0x52, 0x65, 0x71, 0x1a, 0x2c, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49,
-	0x12, 0x5b, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x47, 0x72, 0x6f,
+	0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x44, 0x65, 0x6c, 0x65,
-	0x75, 0x70, 0x12, 0x23, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65,
+	0x74, 0x65, 0x4d, 0x73, 0x67, 0x50, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x42, 0x79, 0x53,
-	0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x47,
+	0x65, 0x71, 0x52, 0x65, 0x73, 0x70, 0x12, 0x64, 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
-	0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x71, 0x1a, 0x24, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d,
+	0x4d, 0x73, 0x67, 0x50, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x12, 0x26, 0x2e, 0x4f, 0x70,
-	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x63,
+	0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x44,
-	0x74, 0x69, 0x76, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x73, 0x70, 0x42, 0x33, 0x5a,
+	0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x73, 0x67, 0x50, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c,
-	0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x4f, 0x70, 0x65, 0x6e,
+	0x52, 0x65, 0x71, 0x1a, 0x27, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76,
-	0x49, 0x4d, 0x53, 0x44, 0x4b, 0x2f, 0x4f, 0x70, 0x65, 0x6e, 0x2d, 0x49, 0x4d, 0x2d, 0x53, 0x65,
+	0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x73, 0x67,
-	0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6d,
+	0x50, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x61, 0x0a, 0x10,
-	0x73, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x53, 0x65, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0x12, 0x25, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e,
+	0x6d, 0x73, 0x67, 0x2e, 0x53, 0x65, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x53, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x26, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d,
+	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x53, 0x65, 0x74, 0x53, 0x65,
+	0x6e, 0x64, 0x4d, 0x73, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x61, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x53, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x12, 0x25, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76,
+	0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73,
+	0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x26, 0x2e, 0x4f, 0x70, 0x65,
+	0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x47, 0x65,
+	0x74, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x4c, 0x0a, 0x09, 0x52, 0x65, 0x76, 0x6f, 0x6b, 0x65, 0x4d, 0x73, 0x67, 0x12,
+	0x1e, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d,
+	0x73, 0x67, 0x2e, 0x52, 0x65, 0x76, 0x6f, 0x6b, 0x65, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x1a,
+	0x1f, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d,
+	0x73, 0x67, 0x2e, 0x52, 0x65, 0x76, 0x6f, 0x6b, 0x65, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x5b, 0x0a, 0x0e, 0x4d, 0x61, 0x72, 0x6b, 0x4d, 0x73, 0x67, 0x73, 0x41, 0x73, 0x52, 0x65,
+	0x61, 0x64, 0x12, 0x23, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65,
+	0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x4d, 0x61, 0x72, 0x6b, 0x4d, 0x73, 0x67, 0x73, 0x41, 0x73,
+	0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x24, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d,
+	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x4d, 0x61, 0x72, 0x6b, 0x4d,
+	0x73, 0x67, 0x73, 0x41, 0x73, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x73, 0x0a,
+	0x16, 0x4d, 0x61, 0x72, 0x6b, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x41, 0x73, 0x52, 0x65, 0x61, 0x64, 0x12, 0x2b, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d,
+	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x4d, 0x61, 0x72, 0x6b, 0x43,
+	0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x73, 0x52, 0x65, 0x61,
+	0x64, 0x52, 0x65, 0x71, 0x1a, 0x2c, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72,
+	0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x4d, 0x61, 0x72, 0x6b, 0x43, 0x6f, 0x6e, 0x76,
+	0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x73, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x7c, 0x0a, 0x19, 0x53, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x61, 0x73, 0x52, 0x65, 0x61, 0x64, 0x53, 0x65, 0x71, 0x12,
+	0x2e, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d,
+	0x73, 0x67, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x48, 0x61, 0x73, 0x52, 0x65, 0x61, 0x64, 0x53, 0x65, 0x71, 0x52, 0x65, 0x71, 0x1a,
+	0x2f, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d,
+	0x73, 0x67, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x48, 0x61, 0x73, 0x52, 0x65, 0x61, 0x64, 0x53, 0x65, 0x71, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x91, 0x01, 0x0a, 0x20, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x48, 0x61, 0x73, 0x52, 0x65, 0x61, 0x64, 0x41, 0x6e, 0x64, 0x4d,
+	0x61, 0x78, 0x53, 0x65, 0x71, 0x12, 0x35, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65,
+	0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x76,
+	0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x48, 0x61, 0x73, 0x52, 0x65, 0x61, 0x64,
+	0x41, 0x6e, 0x64, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x71, 0x52, 0x65, 0x71, 0x1a, 0x36, 0x2e, 0x4f,
+	0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e,
+	0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x48, 0x61, 0x73, 0x52, 0x65, 0x61, 0x64, 0x41, 0x6e, 0x64, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x71,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x58, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76,
+	0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x22, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65,
+	0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69,
+	0x76, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x1a, 0x23, 0x2e, 0x4f, 0x70, 0x65, 0x6e,
+	0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x47, 0x65, 0x74,
+	0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x5b,
+	0x0a, 0x0e, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70,
+	0x12, 0x23, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e,
+	0x6d, 0x73, 0x67, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x47, 0x72, 0x6f,
+	0x75, 0x70, 0x52, 0x65, 0x71, 0x1a, 0x24, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65,
+	0x72, 0x76, 0x65, 0x72, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69,
+	0x76, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x73, 0x70, 0x42, 0x33, 0x5a, 0x31, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d,
+	0x53, 0x44, 0x4b, 0x2f, 0x4f, 0x70, 0x65, 0x6e, 0x2d, 0x49, 0x4d, 0x2d, 0x53, 0x65, 0x72, 0x76,
+	0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6d, 0x73, 0x67,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2745,7 +3196,7 @@ func file_msg_msg_proto_rawDescGZIP() []byte {
 	return file_msg_msg_proto_rawDescData
 }
 
-var file_msg_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 48)
+var file_msg_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 51)
 var file_msg_msg_proto_goTypes = []interface{}{
 	(*MsgDataToMQ)(nil),                          // 0: OpenIMServer.msg.MsgDataToMQ
 	(*MsgDataToDB)(nil),                          // 1: OpenIMServer.msg.MsgDataToDB
@@ -2792,79 +3243,86 @@ var file_msg_msg_proto_goTypes = []interface{}{
 	(*GetActiveGroupReq)(nil),                    // 42: OpenIMServer.msg.GetActiveGroupReq
 	(*ActiveGroup)(nil),                          // 43: OpenIMServer.msg.ActiveGroup
 	(*GetActiveGroupResp)(nil),                   // 44: OpenIMServer.msg.GetActiveGroupResp
-	nil,                                          // 45: OpenIMServer.msg.GetConversationsHasReadAndMaxSeqResp.SeqsEntry
+	(*SearchMessageReq)(nil),                     // 45: OpenIMServer.msg.SearchMessageReq
-	nil,                                          // 46: OpenIMServer.msg.GetActiveUserResp.DateCountEntry
+	(*SearchMessageResp)(nil),                    // 46: OpenIMServer.msg.SearchMessageResp
-	nil,                                          // 47: OpenIMServer.msg.GetActiveGroupResp.DateCountEntry
+	(*ChatLog)(nil),                              // 47: OpenIMServer.msg.ChatLog
-	(*sdkws.MsgData)(nil),                        // 48: OpenIMServer.sdkws.MsgData
+	nil,                                          // 48: OpenIMServer.msg.GetConversationsHasReadAndMaxSeqResp.SeqsEntry
-	(*sdkws.RequestPagination)(nil),              // 49: OpenIMServer.sdkws.RequestPagination
+	nil,                                          // 49: OpenIMServer.msg.GetActiveUserResp.DateCountEntry
-	(*sdkws.UserInfo)(nil),                       // 50: OpenIMServer.sdkws.UserInfo
+	nil,                                          // 50: OpenIMServer.msg.GetActiveGroupResp.DateCountEntry
-	(*sdkws.GroupInfo)(nil),                      // 51: OpenIMServer.sdkws.GroupInfo
+	(*sdkws.MsgData)(nil),                        // 51: OpenIMServer.sdkws.MsgData
-	(*sdkws.GetMaxSeqReq)(nil),                   // 52: OpenIMServer.sdkws.GetMaxSeqReq
+	(*sdkws.RequestPagination)(nil),              // 52: OpenIMServer.sdkws.RequestPagination
-	(*sdkws.PullMessageBySeqsReq)(nil),           // 53: OpenIMServer.sdkws.PullMessageBySeqsReq
+	(*sdkws.UserInfo)(nil),                       // 53: OpenIMServer.sdkws.UserInfo
-	(*sdkws.GetMaxSeqResp)(nil),                  // 54: OpenIMServer.sdkws.GetMaxSeqResp
+	(*sdkws.GroupInfo)(nil),                      // 54: OpenIMServer.sdkws.GroupInfo
-	(*sdkws.PullMessageBySeqsResp)(nil),          // 55: OpenIMServer.sdkws.PullMessageBySeqsResp
+	(*sdkws.GetMaxSeqReq)(nil),                   // 55: OpenIMServer.sdkws.GetMaxSeqReq
+	(*sdkws.PullMessageBySeqsReq)(nil),           // 56: OpenIMServer.sdkws.PullMessageBySeqsReq
+	(*sdkws.GetMaxSeqResp)(nil),                  // 57: OpenIMServer.sdkws.GetMaxSeqResp
+	(*sdkws.PullMessageBySeqsResp)(nil),          // 58: OpenIMServer.sdkws.PullMessageBySeqsResp
 }
 var file_msg_msg_proto_depIdxs = []int32{
-	48, // 0: OpenIMServer.msg.MsgDataToMQ.msgData:type_name -> OpenIMServer.sdkws.MsgData
+	51, // 0: OpenIMServer.msg.MsgDataToMQ.msgData:type_name -> OpenIMServer.sdkws.MsgData
-	48, // 1: OpenIMServer.msg.MsgDataToDB.msgData:type_name -> OpenIMServer.sdkws.MsgData
+	51, // 1: OpenIMServer.msg.MsgDataToDB.msgData:type_name -> OpenIMServer.sdkws.MsgData
-	48, // 2: OpenIMServer.msg.PushMsgDataToMQ.msgData:type_name -> OpenIMServer.sdkws.MsgData
+	51, // 2: OpenIMServer.msg.PushMsgDataToMQ.msgData:type_name -> OpenIMServer.sdkws.MsgData
-	48, // 3: OpenIMServer.msg.MsgDataToMongoByMQ.msgData:type_name -> OpenIMServer.sdkws.MsgData
+	51, // 3: OpenIMServer.msg.MsgDataToMongoByMQ.msgData:type_name -> OpenIMServer.sdkws.MsgData
-	48, // 4: OpenIMServer.msg.SendMsgReq.msgData:type_name -> OpenIMServer.sdkws.MsgData
+	51, // 4: OpenIMServer.msg.SendMsgReq.msgData:type_name -> OpenIMServer.sdkws.MsgData
-	48, // 5: OpenIMServer.msg.MsgDataToModifyByMQ.messages:type_name -> OpenIMServer.sdkws.MsgData
+	51, // 5: OpenIMServer.msg.MsgDataToModifyByMQ.messages:type_name -> OpenIMServer.sdkws.MsgData
 	23, // 6: OpenIMServer.msg.ClearConversationsMsgReq.deleteSyncOpt:type_name -> OpenIMServer.msg.DeleteSyncOpt
 	23, // 7: OpenIMServer.msg.UserClearAllMsgReq.deleteSyncOpt:type_name -> OpenIMServer.msg.DeleteSyncOpt
 	23, // 8: OpenIMServer.msg.DeleteMsgsReq.deleteSyncOpt:type_name -> OpenIMServer.msg.DeleteSyncOpt
-	45, // 9: OpenIMServer.msg.GetConversationsHasReadAndMaxSeqResp.seqs:type_name -> OpenIMServer.msg.GetConversationsHasReadAndMaxSeqResp.SeqsEntry
+	48, // 9: OpenIMServer.msg.GetConversationsHasReadAndMaxSeqResp.seqs:type_name -> OpenIMServer.msg.GetConversationsHasReadAndMaxSeqResp.SeqsEntry
-	49, // 10: OpenIMServer.msg.GetActiveUserReq.pagination:type_name -> OpenIMServer.sdkws.RequestPagination
+	52, // 10: OpenIMServer.msg.GetActiveUserReq.pagination:type_name -> OpenIMServer.sdkws.RequestPagination
-	50, // 11: OpenIMServer.msg.ActiveUser.user:type_name -> OpenIMServer.sdkws.UserInfo
+	53, // 11: OpenIMServer.msg.ActiveUser.user:type_name -> OpenIMServer.sdkws.UserInfo
-	46, // 12: OpenIMServer.msg.GetActiveUserResp.dateCount:type_name -> OpenIMServer.msg.GetActiveUserResp.DateCountEntry
+	49, // 12: OpenIMServer.msg.GetActiveUserResp.dateCount:type_name -> OpenIMServer.msg.GetActiveUserResp.DateCountEntry
 	40, // 13: OpenIMServer.msg.GetActiveUserResp.users:type_name -> OpenIMServer.msg.ActiveUser
-	49, // 14: OpenIMServer.msg.GetActiveGroupReq.pagination:type_name -> OpenIMServer.sdkws.RequestPagination
+	52, // 14: OpenIMServer.msg.GetActiveGroupReq.pagination:type_name -> OpenIMServer.sdkws.RequestPagination
-	51, // 15: OpenIMServer.msg.ActiveGroup.group:type_name -> OpenIMServer.sdkws.GroupInfo
+	54, // 15: OpenIMServer.msg.ActiveGroup.group:type_name -> OpenIMServer.sdkws.GroupInfo
-	47, // 16: OpenIMServer.msg.GetActiveGroupResp.dateCount:type_name -> OpenIMServer.msg.GetActiveGroupResp.DateCountEntry
+	50, // 16: OpenIMServer.msg.GetActiveGroupResp.dateCount:type_name -> OpenIMServer.msg.GetActiveGroupResp.DateCountEntry
 	43, // 17: OpenIMServer.msg.GetActiveGroupResp.groups:type_name -> OpenIMServer.msg.ActiveGroup
-	37, // 18: OpenIMServer.msg.GetConversationsHasReadAndMaxSeqResp.SeqsEntry.value:type_name -> OpenIMServer.msg.Seqs
+	52, // 18: OpenIMServer.msg.SearchMessageReq.pagination:type_name -> OpenIMServer.sdkws.RequestPagination
-	52, // 19: OpenIMServer.msg.msg.GetMaxSeq:input_type -> OpenIMServer.sdkws.GetMaxSeqReq
+	47, // 19: OpenIMServer.msg.SearchMessageResp.chatLogs:type_name -> OpenIMServer.msg.ChatLog
-	34, // 20: OpenIMServer.msg.msg.GetConversationMaxSeq:input_type -> OpenIMServer.msg.GetConversationMaxSeqReq
+	37, // 20: OpenIMServer.msg.GetConversationsHasReadAndMaxSeqResp.SeqsEntry.value:type_name -> OpenIMServer.msg.Seqs
-	53, // 21: OpenIMServer.msg.msg.PullMessageBySeqs:input_type -> OpenIMServer.sdkws.PullMessageBySeqsReq
+	55, // 21: OpenIMServer.msg.msg.GetMaxSeq:input_type -> OpenIMServer.sdkws.GetMaxSeqReq
-	6,  // 22: OpenIMServer.msg.msg.SendMsg:input_type -> OpenIMServer.msg.SendMsgReq
+	34, // 22: OpenIMServer.msg.msg.GetConversationMaxSeq:input_type -> OpenIMServer.msg.GetConversationMaxSeqReq
-	24, // 23: OpenIMServer.msg.msg.ClearConversationsMsg:input_type -> OpenIMServer.msg.ClearConversationsMsgReq
+	56, // 23: OpenIMServer.msg.msg.PullMessageBySeqs:input_type -> OpenIMServer.sdkws.PullMessageBySeqsReq
-	26, // 24: OpenIMServer.msg.msg.UserClearAllMsg:input_type -> OpenIMServer.msg.UserClearAllMsgReq
+	45, // 24: OpenIMServer.msg.msg.SearchMessage:input_type -> OpenIMServer.msg.SearchMessageReq
-	28, // 25: OpenIMServer.msg.msg.DeleteMsgs:input_type -> OpenIMServer.msg.DeleteMsgsReq
+	6,  // 25: OpenIMServer.msg.msg.SendMsg:input_type -> OpenIMServer.msg.SendMsgReq
-	32, // 26: OpenIMServer.msg.msg.DeleteMsgPhysicalBySeq:input_type -> OpenIMServer.msg.DeleteMsgPhysicalBySeqReq
+	24, // 26: OpenIMServer.msg.msg.ClearConversationsMsg:input_type -> OpenIMServer.msg.ClearConversationsMsgReq
-	30, // 27: OpenIMServer.msg.msg.DeleteMsgPhysical:input_type -> OpenIMServer.msg.DeleteMsgPhysicalReq
+	26, // 27: OpenIMServer.msg.msg.UserClearAllMsg:input_type -> OpenIMServer.msg.UserClearAllMsgReq
-	8,  // 28: OpenIMServer.msg.msg.SetSendMsgStatus:input_type -> OpenIMServer.msg.SetSendMsgStatusReq
+	28, // 28: OpenIMServer.msg.msg.DeleteMsgs:input_type -> OpenIMServer.msg.DeleteMsgsReq
-	10, // 29: OpenIMServer.msg.msg.GetSendMsgStatus:input_type -> OpenIMServer.msg.GetSendMsgStatusReq
+	32, // 29: OpenIMServer.msg.msg.DeleteMsgPhysicalBySeq:input_type -> OpenIMServer.msg.DeleteMsgPhysicalBySeqReq
-	15, // 30: OpenIMServer.msg.msg.RevokeMsg:input_type -> OpenIMServer.msg.RevokeMsgReq
+	30, // 30: OpenIMServer.msg.msg.DeleteMsgPhysical:input_type -> OpenIMServer.msg.DeleteMsgPhysicalReq
-	17, // 31: OpenIMServer.msg.msg.MarkMsgsAsRead:input_type -> OpenIMServer.msg.MarkMsgsAsReadReq
+	8,  // 31: OpenIMServer.msg.msg.SetSendMsgStatus:input_type -> OpenIMServer.msg.SetSendMsgStatusReq
-	19, // 32: OpenIMServer.msg.msg.MarkConversationAsRead:input_type -> OpenIMServer.msg.MarkConversationAsReadReq
+	10, // 32: OpenIMServer.msg.msg.GetSendMsgStatus:input_type -> OpenIMServer.msg.GetSendMsgStatusReq
-	21, // 33: OpenIMServer.msg.msg.SetConversationHasReadSeq:input_type -> OpenIMServer.msg.SetConversationHasReadSeqReq
+	15, // 33: OpenIMServer.msg.msg.RevokeMsg:input_type -> OpenIMServer.msg.RevokeMsgReq
-	36, // 34: OpenIMServer.msg.msg.GetConversationsHasReadAndMaxSeq:input_type -> OpenIMServer.msg.GetConversationsHasReadAndMaxSeqReq
+	17, // 34: OpenIMServer.msg.msg.MarkMsgsAsRead:input_type -> OpenIMServer.msg.MarkMsgsAsReadReq
-	39, // 35: OpenIMServer.msg.msg.GetActiveUser:input_type -> OpenIMServer.msg.GetActiveUserReq
+	19, // 35: OpenIMServer.msg.msg.MarkConversationAsRead:input_type -> OpenIMServer.msg.MarkConversationAsReadReq
-	42, // 36: OpenIMServer.msg.msg.GetActiveGroup:input_type -> OpenIMServer.msg.GetActiveGroupReq
+	21, // 36: OpenIMServer.msg.msg.SetConversationHasReadSeq:input_type -> OpenIMServer.msg.SetConversationHasReadSeqReq
-	54, // 37: OpenIMServer.msg.msg.GetMaxSeq:output_type -> OpenIMServer.sdkws.GetMaxSeqResp
+	36, // 37: OpenIMServer.msg.msg.GetConversationsHasReadAndMaxSeq:input_type -> OpenIMServer.msg.GetConversationsHasReadAndMaxSeqReq
-	35, // 38: OpenIMServer.msg.msg.GetConversationMaxSeq:output_type -> OpenIMServer.msg.GetConversationMaxSeqResp
+	39, // 38: OpenIMServer.msg.msg.GetActiveUser:input_type -> OpenIMServer.msg.GetActiveUserReq
-	55, // 39: OpenIMServer.msg.msg.PullMessageBySeqs:output_type -> OpenIMServer.sdkws.PullMessageBySeqsResp
+	42, // 39: OpenIMServer.msg.msg.GetActiveGroup:input_type -> OpenIMServer.msg.GetActiveGroupReq
-	7,  // 40: OpenIMServer.msg.msg.SendMsg:output_type -> OpenIMServer.msg.SendMsgResp
+	57, // 40: OpenIMServer.msg.msg.GetMaxSeq:output_type -> OpenIMServer.sdkws.GetMaxSeqResp
-	25, // 41: OpenIMServer.msg.msg.ClearConversationsMsg:output_type -> OpenIMServer.msg.ClearConversationsMsgResp
+	35, // 41: OpenIMServer.msg.msg.GetConversationMaxSeq:output_type -> OpenIMServer.msg.GetConversationMaxSeqResp
-	27, // 42: OpenIMServer.msg.msg.UserClearAllMsg:output_type -> OpenIMServer.msg.UserClearAllMsgResp
+	58, // 42: OpenIMServer.msg.msg.PullMessageBySeqs:output_type -> OpenIMServer.sdkws.PullMessageBySeqsResp
-	29, // 43: OpenIMServer.msg.msg.DeleteMsgs:output_type -> OpenIMServer.msg.DeleteMsgsResp
+	46, // 43: OpenIMServer.msg.msg.SearchMessage:output_type -> OpenIMServer.msg.SearchMessageResp
-	33, // 44: OpenIMServer.msg.msg.DeleteMsgPhysicalBySeq:output_type -> OpenIMServer.msg.DeleteMsgPhysicalBySeqResp
+	7,  // 44: OpenIMServer.msg.msg.SendMsg:output_type -> OpenIMServer.msg.SendMsgResp
-	31, // 45: OpenIMServer.msg.msg.DeleteMsgPhysical:output_type -> OpenIMServer.msg.DeleteMsgPhysicalResp
+	25, // 45: OpenIMServer.msg.msg.ClearConversationsMsg:output_type -> OpenIMServer.msg.ClearConversationsMsgResp
-	9,  // 46: OpenIMServer.msg.msg.SetSendMsgStatus:output_type -> OpenIMServer.msg.SetSendMsgStatusResp
+	27, // 46: OpenIMServer.msg.msg.UserClearAllMsg:output_type -> OpenIMServer.msg.UserClearAllMsgResp
-	11, // 47: OpenIMServer.msg.msg.GetSendMsgStatus:output_type -> OpenIMServer.msg.GetSendMsgStatusResp
+	29, // 47: OpenIMServer.msg.msg.DeleteMsgs:output_type -> OpenIMServer.msg.DeleteMsgsResp
-	16, // 48: OpenIMServer.msg.msg.RevokeMsg:output_type -> OpenIMServer.msg.RevokeMsgResp
+	33, // 48: OpenIMServer.msg.msg.DeleteMsgPhysicalBySeq:output_type -> OpenIMServer.msg.DeleteMsgPhysicalBySeqResp
-	18, // 49: OpenIMServer.msg.msg.MarkMsgsAsRead:output_type -> OpenIMServer.msg.MarkMsgsAsReadResp
+	31, // 49: OpenIMServer.msg.msg.DeleteMsgPhysical:output_type -> OpenIMServer.msg.DeleteMsgPhysicalResp
-	20, // 50: OpenIMServer.msg.msg.MarkConversationAsRead:output_type -> OpenIMServer.msg.MarkConversationAsReadResp
+	9,  // 50: OpenIMServer.msg.msg.SetSendMsgStatus:output_type -> OpenIMServer.msg.SetSendMsgStatusResp
-	22, // 51: OpenIMServer.msg.msg.SetConversationHasReadSeq:output_type -> OpenIMServer.msg.SetConversationHasReadSeqResp
+	11, // 51: OpenIMServer.msg.msg.GetSendMsgStatus:output_type -> OpenIMServer.msg.GetSendMsgStatusResp
-	38, // 52: OpenIMServer.msg.msg.GetConversationsHasReadAndMaxSeq:output_type -> OpenIMServer.msg.GetConversationsHasReadAndMaxSeqResp
+	16, // 52: OpenIMServer.msg.msg.RevokeMsg:output_type -> OpenIMServer.msg.RevokeMsgResp
-	41, // 53: OpenIMServer.msg.msg.GetActiveUser:output_type -> OpenIMServer.msg.GetActiveUserResp
+	18, // 53: OpenIMServer.msg.msg.MarkMsgsAsRead:output_type -> OpenIMServer.msg.MarkMsgsAsReadResp
-	44, // 54: OpenIMServer.msg.msg.GetActiveGroup:output_type -> OpenIMServer.msg.GetActiveGroupResp
+	20, // 54: OpenIMServer.msg.msg.MarkConversationAsRead:output_type -> OpenIMServer.msg.MarkConversationAsReadResp
-	37, // [37:55] is the sub-list for method output_type
+	22, // 55: OpenIMServer.msg.msg.SetConversationHasReadSeq:output_type -> OpenIMServer.msg.SetConversationHasReadSeqResp
-	19, // [19:37] is the sub-list for method input_type
+	38, // 56: OpenIMServer.msg.msg.GetConversationsHasReadAndMaxSeq:output_type -> OpenIMServer.msg.GetConversationsHasReadAndMaxSeqResp
-	19, // [19:19] is the sub-list for extension type_name
+	41, // 57: OpenIMServer.msg.msg.GetActiveUser:output_type -> OpenIMServer.msg.GetActiveUserResp
-	19, // [19:19] is the sub-list for extension extendee
+	44, // 58: OpenIMServer.msg.msg.GetActiveGroup:output_type -> OpenIMServer.msg.GetActiveGroupResp
-	0,  // [0:19] is the sub-list for field type_name
+	40, // [40:59] is the sub-list for method output_type
+	21, // [21:40] is the sub-list for method input_type
+	21, // [21:21] is the sub-list for extension type_name
+	21, // [21:21] is the sub-list for extension extendee
+	0,  // [0:21] is the sub-list for field type_name
 }
 
 func init() { file_msg_msg_proto_init() }
@@ -3413,6 +3871,42 @@ func file_msg_msg_proto_init() {
 				return nil
 			}
 		}
+		file_msg_msg_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SearchMessageReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_msg_msg_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SearchMessageResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_msg_msg_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ChatLog); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -3420,7 +3914,7 @@ func file_msg_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_msg_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   48,
+			NumMessages:   51,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
@@ -3451,6 +3945,7 @@ type MsgClient interface {
 	GetConversationMaxSeq(ctx context.Context, in *GetConversationMaxSeqReq, opts ...grpc.CallOption) (*GetConversationMaxSeqResp, error)
 	// 拉取历史消息（包括用户的，以及指定群组的）
 	PullMessageBySeqs(ctx context.Context, in *sdkws.PullMessageBySeqsReq, opts ...grpc.CallOption) (*sdkws.PullMessageBySeqsResp, error)
+	SearchMessage(ctx context.Context, in *SearchMessageReq, opts ...grpc.CallOption) (*SearchMessageResp, error)
 	// 发送消息
 	SendMsg(ctx context.Context, in *SendMsgReq, opts ...grpc.CallOption) (*SendMsgResp, error)
 	// 全量清空指定会话消息 重置min seq 比最大seq大1
@@ -3512,6 +4007,15 @@ func (c *msgClient) PullMessageBySeqs(ctx context.Context, in *sdkws.PullMessage
 	return out, nil
 }
 
+func (c *msgClient) SearchMessage(ctx context.Context, in *SearchMessageReq, opts ...grpc.CallOption) (*SearchMessageResp, error) {
+	out := new(SearchMessageResp)
+	err := c.cc.Invoke(ctx, "/OpenIMServer.msg.msg/SearchMessage", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *msgClient) SendMsg(ctx context.Context, in *SendMsgReq, opts ...grpc.CallOption) (*SendMsgResp, error) {
 	out := new(SendMsgResp)
 	err := c.cc.Invoke(ctx, "/OpenIMServer.msg.msg/SendMsg", in, out, opts...)
@@ -3654,6 +4158,7 @@ type MsgServer interface {
 	GetConversationMaxSeq(context.Context, *GetConversationMaxSeqReq) (*GetConversationMaxSeqResp, error)
 	// 拉取历史消息（包括用户的，以及指定群组的）
 	PullMessageBySeqs(context.Context, *sdkws.PullMessageBySeqsReq) (*sdkws.PullMessageBySeqsResp, error)
+	SearchMessage(context.Context, *SearchMessageReq) (*SearchMessageResp, error)
 	// 发送消息
 	SendMsg(context.Context, *SendMsgReq) (*SendMsgResp, error)
 	// 全量清空指定会话消息 重置min seq 比最大seq大1
@@ -3693,6 +4198,9 @@ func (*UnimplementedMsgServer) GetConversationMaxSeq(context.Context, *GetConver
 func (*UnimplementedMsgServer) PullMessageBySeqs(context.Context, *sdkws.PullMessageBySeqsReq) (*sdkws.PullMessageBySeqsResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method PullMessageBySeqs not implemented")
 }
+func (*UnimplementedMsgServer) SearchMessage(context.Context, *SearchMessageReq) (*SearchMessageResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method SearchMessage not implemented")
+}
 func (*UnimplementedMsgServer) SendMsg(context.Context, *SendMsgReq) (*SendMsgResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SendMsg not implemented")
 }
@@ -3797,6 +4305,24 @@ func _Msg_PullMessageBySeqs_Handler(srv interface{}, ctx context.Context, dec fu
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Msg_SearchMessage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SearchMessageReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(MsgServer).SearchMessage(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/OpenIMServer.msg.msg/SearchMessage",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(MsgServer).SearchMessage(ctx, req.(*SearchMessageReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Msg_SendMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(SendMsgReq)
 	if err := dec(in); err != nil {
@@ -4083,6 +4609,10 @@ var _Msg_serviceDesc = grpc.ServiceDesc{
 			MethodName: "PullMessageBySeqs",
 			Handler:    _Msg_PullMessageBySeqs_Handler,
 		},
+		{
+			MethodName: "SearchMessage",
+			Handler:    _Msg_SearchMessage_Handler,
+		},
 		{
 			MethodName: "SendMsg",
 			Handler:    _Msg_SendMsg_Handler,

pkg/proto/msg/msg.proto

@@ -232,12 +232,55 @@ message GetActiveGroupResp {
   repeated ActiveGroup groups = 4;
 }
 
+message SearchMessageReq{
+  string sendID=1;//发送者ID
+  string recvID=2;//接收者ID
+  int32 msgType=3;
+  string sendTime=4;
+  int32 sessionType=5;
+  sdkws.RequestPagination pagination = 6;
+}
+
+message SearchMessageResp{
+  repeated ChatLog chatLogs=1;
+  int32 chatLogsNum = 2;
+}
+
+
+message ChatLog {
+  string serverMsgID = 1;
+  string clientMsgID = 2;
+  string sendID = 3;
+  string recvID = 4;
+  string groupID = 5;
+  string recvNickname = 6;
+  int32 senderPlatformID = 7;
+  string senderNickname = 8;
+  string senderFaceURL = 9;
+  string groupName = 10;
+  int32 sessionType = 11;
+  int32 msgFrom = 12;
+  int32 contentType = 13;
+  string content = 14;
+  int32 status = 15;
+  int64 sendTime = 16;
+  int64 createTime = 17;
+  string ex = 18;
+  string groupFaceURL=19;
+  uint32 groupMemberCount=20;
+  int64 seq=21;
+  string groupOwner=22;
+  int32 groupType=23;
+}
+
+
 service msg {
   //获取最小最大seq（包括用户的，以及指定群组的）
   rpc GetMaxSeq(sdkws.GetMaxSeqReq) returns(sdkws.GetMaxSeqResp);
   rpc GetConversationMaxSeq(GetConversationMaxSeqReq) returns(GetConversationMaxSeqResp);
   //拉取历史消息（包括用户的，以及指定群组的）
   rpc PullMessageBySeqs(sdkws.PullMessageBySeqsReq) returns(sdkws.PullMessageBySeqsResp);
+  rpc SearchMessage(SearchMessageReq) returns(SearchMessageResp);
   //发送消息
   rpc SendMsg(SendMsgReq) returns(SendMsgResp);
 

pkg/proto/msggateway/msggateway.pb.go

@@ -1,3 +1,17 @@
+// 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.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.29.1
@@ -8,16 +22,14 @@ package msggateway
 
 import (
 	context "context"
-	reflect "reflect"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
-	sync "sync"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-
+	reflect "reflect"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	sync "sync"
 )
 
 const (