Merge pull request #2177 from openimsdk/cubxxw-patch-2

update release-v3.1 images
Update README.md
2026-04-28 22:39:18 +08:00 · 2024-04-10 19:51:14 +08:00 · 2024-04-10 19:47:00 +08:00 · 2023-10-13 11:46:52 +08:00 · 2023-10-13 10:38:05 +08:00 · 2023-08-15 14:35:33 +08:00
30 changed files with 966 additions and 313 deletions
@@ -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://127.0.0.1:10005
+API_URL=http://127.0.0.1:10002/object/
+DATA_DIR=./
@@ -18,6 +18,7 @@ on:
  push:
    branches:
      - main
+      - release-*
    tags:
      - v*
  workflow_dispatch:
@@ -29,82 +30,71 @@ jobs:
      - name: Check out the repo
        uses: actions/checkout@v3

+      - 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@f054a8b539a109f9f41c372932f1ae047eff08c9
+        uses: docker/login-action@v2
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}

-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
-        with:
-          images: openim/openim-server
-          tags: latest
-
      - name: Build and push Docker image
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        uses: docker/build-push-action@v4
        with:
          context: .
-          push: true
+          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@f054a8b539a109f9f41c372932f1ae047eff08c9
+        uses: docker/login-action@v2
        with:
          registry: registry.cn-hangzhou.aliyuncs.com
          username: ${{ secrets.ALIREGISTRY_USERNAME }}
          password: ${{ secrets.ALIREGISTRY_TOKEN }}
      
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta2
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
-        with:
-          images: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server
-          tags: latest
-      
      - name: Build and push Docker image
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        uses: docker/build-push-action@v4
        with:
          context: .
