feat: add test

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

.env

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

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

@@ -12,38 +12,125 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: OpenIM Build Docker Images
+name: Publish Docker image
+
 on:
   push:
+    branches:
+      - main
+      - release-*
     tags:
       - v*
+  workflow_dispatch:
+
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        bin:
-          - openim-server
     steps:
-      - name: Checkout
+      - name: Check out the repo
         uses: actions/checkout@v3
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to GitHub Container Registry
+
+      - name: Build OpenIM Server
+        run: |
+          sudo make build
+
+# docker.io/openim/openim-server:latest
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4.6.0
+        with:
+          images: openim/openim-server
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+# registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:latest
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta2
+        uses: docker/metadata-action@v4.6.0
+        with:
+          images: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server
+
+      - name: Log in to AliYun Docker Hub
+        uses: docker/login-action@v2
+        with:
+          registry: registry.cn-hangzhou.aliyuncs.com
+          username: ${{ secrets.ALIREGISTRY_USERNAME }}
+          password: ${{ secrets.ALIREGISTRY_TOKEN }}
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta2.outputs.tags }}
+          labels: ${{ steps.meta2.outputs.labels }}
+
+# ghcr.io/openimsdk/openim-server:latest
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta3
+        uses: docker/metadata-action@v4.6.0
+        with:
+          images: ghcr.io/openimsdk/openim-server
+
+      - name: Log in to GitHub Container Registry
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
-          username: ${{ github.repository_owner }}
+          username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Docker metadata
-        id: metadata
-        uses: docker/metadata-action@v4
+
+      - name: Build and push Docker image
+        uses: docker/build-push-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
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta3.outputs.tags }}
+          labels: ${{ steps.meta3.outputs.labels }}
+
+# name: OpenIM Build Docker Images
+# on:
+#   push:
+#     tags:
+#       - v*
+# jobs:
+#   build:
+#     runs-on: ubuntu-latest
+#     strategy:
+#       matrix:
+#         bin:
+#           - openim-server
+#     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/codeql-analysis.yml

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-name: "Code Scanning - Action"
+name: "OpenIM Code Scanning - Action"
 
 on:
   push:
@@ -42,8 +42,8 @@ jobs:
       security-events: write
 
       # only required for workflows in private repositories
-      actions: read
-      contents: read
+      actions: write
+      contents: write
 
     steps:
       - name: Checkout repository
@@ -53,8 +53,8 @@ jobs:
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         # Override language selection by uncommenting this and choosing your languages
-        # with:
-        #   languages: go, javascript, csharp, python, cpp, java, ruby
+        with:
+          languages: go
 
       # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
       # If this step fails, then you should remove it and run the build manually (see below).
@@ -68,9 +68,9 @@ jobs:
       #    three lines and modify them (or add more) to build your code if your
       #    project uses a compiled language
 
-      #- run: |
-      #     make bootstrap
-      #     make release
+    #   - run: |
+    #       make bootstrap
+    #       make release
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2

.github/workflows/deploy.yml

@@ -12,48 +12,62 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: deploy for dev
+name: OpenIM Deploy for dev
 
 on:
-    push:
-        branches:
-            - 'devops' # Only for the dev branch
-        paths:
-            - '.github/workflows/*'
-            # - '__test__/**' # dev No immediate testing is required
-            - 'src/**'
-            - 'Dockerfile'
-            - 'docker-compose.yml'
-            - 'bin/*'
+  push:
+    branches:
+      - 'devops' # Only for the dev branch
+      - 'main'
+    paths:
+      - '.github/workflows/*'
+      # - '__test__/**' # dev No immediate testing is required
+      - 'src/**'
+      - 'Dockerfile'
+      - 'docker-compose.yml'
+      - 'bin/*'
 
 jobs:
-    deploy-dev:
-        runs-on: ubuntu-latest
+  deploy-dev:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: executing remote ssh commands using password
+        uses: appleboy/ssh-action@v1.0.0
+        env:
+            OWNER: ${{ github.repository_owner }}
+            REPO: ${{ github.event.repository.name }}
+        with:
+          host: "${{ secrets.SG_M1_HOST }}, ${{ secrets.SG_N1_HOST }}, ${{ secrets.SG_N2_HOST}}"
+          username: ${{ secrets.SG_USERNAME }}
+          password: ${{ secrets.SG_PASSWORD }}
+          port: ${{ secrets.SG_PORT }}
+          envs: OWNER,REPO
+          script_stop: true
+          script: |
+            mkdir -p /test/openim
+            cd /test/openim
+            pwd;ls -al
+            echo "OWNER: $OWNER"
+            echo "REPO: $REPO"
+            git clone -b develop https://github.com/${OWNER}/${REPO}.git; cd ${REPO}
+            docker compose up -d
 
-        steps:
-            - uses: actions/checkout@v2
-            - name: set ssh key # Temporarily set up ssh key
-              run: |
-                  mkdir -p ~/.ssh/
-                  # secrets.WFP_ID_RSA set in GitHub
-                  echo "${{secrets.WFP_ID_RSA}}" > ~/.ssh/id_rsa
-                  chmod 600 ~/.ssh/id_rsa
-                  ssh-keyscan "182.92.xxx.xxx" >> ~/.ssh/known_hosts
-            - name: deploy # Deployment
-              run: |
-                  ssh work@182.92.xxx.xxx "
-                    # 【Attention】Log in with the 'work' account, manually create /home/work/imooc-lego directory
-                    # Then git clone https://username:password@github.com/imooc-lego/biz-editor-server.git -b dev (private repository, use GitHub username and password)
-                    # Remember to delete origin to avoid exposing GitHub password
 
-                    cd /home/work/imooc-lego/biz-editor-server;
-                    git remote add origin https://openimbot:${{secrets.WFP_PASSWORD}}@github.com/OpenIMSDK/open-im-server.git;
-                    git checkout dev;
-                    git pull origin dev; # Download the latest code again
-                    git remote remove origin; # Remove origin to avoid exposing GitHub password
-                    # Start docker
-                    docker-compose build editor-server; # Same as the service name in docker-compose.yml
-                    docker-compose up -d;
-                  "
-            - name: delete ssh key # Delete ssh key
-              run: rm -rf ~/.ssh/id_rsa
+    #   - name: deploy # Deployment
+    #     run: |
+    #       ssh work@182.92.xxx.xxx "
+    #         # 【Attention】Log in with the 'work' account, manually create /home/work/imooc-lego directory
+    #         # Then git clone https://username:password@github.com/imooc-lego/biz-editor-server.git -b dev (private repository, use GitHub username and password)
+    #         # Remember to delete origin to avoid exposing GitHub password
+    #         cd /home/work/imooc-lego/biz-editor-server;
+    #         git remote add origin https://openimbot:${{secrets.WFP_PASSWORD}}@github.com/OpenIMSDK/open-im-server.git;
+    #         git checkout dev;
+    #         git pull origin dev; # Download the latest code again
+    #         git remote remove origin; # Remove origin to avoid exposing GitHub password
+    #         # Start docker
+    #         docker-compose build editor-server; # Same as the service name in docker-compose.yml
+    #         docker-compose up -d;
+    #       "
+    #   - name: delete ssh key # Delete ssh key
+    #     run: rm -rf ~/.ssh/id_rsa

.github/workflows/openimci.yml

@@ -128,6 +128,14 @@ jobs:
         #   commit_author: Kubbot # defaults to author of the commit that triggered the run
         continue-on-error: true
 
+      - name: Commit Changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: "chore(fmt): robot automated format and lint Change"
+          commit_options: '--no-verify --signoff'
+          branch: main
+        continue-on-error: true
+
       - name: Set Current Directory
         id: set_directory
         run: |

.github/workflows/pull-request.yml

@@ -35,18 +35,80 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Get League branch Patch
+        run: |
+          git config user.name 'openimbot'
+          git config user.email 'openimsdk@qq.com'
+          git checkout -b cicd/patch-${{ github.event.number }}
       - uses: actions/setup-node@v3
+      - name: Setup Go
+        uses: actions/setup-go@v2
+      - name: Run go modules tidy
+        run: |
+          sudo make tidy
+          sudo make tools.verify.go-gitlint
+          echo "Run go modules tidy successfully" 
+
+      - name: Run go format
+        run: |
+          sudo make format
+          echo "Run go format successfully" 
+        continue-on-error: true
+
+      - name: Generate all necessary files, such as error code files
+        run: |
+          make generate
+          echo "Generate all necessary files successfully" 
+        continue-on-error: true
+
+      - name: Run unit test and get test coverage
+        run: |
+          make cover
+          echo "Run unit test and get test coverage successfully" 
+        continue-on-error: true
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: go
+
+      - name: Build source code for host platform
+        run: |
+          sudo make build
+          echo "Build source code for host platform successfully" 
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+
+      - name: OpenIM verify copyright
+        run: |
+          sudo make verify-copyright
+          sudo make add-copyright
+          echo "OpenIM verify successfully" 
+        continue-on-error: true
+      
+      - name: Commit code
+        run: |
+            git add .
+    
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v5
         with:
-          token: ${{ secrets.BOT_GITHUB_TOKEN }}
-          commit-message: 'build: update distribution'
-          title: 'build: update distribution'
+          commit-message: "cicd: bump League Patch to cicd/patch-${{ github.event.number }}"
+          title: Bump League Patch to cicd/patch-${{ github.event.number }}
           body: |
-            - Updates the distribution for changes on `main`
-
-            Auto-generated by [create-pull-request][1]
-
-            [1]: https://github.com/OpenIMSDK/Open-IM-Sever
-          branch: 'bot/update-distribution'
+            Review criteria:
+            
+            - [ ] Disenchanter can connect and issue actions
+            
+            This is an automated PR.
+            <sub>[workflow](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/.github/workflows/pull-request.yml).</sub>
+          base: main
+          branch: cicd/patch-${{ github.event.number }}
+          labels: kind/documentation, area/test, ok-to-test
+          token: ${{ secrets.REDBOT_GITHUB_TOKEN }}

.goreleaser.yaml

@@ -343,11 +343,11 @@ changelog:
 #     use: buildx
 #     build_flag_templates:
 #       - "--pull"
-#       - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/goreleaser/goreleaser/main/README.md"
-#       - "--label=io.artifacthub.package.logo-url=https://goreleaser.com/static/avatar.png"
-#       - '--label=io.artifacthub.package.maintainers=[{"name":"Carlos Alexandro Becker","email":"carlos@carlosbecker.dev"}]'
-#       - "--label=io.artifacthub.package.license=MIT"
-#       - "--label=org.opencontainers.image.description=Deliver Go binaries as fast and easily as possible"
+#       - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/OpenIMSDK/Open-IM-Server/main/README.md"
+#       - "--label=io.artifacthub.package.logo-url=hhttps://github.com/OpenIMSDK/Open-IM-Server/blob/main/assets/logo/openim-logo-green.png"
+#       - '--label=io.artifacthub.package.maintainers=[{"name":"Xinwei Xiong","email":"3293172751nss@gmail.com"}]'
+#       - "--label=io.artifacthub.package.license=Apace-2.0"
+#       - "--label=org.opencontainers.image.description=OpenIM Open source top instant messaging system"
 #       - "--label=org.opencontainers.image.created={{.Date}}"
 #       - "--label=org.opencontainers.image.name={{.ProjectName}}"
 #       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
@@ -363,11 +363,11 @@ changelog:
 #     use: buildx
 #     build_flag_templates:
 #       - "--pull"
-#       - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/goreleaser/goreleaser/main/README.md"
-#       - "--label=io.artifacthub.package.logo-url=https://goreleaser.com/static/avatar.png"
-#       - '--label=io.artifacthub.package.maintainers=[{"name":"Carlos Alexandro Becker","email":"carlos@carlosbecker.dev"}]'
-#       - "--label=io.artifacthub.package.license=MIT"
-#       - "--label=org.opencontainers.image.description=Deliver Go binaries as fast and easily as possible"
+#       - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/OpenIMSDK/Open-IM-Server/main/README.md"
+#       - "--label=io.artifacthub.package.logo-url=hhttps://github.com/OpenIMSDK/Open-IM-Server/blob/main/assets/logo/openim-logo-green.png"
+#       - '--label=io.artifacthub.package.maintainers=[{"name":"Xinwei Xiong","email":"3293172751nss@gmail.com"}]'
+#       - "--label=io.artifacthub.package.license=Apace-2.0"
+#       - "--label=org.opencontainers.image.description=OpenIM Open source top instant messaging system"
 #       - "--label=org.opencontainers.image.created={{.Date}}"
 #       - "--label=org.opencontainers.image.name={{.ProjectName}}"
 #       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
@@ -484,9 +484,12 @@ release:
 
     ## Helping out
 
+    We release logs are recorded on [✨ CHANGELOG](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/CHANGELOG/CHANGELOG.md)
+
     This release is only possible thanks to **all** the support of some **awesome people**!
 
-    Want to be one of them?
+    **Want to be one of them 😘?**
+
     Contributions to this project are welcome! Please see [CONTRIBUTING.md](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/CONTRIBUTING.md) for details.
 
     <p align="center">
@@ -502,19 +505,16 @@ release:
     </p>
 
 
-    ## Contact Us
+    ## Get Involved with OpenIM!
 
-    We value close connections with our users, developers, and contributors here at OpenIMSDK. With a large community and maintainer team, we're always here to help and support you. Whether you're looking to join our community or have any questions or suggestions, we welcome you to get in touch with us.
+    **Here are some ways to get involved with the OpenIM community:**
 
-    Our most recommended way to get in touch is through [Slack](https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg). Even if you're in China, Slack is usually not blocked by firewalls, making it an easy way to connect with us. Our Slack community is the ideal place to discuss and share ideas and suggestions with other users and developers of OpenIMSDK. You can ask technical questions, seek help, or share your experiences with other users of OpenIMSDK.
+    📢 **Slack Channel**: Join our Slack channels for discussions, communication, and support. Click [here](https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg) to join the Open-IM-Server Slack team channel.
 
-    In [OpenIM community is recruiting new members! discussion](https://github.com/orgs/OpenIMSDK/discussions/426) please leave your information, convenient we will better developers around the small gift to send to your hands.
+    📧 **Gmail Contact**: If you have any questions, suggestions, or feedback for our open-source projects, please feel free to [contact us via email](https://mail.google.com/mail/?view=cm&fs=1&tf=1&to=winxu81@gmail.com).
 
-    In addition to Slack, we also offer the following ways to get in touch:
+    📖 **Blog**: Stay up-to-date with OpenIM-Server projects and trends by reading our [blog](https://doc.rentsoft.cn/). We share the latest developments, tech trends, and other interesting information related to OpenIM.
 
-    + <a href="https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg" target="_blank"><img src="https://img.shields.io/badge/slack-%40OpenIMSDKCore-informational?logo=slack&style=flat-square"></a>:  We also have Slack channels for you to communicate and discuss. To join, visit https://slack.com/ and join our [👀 Open-IM-Server slack](https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg) team channel.
-    + <a href="https://mail.google.com/mail/u/0/?fs=1&tf=cm&to=4closetool3@gmail.com" target="_blank"><img src="https://img.shields.io/badge/gmail-%40OOpenIMSDKCore?style=social&logo=gmail"></a>: Get in touch with us on [Gmail](winxu81@gmail.com). If you have any questions or issues that need resolving, or any suggestions and feedback for our open source projects, please feel free to contact us via email.
-    + <a href="https://doc.rentsoft.cn/" target="_blank"><img src="https://img.shields.io/badge/%E5%8D%9A%E5%AE%A2-%40OpenIMSDKCore-blue?style=social&logo=Octopus%20Deploy"></a>: Read our [blog](https://doc.rentsoft.cn/). Our blog is a great place to stay up-to-date with Open-IM-Server projects and trends. On the blog, we share our latest developments, tech trends, and other interesting information.
-    + <a href="https://github.com/OpenIMSDK/OpenIM-Docs/blob/main/docs/images/WechatIMG20.jpeg" target="_blank"><img src="https://img.shields.io/badge/%E5%BE%AE%E4%BF%A1-OpenIMSDKCore-brightgreen?logo=wechat&style=flat-square"></a>: Add [Wechat](https://github.com/OpenIMSDK/OpenIM-Docs/blob/main/docs/images/WechatIMG20.jpeg) and indicate that you are a user or developer of Open-IM-Server. We will process your request as soon as possible.
+    📱 **WeChat**: Add us on WeChat (QR Code) and indicate that you are a user or developer of Open-IM-Server. We'll process your request as soon as possible.
 
-    Whether you're looking to join our community or have any questions or suggestions, we welcome you to get in touch with us.
+    Remember, your contributions play a vital role in making OpenIM successful, and we look forward to your active participation in our community! 🙌

Makefile

@@ -68,6 +68,11 @@ multiarch:
 install:
 	@$(MAKE) go.install
 
+## check: Check OpenIM deployment ✨
+.PHONY: check
+check:
+	@$(MAKE) go.check
+
 ## tidy: tidy go.mod ✨
 .PHONY: tidy
 tidy:
@@ -176,6 +181,11 @@ verify-copyright:
 add-copyright:
 	@$(MAKE) copyright.add
 
+## advertise: Project introduction, become a contributor ✨
+.PHONY: advertise
+advertise:
+	@$(MAKE) copyright.advertise
+
 ## release: release the project ✨
 .PHONY: release
 release: release.verify release.ensure-tag

README.md

@@ -13,7 +13,7 @@
 <a href="https://goreportcard.com/report/github.com/OpenIMSDK/Open-IM-Server"><img src="https://goreportcard.com/badge/github.com/OpenIMSDK/Open-IM-Server" alt="A+"></a>
 <a href="https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22good+first+issue%22"><img src="https://img.shields.io/github/issues/OpenIMSDK/Open-IM-Server/good%20first%20issue?logo=%22github%22" alt="good first"></a>
 <a href="https://github.com/OpenIMSDK/Open-IM-Server"><img src="https://img.shields.io/github/stars/OpenIMSDK/Open-IM-Server.svg?style=flat&logo=github&colorB=deeppink&label=stars"></a>
-<a href="https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg"><img src="https://img.shields.io/badge/Slack-100%2B-blueviolet?logo=slack&amp;logoColor=white"></a>
+<a href="https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg"><img src="https://img.shields.io/badge/Slack-300%2B-blueviolet?logo=slack&amp;logoColor=white"></a>
 <a href="https://github.com/OpenIMSDK/Open-IM-Server/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-Apache--2.0-green"></a>
 <a href="https://golang.org/"><img src="https://img.shields.io/badge/Language-Go-blue.svg"></a>
 </p>
@@ -51,15 +51,15 @@ Open-IM-Server is not a standalone product and does not include account registra
 
 1. Clone the project
 
-```
-clone https://github.com/OpenIMSDK/Open-IM-Server 
-cd Open-IM-Server
-git checkout release-v3.0 #or other release branch
+```bash
+# choose what you need
+BRANCH=release-v3.0
+git clone -b $BRANCH https://github.com/OpenIMSDK/Open-IM-Server openim && export openim=$(pwd)/openim && cd $openim && make build
 ```
 
-1. Modify .env
+2. Modify .env
 
-```
+```bash
 USER=root #no need to modify
 PASSWORD=openIM123  #A combination of 8 or more numbers and letters, this password applies to redis, mysql, mongo, as well as accessSecret in config/config.yaml
 ENDPOINT=http://127.0.0.1:10005 #minio's external service IP and port, or use the domain name storage.xx.xx, the app must be able to access this IP and port or domain,
@@ -67,20 +67,19 @@ API_URL=http://127.0.0.1:10002/object/ #the app must be able to access this IP a
 DATA_DIR=./  #designate large disk directory
 ```
 
-1. Deploy and start
+3. Deploy and start
 
-Note: This command can only be executed once. It will modify the component passwords in docker-compose based on the PASSWORD variable in .env, and modify the component passwords in config/config.yaml. If the password in .env changes, you need to first execute docker-compose down; rm components -rf and then execute this command.
+> **Note**
+> This command can only be executed once. It will modify the component passwords in docker-compose based on the PASSWORD variable in .env, and modify the component passwords in config/config.yaml. If the password in .env changes, you need to first execute docker-compose down; rm components -rf and then execute this command.
 
 ```
-chmod +x install_im_server.sh;
-./install_im_server.sh;
+make install
 ```
 
-1. Check the service
+4. Check the service
 
-```
-cd scripts;
-./docker_check_service.sh
+```bash
+make check
 ```
 
 ![https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/docker_build.png](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/docker_build.png)
@@ -89,23 +88,15 @@ cd scripts;
 
 ### Compile from source
 
-1. Go 1.18 or higher version.
+Ur need `Go 1.18` or higher version, and `make`.
+```bash
+# choose what you need
+BRANCH=release-v3.0
+git clone -b $BRANCH https://github.com/OpenIMSDK/Open-IM-Server openim && export openim=$(pwd)/openim && cd $openim && make build
+```
+Read about the [OpenIM Version Policy](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md)
 
-2. Clone
-
-   ```
-   git clone https://github.com/OpenIMSDK/Open-IM-Server 
-   cd Open-IM-Server
-   git checkout release-v3.0 #or other release branch
-   ```
-
-3. Compile
-
-   ```
-   cd Open-IM-server/scripts
-   chmod +x *.sh
-   ./build_all_service.sh
-   ```
+`make help` to help you see the instructions supported by OpenIM.
 
 All services have been successfully built as shown in the figure
 

cmd/openim-api/main.go

@@ -28,9 +28,9 @@ import (
 
 	"github.com/OpenIMSDK/Open-IM-Server/internal/api"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 	openKeeper "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper"
 	"github.com/OpenIMSDK/tools/log"

cmd/openim-push/main.go

@@ -17,7 +17,7 @@ package main
 import (
 	"github.com/OpenIMSDK/Open-IM-Server/internal/push"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
-	"github.com/OpenIMSDK/tools/config"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 )
 
 func main() {

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

@@ -17,7 +17,7 @@ package main
 import (
 	"github.com/OpenIMSDK/Open-IM-Server/internal/rpc/auth"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
-	"github.com/OpenIMSDK/tools/config"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 )
 
 func main() {

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

@@ -17,7 +17,7 @@ package main
 import (
 	"github.com/OpenIMSDK/Open-IM-Server/internal/rpc/conversation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
-	"github.com/OpenIMSDK/tools/config"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 )
 
 func main() {

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

@@ -17,7 +17,7 @@ package main
 import (
 	"github.com/OpenIMSDK/Open-IM-Server/internal/rpc/friend"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
-	"github.com/OpenIMSDK/tools/config"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 )
 
 func main() {

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

@@ -17,7 +17,7 @@ package main
 import (
 	"github.com/OpenIMSDK/Open-IM-Server/internal/rpc/group"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
-	"github.com/OpenIMSDK/tools/config"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 )
 
 func main() {

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

@@ -17,7 +17,7 @@ package main
 import (
 	"github.com/OpenIMSDK/Open-IM-Server/internal/rpc/msg"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
-	"github.com/OpenIMSDK/tools/config"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 )
 
 func main() {

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

@@ -17,7 +17,7 @@ package main
 import (
 	"github.com/OpenIMSDK/Open-IM-Server/internal/rpc/third"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
-	"github.com/OpenIMSDK/tools/config"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 )
 
 func main() {

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

@@ -17,7 +17,7 @@ package main
 import (
 	"github.com/OpenIMSDK/Open-IM-Server/internal/rpc/user"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
-	"github.com/OpenIMSDK/tools/config"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 )
 
 func main() {

config/config.yaml

@@ -12,89 +12,145 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#OpenIM config
+# -----------------------------------------------------------------
+# Infrastructural configurations, please modify based on your setup
+# -----------------------------------------------------------------
 
-
-#---------------Infrastructure configuration---------------------#
+###################### Zookeeper ######################
+# Zookeeper configuration
+# It's not recommended to modify the schema
+# 
+# Zookeeper address
+# Zookeeper username
+# Zookeeper password
 zookeeper:
-  schema: openim                          #不建议修改
-  address: [ 127.0.0.1:2181 ]             #
-  username:                               #用户名
-  password:                               #密码
+  schema: openim                          
+  address: [ 127.0.0.1:2181 ]            
+  username:                               
+  password:   
 
+###################### Mysql ######################
+# MySQL configuration
+# Currently, only single machine setup is supported
+#
+# Maximum number of open connections
+# Maximum number of idle connections
+# Maximum lifetime in seconds a connection can be reused
+# Log level: 1=slient, 2=error, 3=warn, 4=info
+# Slow query threshold in milliseconds
 mysql:
-  address: [ 127.0.0.1:13306 ]            #目前仅支持单机
-  username: root                          #用户名
-  password: openIM123                     #密码
-  database: openIM_v3                     #不建议修改
-  maxOpenConn: 1000                       #最大连接数
-  maxIdleConn: 100                        #最大空闲连接数
-  maxLifeTime: 60                         #连接可以重复使用的最长时间（秒）
-  logLevel: 4                             #日志级别 1=slient 2=error 3=warn 4=info
-  slowThreshold: 500                      #慢语句阈值 （毫秒）
+  address: [ 127.0.0.1:13306 ]
+  username: root
+  password: openIM123
+  database: openIM_v3                     
+  maxOpenConn: 1000                       
+  maxIdleConn: 100                        
+  maxLifeTime: 60                         
+  logLevel: 4                             
+  slowThreshold: 500    
 
+###################### Mongo ######################
+# MongoDB configuration
+# If uri is not empty, it will be used directly
+#
+# MongoDB address for standalone setup, Mongos address for sharded cluster setup
+# Default MongoDB database name
+# Maximum connection pool size
 mongo:
-  uri:                                    #不为空则直接使用该值
-  address: [ 127.0.0.1:37017 ]            #单机时为mongo地址，使用分片集群时，为mongos地址
-  database: openIM_v3                      #mongo db 默认即可
-  username: root                          #用户名
-  password: openIM123                     #密码
-  maxPoolSize: 100
+  uri:
+  address: [ 127.0.0.1:37017 ]
+  database: openIM_v3
+  username: root
+  password: openIM123
+  maxPoolSize: 100  
 
+###################### Redis ######################
+# Redis configuration
+#
+# Username is required only for Redis version 6.0+
 redis:
-  address: [ 127.0.0.1:16379 ]            #
-  username:                               #only redis version 6.0+ need username
-  password: openIM123                     #密码
+  address: [ 127.0.0.1:16379 ]
+  username:                               
+  password: openIM123
 
+###################### Kafka ######################
+# Kafka configuration
+#
+# Kafka username
+# Kafka password
+# It's not recommended to modify this topic name
+# Consumer group ID, it's not recommended to modify
 kafka:
-  username:                               #用户名
-  password:                               #密码
-  addr: [ 127.0.0.1:9092 ]                #
+  username:                               
+  password:                               
+  addr: [ 127.0.0.1:9092 ]
   latestMsgToRedis:
-    topic: "latestMsgToRedis"             #不建议修改
+    topic: "latestMsgToRedis"             
   offlineMsgToMongo:
-    topic: "offlineMsgToMongoMysql"       #不建议修改
+    topic: "offlineMsgToMongoMysql"       
   msgToPush:
-    topic: "msgToPush"                    #不建议修改
-  consumerGroupID: #消费者组，不建议修改
-    msgToRedis: redis                     #
-    msgToMongo: mongo                     #
-    msgToMySql: mysql                     #
-    msgToPush: push                       #
-
+    topic: "msgToPush"
+  consumerGroupID:
+    msgToRedis: redis
+    msgToMongo: mongo
+    msgToMySql: mysql
+    msgToPush: push
 
+###################### RPC ######################
+# RPC configuration
+#
+# IP address to register with zookeeper when starting RPC, the IP and corresponding rpcPort should be accessible by api/gateway
+# Default listen IP is 0.0.0.0
 rpc:
-  registerIP:                             #作为rpc启动时，注册到zookeeper的IP，api/gateway能访问到此ip和对应的rpcPort中的端口
-  listenIP:                               #默认为0.0.0.0
-
+  registerIP:
+  listenIP: 0.0.0.0
 
+###################### API ######################
+# API configuration
+#
+# API service port
+# Default listen IP is 0.0.0.0
 api:
-  openImApiPort: [ 10002 ]                #api服务端口
-  listenIP:                               #默认为0.0.0.0
+  openImApiPort: [ 10002 ]                
+  listenIP: 0.0.0.0    
 
+###################### Gateway ######################
+# Object storage configuration
+#
+# Use minio for object storage
+# API URL should be accessible by the app
+# It's not recommended to modify the bucket name
+# Endpoint should be accessible by the app
+# Session token
+# Configuration for Tencent COS
+# Configuration for Aliyun OSS
 object:
-  enable: "minio"                           #使用minio
-  apiURL: "http://127.0.0.1:10002/object/"  #地址需要app能访问到
+  enable: "minio"                         
+  apiURL: http://113.99.98.99:10002/object/
   minio:
-    bucket: "openim"                      #不建议修改
-    endpoint: "http://127.0.0.1:10005"      #minio对外服务的ip和端口，app要能访问此ip和端口
-    accessKeyID: "root"                     #ID
-    secretAccessKey: "openIM123"            #秘钥
-    sessionToken: ""            #token
-  cos: #tencent cos
+    bucket: "openim"                      
+    endpoint: http://113.99.98.99:10005
+    accessKeyID: root
+    secretAccessKey: openIM123
+    sessionToken: ""                      
+  cos:                                    
     bucketURL: "https://temp-1252357374.cos.ap-chengdu.myqcloud.com"
     secretID: ""
     secretKey: ""
     sessionToken: ""
-  oss: #ali oss
+  oss:                                    
     endpoint: "https://oss-cn-chengdu.aliyuncs.com"
     bucket: "demo-9999999"
     bucketURL: "https://demo-9999999.oss-cn-chengdu.aliyuncs.com"
-    accessKeyID: ""
+    accessKeyID: root
     accessKeySecret: ""
     sessionToken: ""
 
-rpcPort: #rpc服务端口，不建议修改，端口由脚本读取后传入程序，如启动多个程序，只需要填入多个端口，用逗号隔开，如  [10110, 10111]
+# RPC service ports
+# These ports are passed into the program by the script and are not recommended to modify
+# For launching multiple programs, just fill in multiple ports separated by commas
+# For example, [10110, 10111]
+rpcPort: 
   openImUserPort: [ 10110 ]
   openImFriendPort: [ 10120 ]
   openImMessagePort: [ 10130 ]
@@ -105,7 +161,8 @@ rpcPort: #rpc服务端口，不建议修改，端口由脚本读取后传入程
   openImConversationPort: [ 10180 ]
   openImThirdPort: [ 10190 ]
 
-rpcRegisterName: #rpc注册服务名，不建议修改
+# RPC service names for registration, it's not recommended to modify these
+rpcRegisterName:
   openImUserName: User
   openImFriendName: Friend
   openImMsgName: Msg
@@ -116,78 +173,132 @@ rpcRegisterName: #rpc注册服务名，不建议修改
   openImConversationName: Conversation
   openImThirdName: Third
 
+# Log configuration
+#
+# Storage directory
+# Log rotation time
+# Maximum number of logs to retain
+# Log level, 6 means all levels
+# Whether to output to stdout
+# Whether to output in json format
+# Whether to include stack trace in logs
 log:
-  storageLocation: ../../../../../logs/   #存放目录
-  rotationTime: 24                        #日志旋转时间
-  remainRotationCount: 2                  #日志数量
-  remainLogLevel: 6                       #日志级别 6表示全都打印，
-  isStdout: false
-  isJson: false
+  storageLocation: ../../../../../logs/  
+  rotationTime: 24                        
+  remainRotationCount: 2                  
+  remainLogLevel: 6                       
+  isStdout: false                         
+  isJson: false                           
   withStack: false
 
+# Long connection server configuration
+#
+# Websocket port for msg_gateway
+# Maximum number of websocket connections
+# Maximum length of websocket request package
+# Websocket connection handshake timeout
 longConnSvr:
-  openImWsPort: [ 10001 ]             #msg_gateway的websocket端口
-  websocketMaxConnNum: 100000         #websocket最大连接数
-  websocketMaxMsgLen: 4096            #websocket请求包最大长度
-  websocketTimeout: 10                #websocket连接握手超时时间
+  openImWsPort: [ 10001 ]                 
+  websocketMaxConnNum: 100000             
+  websocketMaxMsgLen: 4096                
+  websocketTimeout: 10  
 
+# Push notification service configuration
+#
+# Use GeTui for push notifications
+# GeTui offline push configuration
+# FCM offline push configuration
+# Account file, place it in the config directory
+# JPush configuration, modify these after applying in JPush backend
 push:
   enable: getui
-  geTui: #个推离线推送
+  geTui:
     pushUrl: "https://restapi.getui.com/v2/$appId"
     masterSecret: ""
     appKey: ""
     intent: ""
     channelID: ""
     channelName: ""
-  fcm: #fcm离线推送
-    serviceAccount: "x.json"          #帐号文件，并放在 config目录下
-  jpns: #极光推送 在极光后台申请后，修改以下四项
+  fcm:
+    serviceAccount: "x.json"
+  jpns:
     appKey:
     masterSecret:
     pushUrl:
     pushIntent:
 
+# App manager configuration
+#
+# Built-in app manager user IDs
+# Built-in app manager nicknames
 manager:
-  userID: [ "openIM123456","openIM654321","openIMAdmin" ]   #内置的app管理员userID
-  nickname: [ "system1","system2", "system3" ]              #内置的app管理员nickname
+  userID: [ "openIM123456","openIM654321","openIMAdmin" ]
+  nickname: [ "system1","system2", "system3" ]
 
+# Multi-platform login policy
+# For each platform(Android, iOS, Windows, Mac, web), only one can be online at a time
+multiLoginPolicy: 1
 
+# Whether to store messages in MySQL, messages in MySQL are only used for management background
+chatPersistenceMysql: true
 
+# Message cache timeout in seconds, it's not recommended to modify
+msgCacheTimeout: 86400
 
-multiLoginPolicy: 1                                     #多平台登录：Android、iOS、Windows、Mac、web 每种平台只能有一个在线
+# Whether to enable read receipts for group chat
+groupMessageHasReadReceiptEnable: true
 
+# Whether to enable read receipts for single chat
+singleMessageHasReadReceiptEnable: true
 
-chatPersistenceMysql: true                              #消息是否存入mysql，mysql中的消息仅用于管理后台使用
-msgCacheTimeout: 86400                                  #信消息缓存时间秒，不建议修改
-groupMessageHasReadReceiptEnable: true                  #群聊已读是否开启
-singleMessageHasReadReceiptEnable: true                 #单聊已读是否开启
+# MongoDB offline message retention period in days
+retainChatRecords: 365
 
-retainChatRecords: 365                                  #mongo保存离线消息时间（天）
-chatRecordsClearTime: "0 2 * * 3"                       #每周三凌晨2点清理mongo中的过期（超过retainChatRecords时间）消息，这个删除是为了清理满足上个配置retainChatRecords的过期消息，不会发送通知，仅仅作为清理磁盘使用
-msgDestructTime: "0 2 * * *"                            #消息自动删除时间，每天凌晨2点删除过期消息，这个删除是为了删除保留时间超过超过会话字段msg_destruct_time（秒）的消息。
+# Schedule to clear expired messages(older than retainChatRecords days) in MongoDB every Wednesday at 2am
+# This deletion is just for cleaning up disk usage according to previous configuration retainChatRecords, no notification will be sent
+chatRecordsClearTime: "0 2 * * 3"
 
-secret: tuoyun #秘钥，获取token时校验
+# Schedule to auto delete messages every day at 2am
+# This deletion is for messages that have been retained for more than msg_destruct_time (seconds) in the conversation field
+msgDestructTime: "0 2 * * *"
 
+# Secret key
+secret: openIM123
+
+# Token policy
+#
+# Token expiration period in days
 tokenPolicy:
-  expire: 90                                     #过期时间（天）
+  expire: 90
 
+# Message verification policy
+#
+# Whether to verify friendship when sending messages
 messageVerify:
-  friendVerify: false                                  #发送消息时是否验证好友关系
+  friendVerify: false
 
-#ios系统推送声音以及标记计数
+# iOS push notification configuration
+#
+# iOS push notification sound
+# Whether to count badge
+# Whether it's production environment
 iosPush:
   pushSound: "xxx"
   badgeCount: true
   production: false
 
+# Callback configuration
+#
+# Callback URL
+# Whether to enable this callback event
+# Timeout in seconds
+# Whether to continue execution if callback fails
 callback:
-  # 回调callback
   url:
   beforeSendSingleMsg:
-    enable: false                                     #是否启用此回调事件
-    timeout: 5                                        #超时时间（秒）
-    failedContinue: true                              #如回调失败是否继续往后执行
+    enable: false
+    timeout: 5
+    failedContinue: true
   afterSendSingleMsg:
     enable: false
     timeout: 5
@@ -244,8 +355,11 @@ callback:
     timeout: 5
     failedContinue: true
 
-
-prometheus: #prometheus每个服务的端口数量需要和rpcPort保持对应
+###################### Prometheus ######################
+# Prometheus configuration
+# The number of Prometheus ports per service needs to correspond to rpcPort
+# The number of ports needs to be consistent with msg_transfer_service_num in script/path_info.sh
+prometheus:
   enable: false
   userPrometheusPort: [ 20110 ]
   friendPrometheusPort: [ 20120 ]
@@ -257,4 +371,4 @@ prometheus: #prometheus每个服务的端口数量需要和rpcPort保持对应
   conversationPrometheusPort: [ 20230 ]
   rtcPrometheusPort: [ 21300 ]
   thirdPrometheusPort: [ 21301 ]
-  messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ] #端口数量需要和script/path_info.sh中的msg_transfer_service_num保持一致
+  messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ]

docker-compose.yaml

@@ -110,6 +110,7 @@ services:
       - ./scripts:/Open-IM-Server/scripts
     restart: always
     depends_on:
+      - zookeeper
       - kafka
       - mysql
       - mongodb

docs/CODEOWNERS

@@ -65,7 +65,7 @@ cmd/*
 config/*    @skiffer-git
 
 # db directory
-db/sdk  @BanTanger @cubxxw @Gordon  
+db/sdk  @cubxxw @FGadvancer  
 
 # internal directory
 internal/ @openimsdk/openim @skiffer-git @FGadvancer

docs/conversions/images.md

@@ -0,0 +1,69 @@
+# OpenIM Image Management Strategy and Pulling Guide
+
+OpenIM is an efficient, stable, and scalable instant messaging framework that provides convenient deployment methods through Docker images. OpenIM manages multiple image sources, hosted respectively on GitHub (ghcr), Alibaba Cloud, and Docker Hub. This document is aimed at detailing the image management strategy of OpenIM and providing the steps for pulling these images.
+
+## Image Management Strategy
+
+OpenIM's versions correspond to GitHub's tag versions. Each time we release a new version and tag it on GitHub, an automated process is triggered that pushes the new Docker image version to the following three platforms:
+
+1. **GitHub (ghcr.io):** We use GitHub Container Registry (ghcr.io) to host OpenIM's Docker images. This allows us to better integrate with the GitHub source code repository, providing better version control and continuous integration/deployment (CI/CD) features. You can view all GitHub images [here](https://github.com/orgs/OpenIMSDK/packages).
+2. **Alibaba Cloud (registry.cn-hangzhou.aliyuncs.com):** For users in Mainland China, we also host OpenIM's Docker images on Alibaba Cloud to provide faster pull speeds. You can view all Alibaba Cloud images on this [page](https://cr.console.aliyun.com/cn-hangzhou/instances/repositories) of Alibaba Cloud Image Service (note that you need to log in to your Alibaba Cloud account first).
+3. **Docker Hub (docker.io):** Docker Hub is the most commonly used Docker image hosting platform, and we also host OpenIM's images there to facilitate developers worldwide. You can view all Docker Hub images on the [OpenIM's Docker Hub page](https://hub.docker.com/r/openim).
+
+## Methods and Steps for Pulling Images
+
+When pulling OpenIM's Docker images, you can choose the most suitable source based on your geographic location and network conditions. Here are the steps to pull OpenIM images from each source:
+
+1. First, make sure Docker is installed on your machine. If not, you can refer to the [Docker official documentation](https://docs.docker.com/get-docker/) for installation.
+
+2. Open the terminal and run the following commands to pull the images:
+
+   For OpenIM Server:
+
+   - Pull from GitHub:
+
+     ```
+     bashCopy code
+     docker pull ghcr.io/openimsdk/openim-server:latest
+     ```
+
+   - Pull from Alibaba Cloud:
+
+     ```
+     bashCopy code
+     docker pull registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:latest
+     ```
+
+   - Pull from Docker Hub:
+
+     ```
+     bashCopy code
+     docker pull docker.io/openim/openim-server:latest
+     ```
+
+   For OpenIM Chat:
+
+   - Pull from GitHub:
+
+     ```
+     bashCopy code
+     docker pull ghcr.io/openimsdk/openim-chat:latest
+     ```
+
+   - Pull from Alibaba Cloud:
+
+     ```
+     bashCopy code
+     docker pull registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-chat:latest
+     ```
+
+   - Pull from Docker Hub:
+
+     ```
+     bashCopy code
+     docker pull docker.io/openim/openim-chat:latest
+     ```
+
+3. Run the `docker images` command to confirm that the image has been successfully pulled.
+
+This concludes OpenIM's image management strategy and the steps for pulling images. If you have any questions, please feel free to ask.

docs/conversions/logging.md

@@ -15,6 +15,6 @@
   - Fatal level logs use `log.Fatalw`.
 - Log settings:
   - Development and test environments: The log level is set to `debug`, the log format can be set to `console` / `json` as needed, and caller is enabled;
-  - Production environment: The log level is set to `info`, the log format is set to `json`, and caller is enabled. (Note: In the early stages of going online, to facilitate troubleshooting, the log level can be set to `debug`)
+  - Production environment: The log level is set to `info`, the log format is set to `json`, and caller is enabled. (**Note**: In the early stages of going online, to facilitate troubleshooting, the log level can be set to `debug`)
 - When logging, avoid outputting sensitive information, such as passwords, keys, etc.
 - If you are calling a logging function in a function/method with a `context.Context` parameter, it is recommended to use `log.L(ctx).Infow()` for logging.

docs/conversions/version.md

@@ -54,4 +54,8 @@ git merge release-v3.1
 git push origin main
 ```
 
-Remember, communication with your team is key throughout this process, keeping everyone up-to-date with the changes being made.
+Remember, communication with your team is key throughout this process, keeping everyone up-to-date with the changes being made.
+
+
+## Docker images version management
+

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/golang-jwt/jwt/v4 v4.5.0
 	github.com/golang/protobuf v1.5.3
 	github.com/gorilla/websocket v1.4.2
-	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/jinzhu/copier v0.3.5
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible // indirect
 	github.com/minio/minio-go/v7 v7.0.59
@@ -37,8 +37,8 @@ require (
 require github.com/google/uuid v1.3.0
 
 require (
-	github.com/OpenIMSDK/protocol v0.0.0-20230725064305-11f0568fe5e9
-	github.com/OpenIMSDK/tools v0.0.1
+	github.com/OpenIMSDK/protocol v0.0.1
+	github.com/OpenIMSDK/tools v0.0.5
 	github.com/aliyun/aliyun-oss-go-sdk v2.2.7+incompatible
 	github.com/go-redis/redis v6.15.9+incompatible
 	github.com/go-sql-driver/mysql v1.6.0

go.sum

@@ -16,10 +16,10 @@ cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5og
 firebase.google.com/go v3.13.0+incompatible h1:3TdYC3DDi6aHn20qoRkxwGqNgdjtblwVAyRLQwGn/+4=
 firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIwjt8toICdV5Wh9ptHs=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/OpenIMSDK/protocol v0.0.0-20230725064305-11f0568fe5e9 h1:ZtW+z2j2kjk51awH9OFRXbgNI5Vcfq0Lu9//ax86ktc=
-github.com/OpenIMSDK/protocol v0.0.0-20230725064305-11f0568fe5e9/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y=
-github.com/OpenIMSDK/tools v0.0.1 h1:lxTzjv0vOCH890K9C5LxMq3UCvioDMw0ZZQQtioauuI=
-github.com/OpenIMSDK/tools v0.0.1/go.mod h1:/iSkny1+7i4Z09yddGa4o4fTu9dzJdOLxxe4pWuqI1A=
+github.com/OpenIMSDK/protocol v0.0.1 h1:Q6J1jCU00dfqmguxw2XI+IGcVfBAkb5Tz8LgvyeNkk0=
+github.com/OpenIMSDK/protocol v0.0.1/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y=
+github.com/OpenIMSDK/tools v0.0.5 h1:yBVHJ3EpIDcp8VFKPjuGr6MQvFa3t4JByZ+vmeC06/Q=
+github.com/OpenIMSDK/tools v0.0.5/go.mod h1:eg+q4A34Qmu73xkY0mt37FHGMCMfC6CtmOnm0kFEGFI=
 github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM=
 github.com/Shopify/sarama v1.29.0 h1:ARid8o8oieau9XrHI55f/L3EoRAhm9px6sonbD7yuUE=
 github.com/Shopify/sarama v1.29.0/go.mod h1:2QpgD79wpdAESqNQMxNc0KYMkycd4slxGdV3TWSVqrU=

install.sh

@@ -0,0 +1,560 @@
+#!/bin/bash
+# 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.
+#
+# https://gist.github.com/cubxxw/28f997f2c9aff408630b072f010c1d64
+#
+
+set -e
+set -o pipefail
+
+
+############### OpenIM Github ###############
+# ... rest of the script ...
+
+# TODO
+# You can configure this script in three ways. 
+# 1. First, set the variables in this column with more comments. 
+# 2. The second is to pass an environment variable via a flag such as --help. 
+# 3. The third way is to set the variable externally, or pass it in as an environment variable
+
+# Default configuration for OpenIM Repo
+# The OpenIM Repo settings can be customized according to your needs.
+
+# OpenIM Repo owner, by default it's set to "OpenIMSDK". If you're using a different owner, replace accordingly.
+OWNER="OpenIMSDK" 
+
+# The repository name, by default it's "Open-IM-Server". If you're using a different repository, replace accordingly.
+REPO="Open-IM-Server" 
+
+# Version of Go you want to use, make sure it is compatible with your OpenIM-Server requirements.
+# Default is 1.18, if you want to use a different version, replace accordingly.
+GO_VERSION="1.18"
+
+# Default HTTP_PORT is 80. If you want to use a different port, uncomment and replace the value.
+# HTTP_PORT=80
+
+# CPU core number for concurrent execution. By default it's determined automatically.
+# Uncomment the next line if you want to set it manually.
+# CPU=$(grep -c ^processor /proc/cpuinfo)
+
+# By default, the script uses the latest tag from OpenIM-Server releases.
+# If you want to use a specific tag, uncomment and replace "v3.0.0" with the desired tag.
+# LATEST_TAG=v3.0.0
+
+# Default OpenIM install directory is /tmp. If you want to use a different directory, uncomment and replace "/test".
+# DOWNLOAD_OPENIM_DIR="/test"
+
+# GitHub proxy settings. If you are using a proxy, uncomment and replace the empty field with your proxy URL.
+PROXY=
+
+# If you have a GitHub token, replace the empty field with your token.
+GITHUB_TOKEN=
+
+# Default user is "root". If you need to modify it, uncomment and replace accordingly.
+# USER=root 
+
+# Default password for redis, mysql, mongo, as well as accessSecret in config/config.yaml.
+# Remember, it should be a combination of 8 or more numbers and letters. If you want to set a different password, uncomment and replace "openIM123".
+# PASSWORD=openIM123
+
+# Default endpoint for minio's external service IP and port. If you want to use a different endpoint, uncomment and replace.
+# ENDPOINT=http://127.0.0.1:10005 
+
+# Default API_URL, replace if necessary. 
+# API_URL=http://127.0.0.1:10002/object/
+
+# Default data directory. If you want to specify a different directory, uncomment and replace "./".
+# DATA_DIR=./
+
+############### OpenIM Functions ###############
+# Install horizon of the script
+#
+# Pre-requisites:
+#   - git
+#   - make
+#   - jq
+#   - docker
+#   - docker-compose
+#   - go
+#
+
+# Check if the script is run as root
+function check_isroot() {
+    if [ "$EUID" -ne 0 ]; then
+    fatal "Please run the script as root or use sudo."
+    fi
+}
+
+# check if the current directory is a OpenIM git repository
+function check_git_repo() {
+    if git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+        # Inside a git repository
+        for remote in $(git remote); do
+            repo_url=$(git remote get-url $remote)
+            if [[ $repo_url == "https://github.com/OpenIMSDK/Open-IM-Server.git" || \
+                  $repo_url == "https://github.com/OpenIMSDK/Open-IM-Server" || \
+                  $repo_url == "git@github.com:OpenIMSDK/Open-IM-Server.git" ]]; then
+                # If it's OpenIMSDK repository
+                info "Current directory is OpenIMSDK git repository."
+                info "Executing installation directly."
+                install_openim
+                exit 0
+            fi
+            debug "Remote: $remote, URL: $repo_url"
+        done
+        # If it's not OpenIMSDK repository
+        debug "Current directory is not OpenIMSDK git repository."
+    fi
+    info "Current directory is not a git repository."
+}
+
+# Function to update and install necessary tools
+function install_tools() {
+    info "Checking and installing necessary tools, about git, make, jq, docker, docker-compose."
+    local tools=("git" "make" "jq" "docker" "docker-compose")
+    local install_cmd update_cmd os
+
+    if grep -qEi "debian|buntu|mint" /etc/os-release; then
+        os="Ubuntu"
+        install_cmd="sudo apt install -y"
+        update_cmd="sudo apt update"
+    elif grep -qEi "fedora|rhel" /etc/os-release; then
+        os="CentOS"
+        install_cmd="sudo yum install -y"
+        update_cmd="sudo yum update"
+    else
+        fatal "Unsupported OS, please use Ubuntu or CentOS."
+    fi
+
+    debug "Detected OS: $os"
+    info "Updating system package repositories..."
+    $update_cmd
+
+    for tool in "${tools[@]}"; do
+        if ! command -v $tool &> /dev/null; then
+            warn "$tool is not installed. Installing now..."
+            $install_cmd $tool
+            success "$tool has been installed successfully."
+        else
+            info "$tool is already installed."
+        fi
+    done
+}
+
+# Function to check if Docker and Docker Compose are installed
+function check_docker() {
+    if ! command -v docker &> /dev/null; then
+        fatal "Docker is not installed. Please install Docker first."
+    fi
+    if ! command -v docker-compose &> /dev/null; then
+        fatal "Docker Compose is not installed. Please install Docker Compose first."
+    fi
+}
+
+# Function to download and install Go if it's not already installed
+function install_go() {
+    command -v go >/dev/null 2>&1
+    # Determines if GO_VERSION is defined
+    if [ -z "$GO_VERSION" ]; then
+        GO_VERSION="1.18"
+    fi
+
+    if [[ $? -ne 0 ]]; then
+        warn "Go is not installed. Installing now..."
+        curl -LO "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz"
+        if [ $? -ne 0 ]; then
+            fatal "Download failed! Please check your network connectivity."
+        fi
+        sudo tar -C /usr/local -xzf "go${GO_VERSION}.linux-amd64.tar.gz"
+        echo "export PATH=$PATH:/usr/local/go/bin" >> ~/.bashrc
+        source ~/.bashrc
+        success "Go has been installed successfully."
+    else
+        info "Go is already installed."
+    fi
+}
+
+function download_source_code() {
+
+    # If LATEST_TAG was not defined outside the function, get it here example: v3.0.1-beta.1
+    if [ -z "$LATEST_TAG" ]; then
+        LATEST_TAG=$(curl -s "https://api.github.com/repos/$OWNER/$REPO/tags" | jq -r '.[0].name')
+    fi
+
+    # If LATEST_TAG is still empty, set a default value
+    local DEFAULT_TAG="v3.0.0"
+
+    LATEST_TAG="${LATEST_TAG:-$DEFAULT_TAG}"
+
+    debug "DEFAULT_TAG: $DEFAULT_TAG"
+    info "Use OpenIM Version LATEST_TAG: $LATEST_TAG"
+
+    # If MODIFIED_TAG was not defined outside the function, modify it here,example: 3.0.1-beta.1
+    if [ -z "$MODIFIED_TAG" ]; then
+        MODIFIED_TAG=$(echo $LATEST_TAG | sed 's/v//')
+    fi
+
+    # If MODIFIED_TAG is still empty, set a default value
+    local DEFAULT_MODIFIED_TAG="${DEFAULT_TAG#v}" 
+    MODIFIED_TAG="${MODIFIED_TAG:-$DEFAULT_MODIFIED_TAG}"
+    
+    debug "MODIFIED_TAG: $MODIFIED_TAG"
+
+    # Construct the tarball URL
+    TARBALL_URL="${PROXY}https://github.com/$OWNER/$REPO/archive/refs/tags/$LATEST_TAG.tar.gz"
+
+    info "Downloaded OpenIM TARBALL_URL: $TARBALL_URL"
+
+    info "Starting the OpenIM automated one-click deployment script."
+
+    # Set the download and extract directory to /tmp
+    if [ -z "$DOWNLOAD_OPENIM_DIR" ]; then
+        DOWNLOAD_OPENIM_DIR="/tmp"
+    fi
+
+    # Check if /tmp directory exists
+    if [ ! -d "$DOWNLOAD_OPENIM_DIR" ]; then
+        warn "$DOWNLOAD_OPENIM_DIR does not exist. Creating it..."
+        mkdir -p "$DOWNLOAD_OPENIM_DIR"
+    fi
+
+    info "Downloading OpenIM source code from $TARBALL_URL to $DOWNLOAD_OPENIM_DIR"
+    
+    curl -L -o "${DOWNLOAD_OPENIM_DIR}/${MODIFIED_TAG}.tar.gz" $TARBALL_URL
+
+    tar -xzvf "${DOWNLOAD_OPENIM_DIR}/${MODIFIED_TAG}.tar.gz" -C "$DOWNLOAD_OPENIM_DIR"
+    cd "$DOWNLOAD_OPENIM_DIR/$REPO-$MODIFIED_TAG"
+    git init && git add . && git commit -m "init"  --no-verify
+
+    success "Source code downloaded and extracted to $REPO-$MODIFIED_TAG"
+}
+
+function set_openim_env() {
+    warn "This command can only be executed once. It will modify the component passwords in docker-compose based on the PASSWORD variable in .env, and modify the component passwords in config/config.yaml. If the password in .env changes, you need to first execute docker-compose down; rm components -rf and then execute this command."
+    # Set default values for user input
+    # If the USER environment variable is not set, it defaults to 'root'
+    if [ -z "$USER" ]; then
+        USER="root"
+        debug "USER is not set. Defaulting to 'root'."
+    fi
+
+    # If the PASSWORD environment variable is not set, it defaults to 'openIM123'
+    # This password applies to redis, mysql, mongo, as well as accessSecret in config/config.yaml
+    if [ -z "$PASSWORD" ]; then
+        PASSWORD="openIM123"
+        debug "PASSWORD is not set. Defaulting to 'openIM123'."
+    fi
+
+    # If the ENDPOINT environment variable is not set, it defaults to 'http://127.0.0.1:10005'
+    # This is minio's external service IP and port, or it could be a domain like storage.xx.xx
+    # The app must be able to access this IP and port or domain
+    if [ -z "$ENDPOINT" ]; then
+        ENDPOINT="http://127.0.0.1:10005"
+        debug "ENDPOINT is not set. Defaulting to 'http://127.0.0.1:10005'."
+    fi
+
+    # If the API_URL environment variable is not set, it defaults to 'http://127.0.0.1:10002/object/'
+    # The app must be able to access this IP and port or domain
+    if [ -z "$API_URL" ]; then
+        API_URL="http://127.0.0.1:10002/object/"
+        debug "API_URL is not set. Defaulting to 'http://127.0.0.1:10002/object/'."
+    fi
+
+    # If the DATA_DIR environment variable is not set, it defaults to the current directory './'
+    # This can be set to a directory with large disk space
+    if [ -z "$DATA_DIR" ]; then
+        DATA_DIR="./"
+        debug "DATA_DIR is not set. Defaulting to './'."
+    fi
+}
+
+function install_openim() {
+    info "Installing OpenIM"
+    make -j${CPU} install V=1
+
+    info "Checking installation"
+    make check
+
+    success "OpenIM installation completed successfully. Happy chatting!"
+}
+
+############### OpenIM Help ###############
+
+# Function to display help message
+function cmd_help() {
+    openim_color
+    color_echo ${BRIGHT_GREEN_PREFIX} "Usage: $0 [options]"
+    color_echo ${BRIGHT_GREEN_PREFIX} "Options:"
+    echo
+    color_echo ${BLUE_PREFIX} "-i,  --install       ${CYAN_PREFIX}Execute the installation logic of the script${COLOR_SUFFIX}"
+    color_echo ${BLUE_PREFIX} "-u,  --user          ${CYAN_PREFIX}set user (default: root)${COLOR_SUFFIX}"
+    color_echo ${BLUE_PREFIX} "-p,  --password      ${CYAN_PREFIX}set password (default: openIM123)${COLOR_SUFFIX}"
+    color_echo ${BLUE_PREFIX} "-e,  --endpoint      ${CYAN_PREFIX}set endpoint (default: http://127.0.0.1:10005)${COLOR_SUFFIX}"
+    color_echo ${BLUE_PREFIX} "-a,  --api           ${CYAN_PREFIX}set API URL (default: http://127.0.0.1:10002/object/)${COLOR_SUFFIX}"
+    color_echo ${BLUE_PREFIX} "-d,  --directory     ${CYAN_PREFIX}set directory for large disk space (default: ./)${COLOR_SUFFIX}"
+    color_echo ${BLUE_PREFIX} "-h,  --help          ${CYAN_PREFIX}display this help message and exit${COLOR_SUFFIX}"
+    color_echo ${BLUE_PREFIX} "-cn, --china         ${CYAN_PREFIX}set to use the Chinese domestic proxy${COLOR_SUFFIX}"
+    color_echo ${BLUE_PREFIX} "-t,  --tag           ${CYAN_PREFIX}specify the tag (default option, set to latest if not specified)${COLOR_SUFFIX}"
+    color_echo ${BLUE_PREFIX} "-r,  --release       ${CYAN_PREFIX}specify the release branch (cannot be used with the tag option)${COLOR_SUFFIX}"
+    color_echo ${BLUE_PREFIX} "-gt, --github-token  ${CYAN_PREFIX}set the GITHUB_TOKEN (default: not set)${COLOR_SUFFIX}"
+    color_echo ${BLUE_PREFIX} "-g,  --go-version    ${CYAN_PREFIX}set the Go language version (default: GO_VERSION=\"1.18\")${COLOR_SUFFIX}"
+    color_echo ${BLUE_PREFIX} "--install-dir        ${CYAN_PREFIX}set the OpenIM installation directory (default: /tmp)${COLOR_SUFFIX}"
+    color_echo ${BLUE_PREFIX} "--cpu                ${CYAN_PREFIX}set the number of concurrent processes${COLOR_SUFFIX}"
+    echo
+    color_echo ${RED_PREFIX} "Note: Only one of the -t/--tag or -r/--release options can be used at a time.${COLOR_SUFFIX}"
+    color_echo ${RED_PREFIX} "If both are used or none of them are used, the -t/--tag option will be prioritized.${COLOR_SUFFIX}"
+    echo
+    exit 1
+}
+
+function parseinput() {
+    # set default values
+    # USER=root
+    # PASSWORD=openIM123
+    # ENDPOINT=http://127.0.0.1:10005
+    # API=http://127.0.0.1:10002/object/
+    # DIRECTORY=./
+    # CHINA=false
+    # TAG=latest
+    # RELEASE=""
+    # GO_VERSION=1.18
+    # INSTALL_DIR=/tmp
+    # GITHUB_TOKEN=""
+    # CPU=$(nproc)
+
+    if [ $# -eq 0 ]; then
+        cmd_help
+        exit 1
+    fi
+
+    while [ $# -gt 0 ]; do
+        case $1 in
+            -h|--help)
+                cmd_help
+                exit
+                ;;
+            -u|--user)
+                shift
+                USER=$1
+                ;;
+            -p|--password)
+                shift
+                PASSWORD=$1
+                ;;
+            -e|--endpoint)
+                shift
+                ENDPOINT=$1
+                ;;
+            -a|--api)
+                shift
+                API=$1
+                ;;
+            -d|--directory)
+                shift
+                DIRECTORY=$1
+                ;;
+            -cn|--china)
+                CHINA=true
+                ;;
+            -t|--tag)
+                shift
+                TAG=$1
+                ;;
+            -r|--release)
+                shift
+                RELEASE=$1
+                ;;
+            -g|--go-version)
+                shift
+                GO_VERSION=$1
+                ;;
+            --install-dir)
+                shift
+                INSTALL_DIR=$1
+                ;;
+            -gt|--github-token)
+                shift
+                GITHUB_TOKEN=$1
+                ;;
+            --cpu)
+                shift
+                CPU=$1
+                ;;
+            -i|--install)
+                openim_main
+                exit
+                ;;
+            *)
+                echo "Unknown option: $1"
+                cmd_help
+                exit 1
+                ;;
+        esac
+        shift
+    done
+}
+
+############### OpenIM LOGO ###############
+# Set text color to cyan for header and URL
+print_with_delay() {
+  text="$1"
+  delay="$2"
+
+  for i in $(seq 0 $((${#text}-1))); do
+    printf "${text:$i:1}"
+    sleep $delay
+  done
+  printf "\n"
+}
+
+print_progress() {
+  total="$1"
+  delay="$2"
+
+  printf "["
+  for i in $(seq 1 $total); do
+    printf "#"
+    sleep $delay
+  done
+  printf "]\n"
+}
+
+# Function for colored echo
+color_echo() {
+    COLOR=$1
+    shift
+    echo -e "${COLOR} $* ${COLOR_SUFFIX}"
+}
+
+# Color definitions
+function openim_color() {
+    COLOR_SUFFIX="\033[0m"      # End all colors and special effects
+
+    BLACK_PREFIX="\033[30m"     # Black prefix
+    RED_PREFIX="\033[31m"       # Red prefix
+    GREEN_PREFIX="\033[32m"     # Green prefix
+    YELLOW_PREFIX="\033[33m"    # Yellow prefix
+    BLUE_PREFIX="\033[34m"      # Blue prefix
+    SKY_BLUE_PREFIX="\033[36m"  # Sky blue prefix
+    WHITE_PREFIX="\033[37m"     # White prefix
+    BOLD_PREFIX="\033[1m"       # Bold prefix
+    UNDERLINE_PREFIX="\033[4m"  # Underline prefix
+    ITALIC_PREFIX="\033[3m"     # Italic prefix
+    BRIGHT_GREEN_PREFIX='\033[1;32m' # Bright green prefix
+
+    CYAN_PREFIX="\033[0;36m"     # Cyan prefix
+}
+
+# --- helper functions for logs ---
+info()
+{
+    echo -e "[${GREEN_PREFIX}INFO${COLOR_SUFFIX}] " "$@"
+}
+warn()
+{
+    echo -e "[${YELLOW_PREFIX}WARN${COLOR_SUFFIX}] " "$@" >&2
+}
+fatal()
+{
+    echo -e "[${RED_PREFIX}ERROR${COLOR_SUFFIX}] " "$@" >&2
+    exit 1
+}
+debug()
+{
+    echo -e "[${BLUE_PREFIX}DEBUG${COLOR_SUFFIX}]===> " "$@"
+}
+success()
+{
+    echo -e "${BRIGHT_GREEN_PREFIX}=== [SUCCESS] ===${COLOR_SUFFIX}\n=> " "$@"
+}
+
+function openim_logo() {
+    # Set text color to cyan for header and URL
+    echo -e "\033[0;36m"
+
+    # Display fancy ASCII Art logo
+    # look http://patorjk.com/software/taag/#p=display&h=1&v=1&f=Doh&t=OpenIM
+    print_with_delay '
+                                                                                                                      
+                                                                                                                      
+     OOOOOOOOO                                                               IIIIIIIIIIMMMMMMMM               MMMMMMMM
+   OO:::::::::OO                                                             I::::::::IM:::::::M             M:::::::M
+ OO:::::::::::::OO                                                           I::::::::IM::::::::M           M::::::::M
+O:::::::OOO:::::::O                                                          II::::::IIM:::::::::M         M:::::::::M
+O::::::O   O::::::Oppppp   ppppppppp       eeeeeeeeeeee    nnnn  nnnnnnnn      I::::I  M::::::::::M       M::::::::::M
+O:::::O     O:::::Op::::ppp:::::::::p    ee::::::::::::ee  n:::nn::::::::nn    I::::I  M:::::::::::M     M:::::::::::M
+O:::::O     O:::::Op:::::::::::::::::p  e::::::eeeee:::::een::::::::::::::nn   I::::I  M:::::::M::::M   M::::M:::::::M
+O:::::O     O:::::Opp::::::ppppp::::::pe::::::e     e:::::enn:::::::::::::::n  I::::I  M::::::M M::::M M::::M M::::::M
+O:::::O     O:::::O p:::::p     p:::::pe:::::::eeeee::::::e  n:::::nnnn:::::n  I::::I  M::::::M  M::::M::::M  M::::::M
+O:::::O     O:::::O p:::::p     p:::::pe:::::::::::::::::e   n::::n    n::::n  I::::I  M::::::M   M:::::::M   M::::::M
+O:::::O     O:::::O p:::::p     p:::::pe::::::eeeeeeeeeee    n::::n    n::::n  I::::I  M::::::M    M:::::M    M::::::M
+O::::::O   O::::::O p:::::p    p::::::pe:::::::e             n::::n    n::::n  I::::I  M::::::M     MMMMM     M::::::M
+O:::::::OOO:::::::O p:::::ppppp:::::::pe::::::::e            n::::n    n::::nII::::::IIM::::::M               M::::::M
+ OO:::::::::::::OO  p::::::::::::::::p  e::::::::eeeeeeee    n::::n    n::::nI::::::::IM::::::M               M::::::M
+   OO:::::::::OO    p::::::::::::::pp    ee:::::::::::::e    n::::n    n::::nI::::::::IM::::::M               M::::::M
+     OOOOOOOOO      p::::::pppppppp        eeeeeeeeeeeeee    nnnnnn    nnnnnnIIIIIIIIIIMMMMMMMM               MMMMMMMM
+                    p:::::p                                                                                           
+                    p:::::p                                                                                           
+                   p:::::::p                                                                                          
+                   p:::::::p                                                                                          
+                   p:::::::p                                                                                          
+                   ppppppppp                                                                                          
+                                                                                                                      
+    ' 0.0001
+
+    # Display product URL
+    print_with_delay "Discover more and contribute at: https://github.com/OpenIMSDK/Open-IM-Server" 0.01
+
+    # Reset text color back to normal
+    echo -e "\033[0m"
+
+    # Set text color to green for product description
+    echo -e "\033[1;32m"
+
+    print_with_delay "Open-IM-Server: Reinventing Instant Messaging" 0.01
+    print_progress 50 0.02
+
+    print_with_delay "Open-IM-Server is not just a product; it's a revolution. It's about bringing the power of seamless, real-time messaging to your fingertips. And it's about joining a global community of developers, dedicated to pushing the boundaries of what's possible." 0.01
+
+    print_progress 50 0.02
+
+    # Reset text color back to normal
+    echo -e "\033[0m"
+
+    # Set text color to yellow for the Slack link
+    echo -e "\033[1;33m"
+
+    print_with_delay "Join our developer community on Slack: https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg" 0.01
+
+    # Reset text color back to normal
+    echo -e "\033[0m"
+}
+
+# Main function to run the script
+function openim_main() {
+    check_git_repo
+    check_isroot
+    openim_color
+    install_tools
+    check_docker
+    install_go
+    download_source_code
+    set_openim_env
+    install_openim
+    openim_logo
+
+}
+
+parseinput "$@"

internal/api/custom_validator.go

@@ -17,7 +17,7 @@ package api
 import (
 	"github.com/go-playground/validator/v10"
 
-	"github.com/OpenIMSDK/tools/constant"
+	"github.com/OpenIMSDK/protocol/constant"
 )
 
 func RequiredIf(fl validator.FieldLevel) bool {

internal/api/friend.go

@@ -44,6 +44,10 @@ func (o *FriendApi) GetFriendApplyList(c *gin.Context) {
 	a2r.Call(friend.FriendClient.GetPaginationFriendsApplyTo, o.Client, c)
 }
 
+func (o *FriendApi) GetDesignatedFriendsApply(c *gin.Context) {
+	a2r.Call(friend.FriendClient.GetDesignatedFriendsApply, o.Client, c)
+}
+
 func (o *FriendApi) GetSelfApplyList(c *gin.Context) {
 	a2r.Call(friend.FriendClient.GetPaginationFriendsApplyFrom, o.Client, c)
 }
@@ -52,6 +56,10 @@ func (o *FriendApi) GetFriendList(c *gin.Context) {
 	a2r.Call(friend.FriendClient.GetPaginationFriends, o.Client, c)
 }
 
+func (o *FriendApi) GetDesignatedFriends(c *gin.Context) {
+	a2r.Call(friend.FriendClient.GetDesignatedFriends, o.Client, c)
+}
+
 func (o *FriendApi) SetFriendRemark(c *gin.Context) {
 	a2r.Call(friend.FriendClient.SetFriendRemark, o.Client, c)
 }

internal/api/group.go

@@ -60,6 +60,10 @@ func (o *GroupApi) GetUserReqGroupApplicationList(c *gin.Context) {
 	a2r.Call(group.GroupClient.GetUserReqApplicationList, o.Client, c)
 }
 
+func (o *GroupApi) GetGroupUsersReqApplicationList(c *gin.Context) {
+	a2r.Call(group.GroupClient.GetGroupUsersReqApplicationList, o.Client, c)
+}
+
 func (o *GroupApi) GetGroupsInfo(c *gin.Context) {
 	a2r.Call(group.GroupClient.GetGroupsInfo, o.Client, c)
 }

internal/api/msg.go

@@ -15,6 +15,7 @@
 package api
 
 import (
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
 	"github.com/gin-gonic/gin"
 	"github.com/go-playground/validator/v10"
 	"github.com/mitchellh/mapstructure"
@@ -22,14 +23,13 @@ import (
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/apistruct"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/msg"
 	"github.com/OpenIMSDK/protocol/sdkws"
 	"github.com/OpenIMSDK/tools/a2r"
 	"github.com/OpenIMSDK/tools/apiresp"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
-	"github.com/OpenIMSDK/tools/tokenverify"
 	"github.com/OpenIMSDK/tools/utils"
 )
 
@@ -205,7 +205,7 @@ func (m *MessageApi) SendMessage(c *gin.Context) {
 		return
 	}
 	log.ZInfo(c, "SendMessage", "req", req)
-	if !tokenverify.IsAppManagerUid(c) {
+	if !authverify.IsAppManagerUid(c) {
 		apiresp.GinError(c, errs.ErrNoPermission.Wrap("only app manager can send message"))
 		return
 	}
@@ -245,7 +245,7 @@ func (m *MessageApi) BatchSendMsg(c *gin.Context) {
 		return
 	}
 	log.ZInfo(c, "BatchSendMsg", "req", req)
-	if err := tokenverify.CheckAdmin(c); err != nil {
+	if err := authverify.CheckAdmin(c); err != nil {
 		apiresp.GinError(c, errs.ErrNoPermission.Wrap("only app manager can send message"))
 		return
 	}

internal/api/route.go

@@ -16,10 +16,11 @@ package api
 
 import (
 	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/apiresp"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/tokenverify"
 	"net/http"
@@ -31,9 +32,9 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
-	"github.com/OpenIMSDK/tools/config"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/mw"
@@ -85,8 +86,10 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 		f := NewFriendApi(*friendRpc)
 		friendRouterGroup.POST("/delete_friend", f.DeleteFriend)
 		friendRouterGroup.POST("/get_friend_apply_list", f.GetFriendApplyList)
+		friendRouterGroup.POST("/get_designated_friend_apply", f.GetDesignatedFriendsApply)
 		friendRouterGroup.POST("/get_self_friend_apply_list", f.GetSelfApplyList)
 		friendRouterGroup.POST("/get_friend_list", f.GetFriendList)
+		friendRouterGroup.POST("/get_designated_friends", f.GetDesignatedFriends)
 		friendRouterGroup.POST("/add_friend", f.ApplyToAddFriend)
 		friendRouterGroup.POST("/add_friend_response", f.RespondFriendApply)
 		friendRouterGroup.POST("/set_friend_remark", f.SetFriendRemark)
@@ -107,6 +110,7 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 		groupRouterGroup.POST("/transfer_group", g.TransferGroupOwner)
 		groupRouterGroup.POST("/get_recv_group_applicationList", g.GetRecvGroupApplicationList)
 		groupRouterGroup.POST("/get_user_req_group_applicationList", g.GetUserReqGroupApplicationList)
+		groupRouterGroup.POST("/get_group_users_req_application_list", g.GetGroupUsersReqApplicationList)
 		groupRouterGroup.POST("/get_groups_info", g.GetGroupsInfo)
 		groupRouterGroup.POST("/kick_group", g.KickGroupMember)
 		groupRouterGroup.POST("/get_group_members_info", g.GetGroupMembersInfo)
@@ -210,7 +214,7 @@ func GinParseToken(rdb redis.UniversalClient) gin.HandlerFunc {
 				c.Abort()
 				return
 			}
-			claims, err := tokenverify.GetClaimFromToken(token)
+			claims, err := tokenverify.GetClaimFromToken(token, authverify.Secret())
 			if err != nil {
 				log.ZWarn(c, "jwt get token error", errs.ErrTokenUnknown.Wrap())
 				apiresp.GinError(c, errs.ErrTokenUnknown.Wrap())

internal/api/user.go

@@ -17,13 +17,13 @@ package api
 import (
 	"github.com/gin-gonic/gin"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/msggateway"
 	"github.com/OpenIMSDK/protocol/user"
 	"github.com/OpenIMSDK/tools/a2r"
 	"github.com/OpenIMSDK/tools/apiresp"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
 )

internal/msggateway/callback.go

@@ -19,9 +19,9 @@ import (
 	"time"
 
 	cbapi "github.com/OpenIMSDK/Open-IM-Server/pkg/callbackstruct"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/http"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/mcontext"
 )
 

internal/msggateway/client.go

@@ -18,14 +18,15 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor"
 	"runtime/debug"
 	"sync"
 
 	"google.golang.org/protobuf/proto"
 
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/sdkws"
 	"github.com/OpenIMSDK/tools/apiresp"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/mcontext"
 	"github.com/OpenIMSDK/tools/utils"
@@ -241,9 +242,9 @@ func (c *Client) replyMessage(ctx context.Context, binaryReq *Req, err error, re
 
 func (c *Client) PushMessage(ctx context.Context, msgData *sdkws.MsgData) error {
 	var msg sdkws.PushMessages
-	conversationID := utils.GetConversationIDByMsg(msgData)
+	conversationID := msgprocessor.GetConversationIDByMsg(msgData)
 	m := map[string]*sdkws.PullMsgs{conversationID: {Msgs: []*sdkws.MsgData{msgData}}}
-	if utils.IsNotification(conversationID) {
+	if msgprocessor.IsNotification(conversationID) {
 		msg.NotificationMsgs = m
 	} else {
 		msg.Msgs = m

internal/msggateway/context.go

@@ -19,7 +19,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/OpenIMSDK/tools/constant"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/utils"
 )
 

internal/msggateway/hub_server.go

@@ -16,20 +16,19 @@ package msggateway
 
 import (
 	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/tools/errs"
-	"github.com/OpenIMSDK/tools/tokenverify"
-
 	"google.golang.org/grpc"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/startrpc"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/msggateway"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 	"github.com/OpenIMSDK/tools/log"
-	"github.com/OpenIMSDK/tools/startrpc"
 	"github.com/OpenIMSDK/tools/utils"
 )
 
@@ -84,7 +83,7 @@ func (s *Server) GetUsersOnlineStatus(
 	ctx context.Context,
 	req *msggateway.GetUsersOnlineStatusReq,
 ) (*msggateway.GetUsersOnlineStatusResp, error) {
-	if !tokenverify.IsAppManagerUid(ctx) {
+	if !authverify.IsAppManagerUid(ctx) {
 		return nil, errs.ErrNoPermission.Wrap("only app manager")
 	}
 	var resp msggateway.GetUsersOnlineStatusResp

internal/msggateway/init.go

@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/OpenIMSDK/tools/config"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 )
 
 func RunWsAndServer(rpcPort, wsPort, prometheusPort int) error {
@@ -39,7 +39,11 @@ func RunWsAndServer(rpcPort, wsPort, prometheusPort int) error {
 		return err
 	}
 	hubServer := NewServer(rpcPort, longServer)
-	go hubServer.Start()
-	hubServer.LongConnServer.Run()
-	return nil
+	go func() {
+		err := hubServer.Start()
+		if err != nil {
+			panic(err.Error())
+		}
+	}()
+	return hubServer.LongConnServer.Run()
 }

internal/msggateway/n_ws_server.go

@@ -17,15 +17,16 @@ package msggateway
 import (
 	"context"
 	"errors"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
 	"net/http"
 	"strconv"
 	"sync"
 	"sync/atomic"
 	"time"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
+	"github.com/OpenIMSDK/protocol/constant"
 
 	"github.com/redis/go-redis/v9"
 
@@ -35,7 +36,6 @@ import (
 
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
-	"github.com/OpenIMSDK/tools/tokenverify"
 	"github.com/OpenIMSDK/tools/utils"
 )
 
@@ -338,7 +338,7 @@ func (ws *WsServer) wsHandler(w http.ResponseWriter, r *http.Request) {
 		httpError(connContext, errs.ErrConnArgsErr)
 		return
 	}
-	if err := tokenverify.WsVerifyToken(token, userID, platformID); err != nil {
+	if err := authverify.WsVerifyToken(token, userID, platformID); err != nil {
 		httpError(connContext, err)
 		return
 	}

internal/msgtransfer/init.go

@@ -22,6 +22,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation"
@@ -29,7 +30,6 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
-	"github.com/OpenIMSDK/tools/config"
 	openKeeper "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/mw"

internal/msgtransfer/online_history_msg_handler.go

@@ -16,6 +16,7 @@ package msgtransfer
 
 import (
 	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor"
 	"strconv"
 	"strings"
 	"sync"
@@ -27,12 +28,12 @@ import (
 	"github.com/go-redis/redis"
 	"google.golang.org/protobuf/proto"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/kafka"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/sdkws"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/mcontext"
 	"github.com/OpenIMSDK/tools/utils"
@@ -141,8 +142,8 @@ func (och *OnlineHistoryRedisConsumerHandler) Run(channelID int) {
 					"modifyMsgList",
 					len(modifyMsgList),
 				)
-				conversationIDMsg := utils.GetChatConversationIDByMsg(ctxMsgList[0].message)
-				conversationIDNotification := utils.GetNotificationConversationID(ctxMsgList[0].message)
+				conversationIDMsg := msgprocessor.GetChatConversationIDByMsg(ctxMsgList[0].message)
+				conversationIDNotification := msgprocessor.GetNotificationConversationID(ctxMsgList[0].message)
 				och.handleMsg(ctx, msgChannelValue.uniqueKey, conversationIDMsg, storageMsgList, notStorageMsgList)
 				och.handleNotification(
 					ctx,
@@ -172,7 +173,7 @@ func (och *OnlineHistoryRedisConsumerHandler) getPushStorageMsgList(
 	totalMsgs []*ContextMsg,
 ) (storageMsgList, notStorageMsgList, storageNotificatoinList, notStorageNotificationList, modifyMsgList []*sdkws.MsgData) {
 	isStorage := func(msg *sdkws.MsgData) bool {
-		options2 := utils.Options(msg.Options)
+		options2 := msgprocessor.Options(msg.Options)
 		if options2.IsHistory() {
 			return true
 		} else {
@@ -183,28 +184,28 @@ func (och *OnlineHistoryRedisConsumerHandler) getPushStorageMsgList(
 		}
 	}
 	for _, v := range totalMsgs {
-		options := utils.Options(v.message.Options)
+		options := msgprocessor.Options(v.message.Options)
 		if !options.IsNotNotification() {
 			// clone msg from notificationMsg
 			if options.IsSendMsg() {
 				msg := proto.Clone(v.message).(*sdkws.MsgData)
 				// 消息
 				if v.message.Options != nil {
-					msg.Options = utils.NewMsgOptions()
+					msg.Options = msgprocessor.NewMsgOptions()
 				}
 				if options.IsOfflinePush() {
-					v.message.Options = utils.WithOptions(
-						utils.Options(v.message.Options),
-						utils.WithOfflinePush(false),
+					v.message.Options = msgprocessor.WithOptions(
+						v.message.Options,
+						msgprocessor.WithOfflinePush(false),
 					)
-					msg.Options = utils.WithOptions(utils.Options(msg.Options), utils.WithOfflinePush(true))
+					msg.Options = msgprocessor.WithOptions(msg.Options, msgprocessor.WithOfflinePush(true))
 				}
 				if options.IsUnreadCount() {
-					v.message.Options = utils.WithOptions(
-						utils.Options(v.message.Options),
-						utils.WithUnreadCount(false),
+					v.message.Options = msgprocessor.WithOptions(
+						v.message.Options,
+						msgprocessor.WithUnreadCount(false),
 					)
-					msg.Options = utils.WithOptions(utils.Options(msg.Options), utils.WithUnreadCount(true))
+					msg.Options = msgprocessor.WithOptions(msg.Options, msgprocessor.WithUnreadCount(true))
 				}
 				storageMsgList = append(storageMsgList, msg)
 			}

internal/msgtransfer/online_msg_to_mongo_handler.go

@@ -20,10 +20,10 @@ import (
 	"github.com/Shopify/sarama"
 	"google.golang.org/protobuf/proto"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
 	kfk "github.com/OpenIMSDK/Open-IM-Server/pkg/common/kafka"
 	pbMsg "github.com/OpenIMSDK/protocol/msg"
-	"github.com/OpenIMSDK/tools/config"
 	"github.com/OpenIMSDK/tools/log"
 )
 

internal/msgtransfer/persistent_msg_handler.go

@@ -17,11 +17,11 @@ package msgtransfer
 import (
 	"context"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
 	kfk "github.com/OpenIMSDK/Open-IM-Server/pkg/common/kafka"
+	"github.com/OpenIMSDK/protocol/constant"
 	pbMsg "github.com/OpenIMSDK/protocol/msg"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/utils"
 

internal/push/callback.go

@@ -18,10 +18,10 @@ import (
 	"context"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/callbackstruct"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/http"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/sdkws"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/mcontext"
 	"github.com/OpenIMSDK/tools/utils"

internal/push/offlinepush/fcm/push.go

@@ -25,9 +25,9 @@ import (
 	"google.golang.org/api/option"
 
 	"github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
+	"github.com/OpenIMSDK/protocol/constant"
 )
 
 const SinglePushCountLimit = 400

internal/push/offlinepush/getui/body.go

@@ -17,7 +17,7 @@ package getui
 import (
 	"fmt"
 
-	"github.com/OpenIMSDK/tools/config"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 )
 
 type Resp struct {

internal/push/offlinepush/getui/push.go

@@ -26,9 +26,9 @@ import (
 	"github.com/go-redis/redis"
 
 	"github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	http2 "github.com/OpenIMSDK/Open-IM-Server/pkg/common/http"
-	"github.com/OpenIMSDK/tools/config"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/mcontext"

internal/push/offlinepush/jpush/body/notification.go

@@ -15,7 +15,7 @@
 package body
 
 import (
-	"github.com/OpenIMSDK/tools/config"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 )
 
 type Notification struct {

internal/push/offlinepush/jpush/body/platform.go

@@ -17,7 +17,7 @@ package body
 import (
 	"errors"
 
-	"github.com/OpenIMSDK/tools/constant"
+	"github.com/OpenIMSDK/protocol/constant"
 )
 
 const (

internal/push/offlinepush/jpush/push.go

@@ -21,8 +21,8 @@ import (
 
 	"github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush"
 	"github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush/jpush/body"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	http2 "github.com/OpenIMSDK/Open-IM-Server/pkg/common/http"
-	"github.com/OpenIMSDK/tools/config"
 )
 
 type JPush struct{}

internal/push/push_handler.go

@@ -20,11 +20,11 @@ import (
 	"github.com/Shopify/sarama"
 	"google.golang.org/protobuf/proto"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	kfk "github.com/OpenIMSDK/Open-IM-Server/pkg/common/kafka"
+	"github.com/OpenIMSDK/protocol/constant"
 	pbChat "github.com/OpenIMSDK/protocol/msg"
 	pbPush "github.com/OpenIMSDK/protocol/push"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/utils"
 )

internal/push/push_rpc_server.go

@@ -24,8 +24,8 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/localcache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
+	"github.com/OpenIMSDK/protocol/constant"
 	pbPush "github.com/OpenIMSDK/protocol/push"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 	"github.com/OpenIMSDK/tools/log"
 )

internal/push/push_to_client.go

@@ -18,20 +18,21 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor"
 
 	"github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush"
 	"github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush/fcm"
 	"github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush/getui"
 	"github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush/jpush"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/localcache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/msggateway"
 	"github.com/OpenIMSDK/protocol/sdkws"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/mcontext"
@@ -82,7 +83,7 @@ func NewOfflinePusher(cache cache.MsgModel) offlinepush.OfflinePusher {
 }
 
 func (p *Pusher) DeleteMemberAndSetConversationSeq(ctx context.Context, groupID string, userIDs []string) error {
-	conevrsationID := utils.GetConversationIDBySessionType(constant.SuperGroupChatType, groupID)
+	conevrsationID := msgprocessor.GetConversationIDBySessionType(constant.SuperGroupChatType, groupID)
 	maxSeq, err := p.msgRpcClient.GetConversationMaxSeq(ctx, conevrsationID)
 	if err != nil {
 		return err
@@ -170,7 +171,7 @@ func (p *Pusher) Push2SuperGroup(ctx context.Context, groupID string, msg *sdkws
 			}(groupID, kickedUsers)
 			pushToUserIDs = append(pushToUserIDs, kickedUsers...)
 		case constant.GroupDismissedNotification:
-			if utils.IsNotification(utils.GetConversationIDByMsg(msg)) { // 消息先到,通知后到
+			if msgprocessor.IsNotification(msgprocessor.GetConversationIDByMsg(msg)) { // 消息先到,通知后到
 				var tips sdkws.GroupDismissedTips
 				if p.UnmarshalNotificationElem(msg.Content, &tips) != nil {
 					return err

internal/push/tools.go

@@ -1,8 +1,8 @@
 package push
 
 import (
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/sdkws"
-	"github.com/OpenIMSDK/tools/constant"
 	"google.golang.org/protobuf/proto"
 )
 

internal/rpc/auth/auth.go

@@ -16,16 +16,17 @@ package auth
 
 import (
 	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
 
 	"google.golang.org/grpc"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 	pbAuth "github.com/OpenIMSDK/protocol/auth"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/msggateway"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
@@ -76,7 +77,7 @@ func (s *authServer) UserToken(ctx context.Context, req *pbAuth.UserTokenReq) (*
 }
 
 func (s *authServer) parseToken(ctx context.Context, tokensString string) (claims *tokenverify.Claims, err error) {
-	claims, err = tokenverify.GetClaimFromToken(tokensString)
+	claims, err = tokenverify.GetClaimFromToken(tokensString, authverify.Secret())
 	if err != nil {
 		return nil, utils.Wrap(err, "")
 	}
@@ -116,7 +117,7 @@ func (s *authServer) ParseToken(
 }
 
 func (s *authServer) ForceLogout(ctx context.Context, req *pbAuth.ForceLogoutReq) (*pbAuth.ForceLogoutResp, error) {
-	if err := tokenverify.CheckAdmin(ctx); err != nil {
+	if err := authverify.CheckAdmin(ctx); err != nil {
 		return nil, err
 	}
 	if err := s.forceKickOff(ctx, req.UserID, req.PlatformID, mcontext.GetOperationID(ctx)); err != nil {

internal/rpc/conversation/conversaion.go

@@ -16,6 +16,7 @@ package conversation
 
 import (
 	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor"
 
 	"google.golang.org/grpc"
 
@@ -26,8 +27,8 @@ import (
 	tableRelation "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification"
+	"github.com/OpenIMSDK/protocol/constant"
 	pbConversation "github.com/OpenIMSDK/protocol/conversation"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
@@ -106,7 +107,7 @@ func (c *conversationServer) SetConversation(ctx context.Context, req *pbConvers
 	if err != nil {
 		return nil, err
 	}
-	_ = c.conversationNotificationSender.ConversationChangeNotification(ctx, req.Conversation.OwnerUserID)
+	_ = c.conversationNotificationSender.ConversationChangeNotification(ctx, req.Conversation.OwnerUserID, []string{req.Conversation.ConversationID})
 	resp := &pbConversation.SetConversationResp{}
 	return resp, nil
 }
@@ -169,7 +170,7 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbConver
 			return nil, err
 		}
 		for _, userID := range req.UserIDs {
-			c.conversationNotificationSender.ConversationSetPrivateNotification(ctx, userID, req.Conversation.UserID, req.Conversation.IsPrivateChat.Value)
+			c.conversationNotificationSender.ConversationSetPrivateNotification(ctx, userID, req.Conversation.UserID, req.Conversation.IsPrivateChat.Value, req.Conversation.ConversationID)
 		}
 	}
 	if req.Conversation.BurnDuration != nil {
@@ -180,7 +181,7 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbConver
 		return nil, err
 	}
 	for _, v := range req.UserIDs {
-		c.conversationNotificationSender.ConversationChangeNotification(ctx, v)
+		c.conversationNotificationSender.ConversationChangeNotification(ctx, v, []string{req.Conversation.ConversationID})
 	}
 	return &pbConversation.SetConversationsResp{}, nil
 }
@@ -197,7 +198,7 @@ func (c *conversationServer) GetRecvMsgNotNotifyUserIDs(ctx context.Context, req
 // create conversation without notification for msg redis transfer.
 func (c *conversationServer) CreateSingleChatConversations(ctx context.Context, req *pbConversation.CreateSingleChatConversationsReq) (*pbConversation.CreateSingleChatConversationsResp, error) {
 	var conversation tableRelation.ConversationModel
-	conversation.ConversationID = utils.GetConversationIDBySessionType(constant.SingleChatType, req.RecvID, req.SendID)
+	conversation.ConversationID = msgprocessor.GetConversationIDBySessionType(constant.SingleChatType, req.RecvID, req.SendID)
 	conversation.ConversationType = constant.SingleChatType
 	conversation.OwnerUserID = req.SendID
 	conversation.UserID = req.RecvID

internal/rpc/friend/black.go

@@ -16,13 +16,13 @@ package friend
 
 import (
 	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
 	"time"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	pbFriend "github.com/OpenIMSDK/protocol/friend"
 	"github.com/OpenIMSDK/tools/mcontext"
-	"github.com/OpenIMSDK/tools/tokenverify"
 )
 
 func (s *friendServer) GetPaginationBlacks(
@@ -76,7 +76,7 @@ func (s *friendServer) RemoveBlack(
 }
 
 func (s *friendServer) AddBlack(ctx context.Context, req *pbFriend.AddBlackReq) (*pbFriend.AddBlackResp, error) {
-	if err := tokenverify.CheckAccessV3(ctx, req.OwnerUserID); err != nil {
+	if err := authverify.CheckAccessV3(ctx, req.OwnerUserID); err != nil {
 		return nil, err
 	}
 	_, err := s.userRpcClient.GetUsersInfo(ctx, []string{req.OwnerUserID, req.BlackUserID})

internal/rpc/friend/callback.go

@@ -18,10 +18,10 @@ import (
 	"context"
 
 	cbapi "github.com/OpenIMSDK/Open-IM-Server/pkg/callbackstruct"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/http"
+	"github.com/OpenIMSDK/protocol/constant"
 	pbfriend "github.com/OpenIMSDK/protocol/friend"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/mcontext"
 )

internal/rpc/friend/friend.go

@@ -16,6 +16,7 @@ package friend
 
 import (
 	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
@@ -28,11 +29,10 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation"
 	tablerelation "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification"
+	"github.com/OpenIMSDK/protocol/constant"
 	pbfriend "github.com/OpenIMSDK/protocol/friend"
-	"github.com/OpenIMSDK/tools/constant"
 	registry "github.com/OpenIMSDK/tools/discoveryregistry"
 	"github.com/OpenIMSDK/tools/errs"
-	"github.com/OpenIMSDK/tools/tokenverify"
 	"github.com/OpenIMSDK/tools/tx"
 	"github.com/OpenIMSDK/tools/utils"
 )
@@ -83,11 +83,6 @@ func Start(client registry.SvcDiscoveryRegistry, server *grpc.Server) error {
 	return nil
 }
 
-func (s *friendServer) GetDesignatedFriendsApply(ctx context.Context, req *pbfriend.GetDesignatedFriendsApplyReq) (*pbfriend.GetDesignatedFriendsApplyResp, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
 // ok.
 func (s *friendServer) ApplyToAddFriend(
 	ctx context.Context,
@@ -95,7 +90,7 @@ func (s *friendServer) ApplyToAddFriend(
 ) (resp *pbfriend.ApplyToAddFriendResp, err error) {
 	defer log.ZInfo(ctx, utils.GetFuncName()+" Return")
 	resp = &pbfriend.ApplyToAddFriendResp{}
-	if err := tokenverify.CheckAccessV3(ctx, req.FromUserID); err != nil {
+	if err := authverify.CheckAccessV3(ctx, req.FromUserID); err != nil {
 		return nil, err
 	}
 	if req.ToUserID == req.FromUserID {
@@ -127,7 +122,7 @@ func (s *friendServer) ImportFriends(
 	req *pbfriend.ImportFriendReq,
 ) (resp *pbfriend.ImportFriendResp, err error) {
 	defer log.ZInfo(ctx, utils.GetFuncName()+" Return")
-	if err := tokenverify.CheckAdmin(ctx); err != nil {
+	if err := authverify.CheckAdmin(ctx); err != nil {
 		return nil, err
 	}
 	if _, err := s.userRpcClient.GetUsersInfo(ctx, append([]string{req.OwnerUserID}, req.FriendUserIDs...)); err != nil {
@@ -154,7 +149,7 @@ func (s *friendServer) RespondFriendApply(
 ) (resp *pbfriend.RespondFriendApplyResp, err error) {
 	defer log.ZInfo(ctx, utils.GetFuncName()+" Return")
 	resp = &pbfriend.RespondFriendApplyResp{}
-	if err := tokenverify.CheckAccessV3(ctx, req.ToUserID); err != nil {
+	if err := authverify.CheckAccessV3(ctx, req.ToUserID); err != nil {
 		return nil, err
 	}
 
@@ -245,6 +240,19 @@ func (s *friendServer) GetDesignatedFriends(
 	return resp, nil
 }
 
+func (s *friendServer) GetDesignatedFriendsApply(ctx context.Context, req *pbfriend.GetDesignatedFriendsApplyReq) (resp *pbfriend.GetDesignatedFriendsApplyResp, err error) {
+	friendRequests, err := s.friendDatabase.FindBothFriendRequests(ctx, req.FromUserID, req.ToUserID)
+	if err != nil {
+		return nil, err
+	}
+	resp = &pbfriend.GetDesignatedFriendsApplyResp{}
+	resp.FriendRequests, err = convert.FriendRequestDB2Pb(ctx, friendRequests, s.userRpcClient.GetUsersInfoMap)
+	if err != nil {
+		return nil, err
+	}
+	return resp, nil
+}
+
 // ok 获取接收到的好友申请（即别人主动申请的）.
 func (s *friendServer) GetPaginationFriendsApplyTo(
 	ctx context.Context,
@@ -303,7 +311,6 @@ func (s *friendServer) IsFriend(
 	return resp, nil
 }
 
-// ok.
 func (s *friendServer) GetPaginationFriends(
 	ctx context.Context,
 	req *pbfriend.GetPaginationFriendsReq,

internal/rpc/group/callback.go

@@ -20,12 +20,12 @@ import (
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/apistruct"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/callbackstruct"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/http"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/group"
 	"github.com/OpenIMSDK/protocol/wrapperspb"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/mcontext"
 	"github.com/OpenIMSDK/tools/utils"

internal/rpc/group/group.go

@@ -23,6 +23,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor"
+
 	pbConversation "github.com/OpenIMSDK/protocol/conversation"
 	"github.com/OpenIMSDK/protocol/wrapperspb"
 
@@ -39,14 +42,13 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation"
 	relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation"
+	"github.com/OpenIMSDK/protocol/constant"
 	pbGroup "github.com/OpenIMSDK/protocol/group"
 	"github.com/OpenIMSDK/protocol/sdkws"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/mcontext"
-	"github.com/OpenIMSDK/tools/tokenverify"
 	"github.com/OpenIMSDK/tools/utils"
 )
 
@@ -94,13 +96,8 @@ type groupServer struct {
 	msgRpcClient          rpcclient.MessageRpcClient
 }
 
-func (s *groupServer) GetGroupUsersReqApplicationList(ctx context.Context, req *pbGroup.GetGroupUsersReqApplicationListReq) (*pbGroup.GetGroupUsersReqApplicationListResp, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
 func (s *groupServer) CheckGroupAdmin(ctx context.Context, groupID string) error {
-	if !tokenverify.IsAppManagerUid(ctx) {
+	if !authverify.IsAppManagerUid(ctx) {
 		groupMember, err := s.GroupDatabase.TakeGroupMember(ctx, groupID, mcontext.GetOpUserID(ctx))
 		if err != nil {
 			return err
@@ -162,7 +159,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
 	if req.OwnerUserID == "" {
 		return nil, errs.ErrArgs.Wrap("no group owner")
 	}
-	if err := tokenverify.CheckAccessV3(ctx, req.OwnerUserID); err != nil {
+	if err := authverify.CheckAccessV3(ctx, req.OwnerUserID); err != nil {
 		return nil, err
 	}
 	userIDs := append(append(req.MemberUserIDs, req.AdminUserIDs...), req.OwnerUserID)
@@ -257,7 +254,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
 
 func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbGroup.GetJoinedGroupListReq) (*pbGroup.GetJoinedGroupListResp, error) {
 	resp := &pbGroup.GetJoinedGroupListResp{}
-	if err := tokenverify.CheckAccessV3(ctx, req.FromUserID); err != nil {
+	if err := authverify.CheckAccessV3(ctx, req.FromUserID); err != nil {
 		return nil, err
 	}
 	var pageNumber, showNumber int32
@@ -325,7 +322,7 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
 	}
 	var groupMember *relationTb.GroupMemberModel
 	var opUserID string
-	if !tokenverify.IsAppManagerUid(ctx) {
+	if !authverify.IsAppManagerUid(ctx) {
 		opUserID = mcontext.GetOpUserID(ctx)
 		groupMembers, err := s.FindGroupMember(ctx, []string{req.GroupID}, []string{opUserID}, nil)
 		if err != nil {
@@ -337,7 +334,7 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
 		groupMember = groupMembers[0]
 	}
 	if group.NeedVerification == constant.AllNeedVerification {
-		if !tokenverify.IsAppManagerUid(ctx) {
+		if !authverify.IsAppManagerUid(ctx) {
 			if !(groupMember.RoleLevel == constant.GroupOwner || groupMember.RoleLevel == constant.GroupAdmin) {
 				var requests []*relationTb.GroupRequestModel
 				for _, userID := range req.InvitedUserIDs {
@@ -480,7 +477,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou
 		for i, member := range members {
 			memberMap[member.UserID] = members[i]
 		}
-		isAppManagerUid := tokenverify.IsAppManagerUid(ctx)
+		isAppManagerUid := authverify.IsAppManagerUid(ctx)
 		opMember := memberMap[opUserID]
 		for _, userID := range req.KickedUserIDs {
 			member, ok := memberMap[userID]
@@ -670,7 +667,7 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup
 	if !utils.Contain(req.HandleResult, constant.GroupResponseAgree, constant.GroupResponseRefuse) {
 		return nil, errs.ErrArgs.Wrap("HandleResult unknown")
 	}
-	if !tokenverify.IsAppManagerUid(ctx) {
+	if !authverify.IsAppManagerUid(ctx) {
 		groupMember, err := s.GroupDatabase.TakeGroupMember(ctx, req.GroupID, mcontext.GetOpUserID(ctx))
 		if err != nil {
 			return nil, err
@@ -722,11 +719,11 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup
 	if err := s.GroupDatabase.HandlerGroupRequest(ctx, req.GroupID, req.FromUserID, req.HandledMsg, req.HandleResult, member); err != nil {
 		return nil, err
 	}
-	if err := s.conversationRpcClient.GroupChatFirstCreateConversation(ctx, req.GroupID, []string{req.FromUserID}); err != nil {
-		return nil, err
-	}
 	switch req.HandleResult {
 	case constant.GroupResponseAgree:
+		if err := s.conversationRpcClient.GroupChatFirstCreateConversation(ctx, req.GroupID, []string{req.FromUserID}); err != nil {
+			return nil, err
+		}
 		s.Notification.GroupApplicationAcceptedNotification(ctx, req)
 	case constant.GroupResponseRefuse:
 		s.Notification.GroupApplicationRejectedNotification(ctx, req)
@@ -829,7 +826,7 @@ func (s *groupServer) QuitGroup(ctx context.Context, req *pbGroup.QuitGroupReq)
 }
 
 func (s *groupServer) deleteMemberAndSetConversationSeq(ctx context.Context, groupID string, userIDs []string) error {
-	conevrsationID := utils.GetConversationIDBySessionType(constant.SuperGroupChatType, groupID)
+	conevrsationID := msgprocessor.GetConversationIDBySessionType(constant.SuperGroupChatType, groupID)
 	maxSeq, err := s.msgRpcClient.GetConversationMaxSeq(ctx, conevrsationID)
 	if err != nil {
 		return err
@@ -839,7 +836,7 @@ func (s *groupServer) deleteMemberAndSetConversationSeq(ctx context.Context, gro
 
 func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInfoReq) (*pbGroup.SetGroupInfoResp, error) {
 	var opMember *relationTb.GroupMemberModel
-	if !tokenverify.IsAppManagerUid(ctx) {
+	if !authverify.IsAppManagerUid(ctx) {
 		var err error
 		opMember, err = s.TakeGroupMember(ctx, req.GroupInfoForSet.GroupID, mcontext.GetOpUserID(ctx))
 		if err != nil {
@@ -889,7 +886,7 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf
 		go func() {
 			nctx := mcontext.NewCtx("@@@" + mcontext.GetOperationID(ctx))
 			conversation := &pbConversation.ConversationReq{
-				ConversationID:   utils.GetConversationIDBySessionType(constant.SuperGroupChatType, req.GroupInfoForSet.GroupID),
+				ConversationID:   msgprocessor.GetConversationIDBySessionType(constant.SuperGroupChatType, req.GroupInfoForSet.GroupID),
 				ConversationType: constant.SuperGroupChatType,
 				GroupID:          req.GroupInfoForSet.GroupID,
 			}
@@ -948,7 +945,7 @@ func (s *groupServer) TransferGroupOwner(ctx context.Context, req *pbGroup.Trans
 	if newOwner == nil {
 		return nil, errs.ErrArgs.Wrap("NewOwnerUser not in group " + req.NewOwnerUserID)
 	}
-	if !tokenverify.IsAppManagerUid(ctx) {
+	if !authverify.IsAppManagerUid(ctx) {
 		if !(mcontext.GetOpUserID(ctx) == oldOwner.UserID && oldOwner.RoleLevel == constant.GroupOwner) {
 			return nil, errs.ErrNoPermission.Wrap("no permission transfer group owner")
 		}
@@ -1080,7 +1077,7 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou
 	if err != nil {
 		return nil, err
 	}
-	if !tokenverify.IsAppManagerUid(ctx) {
+	if !authverify.IsAppManagerUid(ctx) {
 		if owner.UserID != mcontext.GetOpUserID(ctx) {
 			return nil, errs.ErrNoPermission.Wrap("not group owner")
 		}
@@ -1131,7 +1128,7 @@ func (s *groupServer) MuteGroupMember(ctx context.Context, req *pbGroup.MuteGrou
 	if err != nil {
 		return nil, err
 	}
-	if !tokenverify.IsAppManagerUid(ctx) {
+	if !authverify.IsAppManagerUid(ctx) {
 		opMember, err := s.TakeGroupMember(ctx, req.GroupID, mcontext.GetOpUserID(ctx))
 		if err != nil {
 			return nil, err
@@ -1179,7 +1176,7 @@ func (s *groupServer) CancelMuteGroupMember(ctx context.Context, req *pbGroup.Ca
 	if err != nil {
 		return nil, err
 	}
-	if !tokenverify.IsAppManagerUid(ctx) {
+	if !authverify.IsAppManagerUid(ctx) {
 		opMember, err := s.TakeGroupMember(ctx, req.GroupID, mcontext.GetOpUserID(ctx))
 		if err != nil {
 			return nil, err
@@ -1263,7 +1260,7 @@ func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbGroup.SetGr
 	memberMap := utils.SliceToMap(members, func(e *relationTb.GroupMemberModel) [2]string {
 		return [...]string{e.GroupID, e.UserID}
 	})
-	if !tokenverify.IsAppManagerUid(ctx) {
+	if !authverify.IsAppManagerUid(ctx) {
 		opUserID := mcontext.GetOpUserID(ctx)
 		for _, member := range req.Members {
 			if member.RoleLevel != nil {
@@ -1444,3 +1441,46 @@ func (s *groupServer) GetGroupMemberRoleLevel(ctx context.Context, req *pbGroup.
 	})
 	return resp, nil
 }
+
+func (s *groupServer) GetGroupUsersReqApplicationList(ctx context.Context, req *pbGroup.GetGroupUsersReqApplicationListReq) (*pbGroup.GetGroupUsersReqApplicationListResp, error) {
+	resp := &pbGroup.GetGroupUsersReqApplicationListResp{}
+	total, requests, err := s.GroupDatabase.FindGroupRequests(ctx, req.GroupID, req.UserIDs)
+	if err != nil {
+		return nil, err
+	}
+	if len(requests) == 0 {
+		return resp, nil
+	}
+	groupIDs := utils.Distinct(utils.Slice(requests, func(e *relationTb.GroupRequestModel) string {
+		return e.GroupID
+	}))
+	groups, err := s.GroupDatabase.FindGroup(ctx, groupIDs)
+	if err != nil {
+		return nil, err
+	}
+	groupMap := utils.SliceToMap(groups, func(e *relationTb.GroupModel) string {
+		return e.GroupID
+	})
+	if ids := utils.Single(groupIDs, utils.Keys(groupMap)); len(ids) > 0 {
+		return nil, errs.ErrGroupIDNotFound.Wrap(strings.Join(ids, ","))
+	}
+	owners, err := s.FindGroupMember(ctx, groupIDs, nil, []int32{constant.GroupOwner})
+	if err != nil {
+		return nil, err
+	}
+	ownerMap := utils.SliceToMap(owners, func(e *relationTb.GroupMemberModel) string {
+		return e.GroupID
+	})
+	if ids := utils.Single(groupIDs, utils.Keys(ownerMap)); len(ids) > 0 {
+		return nil, errs.ErrData.Wrap("group no owner", strings.Join(ids, ","))
+	}
+	groupMemberNum, err := s.GroupDatabase.MapGroupMemberNum(ctx, groupIDs)
+	if err != nil {
+		return nil, err
+	}
+	resp.GroupRequests = utils.Slice(requests, func(e *relationTb.GroupRequestModel) *sdkws.GroupRequest {
+		return convert.Db2PbGroupRequest(e, nil, convert.Db2PbGroupInfo(groupMap[e.GroupID], ownerMap[e.GroupID].UserID, uint32(groupMemberNum[e.GroupID])))
+	})
+	resp.Total = total
+	return resp, nil
+}

internal/rpc/group/super_group.go

@@ -22,9 +22,9 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
+	"github.com/OpenIMSDK/protocol/constant"
 	pbGroup "github.com/OpenIMSDK/protocol/group"
 	sdkws "github.com/OpenIMSDK/protocol/sdkws"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/utils"
 )

internal/rpc/msg/as_read.go

@@ -19,9 +19,9 @@ import (
 
 	"github.com/redis/go-redis/v9"
 
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/msg"
 	"github.com/OpenIMSDK/protocol/sdkws"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
 )

internal/rpc/msg/callback.go

@@ -20,10 +20,10 @@ import (
 	"google.golang.org/protobuf/proto"
 
 	cbapi "github.com/OpenIMSDK/Open-IM-Server/pkg/callbackstruct"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/http"
+	"github.com/OpenIMSDK/protocol/constant"
 	pbChat "github.com/OpenIMSDK/protocol/msg"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/mcontext"

internal/rpc/msg/delete.go

@@ -16,13 +16,13 @@ package msg
 
 import (
 	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
 
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/conversation"
 	"github.com/OpenIMSDK/protocol/msg"
 	"github.com/OpenIMSDK/protocol/sdkws"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/log"
-	"github.com/OpenIMSDK/tools/tokenverify"
 	"github.com/OpenIMSDK/tools/utils"
 )
 
@@ -45,7 +45,7 @@ func (m *msgServer) ClearConversationsMsg(
 	ctx context.Context,
 	req *msg.ClearConversationsMsgReq,
 ) (*msg.ClearConversationsMsgResp, error) {
-	if err := tokenverify.CheckAccessV3(ctx, req.UserID); err != nil {
+	if err := authverify.CheckAccessV3(ctx, req.UserID); err != nil {
 		return nil, err
 	}
 	if err := m.clearConversation(ctx, req.ConversationIDs, req.UserID, req.DeleteSyncOpt); err != nil {
@@ -58,7 +58,7 @@ func (m *msgServer) UserClearAllMsg(
 	ctx context.Context,
 	req *msg.UserClearAllMsgReq,
 ) (*msg.UserClearAllMsgResp, error) {
-	if err := tokenverify.CheckAccessV3(ctx, req.UserID); err != nil {
+	if err := authverify.CheckAccessV3(ctx, req.UserID); err != nil {
 		return nil, err
 	}
 	conversationIDs, err := m.ConversationLocalCache.GetConversationIDs(ctx, req.UserID)
@@ -73,7 +73,7 @@ func (m *msgServer) UserClearAllMsg(
 }
 
 func (m *msgServer) DeleteMsgs(ctx context.Context, req *msg.DeleteMsgsReq) (*msg.DeleteMsgsResp, error) {
-	if err := tokenverify.CheckAccessV3(ctx, req.UserID); err != nil {
+	if err := authverify.CheckAccessV3(ctx, req.UserID); err != nil {
 		return nil, err
 	}
 	isSyncSelf, isSyncOther := m.validateDeleteSyncOpt(req.DeleteSyncOpt)
@@ -121,7 +121,7 @@ func (m *msgServer) DeleteMsgPhysical(
 	ctx context.Context,
 	req *msg.DeleteMsgPhysicalReq,
 ) (*msg.DeleteMsgPhysicalResp, error) {
-	if err := tokenverify.CheckAdmin(ctx); err != nil {
+	if err := authverify.CheckAdmin(ctx); err != nil {
 		return nil, err
 	}
 	remainTime := utils.GetCurrentTimestampBySecond() - req.Timestamp

internal/rpc/msg/message_interceptor.go

@@ -17,10 +17,10 @@ package msg
 import (
 	"context"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/msg"
 	"github.com/OpenIMSDK/protocol/sdkws"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/errs"
 )
 

internal/rpc/msg/msg_status.go

@@ -17,8 +17,8 @@ package msg
 import (
 	"context"
 
+	"github.com/OpenIMSDK/protocol/constant"
 	pbMsg "github.com/OpenIMSDK/protocol/msg"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/mcontext"
 )
 

internal/rpc/msg/revoke.go

@@ -17,15 +17,15 @@ package msg
 import (
 	"context"
 	"encoding/json"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
 	"time"
 
 	unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/msg"
 	"github.com/OpenIMSDK/protocol/sdkws"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
-	"github.com/OpenIMSDK/tools/tokenverify"
 	"github.com/OpenIMSDK/tools/utils"
 )
 
@@ -40,7 +40,7 @@ func (m *msgServer) RevokeMsg(ctx context.Context, req *msg.RevokeMsgReq) (*msg.
 	if req.Seq < 0 {
 		return nil, errs.ErrArgs.Wrap("seq is invalid")
 	}
-	if err := tokenverify.CheckAccessV3(ctx, req.UserID); err != nil {
+	if err := authverify.CheckAccessV3(ctx, req.UserID); err != nil {
 		return nil, err
 	}
 	user, err := m.User.GetUserInfo(ctx, req.UserID)
@@ -60,10 +60,10 @@ func (m *msgServer) RevokeMsg(ctx context.Context, req *msg.RevokeMsgReq) (*msg.
 	data, _ := json.Marshal(msgs[0])
 	log.ZInfo(ctx, "GetMsgBySeqs", "conversationID", req.ConversationID, "seq", req.Seq, "msg", string(data))
 	var role int32
-	if !tokenverify.IsAppManagerUid(ctx) {
+	if !authverify.IsAppManagerUid(ctx) {
 		switch msgs[0].SessionType {
 		case constant.SingleChatType:
-			if err := tokenverify.CheckAccessV3(ctx, msgs[0].SendID); err != nil {
+			if err := authverify.CheckAccessV3(ctx, msgs[0].SendID); err != nil {
 				return nil, err
 			}
 			role = user.AppMangerLevel

internal/rpc/msg/send.go

@@ -16,13 +16,14 @@ package msg
 
 import (
 	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor"
 
 	promePkg "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome"
+	"github.com/OpenIMSDK/protocol/constant"
 	pbConversation "github.com/OpenIMSDK/protocol/conversation"
 	pbMsg "github.com/OpenIMSDK/protocol/msg"
 	"github.com/OpenIMSDK/protocol/sdkws"
 	"github.com/OpenIMSDK/protocol/wrapperspb"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/mcontext"
@@ -90,7 +91,7 @@ func (m *msgServer) setConversationAtInfo(nctx context.Context, msg *sdkws.MsgDa
 	ctx := mcontext.NewCtx("@@@" + mcontext.GetOperationID(nctx))
 	var atUserID []string
 	conversation := &pbConversation.ConversationReq{
-		ConversationID:   utils.GetConversationIDByMsg(msg),
+		ConversationID:   msgprocessor.GetConversationIDByMsg(msg),
 		ConversationType: msg.SessionType,
 		GroupID:          msg.GroupID,
 	}
@@ -148,8 +149,8 @@ func (m *msgServer) sendMsgSingleChat(ctx context.Context, req *pbMsg.SendMsgReq
 	if err := m.messageVerification(ctx, req); err != nil {
 		return nil, err
 	}
-	var isSend bool = true
-	isNotification := utils.IsNotificationByMsg(req.MsgData)
+	var isSend = true
+	isNotification := msgprocessor.IsNotificationByMsg(req.MsgData)
 	if !isNotification {
 		isSend, err = m.modifyMessageByUserMessageReceiveOpt(
 			ctx,

internal/rpc/msg/server.go

@@ -25,9 +25,9 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/conversation"
 	"github.com/OpenIMSDK/protocol/msg"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 )
 

internal/rpc/msg/sync_msg.go

@@ -16,13 +16,14 @@ package msg
 
 import (
 	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor"
 
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/msg"
-	"github.com/OpenIMSDK/tools/constant"
 
 	"github.com/OpenIMSDK/protocol/sdkws"
 	"github.com/OpenIMSDK/tools/log"
-	"github.com/OpenIMSDK/tools/tokenverify"
 	"github.com/OpenIMSDK/tools/utils"
 )
 
@@ -34,7 +35,7 @@ func (m *msgServer) PullMessageBySeqs(
 	resp.Msgs = make(map[string]*sdkws.PullMsgs)
 	resp.NotificationMsgs = make(map[string]*sdkws.PullMsgs)
 	for _, seq := range req.SeqRanges {
-		if !utils.IsNotification(seq.ConversationID) {
+		if !msgprocessor.IsNotification(seq.ConversationID) {
 			conversation, err := m.Conversation.GetConversation(ctx, req.UserID, seq.ConversationID)
 			if err != nil {
 				log.ZError(ctx, "GetConversation error", err, "conversationID", seq.ConversationID)
@@ -85,7 +86,7 @@ func (m *msgServer) PullMessageBySeqs(
 }
 
 func (m *msgServer) GetMaxSeq(ctx context.Context, req *sdkws.GetMaxSeqReq) (*sdkws.GetMaxSeqResp, error) {
-	if err := tokenverify.CheckAccessV3(ctx, req.UserID); err != nil {
+	if err := authverify.CheckAccessV3(ctx, req.UserID); err != nil {
 		return nil, err
 	}
 	conversationIDs, err := m.ConversationLocalCache.GetConversationIDs(ctx, req.UserID)

internal/rpc/msg/utils.go

@@ -18,9 +18,9 @@ import (
 	"github.com/redis/go-redis/v9"
 	"gorm.io/gorm"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/sdkws"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/utils"
 )
 

internal/rpc/msg/verify.go

@@ -20,10 +20,10 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/msg"
 	"github.com/OpenIMSDK/protocol/sdkws"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/utils"
 )

internal/rpc/third/third.go

@@ -27,13 +27,13 @@ import (
 
 	"google.golang.org/grpc"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation"
 	relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 	"github.com/OpenIMSDK/protocol/third"
-	"github.com/OpenIMSDK/tools/config"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 )
 

internal/rpc/third/tool.go

@@ -18,13 +18,13 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
 	"strings"
 	"unicode/utf8"
 
 	"github.com/OpenIMSDK/protocol/third"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/mcontext"
-	"github.com/OpenIMSDK/tools/tokenverify"
 )
 
 func toPbMapArray(m map[string][]string) []*third.KeyValues {
@@ -52,7 +52,7 @@ func checkUploadName(ctx context.Context, name string) error {
 	if opUserID == "" {
 		return errs.ErrNoPermission.Wrap("opUserID is empty")
 	}
-	if !tokenverify.IsManagerUserID(opUserID) {
+	if !authverify.IsManagerUserID(opUserID) {
 		if !strings.HasPrefix(name, opUserID+"/") {
 			return errs.ErrNoPermission.Wrap(fmt.Sprintf("name must start with `%s/`", opUserID))
 		}

internal/rpc/user/user.go

@@ -20,8 +20,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
+
 	"github.com/OpenIMSDK/tools/log"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
@@ -29,13 +32,11 @@ import (
 	tablerelation "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/sdkws"
 	pbuser "github.com/OpenIMSDK/protocol/user"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
 	registry "github.com/OpenIMSDK/tools/discoveryregistry"
 	"github.com/OpenIMSDK/tools/errs"
-	"github.com/OpenIMSDK/tools/tokenverify"
 	"github.com/OpenIMSDK/tools/tx"
 
 	"google.golang.org/grpc"
@@ -99,7 +100,7 @@ func (s *userServer) GetDesignateUsers(ctx context.Context, req *pbuser.GetDesig
 
 func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbuser.UpdateUserInfoReq) (resp *pbuser.UpdateUserInfoResp, err error) {
 	resp = &pbuser.UpdateUserInfoResp{}
-	err = tokenverify.CheckAccessV3(ctx, req.UserInfo.UserID)
+	err = authverify.CheckAccessV3(ctx, req.UserInfo.UserID)
 	if err != nil {
 		return nil, err
 	}
@@ -141,7 +142,7 @@ func (s *userServer) AccountCheck(ctx context.Context, req *pbuser.AccountCheckR
 	if utils.Duplicate(req.CheckUserIDs) {
 		return nil, errs.ErrArgs.Wrap("userID repeated")
 	}
-	err = tokenverify.CheckAdmin(ctx)
+	err = authverify.CheckAdmin(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -241,3 +242,7 @@ func (s *userServer) GetAllUserID(ctx context.Context, req *pbuser.GetAllUserIDR
 	}
 	return &pbuser.GetAllUserIDResp{UserIDs: userIDs}, nil
 }
+
+func (s *userServer) SubscribeOrCancelUsersStatus(ctx context.Context, req *pbuser.SubscribeOrCancelUsersStatusReq) (resp *pbuser.SubscribeOrCancelUsersStatusResp, err error) {
+	panic("implement me")
+}

internal/tools/cron_task.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/robfig/cron/v3"
 
-	"github.com/OpenIMSDK/tools/config"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/tools/log"
 )
 

internal/tools/msg.go

@@ -24,13 +24,13 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification"
-	"github.com/OpenIMSDK/tools/config"
 	"github.com/OpenIMSDK/tools/discoveryregistry/zookeeper"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"

internal/tools/msg_test.go

@@ -1,355 +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 tools
-
-import (
-	"context"
-	"strconv"
-
-	"go.mongodb.org/mongo-driver/bson"
-
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
-	"github.com/OpenIMSDK/tools/constant"
-	"github.com/OpenIMSDK/tools/mcontext"
-	"github.com/OpenIMSDK/tools/utils"
-
-	unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation"
-
-	"testing"
-	"time"
-)
-
-func GenMsgDoc(startSeq, stopSeq, delSeq, index int64, conversationID string) *unRelationTb.MsgDocModel {
-	msgDoc := &unRelationTb.MsgDocModel{DocID: conversationID + strconv.Itoa(int(index))}
-	for i := 0; i < 5000; i++ {
-		msgDoc.Msg = append(msgDoc.Msg, &unRelationTb.MsgInfoModel{})
-	}
-	for i := startSeq; i <= stopSeq; i++ {
-		msg := &unRelationTb.MsgDataModel{
-			SendID:           "sendID1",
-			RecvID:           "recvID1",
-			GroupID:          "",
-			ClientMsgID:      "xxx",
-			ServerMsgID:      "xxx",
-			SenderPlatformID: 1,
-			SenderNickname:   "testNickName",
-			SenderFaceURL:    "testFaceURL",
-			SessionType:      1,
-			MsgFrom:          100,
-			ContentType:      101,
-			Content:          "testContent",
-			Seq:              i,
-			CreateTime:       time.Now().Unix(),
-			Status:           1,
-		}
-		if i <= delSeq {
-			msg.SendTime = 10000
-		} else {
-			msg.SendTime = utils.GetCurrentTimestampByMill()
-		}
-		msgDoc.Msg[i-1] = &unRelationTb.MsgInfoModel{Msg: msg}
-	}
-	return msgDoc
-}
-
-func TestDeleteMongoMsgAndResetRedisSeq(t *testing.T) {
-	operationID := "test"
-	rdb, err := cache.NewRedis()
-	if err != nil {
-		return
-	}
-	mgo, err := unrelation.NewMongo()
-	if err != nil {
-		return
-	}
-	cacheModel := cache.NewMsgCacheModel(rdb)
-	mongoClient := mgo.GetDatabase().Collection(unRelationTb.MsgDocModel{}.TableName())
-	ctx := context.Background()
-	ctx = mcontext.SetOperationID(ctx, operationID)
-
-	testUID1 := "test_del_id1"
-	var conversationID string
-	conversationID = utils.GetConversationIDBySessionType(constant.SuperGroupChatType, testUID1)
-	_, err = mongoClient.DeleteOne(ctx, bson.M{"doc_id": conversationID + ":" + strconv.Itoa(0)})
-	if err != nil {
-		t.Error("DeleteOne failed")
-		return
-	}
-
-	err = cacheModel.SetMaxSeq(ctx, conversationID, 600)
-	if err != nil {
-		t.Error("SetUserMaxSeq failed")
-	}
-	msgDoc := GenMsgDoc(1, 600, 200, 0, conversationID)
-	if _, err := mongoClient.InsertOne(ctx, msgDoc); err != nil {
-		t.Error("InsertOne failed", conversationID)
-	}
-
-	msgTools, err := InitMsgTool()
-	if err != nil {
-		t.Error("init failed")
-		return
-	}
-	msgTools.ClearConversationsMsg(ctx, []string{conversationID})
-	minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err := msgTools.msgDatabase.GetConversationMinMaxSeqInMongoAndCache(
-		ctx,
-		conversationID,
-	)
-	if err != nil {
-		t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed")
-		return
-	}
-	if maxSeqCache != maxSeqMongo {
-		t.Error("checkMaxSeqWithMongo failed", conversationID)
-	}
-	if minSeqMongo != minSeqCache {
-		t.Error("minSeqMongo != minSeqCache", minSeqMongo, minSeqCache)
-	}
-	if minSeqCache != 201 {
-		t.Error("test1 is not the same", "minSeq:", minSeqCache, "targetSeq", 201)
-	}
-
-	/////// uid2
-
-	testUID2 := "test_del_id2"
-	conversationID = utils.GetConversationIDBySessionType(constant.SuperGroupChatType, testUID2)
-
-	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(0)})
-	if err != nil {
-		t.Error("delete failed")
-	}
-	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(1)})
-	if err != nil {
-		t.Error("delete failed")
-	}
-
-	err = cacheModel.SetMaxSeq(ctx, conversationID, 7000)
-	if err != nil {
-		t.Error("SetUserMaxSeq failed")
-	}
-	msgDoc = GenMsgDoc(1, 4999, 5000, 0, conversationID)
-	msgDoc2 := GenMsgDoc(5000, 7000, 6000, 1, conversationID)
-	if _, err := mongoClient.InsertOne(ctx, msgDoc); err != nil {
-		t.Error("InsertOne failed", testUID1)
-	}
-	if _, err := mongoClient.InsertOne(ctx, msgDoc2); err != nil {
-		t.Error("InsertOne failed", testUID1)
-	}
-
-	msgTools.ClearConversationsMsg(ctx, []string{conversationID})
-	minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err = msgTools.msgDatabase.GetConversationMinMaxSeqInMongoAndCache(
-		ctx,
-		conversationID,
-	)
-	if err != nil {
-		t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed")
-		return
-	}
-	if maxSeqCache != maxSeqMongo {
-		t.Error("checkMaxSeqWithMongo failed", conversationID)
-	}
-	if minSeqMongo != minSeqCache {
-		t.Error("minSeqMongo != minSeqCache", minSeqMongo, minSeqCache)
-	}
-	if minSeqCache != 6001 {
-		t.Error("test1 is not the same", "minSeq:", minSeqCache, "targetSeq", 201)
-	}
-
-	/////// uid3
-	testUID3 := "test_del_id3"
-	conversationID = utils.GetConversationIDBySessionType(constant.SuperGroupChatType, testUID3)
-	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(0)})
-	if err != nil {
-		t.Error("delete failed")
-	}
-	err = cacheModel.SetMaxSeq(ctx, conversationID, 4999)
-	if err != nil {
-		t.Error("SetUserMaxSeq failed")
-	}
-	msgDoc = GenMsgDoc(1, 4999, 5000, 0, conversationID)
-	if _, err := mongoClient.InsertOne(ctx, msgDoc); err != nil {
-		t.Error("InsertOne failed", conversationID)
-	}
-
-	msgTools.ClearConversationsMsg(ctx, []string{conversationID})
-	minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err = msgTools.msgDatabase.GetConversationMinMaxSeqInMongoAndCache(
-		ctx,
-		conversationID,
-	)
-	if err != nil {
-		t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed")
-		return
-	}
-	if maxSeqCache != maxSeqMongo {
-		t.Error("checkMaxSeqWithMongo failed", conversationID)
-	}
-	if minSeqMongo != minSeqCache {
-		t.Error("minSeqMongo != minSeqCache", minSeqMongo, minSeqCache)
-	}
-	if minSeqCache != 5000 {
-		t.Error("test1 is not the same", "minSeq:", minSeqCache, "targetSeq", 201)
-	}
-
-	//// uid4
-	testUID4 := "test_del_id4"
-	conversationID = utils.GetConversationIDBySessionType(constant.SuperGroupChatType, testUID4)
-	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(0)})
-	if err != nil {
-		t.Error("delete failed")
-	}
-	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(1)})
-	if err != nil {
-		t.Error("delete failed")
-	}
-	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(2)})
-	if err != nil {
-		t.Error("delete failed")
-	}
-
-	err = cacheModel.SetMaxSeq(ctx, conversationID, 12000)
-	msgDoc = GenMsgDoc(1, 4999, 5000, 0, conversationID)
-	msgDoc2 = GenMsgDoc(5000, 9999, 10000, 1, conversationID)
-	msgDoc3 := GenMsgDoc(10000, 12000, 11000, 2, conversationID)
-	if _, err := mongoClient.InsertOne(ctx, msgDoc); err != nil {
-		t.Error("InsertOne failed", conversationID)
-	}
-	if _, err := mongoClient.InsertOne(ctx, msgDoc2); err != nil {
-		t.Error("InsertOne failed", conversationID)
-	}
-	if _, err := mongoClient.InsertOne(ctx, msgDoc3); err != nil {
-		t.Error("InsertOne failed", conversationID)
-	}
-
-	msgTools.ClearConversationsMsg(ctx, []string{conversationID})
-	if err != nil {
-		t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed")
-		return
-	}
-	minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err = msgTools.msgDatabase.GetConversationMinMaxSeqInMongoAndCache(
-		ctx,
-		conversationID,
-	)
-	if err != nil {
-		t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed")
-		return
-	}
-	if maxSeqCache != maxSeqMongo {
-		t.Error("checkMaxSeqWithMongo failed", conversationID)
-	}
-	if minSeqMongo != minSeqCache {
-		t.Error("minSeqMongo != minSeqCache", minSeqMongo, minSeqCache)
-	}
-	if minSeqCache != 5000 {
-		t.Error("test1 is not the same", "minSeq:", minSeqCache)
-	}
-
-	testUID5 := "test_del_id5"
-	conversationID = utils.GetConversationIDBySessionType(constant.SuperGroupChatType, testUID5)
-
-	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(0)})
-	if err != nil {
-		t.Error("delete failed")
-	}
-	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(1)})
-	if err != nil {
-		t.Error("delete failed")
-	}
-	err = cacheModel.SetMaxSeq(ctx, conversationID, 9999)
-	msgDoc = GenMsgDoc(1, 4999, 5000, 0, conversationID)
-	msgDoc2 = GenMsgDoc(5000, 9999, 10000, 1, conversationID)
-	if _, err := mongoClient.InsertOne(ctx, msgDoc); err != nil {
-		t.Error("InsertOne failed", conversationID)
-	}
-	if _, err := mongoClient.InsertOne(ctx, msgDoc2); err != nil {
-		t.Error("InsertOne failed", conversationID)
-	}
-
-	msgTools.ClearConversationsMsg(ctx, []string{conversationID})
-	if err != nil {
-		t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed")
-		return
-	}
-	minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err = msgTools.msgDatabase.GetConversationMinMaxSeqInMongoAndCache(
-		ctx,
-		conversationID,
-	)
-	if err != nil {
-		t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed")
-		return
-	}
-	if maxSeqCache != maxSeqMongo {
-		t.Error("checkMaxSeqWithMongo failed", conversationID)
-	}
-	if minSeqMongo != minSeqCache {
-		t.Error("minSeqMongo != minSeqCache", minSeqMongo, minSeqCache)
-	}
-	if minSeqCache != 10000 {
-		t.Error("test1 is not the same", "minSeq:", minSeqCache)
-	}
-
-	testUID6 := "test_del_id6"
-	conversationID = utils.GetConversationIDBySessionType(constant.SuperGroupChatType, testUID6)
-
-	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(0)})
-	if err != nil {
-		t.Error("delete failed")
-	}
-	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(1)})
-	if err != nil {
-		t.Error("delete failed")
-	}
-	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(2)})
-	if err != nil {
-		t.Error("delete failed")
-	}
-	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": conversationID + ":" + strconv.Itoa(3)})
-	if err != nil {
-		t.Error("delete failed")
-	}
-	msgDoc = GenMsgDoc(1, 4999, 5000, 0, conversationID)
-	msgDoc2 = GenMsgDoc(5000, 9999, 10000, 1, conversationID)
-	msgDoc3 = GenMsgDoc(10000, 14999, 13000, 2, conversationID)
-	msgDoc4 := GenMsgDoc(15000, 19999, 0, 3, conversationID)
-	if _, err := mongoClient.InsertOne(ctx, msgDoc); err != nil {
-		t.Error("InsertOne failed", testUID4)
-	}
-	if _, err := mongoClient.InsertOne(ctx, msgDoc2); err != nil {
-		t.Error("InsertOne failed", testUID4)
-	}
-	if _, err := mongoClient.InsertOne(ctx, msgDoc3); err != nil {
-		t.Error("InsertOne failed", testUID4)
-	}
-	if _, err := mongoClient.InsertOne(ctx, msgDoc4); err != nil {
-		t.Error("InsertOne failed", testUID4)
-	}
-	minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err = msgTools.msgDatabase.GetConversationMinMaxSeqInMongoAndCache(
-		ctx,
-		conversationID,
-	)
-	if err != nil {
-		t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed")
-		return
-	}
-	if maxSeqCache != maxSeqMongo {
-		t.Error("checkMaxSeqWithMongo failed", conversationID)
-	}
-	if minSeqMongo != minSeqCache {
-		t.Error("minSeqMongo != minSeqCache", minSeqMongo, minSeqCache)
-	}
-	if minSeqCache != 13001 {
-		t.Error("test1 is not the same", "minSeq:", minSeqCache)
-	}
-}

pkg/apistruct/manage.go

@@ -33,7 +33,7 @@ type SendMsg struct {
 }
 
 type SendMsgReq struct {
-	RecvID string `json:"recvID"           binding:"required_if" message:"recvID is required if sessionType is SingleChatType or NotificationChatType"`
+	RecvID string `json:"recvID" binding:"required_if" message:"recvID is required if sessionType is SingleChatType or NotificationChatType"`
 	SendMsg
 }
 

pkg/authverify/token.go

@@ -0,0 +1,62 @@
+package authverify
+
+import (
+	"context"
+	"fmt"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+	"github.com/OpenIMSDK/tools/errs"
+	"github.com/OpenIMSDK/tools/mcontext"
+	"github.com/OpenIMSDK/tools/tokenverify"
+	"github.com/OpenIMSDK/tools/utils"
+	"github.com/golang-jwt/jwt/v4"
+)
+
+func Secret() jwt.Keyfunc {
+	return func(token *jwt.Token) (interface{}, error) {
+		return []byte(config.Config.Secret), nil
+	}
+}
+
+func CheckAccessV3(ctx context.Context, ownerUserID string) (err error) {
+	opUserID := mcontext.GetOpUserID(ctx)
+	if utils.IsContain(opUserID, config.Config.Manager.UserID) {
+		return nil
+	}
+	if opUserID == ownerUserID {
+		return nil
+	}
+	return errs.ErrNoPermission.Wrap(utils.GetSelfFuncName())
+}
+
+func IsAppManagerUid(ctx context.Context) bool {
+	return utils.IsContain(mcontext.GetOpUserID(ctx), config.Config.Manager.UserID)
+}
+
+func CheckAdmin(ctx context.Context) error {
+	if utils.IsContain(mcontext.GetOpUserID(ctx), config.Config.Manager.UserID) {
+		return nil
+	}
+	return errs.ErrNoPermission.Wrap(fmt.Sprintf("user %s is not admin userID", mcontext.GetOpUserID(ctx)))
+}
+
+func ParseRedisInterfaceToken(redisToken interface{}) (*tokenverify.Claims, error) {
+	return tokenverify.GetClaimFromToken(string(redisToken.([]uint8)), Secret())
+}
+
+func IsManagerUserID(opUserID string) bool {
+	return utils.IsContain(opUserID, config.Config.Manager.UserID)
+}
+
+func WsVerifyToken(token, userID string, platformID int) error {
+	claim, err := tokenverify.GetClaimFromToken(token, Secret())
+	if err != nil {
+		return err
+	}
+	if claim.UserID != userID {
+		return errs.ErrTokenInvalid.Wrap(fmt.Sprintf("token uid %s != userID %s", claim.UserID, userID))
+	}
+	if claim.PlatformID != platformID {
+		return errs.ErrTokenInvalid.Wrap(fmt.Sprintf("token platform %d != %d", claim.PlatformID, platformID))
+	}
+	return nil
+}

pkg/common/cmd/msg_gateway.go

@@ -19,7 +19,7 @@ import (
 	//"github.com/OpenIMSDK/Open-IM-Server/internal/msggateway".
 	"github.com/spf13/cobra"
 
-	"github.com/OpenIMSDK/tools/constant"
+	"github.com/OpenIMSDK/protocol/constant"
 )
 
 type MsgGatewayCmd struct {

pkg/common/cmd/root.go

@@ -20,8 +20,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/log"
 )
 
@@ -65,7 +65,7 @@ func NewRootCmd(name string, opts ...func(*CmdOpts)) (rootCmd *RootCmd) {
 			if cmdOpts.loggerPrefixName == "" {
 				cmdOpts.loggerPrefixName = "OpenIM.log.all"
 			}
-			if err := log.InitFromConfig(cmdOpts.loggerPrefixName, name, config.Config.Log.RemainLogLevel, config.Config.Log.IsStdout, config.Config.Log.IsJson, config.Config.Log.StorageLocation, config.Config.Log.RemainRotationCount); err != nil {
+			if err := log.InitFromConfig(cmdOpts.loggerPrefixName, name, config.Config.Log.RemainLogLevel, config.Config.Log.IsStdout, config.Config.Log.IsJson, config.Config.Log.StorageLocation, config.Config.Log.RemainRotationCount, config.Config.Log.RotationTime); err != nil {
 				panic(err)
 			}
 			return nil

pkg/common/cmd/rpc.go

@@ -20,8 +20,8 @@ import (
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/startrpc"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
-	"github.com/OpenIMSDK/tools/startrpc"
 )
 
 type RpcCmd struct {

pkg/common/config/config.go

@@ -0,0 +1,333 @@
+// 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 config
+
+import (
+	"bytes"
+	"github.com/OpenIMSDK/tools/discoveryregistry"
+	"gopkg.in/yaml.v3"
+)
+
+var Config configStruct
+
+const ConfKey = "conf"
+
+type CallBackConfig struct {
+	Enable                 bool  `yaml:"enable"`
+	CallbackTimeOut        int   `yaml:"timeout"`
+	CallbackFailedContinue *bool `yaml:"failedContinue"`
+}
+
+type NotificationConf struct {
+	IsSendMsg        bool         `yaml:"isSendMsg"`
+	ReliabilityLevel int          `yaml:"reliabilityLevel"` // 1 online 2 persistent
+	UnreadCount      bool         `yaml:"unreadCount"`
+	OfflinePush      POfflinePush `yaml:"offlinePush"`
+}
+
+type POfflinePush struct {
+	Enable bool   `yaml:"enable"`
+	Title  string `yaml:"title"`
+	Desc   string `yaml:"desc"`
+	Ext    string `yaml:"ext"`
+}
+
+type configStruct struct {
+	Zookeeper struct {
+		Schema   string   `yaml:"schema"`
+		ZkAddr   []string `yaml:"address"`
+		Username string   `yaml:"username"`
+		Password string   `yaml:"password"`
+	} `yaml:"zookeeper"`
+
+	Mysql struct {
+		Address       []string `yaml:"address"`
+		Username      string   `yaml:"username"`
+		Password      string   `yaml:"password"`
+		Database      string   `yaml:"database"`
+		MaxOpenConn   int      `yaml:"maxOpenConn"`
+		MaxIdleConn   int      `yaml:"maxIdleConn"`
+		MaxLifeTime   int      `yaml:"maxLifeTime"`
+		LogLevel      int      `yaml:"logLevel"`
+		SlowThreshold int      `yaml:"slowThreshold"`
+	} `yaml:"mysql"`
+
+	Mongo struct {
+		Uri         string   `yaml:"uri"`
+		Address     []string `yaml:"address"`
+		Database    string   `yaml:"database"`
+		Username    string   `yaml:"username"`
+		Password    string   `yaml:"password"`
+		MaxPoolSize int      `yaml:"maxPoolSize"`
+	} `yaml:"mongo"`
+
+	Redis struct {
+		Address  []string `yaml:"address"`
+		Username string   `yaml:"username"`
+		Password string   `yaml:"password"`
+	} `yaml:"redis"`
+
+	Kafka struct {
+		Username         string   `yaml:"username"`
+		Password         string   `yaml:"password"`
+		Addr             []string `yaml:"addr"`
+		LatestMsgToRedis struct {
+			Topic string `yaml:"topic"`
+		} `yaml:"latestMsgToRedis"`
+		MsgToMongo struct {
+			Topic string `yaml:"topic"`
+		} `yaml:"offlineMsgToMongo"`
+		MsgToPush struct {
+			Topic string `yaml:"topic"`
+		} `yaml:"msgToPush"`
+		ConsumerGroupID struct {
+			MsgToRedis string `yaml:"msgToRedis"`
+			MsgToMongo string `yaml:"msgToMongo"`
+			MsgToMySql string `yaml:"msgToMySql"`
+			MsgToPush  string `yaml:"msgToPush"`
+		} `yaml:"consumerGroupID"`
+	} `yaml:"kafka"`
+
+	Rpc struct {
+		RegisterIP string `yaml:"registerIP"`
+		ListenIP   string `yaml:"listenIP"`
+	} `yaml:"rpc"`
+
+	Api struct {
+		OpenImApiPort []int  `yaml:"openImApiPort"`
+		ListenIP      string `yaml:"listenIP"`
+	} `yaml:"api"`
+
+	Object struct {
+		Enable string `yaml:"enable"`
+		ApiURL string `yaml:"apiURL"`
+		Minio  struct {
+			Bucket          string `yaml:"bucket"`
+			Endpoint        string `yaml:"endpoint"`
+			AccessKeyID     string `yaml:"accessKeyID"`
+			SecretAccessKey string `yaml:"secretAccessKey"`
+			SessionToken    string `yaml:"sessionToken"`
+		} `yaml:"minio"`
+		Cos struct {
+			BucketURL    string `yaml:"bucketURL"`
+			SecretID     string `yaml:"secretID"`
+			SecretKey    string `yaml:"secretKey"`
+			SessionToken string `yaml:"sessionToken"`
+		} `yaml:"cos"`
+		Oss struct {
+			Endpoint        string `yaml:"endpoint"`
+			Bucket          string `yaml:"bucket"`
+			BucketURL       string `yaml:"bucketURL"`
+			AccessKeyID     string `yaml:"accessKeyID"`
+			AccessKeySecret string `yaml:"accessKeySecret"`
+			SessionToken    string `yaml:"sessionToken"`
+		} `yaml:"oss"`
+	} `yaml:"object"`
+
+	RpcPort struct {
+		OpenImUserPort           []int `yaml:"openImUserPort"`
+		OpenImFriendPort         []int `yaml:"openImFriendPort"`
+		OpenImMessagePort        []int `yaml:"openImMessagePort"`
+		OpenImMessageGatewayPort []int `yaml:"openImMessageGatewayPort"`
+		OpenImGroupPort          []int `yaml:"openImGroupPort"`
+		OpenImAuthPort           []int `yaml:"openImAuthPort"`
+		OpenImPushPort           []int `yaml:"openImPushPort"`
+		OpenImConversationPort   []int `yaml:"openImConversationPort"`
+		OpenImRtcPort            []int `yaml:"openImRtcPort"`
+		OpenImThirdPort          []int `yaml:"openImThirdPort"`
+	} `yaml:"rpcPort"`
+
+	RpcRegisterName struct {
+		OpenImUserName           string `yaml:"openImUserName"`
+		OpenImFriendName         string `yaml:"openImFriendName"`
+		OpenImMsgName            string `yaml:"openImMsgName"`
+		OpenImPushName           string `yaml:"openImPushName"`
+		OpenImMessageGatewayName string `yaml:"openImMessageGatewayName"`
+		OpenImGroupName          string `yaml:"openImGroupName"`
+		OpenImAuthName           string `yaml:"openImAuthName"`
+		OpenImConversationName   string `yaml:"openImConversationName"`
+		OpenImThirdName          string `yaml:"openImThirdName"`
+	} `yaml:"rpcRegisterName"`
+
+	Log struct {
+		StorageLocation     string `yaml:"storageLocation"`
+		RotationTime        uint   `yaml:"rotationTime"`
+		RemainRotationCount uint   `yaml:"remainRotationCount"`
+		RemainLogLevel      int    `yaml:"remainLogLevel"`
+		IsStdout            bool   `yaml:"isStdout"`
+		IsJson              bool   `yaml:"isJson"`
+		WithStack           bool   `yaml:"withStack"`
+	} `yaml:"log"`
+
+	LongConnSvr struct {
+		OpenImWsPort        []int `yaml:"openImWsPort"`
+		WebsocketMaxConnNum int   `yaml:"websocketMaxConnNum"`
+		WebsocketMaxMsgLen  int   `yaml:"websocketMaxMsgLen"`
+		WebsocketTimeout    int   `yaml:"websocketTimeout"`
+	} `yaml:"longConnSvr"`
+
+	Push struct {
+		Enable string `yaml:"enable"`
+		GeTui  struct {
+			PushUrl      string `yaml:"pushUrl"`
+			AppKey       string `yaml:"appKey"`
+			Intent       string `yaml:"intent"`
+			MasterSecret string `yaml:"masterSecret"`
+			ChannelID    string `yaml:"channelID"`
+			ChannelName  string `yaml:"channelName"`
+		} `yaml:"geTui"`
+		Fcm struct {
+			ServiceAccount string `yaml:"serviceAccount"`
+		} `yaml:"fcm"`
+		Jpns struct {
+			AppKey       string `yaml:"appKey"`
+			MasterSecret string `yaml:"masterSecret"`
+			PushUrl      string `yaml:"pushUrl"`
+			PushIntent   string `yaml:"pushIntent"`
+		} `yaml:"jpns"`
+	}
+	Manager struct {
+		UserID   []string `yaml:"userID"`
+		Nickname []string `yaml:"nickname"`
+	} `yaml:"manager"`
+
+	MultiLoginPolicy                  int    `yaml:"multiLoginPolicy"`
+	ChatPersistenceMysql              bool   `yaml:"chatPersistenceMysql"`
+	MsgCacheTimeout                   int    `yaml:"msgCacheTimeout"`
+	GroupMessageHasReadReceiptEnable  bool   `yaml:"groupMessageHasReadReceiptEnable"`
+	SingleMessageHasReadReceiptEnable bool   `yaml:"singleMessageHasReadReceiptEnable"`
+	RetainChatRecords                 int    `yaml:"retainChatRecords"`
+	ChatRecordsClearTime              string `yaml:"chatRecordsClearTime"`
+	MsgDestructTime                   string `yaml:"msgDestructTime"`
+	Secret                            string `yaml:"secret"`
+	TokenPolicy                       struct {
+		Expire int64 `yaml:"expire"`
+	} `yaml:"tokenPolicy"`
+	MessageVerify struct {
+		FriendVerify *bool `yaml:"friendVerify"`
+	} `yaml:"messageVerify"`
+
+	IOSPush struct {
+		PushSound  string `yaml:"pushSound"`
+		BadgeCount bool   `yaml:"badgeCount"`
+		Production bool   `yaml:"production"`
+	} `yaml:"iosPush"`
+	Callback struct {
+		CallbackUrl                        string         `yaml:"url"`
+		CallbackBeforeSendSingleMsg        CallBackConfig `yaml:"beforeSendSingleMsg"`
+		CallbackAfterSendSingleMsg         CallBackConfig `yaml:"afterSendSingleMsg"`
+		CallbackBeforeSendGroupMsg         CallBackConfig `yaml:"beforeSendGroupMsg"`
+		CallbackAfterSendGroupMsg          CallBackConfig `yaml:"afterSendGroupMsg"`
+		CallbackMsgModify                  CallBackConfig `yaml:"msgModify"`
+		CallbackUserOnline                 CallBackConfig `yaml:"userOnline"`
+		CallbackUserOffline                CallBackConfig `yaml:"userOffline"`
+		CallbackUserKickOff                CallBackConfig `yaml:"userKickOff"`
+		CallbackOfflinePush                CallBackConfig `yaml:"offlinePush"`
+		CallbackOnlinePush                 CallBackConfig `yaml:"onlinePush"`
+		CallbackBeforeSuperGroupOnlinePush CallBackConfig `yaml:"superGroupOnlinePush"`
+		CallbackBeforeAddFriend            CallBackConfig `yaml:"beforeAddFriend"`
+		CallbackBeforeCreateGroup          CallBackConfig `yaml:"beforeCreateGroup"`
+		CallbackBeforeMemberJoinGroup      CallBackConfig `yaml:"beforeMemberJoinGroup"`
+		CallbackBeforeSetGroupMemberInfo   CallBackConfig `yaml:"beforeSetGroupMemberInfo"`
+	} `yaml:"callback"`
+
+	Prometheus struct {
+		Enable                        bool  `yaml:"enable"`
+		UserPrometheusPort            []int `yaml:"userPrometheusPort"`
+		FriendPrometheusPort          []int `yaml:"friendPrometheusPort"`
+		MessagePrometheusPort         []int `yaml:"messagePrometheusPort"`
+		MessageGatewayPrometheusPort  []int `yaml:"messageGatewayPrometheusPort"`
+		GroupPrometheusPort           []int `yaml:"groupPrometheusPort"`
+		AuthPrometheusPort            []int `yaml:"authPrometheusPort"`
+		PushPrometheusPort            []int `yaml:"pushPrometheusPort"`
+		ConversationPrometheusPort    []int `yaml:"conversationPrometheusPort"`
+		RtcPrometheusPort             []int `yaml:"rtcPrometheusPort"`
+		MessageTransferPrometheusPort []int `yaml:"messageTransferPrometheusPort"`
+		ThirdPrometheusPort           []int `yaml:"thirdPrometheusPort"`
+	} `yaml:"prometheus"`
+	Notification notification `yaml:"notification"`
+}
+
+type notification struct {
+	GroupCreated             NotificationConf `yaml:"groupCreated"`
+	GroupInfoSet             NotificationConf `yaml:"groupInfoSet"`
+	JoinGroupApplication     NotificationConf `yaml:"joinGroupApplication"`
+	MemberQuit               NotificationConf `yaml:"memberQuit"`
+	GroupApplicationAccepted NotificationConf `yaml:"groupApplicationAccepted"`
+	GroupApplicationRejected NotificationConf `yaml:"groupApplicationRejected"`
+	GroupOwnerTransferred    NotificationConf `yaml:"groupOwnerTransferred"`
+	MemberKicked             NotificationConf `yaml:"memberKicked"`
+	MemberInvited            NotificationConf `yaml:"memberInvited"`
+	MemberEnter              NotificationConf `yaml:"memberEnter"`
+	GroupDismissed           NotificationConf `yaml:"groupDismissed"`
+	GroupMuted               NotificationConf `yaml:"groupMuted"`
+	GroupCancelMuted         NotificationConf `yaml:"groupCancelMuted"`
+	GroupMemberMuted         NotificationConf `yaml:"groupMemberMuted"`
+	GroupMemberCancelMuted   NotificationConf `yaml:"groupMemberCancelMuted"`
+	GroupMemberInfoSet       NotificationConf `yaml:"groupMemberInfoSet"`
+	GroupMemberSetToAdmin    NotificationConf `yaml:"groupMemberSetToAdmin"`
+	GroupMemberSetToOrdinary NotificationConf `yaml:"groupMemberSetToOrdinaryUser"`
+	GroupInfoSetAnnouncement NotificationConf `yaml:"groupInfoSetAnnouncement"`
+	GroupInfoSetName         NotificationConf `yaml:"groupInfoSetName"`
+	////////////////////////user///////////////////////
+	UserInfoUpdated NotificationConf `yaml:"userInfoUpdated"`
+	//////////////////////friend///////////////////////
+	FriendApplicationAdded    NotificationConf `yaml:"friendApplicationAdded"`
+	FriendApplicationApproved NotificationConf `yaml:"friendApplicationApproved"`
+	FriendApplicationRejected NotificationConf `yaml:"friendApplicationRejected"`
+	FriendAdded               NotificationConf `yaml:"friendAdded"`
+	FriendDeleted             NotificationConf `yaml:"friendDeleted"`
+	FriendRemarkSet           NotificationConf `yaml:"friendRemarkSet"`
+	BlackAdded                NotificationConf `yaml:"blackAdded"`
+	BlackDeleted              NotificationConf `yaml:"blackDeleted"`
+	FriendInfoUpdated         NotificationConf `yaml:"friendInfoUpdated"`
+	//////////////////////conversation///////////////////////
+	ConversationChanged    NotificationConf `yaml:"conversationChanged"`
+	ConversationSetPrivate NotificationConf `yaml:"conversationSetPrivate"`
+}
+
+func (c *configStruct) GetServiceNames() []string {
+	return []string{
+		c.RpcRegisterName.OpenImUserName,
+		c.RpcRegisterName.OpenImFriendName,
+		c.RpcRegisterName.OpenImMsgName,
+		c.RpcRegisterName.OpenImPushName,
+		c.RpcRegisterName.OpenImMessageGatewayName,
+		c.RpcRegisterName.OpenImGroupName,
+		c.RpcRegisterName.OpenImAuthName,
+		c.RpcRegisterName.OpenImConversationName,
+		c.RpcRegisterName.OpenImThirdName,
+	}
+}
+
+func (c *configStruct) RegisterConf2Registry(registry discoveryregistry.SvcDiscoveryRegistry) error {
+	data, err := yaml.Marshal(c)
+	if err != nil {
+		return err
+	}
+	return registry.RegisterConf2Registry(ConfKey, data)
+}
+
+func (c *configStruct) GetConfFromRegistry(registry discoveryregistry.SvcDiscoveryRegistry) ([]byte, error) {
+	return registry.GetConfFromRegistry(ConfKey)
+}
+
+func (c *configStruct) EncodeConfig() []byte {
+	buf := bytes.NewBuffer(nil)
+	if err := yaml.NewEncoder(buf).Encode(c); err != nil {
+		panic(err)
+	}
+	return buf.Bytes()
+}

pkg/common/config/parse.go

@@ -17,23 +17,18 @@ package config
 import (
 	_ "embed"
 	"fmt"
-	"github.com/OpenIMSDK/tools/config"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor"
 	"os"
 	"path/filepath"
 	"runtime"
 
 	"gopkg.in/yaml.v3"
 
-	"github.com/OpenIMSDK/tools/constant"
-	"github.com/OpenIMSDK/tools/utils"
+	"github.com/OpenIMSDK/protocol/constant"
 )
 
 //go:embed version
-var version string
-
-func init() {
-	config.Version = version
-}
+var Version string
 
 var (
 	_, b, _, _ = runtime.Caller(0)
@@ -47,20 +42,20 @@ const (
 	DefaultFolderPath    = "../config/"
 )
 
-func GetOptionsByNotification(cfg config.NotificationConf) utils.Options {
-	opts := utils.NewOptions()
+func GetOptionsByNotification(cfg NotificationConf) msgprocessor.Options {
+	opts := msgprocessor.NewOptions()
 	if cfg.UnreadCount {
-		opts = utils.WithOptions(opts, utils.WithUnreadCount(true))
+		opts = msgprocessor.WithOptions(opts, msgprocessor.WithUnreadCount(true))
 	}
 	if cfg.OfflinePush.Enable {
-		opts = utils.WithOptions(opts, utils.WithOfflinePush(true))
+		opts = msgprocessor.WithOptions(opts, msgprocessor.WithOfflinePush(true))
 	}
 	switch cfg.ReliabilityLevel {
 	case constant.UnreliableNotification:
 	case constant.ReliableNotificationNoMsg:
-		opts = utils.WithOptions(opts, utils.WithHistory(true), utils.WithPersistent())
+		opts = msgprocessor.WithOptions(opts, msgprocessor.WithHistory(true), msgprocessor.WithPersistent())
 	}
-	opts = utils.WithOptions(opts, utils.WithSendMsg(cfg.IsSendMsg))
+	opts = msgprocessor.WithOptions(opts, msgprocessor.WithSendMsg(cfg.IsSendMsg))
 	return opts
 }
 
@@ -92,11 +87,11 @@ func initConfig(config interface{}, configName, configFolderPath string) error {
 }
 
 func InitConfig(configFolderPath string) error {
-	err := initConfig(&config.Config, FileName, configFolderPath)
+	err := initConfig(&Config, FileName, configFolderPath)
 	if err != nil {
 		return err
 	}
-	err = initConfig(&config.Config.Notification, NotificationFileName, configFolderPath)
+	err = initConfig(&Config.Notification, NotificationFileName, configFolderPath)
 	if err != nil {
 		return err
 	}

pkg/common/db/cache/init_redis.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/redis/go-redis/v9"
 
-	"github.com/OpenIMSDK/tools/config"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/mw/specialerror"
 )

pkg/common/db/cache/msg.go

@@ -16,6 +16,7 @@ package cache
 
 import (
 	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor"
 	"strconv"
 	"time"
 
@@ -25,10 +26,10 @@ import (
 
 	"github.com/gogo/protobuf/jsonpb"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/sdkws"
-	"github.com/OpenIMSDK/tools/config"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/utils"
 
@@ -374,7 +375,7 @@ func (c *msgCache) GetMessagesBySeq(
 			failedSeqs = append(failedSeqs, seqs[i])
 		} else {
 			msg := sdkws.MsgData{}
-			err = utils.String2Pb(cmd.Val(), &msg)
+			err = msgprocessor.String2Pb(cmd.Val(), &msg)
 			if err == nil {
 				if msg.Status != constant.MsgDeleted {
 					seqMsgs = append(seqMsgs, &msg)
@@ -394,7 +395,7 @@ func (c *msgCache) SetMessageToCache(ctx context.Context, conversationID string,
 	var failedMsgs []*sdkws.MsgData
 	for _, msg := range msgs {
 		key := c.getMessageCacheKey(conversationID, msg.Seq)
-		s, err := utils.Pb2String(msg)
+		s, err := msgprocessor.Pb2String(msg)
 		if err != nil {
 			return 0, errs.Wrap(err)
 		}
@@ -535,7 +536,7 @@ func (c *msgCache) DelMsgFromCache(ctx context.Context, userID string, seqs []in
 			return err
 		}
 		msg.Status = constant.MsgDeleted
-		s, err := utils.Pb2String(&msg)
+		s, err := msgprocessor.Pb2String(&msg)
 		if err != nil {
 			return errs.Wrap(err)
 		}

pkg/common/db/controller/auth.go

@@ -16,11 +16,12 @@ package controller
 
 import (
 	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
 
 	"github.com/golang-jwt/jwt/v4"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
-	"github.com/OpenIMSDK/tools/constant"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/tokenverify"
 	"github.com/OpenIMSDK/tools/utils"
 )
@@ -60,7 +61,7 @@ func (a *authDatabase) CreateToken(ctx context.Context, userID string, platformI
 	}
 	var deleteTokenKey []string
 	for k, v := range tokens {
-		_, err = tokenverify.GetClaimFromToken(k)
+		_, err = tokenverify.GetClaimFromToken(k, authverify.Secret())
 		if err != nil || v != constant.NormalToken {
 			deleteTokenKey = append(deleteTokenKey, k)
 		}

pkg/common/db/controller/conversation.go

@@ -16,11 +16,12 @@ package controller
 
 import (
 	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor"
 	"time"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
-	"github.com/OpenIMSDK/tools/constant"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/tx"
 	"github.com/OpenIMSDK/tools/utils"
@@ -236,7 +237,7 @@ func (c *conversationDatabase) FindRecvMsgNotNotifyUserIDs(ctx context.Context,
 
 func (c *conversationDatabase) CreateGroupChatConversation(ctx context.Context, groupID string, userIDs []string) error {
 	cache := c.cache.NewCache()
-	conversationID := utils.GetConversationIDBySessionType(constant.SuperGroupChatType, groupID)
+	conversationID := msgprocessor.GetConversationIDBySessionType(constant.SuperGroupChatType, groupID)
 	if err := c.tx.Transaction(func(tx any) error {
 		existConversationUserIDs, err := c.conversationDB.FindUserID(ctx, userIDs, []string{conversationID})
 		if err != nil {

pkg/common/db/controller/friend.go

@@ -22,8 +22,9 @@ import (
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
-	"github.com/OpenIMSDK/tools/constant"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/errs"
+	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/mcontext"
 	"github.com/OpenIMSDK/tools/tx"
 	"github.com/OpenIMSDK/tools/utils"
@@ -75,6 +76,7 @@ type FriendDatabase interface {
 		friendUserIDs []string,
 	) (friends []*relation.FriendModel, err error)
 	FindFriendUserIDs(ctx context.Context, ownerUserID string) (friendUserIDs []string, err error)
+	FindBothFriendRequests(ctx context.Context, fromUserID, toUserID string) (friends []*relation.FriendRequestModel, err error)
 }
 
 type friendDatabase struct {
@@ -221,6 +223,7 @@ func (f *friendDatabase) AgreeFriendRequest(
 	friendRequest *relation.FriendRequestModel,
 ) (err error) {
 	return f.tx.Transaction(func(tx any) error {
+		defer log.ZDebug(ctx, "return line")
 		now := time.Now()
 		fr, err := f.friendRequest.NewTx(tx).Take(ctx, friendRequest.FromUserID, friendRequest.ToUserID)
 		if err != nil {
@@ -246,7 +249,7 @@ func (f *friendDatabase) AgreeFriendRequest(
 			if err != nil {
 				return err
 			}
-		} else if errs.Unwrap(err) != gorm.ErrRecordNotFound {
+		} else if err != nil && errs.Unwrap(err) != gorm.ErrRecordNotFound {
 			return err
 		}
 
@@ -363,3 +366,7 @@ func (f *friendDatabase) FindFriendUserIDs(
 ) (friendUserIDs []string, err error) {
 	return f.cache.GetFriendIDs(ctx, ownerUserID)
 }
+
+func (f *friendDatabase) FindBothFriendRequests(ctx context.Context, fromUserID, toUserID string) (friends []*relation.FriendRequestModel, err error) {
+	return f.friendRequest.FindBothFriendRequests(ctx, fromUserID, toUserID)
+}

pkg/common/db/controller/group.go

@@ -29,7 +29,7 @@ import (
 	relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation"
-	"github.com/OpenIMSDK/tools/constant"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/tx"
 	"github.com/OpenIMSDK/tools/utils"
 )
@@ -110,6 +110,7 @@ type GroupDatabase interface {
 	// GroupRequest
 	CreateGroupRequest(ctx context.Context, requests []*relationTb.GroupRequestModel) error
 	TakeGroupRequest(ctx context.Context, groupID string, userID string) (*relationTb.GroupRequestModel, error)
+	FindGroupRequests(ctx context.Context, groupID string, userIDs []string) (int64, []*relationTb.GroupRequestModel, error)
 	PageGroupRequestUser(
 		ctx context.Context,
 		userID string,
@@ -576,3 +577,7 @@ func (g *groupDatabase) CountTotal(ctx context.Context, before *time.Time) (coun
 func (g *groupDatabase) CountRangeEverydayTotal(ctx context.Context, start time.Time, end time.Time) (map[string]int64, error) {
 	return g.groupDB.CountRangeEverydayTotal(ctx, start, end)
 }
+
+func (g *groupDatabase) FindGroupRequests(ctx context.Context, groupID string, userIDs []string) (int64, []*relationTb.GroupRequestModel, error) {
+	return g.groupRequestDB.FindGroupRequests(ctx, groupID, userIDs)
+}

pkg/common/db/controller/msg.go

@@ -21,13 +21,13 @@ import (
 
 	"github.com/redis/go-redis/v9"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/kafka"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome"
-	"github.com/OpenIMSDK/tools/config"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
 

pkg/common/db/controller/msg_test.go

@@ -27,9 +27,9 @@ import (
 
 	"go.mongodb.org/mongo-driver/bson"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation"
-	"github.com/OpenIMSDK/tools/config"
 )
 
 func Test_BatchInsertChat2DB(t *testing.T) {
@@ -203,7 +203,7 @@ func Test_Revoke(t *testing.T) {
 }
 
 func Test_FindBySeq(t *testing.T) {
-	if err := log.InitFromConfig("", "", 6, true, false, "", 2); err != nil {
+	if err := log.InitFromConfig("", "", 6, true, false, "", 2, 1); err != nil {
 		t.Fatal(err)
 	}
 	db := GetDB()

pkg/common/db/relation/chat_log_model.go

@@ -21,9 +21,9 @@ import (
 	"gorm.io/gorm"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	"github.com/OpenIMSDK/protocol/constant"
 	pbMsg "github.com/OpenIMSDK/protocol/msg"
 	sdkws "github.com/OpenIMSDK/protocol/sdkws"
-	"github.com/OpenIMSDK/tools/constant"
 	"github.com/OpenIMSDK/tools/utils"
 )
 

pkg/common/db/relation/conversation_model.go

@@ -20,7 +20,7 @@ import (
 	"gorm.io/gorm"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
-	"github.com/OpenIMSDK/tools/constant"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/utils"
 )
 

pkg/common/db/relation/friend_request_model.go

@@ -147,3 +147,14 @@ func (f *FriendRequestGorm) FindFromUserID(
 	)
 	return
 }
+
+func (f *FriendRequestGorm) FindBothFriendRequests(ctx context.Context, fromUserID, toUserID string) (friends []*relation.FriendRequestModel, err error) {
+	err = utils.Wrap(
+		f.db(ctx).
+			Where("(from_user_id = ? AND to_user_id = ?) OR (from_user_id = ? AND to_user_id = ?)", fromUserID, toUserID, toUserID, fromUserID).
+			Find(&friends).
+			Error,
+		"",
+	)
+	return
+}

pkg/common/db/relation/group_member_model.go

@@ -20,7 +20,7 @@ import (
 	"gorm.io/gorm"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
-	"github.com/OpenIMSDK/tools/constant"
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/ormutil"
 	"github.com/OpenIMSDK/tools/utils"
 )

pkg/common/db/relation/group_model.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/OpenIMSDK/tools/constant"
+	"github.com/OpenIMSDK/protocol/constant"
 
 	"gorm.io/gorm"
 

pkg/common/db/relation/group_request_model.go

@@ -110,3 +110,8 @@ func (g *GroupRequestGorm) PageGroup(
 		showNumber,
 	)
 }
+
+func (g *GroupRequestGorm) FindGroupRequests(ctx context.Context, groupID string, userIDs []string) (total int64, groupRequests []*relation.GroupRequestModel, err error) {
+	err = g.DB.WithContext(ctx).Where("group_id = ? and user_id in ?", groupID, userIDs).Find(&groupRequests).Error
+	return int64(len(groupRequests)), groupRequests, utils.Wrap(err, utils.GetSelfFuncName())
+}