-          push: true
+          push: ${{ github.event_name != 'pull_request' }}
          tags: ${{ steps.meta2.outputs.tags }}
          labels: ${{ steps.meta2.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
+# 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.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta3.outputs.tags }}
+          labels: ${{ steps.meta3.outputs.labels }}
@@ -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
@@ -335,66 +335,66 @@ changelog:
    - title: Other work
      order: 9999

-dockers:
-  - image_templates:
-      - "openimsdk/open-im-server:{{ .Tag }}-amd64"
-      - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-amd64"
-    dockerfile: Dockerfile
-    use: buildx
-    build_flag_templates:
-      - "--pull"
-      - "--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}}"
-      - "--label=org.opencontainers.image.version={{.Version}}"
-      - "--label=org.opencontainers.image.source={{.GitURL}}"
-      - "--platform=linux/amd64"
-    extra_files:
-      - scripts/entrypoint.sh
-  - image_templates:
-      - "goreleaser/goreleaser:{{ .Tag }}-arm64"
-      - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-arm64"
-    dockerfile: Dockerfile
-    use: buildx
-    build_flag_templates:
-      - "--pull"
-      - "--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}}"
-      - "--label=org.opencontainers.image.version={{.Version}}"
-      - "--label=org.opencontainers.image.source={{.GitURL}}"
-      - "--platform=linux/arm64"
-    goarch: arm64
-    extra_files:
-      - scripts/entrypoint.sh
+# dockers:
+#   - image_templates:
+#       - "openimsdk/open-im-server:{{ .Tag }}-amd64"
+#       - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-amd64"
+#     dockerfile: Dockerfile
+#     use: buildx
+#     build_flag_templates:
+#       - "--pull"
+#       - "--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}}"
+#       - "--label=org.opencontainers.image.version={{.Version}}"
+#       - "--label=org.opencontainers.image.source={{.GitURL}}"
+#       - "--platform=linux/amd64"
+#     extra_files:
+#       - scripts/entrypoint.sh
+#   - image_templates:
+#       - "goreleaser/goreleaser:{{ .Tag }}-arm64"
+#       - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-arm64"
+#     dockerfile: Dockerfile
+#     use: buildx
+#     build_flag_templates:
+#       - "--pull"
+#       - "--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}}"
+#       - "--label=org.opencontainers.image.version={{.Version}}"
+#       - "--label=org.opencontainers.image.source={{.GitURL}}"
+#       - "--platform=linux/arm64"
+#     goarch: arm64
+#     extra_files:
+#       - scripts/entrypoint.sh

-docker_manifests:
-  - name_template: "goreleaser/goreleaser:{{ .Tag }}"
-    image_templates:
-      - "goreleaser/goreleaser:{{ .Tag }}-amd64"
-      - "goreleaser/goreleaser:{{ .Tag }}-arm64"
-  - name_template: "ghcr.io/goreleaser/goreleaser:{{ .Tag }}"
-    image_templates:
-      - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-amd64"
-      - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-arm64"
-  - name_template: "goreleaser/goreleaser:latest"
-    image_templates:
-      - "goreleaser/goreleaser:{{ .Tag }}-amd64"
-      - "goreleaser/goreleaser:{{ .Tag }}-arm64"
-  - name_template: "ghcr.io/goreleaser/goreleaser:latest"
-    image_templates:
-      - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-amd64"
-      - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-arm64"
+# docker_manifests:
+#   - name_template: "goreleaser/goreleaser:{{ .Tag }}"
+#     image_templates:
+#       - "goreleaser/goreleaser:{{ .Tag }}-amd64"
+#       - "goreleaser/goreleaser:{{ .Tag }}-arm64"
+#   - name_template: "ghcr.io/goreleaser/goreleaser:{{ .Tag }}"
+#     image_templates:
+#       - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-amd64"
+#       - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-arm64"
+#   - name_template: "goreleaser/goreleaser:latest"
+#     image_templates:
+#       - "goreleaser/goreleaser:{{ .Tag }}-amd64"
+#       - "goreleaser/goreleaser:{{ .Tag }}-arm64"
+#   - name_template: "ghcr.io/goreleaser/goreleaser:latest"
+#     image_templates:
+#       - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-amd64"
+#       - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-arm64"

 nfpms:
  - id: packages
@@ -480,6 +480,9 @@ checksum:

 release:
  footer: |
+  
+    ## Welcome to the {{ .Tag }} release of [chat](https://github.com/OpenIMSDK/chat)!🎉🎉!
+
    **Full Changelog**: https://github.com/OpenIMSDK/Open-IM-Server/compare/{{ .PreviousTag }}...{{ .Tag }}

    ## Helping out
@@ -22,7 +22,8 @@ RUN /bin/sh -c "make build"
 # Production Stage
 FROM alpine

-RUN apk --no-cache add tzdata
+RUN echo "https://mirrors.aliyun.com/alpine/v3.4/main" > /etc/apk/repositories && \
+    apk --no-cache add tzdata ca-certificates bash

 # Set directory to map logs, config files, scripts, and SDK
 VOLUME ["/Open-IM-Server/logs", "/Open-IM-Server/config", "/Open-IM-Server/scripts", "/Open-IM-Server/db/sdk"]
@@ -33,4 +34,4 @@ COPY --from=builder /Open-IM-Server/_output/bin/platforms/linux/amd64 /Open-IM-S

 WORKDIR /Open-IM-Server/scripts

-CMD ["docker_start_all.sh"]
+CMD ["./docker_start_all.sh"]
@@ -8,7 +8,6 @@
    ⭐️  Open source Instant Messaging Server ⭐️ <br>
 <h3>

-
 <p align=center>
 <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>
@@ -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 ]            #目前仅支持单机
+  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                      #慢语句阈值 （毫秒）
+  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 默认即可
+  uri:
+  address: [ 127.0.0.1:37017 ]
+  database: openIM_v3
  username: root
  password: openIM123
-  maxPoolSize: 100
+  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
+  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://127.0.0.1:10002/object/
  minio:
-    bucket: "openim"                      #不建议修改
-    endpoint: http://127.0.0.1:10005      #地址需要app能够访问
+    bucket: "openim"                      
+    endpoint: http://127.0.0.1:10005
    accessKeyID: root
    secretAccessKey: openIM123
-    sessionToken: ""            #token
-  cos: #tencent cos
+    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"

+# 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 ]
@@ -100,7 +100,7 @@ services:


  openim_server:
-    image: ghcr.io/openimsdk/openim-server:v3.0
+    image: ghcr.io/openimsdk/openim-server:release-v3.1
    container_name: openim-server
    volumes:
      - ./logs:/Open-IM-Server/logs
@@ -124,7 +124,7 @@ services:
        max-file: "2"

  openim_chat:
-    image: ghcr.io/openimsdk/openim-chat:v1.0.0
+    image: ghcr.io/openimsdk/openim-chat:v1.1.1
    container_name: openim_chat
    restart: always
    depends_on:
@@ -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.
@@ -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
+
@@ -37,7 +37,7 @@ require (
 require github.com/google/uuid v1.3.0

 require (
-	github.com/OpenIMSDK/protocol v0.0.1
+	github.com/OpenIMSDK/protocol v0.0.2
 	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
@@ -16,8 +16,8 @@ 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.1 h1:Q6J1jCU00dfqmguxw2XI+IGcVfBAkb5Tz8LgvyeNkk0=
-github.com/OpenIMSDK/protocol v0.0.1/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y=
+github.com/OpenIMSDK/protocol v0.0.2 h1:O53/WiqLCHF9aWPLI32GPF82hn7suM8PkhrtL89Klrw=
+github.com/OpenIMSDK/protocol v0.0.2/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=
@@ -308,9 +308,9 @@ function cmd_help() {
    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} "-g,  --go-version    ${CYAN_PREFIX}set the Go language version (default: GO_VERSION=\"1.18\")${COLOR_SUFFIX}"
-    color_echo ${BLUE_PREFIX} "-i,  --install-dir   ${CYAN_PREFIX}set the OpenIM installation directory (default: /tmp)${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}"
@@ -380,7 +380,7 @@ function parseinput() {
                shift
                GO_VERSION=$1
                ;;
-            -i|--install-dir)
+            --install-dir)
                shift
                INSTALL_DIR=$1
                ;;
@@ -435,7 +435,7 @@ print_progress() {
 color_echo() {
    COLOR=$1
    shift
-    echo -e "${COLOR}===> $* ${COLOR_SUFFIX}"
+    echo -e "${COLOR} $* ${COLOR_SUFFIX}"
 }

 # Color definitions
@@ -79,6 +79,10 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 		userRouterGroup.POST("/get_users", ParseToken, u.GetUsers)
 		userRouterGroup.POST("/get_users_online_status", ParseToken, u.GetUsersOnlineStatus)
 		userRouterGroup.POST("/get_users_online_token_detail", ParseToken, u.GetUsersOnlineTokenDetail)
+		userRouterGroup.POST("/subscribe_users_status", ParseToken, u.UnSubscriberStatus)
+		userRouterGroup.POST("/unsubscribe_users_status", ParseToken, u.UnSubscriberStatus)
+		userRouterGroup.POST("/get_users_status", ParseToken, u.GetUserStatus)
+
 	}
 	// friend routing group
 	friendRouterGroup := r.Group("/friend", ParseToken)
@@ -62,6 +62,7 @@ func (u *UserApi) GetUsers(c *gin.Context) {
 	a2r.Call(user.UserClient.GetPaginationUsers, u.Client, c)
 }

+// GetUsersOnlineStatus Get user online status.
 func (u *UserApi) GetUsersOnlineStatus(c *gin.Context) {
 	var req msggateway.GetUsersOnlineStatusReq
 	if err := c.BindJSON(&req); err != nil {
@@ -95,13 +96,13 @@ func (u *UserApi) GetUsersOnlineStatus(c *gin.Context) {
 			wsResult = append(wsResult, reply.SuccessResult...)
 		}
 	}
-	// 遍历 api 请求体中的 userIDs
+	// Traversing the userIDs in the api request body
 	for _, v1 := range req.UserIDs {
 		flag = false
 		res := new(msggateway.GetUsersOnlineStatusResp_SuccessResult)
-		// 遍历从各个网关中获取的在线结果
+		// Iterate through the online results fetched from various gateways
 		for _, v2 := range wsResult {
-			// 如果匹配上说明在线，反之
+			// If matches the above description on the line, and vice versa
 			if v2.UserID == v1 {
 				flag = true
 				res.UserID = v1
@@ -123,6 +124,7 @@ func (u *UserApi) UserRegisterCount(c *gin.Context) {
 	a2r.Call(user.UserClient.UserRegisterCount, u.Client, c)
 }

+// GetUsersOnlineTokenDetail Get user online token details.
 func (u *UserApi) GetUsersOnlineTokenDetail(c *gin.Context) {
 	var wsResult []*msggateway.GetUsersOnlineStatusResp_SuccessResult
 	var respResult []*msggateway.SingleDetail
@@ -182,3 +184,17 @@ func (u *UserApi) GetUsersOnlineTokenDetail(c *gin.Context) {

 	apiresp.GinSuccess(c, respResult)
 }
+
+// SubscriberStatus Presence status of subscribed users.
+func (u *UserApi) SubscriberStatus(c *gin.Context) {
+	a2r.Call(user.UserClient.SubscribeOrCancelUsersStatus, u.Client, c)
+}
+
+// UnSubscriberStatus Unsubscribe a user's presence.
+func (u *UserApi) UnSubscriberStatus(c *gin.Context) {
+	a2r.Call(user.UserClient.SubscribeOrCancelUsersStatus, u.Client, c)
+}
+
+func (u *UserApi) GetUserStatus(c *gin.Context) {
+	a2r.Call(user.UserClient.GetUserStatus, u.Client, c)
+}
@@ -39,7 +39,13 @@ type Req struct {
 }

 func (r *Req) String() string {
-	return utils.StructToJsonString(r)
+	var tReq Req
+	tReq.ReqIdentifier = r.ReqIdentifier
+	tReq.Token = r.Token
+	tReq.SendID = r.SendID
+	tReq.OperationID = r.OperationID
+	tReq.MsgIncr = r.MsgIncr
+	return utils.StructToJsonString(tReq)
 }

 type Resp struct {
@@ -52,6 +58,12 @@ type Resp struct {
 }

 func (r *Resp) String() string {
+	var tResp Resp
+	tResp.ReqIdentifier = r.ReqIdentifier
+	tResp.MsgIncr = r.MsgIncr
+	tResp.OperationID = r.OperationID
+	tResp.ErrCode = r.ErrCode
+	tResp.ErrMsg = r.ErrMsg
 	return utils.StructToJsonString(r)
 }

@@ -17,14 +17,15 @@ package group
 import (
 	"context"
 	"fmt"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/msgprocessor"
 	"math/big"
 	"math/rand"
 	"strconv"
 	"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"

@@ -718,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)
@@ -1039,7 +1040,7 @@ func (s *groupServer) GetUserReqApplicationList(ctx context.Context, req *pbGrou
 	groupIDs := utils.Distinct(utils.Slice(requests, func(e *relationTb.GroupRequestModel) string {
 		return e.GroupID
 	}))
-	groups, err := s.GroupDatabase.FindGroup(ctx, groupIDs)
+	groups, err := s.GroupDatabase.FindNotDismissedGroup(ctx, groupIDs)
 	if err != nil {
 		return nil, err
 	}
@@ -17,13 +17,12 @@ package user
 import (
 	"context"
 	"errors"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/unrelation"
+	"github.com/OpenIMSDK/tools/log"
 	"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"
@@ -60,6 +59,10 @@ func Start(client registry.SvcDiscoveryRegistry, server *grpc.Server) error {
 	if err != nil {
 		return err
 	}
+	mongo, err := unrelation.NewMongo()
+	if err != nil {
+		return err
+	}
 	if err := db.AutoMigrate(&tablerelation.UserModel{}); err != nil {
 		return err
 	}
@@ -72,7 +75,8 @@ func Start(client registry.SvcDiscoveryRegistry, server *grpc.Server) error {
 	}
 	userDB := relation.NewUserGorm(db)
 	cache := cache.NewUserCacheRedis(rdb, userDB, cache.GetDefaultOpt())
-	database := controller.NewUserDatabase(userDB, cache, tx.NewGorm(db))
+	userMongoDB := unrelation.NewUserMongoDriver(mongo.GetDatabase())
+	database := controller.NewUserDatabase(userDB, cache, tx.NewGorm(db), userMongoDB)
 	friendRpcClient := rpcclient.NewFriendRpcClient(client)
 	msgRpcClient := rpcclient.NewMessageRpcClient(client)
 	u := &userServer{
@@ -235,6 +239,7 @@ func (s *userServer) GetGlobalRecvMessageOpt(ctx context.Context, req *pbuser.Ge
 	return &pbuser.GetGlobalRecvMessageOptResp{GlobalRecvMsgOpt: user[0].GlobalRecvMsgOpt}, nil
 }

+// GetAllUserID Get user account by page.
 func (s *userServer) GetAllUserID(ctx context.Context, req *pbuser.GetAllUserIDReq) (resp *pbuser.GetAllUserIDResp, err error) {
 	userIDs, err := s.UserDatabase.GetAllUserID(ctx, req.Pagination.PageNumber, req.Pagination.ShowNumber)
 	if err != nil {
@@ -243,6 +248,31 @@ func (s *userServer) GetAllUserID(ctx context.Context, req *pbuser.GetAllUserIDR
 	return &pbuser.GetAllUserIDResp{UserIDs: userIDs}, nil
 }

+// SubscribeOrCancelUsersStatus Subscribe online or cancel online users.
 func (s *userServer) SubscribeOrCancelUsersStatus(ctx context.Context, req *pbuser.SubscribeOrCancelUsersStatusReq) (resp *pbuser.SubscribeOrCancelUsersStatusResp, err error) {
-	panic("implement me")
+	err = s.UserDatabase.SubscribeOrCancelUsersStatus(ctx, req.UserID, req.UserIDs, req.Genre)
+	if err != nil {
+		return nil, err
+	}
+	//var status map[string][]string
+	//TODO 获取用户在线列表，返回订阅的用户的在线列表
+
+	return &pbuser.SubscribeOrCancelUsersStatusResp{}, nil
+}
+
+func (s *userServer) GetUserStatus(ctx context.Context, req *pbuser.GetUserStatusReq) (resp *pbuser.GetUserStatusResp, err error) {
+	//TODO 是否加一个参数校验-判断req.userID的数量，每一个获取加一个限制，一次请求限制500？
+	onlineStatusList, err := s.UserDatabase.GetUserStatus(ctx, req.UserIDs)
+	if err != nil {
+		return nil, err
+	}
+	return &pbuser.GetUserStatusResp{StatusList: onlineStatusList}, nil
+}
+
+func (s *userServer) SetUserStatus(ctx context.Context, req *pbuser.SetUserStatusReq) (resp *pbuser.SetUserStatusResp, err error) {
+	err = s.UserDatabase.SetUserStatus(ctx, req.StatusList)
+	if err != nil {
+		return nil, err
+	}
+	return &pbuser.SetUserStatusResp{}, nil
 }
@@ -82,10 +82,12 @@ func InitMsgTool() (*MsgTool, error) {
 	discov.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	userDB := relation.NewUserGorm(db)
 	msgDatabase := controller.InitCommonMsgDatabase(rdb, mongo.GetDatabase())
+	userMongoDB := unrelation.NewUserMongoDriver(mongo.GetDatabase())
 	userDatabase := controller.NewUserDatabase(
 		userDB,
 		cache.NewUserCacheRedis(rdb, relation.NewUserGorm(db), cache.GetDefaultOpt()),
 		tx.NewGorm(db),
+		userMongoDB,
 	)
 	groupDatabase := controller.InitGroupDatabase(db, rdb, mongo.GetDatabase())
 	conversationDatabase := controller.NewConversationDatabase(
@@ -16,6 +16,9 @@ package cache

 import (
 	"context"
+	"encoding/json"
+	"github.com/OpenIMSDK/protocol/user"
+	"strconv"
 	"time"

 	"github.com/dtm-labs/rockscache"
@@ -25,9 +28,12 @@ import (
 )

 const (
-	userExpireTime          = time.Second * 60 * 60 * 12
-	userInfoKey             = "USER_INFO:"
-	userGlobalRecvMsgOptKey = "USER_GLOBAL_RECV_MSG_OPT_KEY:"
+	userExpireTime            = time.Second * 60 * 60 * 12
+	userInfoKey               = "USER_INFO:"
+	userGlobalRecvMsgOptKey   = "USER_GLOBAL_RECV_MSG_OPT_KEY:"
+	olineStatusKey            = "ONLINE_STATUS:"
+	userOlineStatusExpireTime = time.Second * 60 * 60 * 24
+	statusMod                 = 500
 )

 type UserCache interface {
@@ -38,10 +44,13 @@ type UserCache interface {
 	DelUsersInfo(userIDs ...string) UserCache
 	GetUserGlobalRecvMsgOpt(ctx context.Context, userID string) (opt int, err error)
 	DelUsersGlobalRecvMsgOpt(userIDs ...string) UserCache
+	GetUserStatus(ctx context.Context, userIDs []string) ([]*user.OnlineStatus, error)
+	SetUserStatus(ctx context.Context, list []*user.OnlineStatus) error
 }

 type UserCacheRedis struct {
 	metaCache
+	rdb        redis.UniversalClient
 	userDB     relationTb.UserModelInterface
 	expireTime time.Duration
 	rcClient   *rockscache.Client
@@ -54,6 +63,7 @@ func NewUserCacheRedis(
 ) UserCache {
 	rcClient := rockscache.NewClient(rdb, options)
 	return &UserCacheRedis{
+		rdb:        rdb,
 		metaCache:  NewMetaCacheRedis(rcClient),
 		userDB:     userDB,
 		expireTime: userExpireTime,
@@ -63,6 +73,7 @@ func NewUserCacheRedis(

 func (u *UserCacheRedis) NewCache() UserCache {
 	return &UserCacheRedis{
+		rdb:        u.rdb,
 		metaCache:  NewMetaCacheRedis(u.rcClient, u.metaCache.GetPreDelKeys()...),
 		userDB:     u.userDB,
 		expireTime: u.expireTime,
@@ -145,3 +156,71 @@ func (u *UserCacheRedis) DelUsersGlobalRecvMsgOpt(userIDs ...string) UserCache {
 	cache.AddKeys(keys...)
 	return cache
 }
+
+func (u *UserCacheRedis) getOnlineStatusKey(userID string) string {
+	return olineStatusKey + userID
+}
+
+// GetUserStatus get user status
+func (u *UserCacheRedis) GetUserStatus(ctx context.Context, userIDs []string) ([]*user.OnlineStatus, error) {
+	var res []*user.OnlineStatus
+	for _, userID := range userIDs {
+		UserIDNum, err := strconv.Atoi(userID)
+		if err != nil {
+			return nil, err
+		}
+		var modKey = strconv.Itoa(UserIDNum % statusMod)
+		var onlineStatus user.OnlineStatus
+		key := olineStatusKey + modKey
+		result, err := u.rdb.HGet(ctx, key, userID).Result()
+		if err != nil {
+			if err == redis.Nil {
+				// key or field does not exist
+				res = append(res, &user.OnlineStatus{
+					UserID:     userID,
+					Status:     0,
+					PlatformID: -1,
+				})
+				continue
+			} else {
+				return nil, err
+			}
+		}
+		err = json.Unmarshal([]byte(result), &onlineStatus)
+		if err != nil {
+			return nil, err
+		}
+		onlineStatus.UserID = userID
+		res = append(res, &onlineStatus)
+	}
+	return res, nil
+}
+
+// SetUserStatus Set the user status and save it in redis
+func (u *UserCacheRedis) SetUserStatus(ctx context.Context, list []*user.OnlineStatus) error {
+	for _, status := range list {
+		var isNewKey int64
+		UserIDNum, err := strconv.Atoi(status.UserID)
+		if err != nil {
+			return err
+		}
+		var modKey = strconv.Itoa(UserIDNum % statusMod)
+		key := olineStatusKey + modKey
+		jsonData, err := json.Marshal(status)
+		if err != nil {
+			return err
+		}
+		isNewKey, err = u.rdb.Exists(ctx, key).Result()
+		if err != nil {
+			return err
+		}
+		_, err = u.rdb.HSet(ctx, key, status.UserID, string(jsonData)).Result()
+		if err != nil {
+			return err
+		}
+		if isNewKey > 0 {
+			u.rdb.Expire(ctx, key, userOlineStatusExpireTime)
+		}
+	}
+	return nil
+}
@@ -24,6 +24,7 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"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"
@@ -222,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 {
@@ -247,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
 		}

@@ -39,6 +39,7 @@ type GroupDatabase interface {
 	CreateGroup(ctx context.Context, groups []*relationTb.GroupModel, groupMembers []*relationTb.GroupMemberModel) error
 	TakeGroup(ctx context.Context, groupID string) (group *relationTb.GroupModel, err error)
 	FindGroup(ctx context.Context, groupIDs []string) (groups []*relationTb.GroupModel, err error)
+	FindNotDismissedGroup(ctx context.Context, groupIDs []string) (groups []*relationTb.GroupModel, err error)
 	SearchGroup(
 		ctx context.Context,
 		keyword string,
@@ -581,3 +582,7 @@ func (g *groupDatabase) CountRangeEverydayTotal(ctx context.Context, start time.
 func (g *groupDatabase) FindGroupRequests(ctx context.Context, groupID string, userIDs []string) (int64, []*relationTb.GroupRequestModel, error) {
 	return g.groupRequestDB.FindGroupRequests(ctx, groupID, userIDs)
 }
+
+func (g *groupDatabase) FindNotDismissedGroup(ctx context.Context, groupIDs []string) (groups []*relationTb.GroupModel, err error) {
+	return g.groupDB.FindNotDismissedGroup(ctx, groupIDs)
+}
@@ -16,6 +16,9 @@ package controller

 import (
 	"context"
+	unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
+	"github.com/OpenIMSDK/protocol/constant"
+	"github.com/OpenIMSDK/protocol/user"
 	"time"

 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
@@ -26,38 +29,49 @@ import (
 )

 type UserDatabase interface {
-	// 获取指定用户的信息 如有userID未找到 也返回错误
+	// FindWithError Get the information of the specified user. If the userID is not found, it will also return an error
 	FindWithError(ctx context.Context, userIDs []string) (users []*relation.UserModel, err error)
-	// 获取指定用户的信息 如有userID未找到 不返回错误
+	// Find Get the information of the specified user If the userID is not found, no error will be returned
 	Find(ctx context.Context, userIDs []string) (users []*relation.UserModel, err error)
-	// 插入多条 外部保证userID 不重复 且在db中不存在
+	// Create Insert multiple external guarantees that the userID is not repeated and does not exist in the db
 	Create(ctx context.Context, users []*relation.UserModel) (err error)
-	// 更新（非零值） 外部保证userID存在
+	// Update update (non-zero value) external guarantee userID exists
 	Update(ctx context.Context, user *relation.UserModel) (err error)
-	// 更新（零值） 外部保证userID存在
+	// UpdateByMap update (zero value) external guarantee userID exists
 	UpdateByMap(ctx context.Context, userID string, args map[string]interface{}) (err error)
-	// 如果没找到，不返回错误
+	// Page If not found, no error is returned
 	Page(ctx context.Context, pageNumber, showNumber int32) (users []*relation.UserModel, count int64, err error)
-	// 只要有一个存在就为true
+	// IsExist true as long as one exists
 	IsExist(ctx context.Context, userIDs []string) (exist bool, err error)
-	// 获取所有用户ID
+	// GetAllUserID Get all user IDs
 	GetAllUserID(ctx context.Context, pageNumber, showNumber int32) ([]string, error)
-	// 函数内部先查询db中是否存在，存在则什么都不做；不存在则插入
+	// InitOnce Inside the function, first query whether it exists in the db, if it exists, do nothing; if it does not exist, insert it
 	InitOnce(ctx context.Context, users []*relation.UserModel) (err error)
-	// 获取用户总数
+	// CountTotal Get the total number of users
 	CountTotal(ctx context.Context, before *time.Time) (int64, error)
-	// 获取范围内用户增量
+	// CountRangeEverydayTotal Get the user increment in the range
 	CountRangeEverydayTotal(ctx context.Context, start time.Time, end time.Time) (map[string]int64, error)
+	//SubscribeOrCancelUsersStatus Subscribe or unsubscribe a user's presence status
+	SubscribeOrCancelUsersStatus(ctx context.Context, userID string, userIDs []string, genre int32) error
+	// GetAllSubscribeList Get a list of all subscriptions
+	GetAllSubscribeList(ctx context.Context, userID string) ([]string, error)
+	// GetSubscribedList Get all subscribed lists
+	GetSubscribedList(ctx context.Context, userID string) ([]string, error)
+	// GetUserStatus Get the online status of the user
+	GetUserStatus(ctx context.Context, userIDs []string) ([]*user.OnlineStatus, error)
+	// SetUserStatus Set the user status and store the user status in redis
+	SetUserStatus(ctx context.Context, list []*user.OnlineStatus) error
 }

 type userDatabase struct {
-	userDB relation.UserModelInterface
-	cache  cache.UserCache
-	tx     tx.Tx
+	userDB  relation.UserModelInterface
+	cache   cache.UserCache
+	tx      tx.Tx
+	mongoDB unRelationTb.UserModelInterface
 }

-func NewUserDatabase(userDB relation.UserModelInterface, cache cache.UserCache, tx tx.Tx) UserDatabase {
-	return &userDatabase{userDB: userDB, cache: cache, tx: tx}
+func NewUserDatabase(userDB relation.UserModelInterface, cache cache.UserCache, tx tx.Tx, mongoDB unRelationTb.UserModelInterface) UserDatabase {
+	return &userDatabase{userDB: userDB, cache: cache, tx: tx, mongoDB: mongoDB}
 }

 func (u *userDatabase) InitOnce(ctx context.Context, users []*relation.UserModel) (err error) {
@@ -75,7 +89,7 @@ func (u *userDatabase) InitOnce(ctx context.Context, users []*relation.UserModel
 	return nil
 }

-// 获取指定用户的信息 如有userID未找到 也返回错误.
+// FindWithError Get the information of the specified user and return an error if the userID is not found.
 func (u *userDatabase) FindWithError(ctx context.Context, userIDs []string) (users []*relation.UserModel, err error) {
 	users, err = u.cache.GetUsersInfo(ctx, userIDs)
 	if err != nil {
@@ -87,13 +101,13 @@ func (u *userDatabase) FindWithError(ctx context.Context, userIDs []string) (use
 	return
 }

-// 获取指定用户的信息 如有userID未找到 不返回错误.
+// Find Get the information of the specified user. If the userID is not found, no error will be returned.
 func (u *userDatabase) Find(ctx context.Context, userIDs []string) (users []*relation.UserModel, err error) {
 	users, err = u.cache.GetUsersInfo(ctx, userIDs)
 	return
 }

-// 插入多条 外部保证userID 不重复 且在db中不存在.
+// Create Insert multiple external guarantees that the userID is not repeated and does not exist in the db.
 func (u *userDatabase) Create(ctx context.Context, users []*relation.UserModel) (err error) {
 	if err := u.tx.Transaction(func(tx any) error {
 		err = u.userDB.Create(ctx, users)
@@ -111,7 +125,7 @@ func (u *userDatabase) Create(ctx context.Context, users []*relation.UserModel)
 	return u.cache.DelUsersInfo(userIDs...).ExecDel(ctx)
 }

-// 更新（非零值） 外部保证userID存在.
+// Update (non-zero value) externally guarantees that userID exists.
 func (u *userDatabase) Update(ctx context.Context, user *relation.UserModel) (err error) {
 	if err := u.userDB.Update(ctx, user); err != nil {
 		return err
@@ -119,7 +133,7 @@ func (u *userDatabase) Update(ctx context.Context, user *relation.UserModel) (er
 	return u.cache.DelUsersInfo(user.UserID).ExecDel(ctx)
 }

-// 更新（零值） 外部保证userID存在.
+// UpdateByMap update (zero value) externally guarantees that userID exists.
 func (u *userDatabase) UpdateByMap(ctx context.Context, userID string, args map[string]interface{}) (err error) {
 	if err := u.userDB.UpdateByMap(ctx, userID, args); err != nil {
 		return err
@@ -127,7 +141,7 @@ func (u *userDatabase) UpdateByMap(ctx context.Context, userID string, args map[
 	return u.cache.DelUsersInfo(userID).ExecDel(ctx)
 }

-// 获取，如果没找到，不返回错误.
+// Page Gets, returns no error if not found.
 func (u *userDatabase) Page(
 	ctx context.Context,
 	pageNumber, showNumber int32,
@@ -135,7 +149,7 @@ func (u *userDatabase) Page(
 	return u.userDB.Page(ctx, pageNumber, showNumber)
 }

-// userIDs是否存在 只要有一个存在就为true.
+// IsExist Does userIDs exist? As long as there is one, it will be true.
 func (u *userDatabase) IsExist(ctx context.Context, userIDs []string) (exist bool, err error) {
 	users, err := u.userDB.Find(ctx, userIDs)
 	if err != nil {
@@ -147,18 +161,53 @@ func (u *userDatabase) IsExist(ctx context.Context, userIDs []string) (exist boo
 	return false, nil
 }

+// GetAllUserID Get all user IDs
 func (u *userDatabase) GetAllUserID(ctx context.Context, pageNumber, showNumber int32) (userIDs []string, err error) {
 	return u.userDB.GetAllUserID(ctx, pageNumber, showNumber)
 }

+// CountTotal Get the total number of users
 func (u *userDatabase) CountTotal(ctx context.Context, before *time.Time) (count int64, err error) {
 	return u.userDB.CountTotal(ctx, before)
 }

-func (u *userDatabase) CountRangeEverydayTotal(
-	ctx context.Context,
-	start time.Time,
-	end time.Time,
-) (map[string]int64, error) {
+// CountRangeEverydayTotal Get the user increment in the range
+func (u *userDatabase) CountRangeEverydayTotal(ctx context.Context, start time.Time, end time.Time) (map[string]int64, error) {
 	return u.userDB.CountRangeEverydayTotal(ctx, start, end)
 }
+
+//SubscribeOrCancelUsersStatus Subscribe or unsubscribe a user's presence status
+func (u *userDatabase) SubscribeOrCancelUsersStatus(ctx context.Context, userID string, userIDs []string, genre int32) error {
+	var err error
+	if genre == constant.SubscriberUser {
+		err = u.mongoDB.AddSubscriptionList(ctx, userID, userIDs)
+	} else if genre == constant.Unsubscribe {
+		err = u.mongoDB.UnsubscriptionList(ctx, userID, userIDs)
+	}
+	return err
+}
+
+// GetAllSubscribeList Get a list of all subscriptions.
+func (u *userDatabase) GetAllSubscribeList(ctx context.Context, userID string) ([]string, error) {
+
+	//TODO 获取所有订阅
+	return nil, nil
+}
+
+// GetSubscribedList Get all subscribed lists
+func (u *userDatabase) GetSubscribedList(ctx context.Context, userID string) ([]string, error) {
+
+	//TODO 获取所有被订阅
+	return nil, nil
+}
+
+// GetUserStatus get user status
+func (u *userDatabase) GetUserStatus(ctx context.Context, userIDs []string) ([]*user.OnlineStatus, error) {
+	onlineStatusList, err := u.cache.GetUserStatus(ctx, userIDs)
+	return onlineStatusList, err
+}
+
+// SetUserStatus Set the user status and save it in redis
+func (u *userDatabase) SetUserStatus(ctx context.Context, list []*user.OnlineStatus) error {
+	return u.cache.SetUserStatus(ctx, list)
+}
@@ -99,3 +99,7 @@ func (g *GroupGorm) CountRangeEverydayTotal(ctx context.Context, start time.Time
 	}
 	return v, nil
 }
+
+func (g *GroupGorm) FindNotDismissedGroup(ctx context.Context, groupIDs []string) (groups []*relation.GroupModel, err error) {
+	return groups, utils.Wrap(g.DB.Where("group_id in (?) and status != ?", groupIDs, constant.GroupStatusDismissed).Find(&groups).Error, "")
+}
@@ -51,6 +51,7 @@ type GroupModelInterface interface {
 	UpdateMap(ctx context.Context, groupID string, args map[string]interface{}) (err error)
 	UpdateStatus(ctx context.Context, groupID string, status int32) (err error)
 	Find(ctx context.Context, groupIDs []string) (groups []*GroupModel, err error)
+	FindNotDismissedGroup(ctx context.Context, groupIDs []string) (groups []*GroupModel, err error)
 	Take(ctx context.Context, groupID string) (group *GroupModel, err error)
 	Search(
 		ctx context.Context,
@@ -0,0 +1,42 @@
+// 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 unrelation
+
+import "context"
+
+// SubscribeUser collection constant.
+const (
+	SubscribeUser = "subscribe_user"
+)
+
+// UserModel collection structure.
+type UserModel struct {
+	UserID     string   `bson:"user_id"       json:"userID"`
+	UserIDList []string `bson:"user_id_list" json:"userIDList"`
+}
+
+func (UserModel) TableName() string {
+	return SubscribeUser
+}
+
+// UserModelInterface Operation interface of user mongodb.
+type UserModelInterface interface {
+	// AddSubscriptionList Subscriber's handling of thresholds.
+	AddSubscriptionList(ctx context.Context, userID string, userIDList []string) error
+	// UnsubscriptionList Handling of unsubscribe.
+	UnsubscriptionList(ctx context.Context, userID string, userIDList []string) error
+	// RemoveSubscribedListFromUser Among the unsubscribed users, delete the user from the subscribed list.
+	RemoveSubscribedListFromUser(ctx context.Context, userID string, userIDList []string) error
+}
@@ -0,0 +1,141 @@
+// 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 unrelation
+
+import (
+	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
+	"github.com/OpenIMSDK/tools/utils"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+	"log"
+)
+
+//  prefixes and suffixes.
+const (
+	SubscriptionPrefix = "subscription_prefix"
+	SubscribedPrefix   = "subscribed_prefix"
+)
+
+// MaximumSubscription Maximum number of subscriptions.
+const (
+	MaximumSubscription = 3000
+)
+
+func NewUserMongoDriver(database *mongo.Database) unrelation.UserModelInterface {
+	return &UserMongoDriver{
+		userCollection: database.Collection(unrelation.SubscribeUser),
+	}
+}
+
+type UserMongoDriver struct {
+	userCollection *mongo.Collection
+}
+
+// AddSubscriptionList Subscriber's handling of thresholds.
+func (u *UserMongoDriver) AddSubscriptionList(ctx context.Context, userID string, userIDList []string) error {
+	// Check the number of lists in the key.
+	filter := bson.M{SubscriptionPrefix + userID: bson.M{"$size": 1}}
+	result, err := u.userCollection.Find(context.Background(), filter)
+	if err != nil {
+		return err
+	}
+	var newUserIDList []string
+	for result.Next(context.Background()) {
+		err := result.Decode(&newUserIDList)
+		if err != nil {
+			log.Fatal(err)
+		}
+	}
+	// If the threshold is exceeded, pop out the previous MaximumSubscription - len(userIDList) and insert it.
+	if len(newUserIDList)+len(userIDList) > MaximumSubscription {
+		newUserIDList = newUserIDList[MaximumSubscription-len(userIDList):]
+		_, err := u.userCollection.UpdateOne(
+			ctx,
+			bson.M{"user_id": SubscriptionPrefix + userID},
+			bson.M{"$set": bson.M{"user_id_list": newUserIDList}},
+		)
+		if err != nil {
+			return err
+		}
+		//for i := 1; i <= MaximumSubscription-len(userIDList); i++ {
+		//	_, err := u.userCollection.UpdateOne(
+		//		ctx,
+		//		bson.M{"user_id": SubscriptionPrefix + userID},
+		//		bson.M{SubscriptionPrefix + userID: bson.M{"$pop": -1}},
+		//	)
+		//	if err != nil {
+		//		return err
+		//	}
+		//}
+	}
+	upsert := true
+	opts := &options.UpdateOptions{
+		Upsert: &upsert,
+	}
+	_, err = u.userCollection.UpdateOne(
+		ctx,
+		bson.M{"user_id": SubscriptionPrefix + userID},
+		bson.M{"$addToSet": bson.M{"user_id_list": bson.M{"$each": userIDList}}},
+		opts,
+	)
+	if err != nil {
+		return err
+	}
+	for _, user := range userIDList {
+		_, err = u.userCollection.UpdateOne(
+			ctx,
+			bson.M{"user_id": SubscribedPrefix + user},
+			bson.M{"$addToSet": bson.M{"user_id_list": userID}},
+			opts,
+		)
+		if err != nil {
+			return utils.Wrap(err, "transaction failed")
+		}
+	}
+	return nil
+}
+
+// UnsubscriptionList Handling of unsubscribe.
+func (u *UserMongoDriver) UnsubscriptionList(ctx context.Context, userID string, userIDList []string) error {
+	_, err := u.userCollection.UpdateOne(
+		ctx,
+		bson.M{"user_id": SubscriptionPrefix + userID},
+		bson.M{"$pull": bson.M{"user_id_list": bson.M{"$in": userIDList}}},
+	)
+	if err != nil {
+		return err
+	}
+	err = u.RemoveSubscribedListFromUser(ctx, userID, userIDList)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// RemoveSubscribedListFromUser Among the unsubscribed users, delete the user from the subscribed list.
+func (u *UserMongoDriver) RemoveSubscribedListFromUser(ctx context.Context, userID string, userIDList []string) error {
+	var newUserIDList []string
+	for _, value := range userIDList {
+		newUserIDList = append(newUserIDList, SubscribedPrefix+value)
+	}
+	_, err := u.userCollection.UpdateOne(
+		ctx,
+		bson.M{"user_id": bson.M{"$in": newUserIDList}},
+		bson.M{"$pull": bson.M{"user_id_list": userID}},
+	)
+	return utils.Wrap(err, "")
+}
@@ -1,4 +1,72 @@
-# `/scripts`
+# OpenIM Scripts Directory Structure
+
+This document outlines the directory structure for scripts in the OpenIM Server project. These scripts play a critical role in various areas like building, deploying, running and managing the services of OpenIM.
+
+```bash
+scripts/
+├── LICENSE                        # License related files
+│   ├── LICENSE                    # The license file
+│   └── LICENSE_TEMPLATES          # Template for license file
+├── README.md                      # Readme file for scripts directory
+├── advertise.sh                   # Script for advertisement services
+├── batch_start_all.sh             # Script to start all services in batch
+├── build.cmd                      # Windows build command script
+├── build_all_service.sh           # Script to build all services
+├── build_push_k8s_images.sh       # Script to build and push images for Kubernetes
+├── check_all.sh                   # Script to check status of all services
+├── common.sh                      # Contains common functions used by other scripts
+├── coverage.awk                   # AWK script for coverage report generation
+├── coverage.sh                    # Script for generating coverage reports
+├── docker_check_service.sh        # Docker specific service check script
+├── docker_start_all.sh            # Script to start all services in a docker environment
+├── ensure_tag.sh                  # Script to ensure proper tagging of docker images
+├── enterprise                     # Scripts specific to enterprise version
+│   ├── check_all.sh               # Check status of all enterprise services
+│   ├── function.sh                # Functions specific to enterprise version
+│   └── path_info.cfg              # Path information configuration for enterprise version
+├── env_check.sh                   # Script to check the environment
+├── function.sh                    # Contains functions used by other scripts
+├── githooks                       # Git hook scripts
+│   ├── commit-msg                 # Script to validate commit message
+│   ├── pre-commit                 # Script to run before each commit
+│   └── pre-push                   # Script to run before each push
+├── init_pwd.sh                    # Script to initialize password
+├── install_im_compose.sh          # Script to install IM with Docker Compose
+├── install_im_server.sh           # Script to install IM server
+├── lib                            # Library scripts
+│   ├── color.sh                   # Script for console color manipulation
+│   ├── golang.sh                  # Script for golang related utility functions
+│   ├── init.sh                    # Script for initialization tasks
+│   ├── logging.sh                 # Script for logging related utility functions
+│   ├── release.sh                 # Script for release related utility functions
+│   ├── util.sh                    # Script for generic utility functions
+│   └── version.sh                 # Script for versioning related tasks
+├── make-rules                     # Makefile rules
+│   ├── common.mk                  # Common Make rules
+│   ├── copyright.mk               # Copyright related Make rules
+│   ├── dependencies.mk            # Dependencies related Make rules
+│   ├── gen.mk                     # Make rules for code generation
+│   ├── golang.mk                  # Golang specific Make rules
+│   ├── image.mk                   # Make rules for image building
+│   ├── release.mk                 # Make rules for release process
+│   ├── swagger.mk                 # Make rules for swagger documentation
+│   └── tools.mk                   # Make rules for tools and utilities
+├── mongo-init.sh                  # Script to initialize MongoDB
+├── msg_gateway_start.sh           # Script to start message gateway service
+├── msg_transfer_start.sh          # Script to start message transfer service
+├── path_info.sh                   # Script containing path information
+├── push_start.sh                  # Script to start push service
+├── release.sh                     # Script to perform release process
+├── start_all.sh                   # Script to start all services
+├── start_cron.sh                  # Script to start cron jobs
+├── start_rpc_service.sh           # Script to start RPC service
+├── stop_all.sh                    # Script to stop all services
+└── style_info.sh                  # Script containing style related information
+```
+
+The purpose of having a structured scripts directory like this is to make the operations of OpenIM Server clear and easy to manage. Each script has its own responsibility, making it easier to maintain and update. It's also helpful for newcomers who can easily understand what each part of the system is doing by just looking at this directory structure.
+
+Each directory and script in the structure should be understood as a part of a larger whole. All scripts work together to ensure the smooth operation and maintenance of the OpenIM Server.

 ## Supported platforms

@@ -37,12 +37,24 @@ function onCtrlC () {
    exit 1
 }

+# Load environment variables from .env file
+source ${OPENIM_ROOT}/.env
+
 # Get the public internet IP address
 internet_ip=$(curl ifconfig.me -s)
 echo -e "${PURPLE_PREFIX}=========> Your public internet IP address is ${internet_ip} ${COLOR_SUFFIX} \n"

-# Load environment variables from .env file
-source ${OPENIM_ROOT}/.env
+# Replace local IP address with the public IP address in .env file
+if [ $API_URL == "http://127.0.0.1:10002/object/" ]; then
+    sed -i "s/127.0.0.1/${internet_ip}/" ${OPENIM_ROOT}/.env
+fi
+
+if [ $MINIO_ENDPOINT == "http://127.0.0.1:10005" ]; then
+    sed -i "s/127.0.0.1/${internet_ip}/" ${OPENIM_ROOT}/.env
+fi 
+
+
+

 echo -e "${PURPLE_PREFIX}=========> Your minio endpoint is ${MINIO_ENDPOINT} ${COLOR_SUFFIX} \n"

@@ -59,15 +71,6 @@ echo -e "${PURPLE_PREFIX}=========> env_check.sh ${COLOR_SUFFIX} \n"

 ${SCRIPTS_ROOT}/env_check.sh

-# Replace local IP address with the public IP address in .env file
-if [ $API_URL == "http://127.0.0.1:10002/object/" ]; then
-    sed -i "s/127.0.0.1/${internet_ip}/" ${OPENIM_ROOT}/.env
-fi
-
-if [ $MINIO_ENDPOINT == "http://127.0.0.1:10005" ]; then
-    sed -i "s/127.0.0.1/${internet_ip}/" ${OPENIM_ROOT}/.env
-fi 
-
 # Go back to the previous directory
 cd ${OPENIM_ROOT}

@@ -79,4 +82,4 @@ else
    docker compose up -d
 fi

-${SCRIPTS_ROOT}/docker_check_service.sh
+${SCRIPTS_ROOT}/docker_check_service.sh
@@ -17,7 +17,7 @@
 #

 GO := go
-GO_SUPPORTED_VERSIONS ?= 1.18|1.19|1.20
+GO_SUPPORTED_VERSIONS ?= 1.18|1.19|1.20|1.21

 GO_LDFLAGS += -X $(VERSION_PACKAGE).gitVersion=$(GIT_TAG) \
 	-X $(VERSION_PACKAGE).gitCommit=$(GIT_COMMIT) \
@@ -204,4 +204,4 @@ go.clean:
 ## copyright.help: Show copyright help
 .PHONY: go.help
 go.help: scripts/make-rules/golang.mk
-	$(call smallhelp)
+	$(call smallhelp)
Author	SHA1	Message	Date
Xinwei Xiong	dabe7c2813	Merge pull request #2177 from openimsdk/cubxxw-patch-2 update release-v3.1 images	2024-04-10 19:51:14 +08:00
Xinwei Xiong	fcf67d40cd	Update README.md	2024-04-10 19:47:00 +08:00
OpenIM Robot	ca6b46c4ff	Merge pull request #1210 from openimsdk/fix/makefile fix(release-v3.1): fix makefile go version update image	2023-10-13 11:46:52 +08:00
Xinwei Xiong	35d6b7503c	fix: fix makefile go version update image	2023-10-13 10:38:05 +08:00
Xinwei Xiong	ce3816cfc4	Update docker-compose.yaml (#868 )	2023-08-15 14:35:33 +08:00
Xinwei Xiong	45a5661d2e	Update golang.mk (#823 )	2023-08-09 10:54:08 +08:00
Gordon	383ae8e47e	refactor: log change Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com>	2023-08-07 19:51:06 +08:00
skiffer-git	baa6c18f93	fix: adjust the order: first replace the values in the .env file, then replace the configuration in the config file	2023-07-29 22:03:33 +08:00
skiffer-git	25671158a4	fix: adjust the order: first replace the values in the .env file, then replace the configuration in the config file	2023-07-29 21:59:31 +08:00
skiffer-git	923023271a	fix: adjust the order: first replace the values in the .env file, then replace the configuration in the config file	2023-07-29 21:55:54 +08:00
Xinwei Xiong	0feb950c5a	fix: docker images (#702 ) Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>	2023-07-29 13:01:17 +08:00
skiffer-git	1e2d175c67	synchronize the image and tag name of chat	2023-07-28 22:37:35 +08:00
skiffer-git	28177654c7	restore the IP in the env to 127.0.0.1	2023-07-28 22:19:05 +08:00
skiffer-git	baae864903	synchronize the image and tag name of open-im-server	2023-07-28 22:14:14 +08:00
WangchuXiao	ce752f7a00	Merge pull request #697 from wangchuxiao-dev/dev2 fix bug: join group failed	2023-07-28 20:24:37 +08:00
wangchuxiao	a73d8fe4f6	fix bug: join group failed	2023-07-28 20:21:40 +08:00
WangchuXiao	6713c4df52	Merge pull request #695 from wangchuxiao-dev/dev2 Dev2	2023-07-28 20:17:51 +08:00
wangchuxiao	c9c698551b	fix bug: join group failed	2023-07-28 20:16:32 +08:00
wangchuxiao	e868073543	Merge remote-tracking branch 'upstream/main' into dev2	2023-07-28 20:16:19 +08:00
pluto	e24b0e2114	Get user online status (#693 ) * Resolving code conflicts after project directory changes and Add subscribe and unsubscribe mongodb operations * Organize and update module dependencies * Get user online status * Get user online status * Get user online status	2023-07-28 09:54:29 +00:00
Xinwei Xiong	8979b9dce1	fix: docker file fix (#692 ) Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>	2023-07-28 07:09:04 +00:00
Xinwei Xiong	e7040d3b26	docs: add readme docs (#691 ) * docs: add readme docs Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add script yaml Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add script yaml Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add test Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add test Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * fix bug: reject group req bug * feat: add go relase Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add test Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add test Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * fix: config env command Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --------- Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> Co-authored-by: wangchuxiao <wangchuxiao97@outlook.com>	2023-07-28 06:37:39 +00:00
Xinwei Xiong	114d77b9d8	docs: add readme docs (#690 ) * docs: add readme docs Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add script yaml Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add script yaml Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add test Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --------- Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>	2023-07-28 06:26:18 +00:00
Xinwei Xiong	cf59084dde	Fix/docker images (#689 ) * docs: add readme docs Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add script yaml Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add script yaml Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add test Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --------- Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>	2023-07-28 06:22:27 +00:00
Xinwei Xiong(cubxxw-openim)	5eb97766b6	feat: add go relase Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>	2023-07-27 20:45:01 +08:00
wangchuxiao	340ce42b17	fix bug: reject group req bug	2023-07-27 20:27:05 +08:00
pluto	4d816978ec	Resolving code conflicts after project directory changes and Add user subscription to the operation from rpc to db layer (#684 ) * Resolving code conflicts after project directory changes and Add subscribe and unsubscribe mongodb operations * Organize and update module dependencies	2023-07-27 11:46:44 +00:00
Xinwei Xiong	0b9ac4bd87	Feat/develop test (#687 ) * docs: add readme docs Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add script yaml Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add script yaml Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add test Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * Update config.yaml * Update config.yaml --------- Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>	2023-07-27 08:44:02 +00:00
Xinwei Xiong(cubxxw-openim)	e9f5752e29	feat: add test Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>	2023-07-27 16:27:43 +08:00
Xinwei Xiong(cubxxw-openim)	c509f7d4d2	feat: add test Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>	2023-07-27 16:16:13 +08:00
Xinwei Xiong(cubxxw-openim)	692ff29a0c	feat: add script yaml Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>	2023-07-27 15:51:57 +08:00
Xinwei Xiong(cubxxw-openim)	de641f574c	feat: add script yaml Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>	2023-07-27 15:36:24 +08:00
Xinwei Xiong(cubxxw-openim)	57374a4df4	docs: add readme docs Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>	2023-07-27 15:36:24 +08:00
WangchuXiao	df71049533	fix bug: delete friend and repeat add friend not effect (#682 ) * new feature: add batch send msg * new feature: add batch send msg * new feature: add batch send msg * new feature: add batch send msg * new feature: add batch send msg * new feature: add batch send msg * fix bug: multiple gateway kick user * fix bug: multiple gateway kick user * fix bug: multiple gateway kick user * fix bug: multiple gateway kick user * fix bug: multiple gateway kick user * MsgDestructTime * fix bug: msg destruct sql * fix bug: msg destruct * fix bug: msg destruct * fix bug: msg destruct sql * fix bug: msg destruct sql * fix bug: msg destruct sql * fix bug: msg destruct sql * debug: print stack * debug: print stack * debug: print stack * fix bug: msg destruct sql Signed-off-by: wangchuxiao <wangchuxiao97@outlook.com> * fix bug: msg notification self 2 self push twice * fix bug: heartbeat get self notification * fix bug: init grpc conn in one process * fix bug: grpc conn Signed-off-by: wangchuxiao <wangchuxiao97@outlook.com> * fix bug: zk client recreate node when reconn * fix bug: set friend mark args error * fix bug: rpc client intercepter called twice Signed-off-by: wangchuxiao <wangchuxiao97@outlook.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * test: document msg num set 100 * new feat: sync designated model * new feat: sync designated model * new feat: sync designated model * new feat: sync designated model * new feat: sync designated model * new feat: sync designated model * new feat: sync designated model * merge code * merge code * fix bug: repeat add friend not effect --------- Signed-off-by: wangchuxiao <wangchuxiao97@outlook.com> Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: wangchuxiao-dev <wangchuxiao-dev@users.noreply.github.com>	2023-07-27 07:04:50 +00:00
Xinwei Xiong	68e521d198	feat: config env optimize (#683 ) * feat: config env optimize Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * docs: add readme docs Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --------- Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>	2023-07-27 07:00:33 +00:00
Xinwei Xiong	a86d24cfd1	feat: config env optimize (#680 ) Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>	2023-07-27 06:38:46 +00:00