Merge pull request #3174 from icey-yu/fix-push

fix: Offline push does not have a badge && Android offline push (#3146)

.env

@@ -17,8 +17,6 @@ OPENIM_ADMIN_FRONT_IMAGE=openim/openim-admin-front:release-v1.8.4
 
 DATA_DIR=./
 
-MONGO_BACKUP_DIR=${DATA_DIR}components/backup/mongo/
-
 PROMETHEUS_PORT=19091
 ALERTMANAGER_PORT=19093
 GRAFANA_PORT=13000

.github/workflows/docker-build-and-release-services-images.yml

@@ -1,4 +1,4 @@
-name: Build and release services Docker Images
+name: Build and release services Images
 
 on:
   push:
@@ -19,26 +19,26 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.8.0
+        uses: docker/setup-buildx-action@v2
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Log in to Aliyun Container Registry
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v2
         with:
           registry: registry.cn-hangzhou.aliyuncs.com
           username: ${{ secrets.ALIREGISTRY_USERNAME }}
@@ -46,7 +46,7 @@ jobs:
 
       - name: Extract metadata for Docker (tags, labels)
         id: meta
-        uses: docker/metadata-action@v5.6.0
+        uses: docker/metadata-action@v5
         with:
           tags: |
             type=ref,event=tag
@@ -54,14 +54,15 @@ jobs:
             type=ref,event=branch
             type=semver,pattern={{version}}
             type=semver,pattern=v{{version}}
+            # type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern=release-{{raw}}
             type=sha
             type=raw,value=${{ github.event.inputs.tag }}
 
       - name: Build and push Docker images
         run: |
-          IMG_DIR="build/images"
-          for dir in "$IMG_DIR"/*/; do
+          ROOT_DIR="build/images"
+          for dir in "$ROOT_DIR"/*/; do
               # Find Dockerfile or *.dockerfile in a case-insensitive manner
               dockerfile=$(find "$dir" -maxdepth 1 -type f \( -iname 'dockerfile' -o -iname '*.dockerfile' \) | head -n 1)
               
@@ -83,9 +84,8 @@ jobs:
                   docker buildx build --platform linux/amd64,linux/arm64 \
                     --file "$dockerfile" \
                     "${tag_args[@]}" \
-                    --push \
-                    "."
+                    --push "$dir"
               else
                   echo "No valid Dockerfile found in $dir"
               fi
-          done
+          done

.github/workflows/go-build-test.yml

@@ -4,7 +4,7 @@ on:
   push:
   pull_request:
     paths-ignore:
-      - "**/*.md"
+      - '**/*.md'
 
   workflow_dispatch:
 
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        go_version: ["1.22.x"]
+        go_version: ["1.21.x", "1.22.x"]
 
     steps:
       - name: Checkout Server repository
@@ -37,20 +37,27 @@ jobs:
 
       - name: Set up infra services
         uses: hoverkraft-tech/compose-action@v2.0.1
+        # Uncomment and set the correct path to your docker-compose file
         with:
           compose-file: "./docker-compose.yml"
 
-      # - name: Get Internal IP Address
-      #   id: get-ip
-      #   run: |
-      #     IP=$(hostname -I | awk '{print $1}')
-      #     echo "The IP Address is: $IP"
-      #     echo "::set-output name=ip::$IP"
+        # run: |
+        #   sudo docker compose up -d
+        #   sudo sleep 30  # Increased sleep time for better stability
+        # timeout-minutes: 60 # Increased timeout for Docker setup
 
-      # - name: Update .env
-      #   run: |
-      #     sed -i 's|externalAddress:.*|externalAddress: "http://${{ steps.get-ip.outputs.ip }}:10005"|' config/minio.yml
-      #     cat config/minio.yml
+
+    # - name: Get Internal IP Address
+    #   id: get-ip
+    #   run: |
+    #     IP=$(hostname -I | awk '{print $1}')
+    #     echo "The IP Address is: $IP"
+    #     echo "::set-output name=ip::$IP"
+      
+    # - name: Update .env
+    #   run: |
+    #     sed -i 's|externalAddress:.*|externalAddress: "http://${{ steps.get-ip.outputs.ip }}:10005"|' config/minio.yml
+    #     cat config/minio.yml
 
       - name: Build and test Server Services
         run: |
@@ -78,90 +85,6 @@ jobs:
           mage start
           mage check
 
-      - name: Test Server and Chat
-        run: |
-          check_error() {
-            echo "Response: $1"
-            errCode=$(echo $1 | jq -r '.errCode')
-            if [ "$errCode" != "0" ]; then
-              errMsg=$(echo $1 | jq -r '.errMsg')
-              echo "Error: $errMsg"
-              exit 1
-            fi
-          }
-
-          # Test register
-          response1=$(curl -X POST -H "Content-Type: application/json" -H "operationID: imAdmin" -d '{
-            "verifyCode": "666666",
-            "platform": 3,
-            "autoLogin": true,
-            "user":{
-            "nickname": "test12312",
-            "areaCode":"+86",
-            "phoneNumber": "12345678190",
-            "password":"test123456"
-            }
-          }' http://127.0.0.1:10008/account/register)
-          check_error "$response1"
-          userID1=$(echo $response1 | jq -r '.data.userID')
-          echo "userID1: $userID1"
-
-          response2=$(curl -X POST -H "Content-Type: application/json" -H "operationID: imAdmin" -d '{
-            "verifyCode": "666666",
-            "platform": 3,
-            "autoLogin": true,
-            "user":{
-            "nickname": "test22312",
-            "areaCode":"+86",
-            "phoneNumber": "12345678290",
-            "password":"test123456"
-            }
-          }' http://127.0.0.1:10008/account/register)
-          check_error "$response2"
-          userID2=$(echo $response2 | jq -r '.data.userID')
-          echo "userID2: $userID2"
-
-          # Test login
-          login_response=$(curl -X POST -H "Content-Type: application/json" -H "operationID: imAdmin"  -d '{
-            "platform": 3,
-            "areaCode":"+86",
-            "phoneNumber": "12345678190",
-            "password":"test123456"
-          }' http://localhost:10008/account/login)
-          check_error "$login_response"
-
-          # Test get admin token
-          get_admin_token_response=$(curl -X POST -H "Content-Type: application/json" -H "operationID: imAdmin" -d '{
-            "secret": "openIM123",
-            "platformID": 2,
-            "userID": "imAdmin"
-          }' http://127.0.0.1:10002/auth/get_admin_token)
-          check_error "$get_admin_token_response"
-          adminToken=$(echo $get_admin_token_response | jq -r '.data.token')
-          echo "adminToken: $adminToken"
-
-          # Test send message
-          send_msg_response=$(curl -X POST -H "Content-Type: application/json" -H "operationID: imAdmin" -H "token: $adminToken" -d '{
-            "sendID": "'$userID1'",
-            "recvID": "'$userID2'",
-            "senderPlatformID": 3,
-            "content": {
-              "content": "hello!!"
-            },
-            "contentType": 101,
-            "sessionType": 1
-           }' http://127.0.0.1:10002/msg/send_msg)
-           check_error "$send_msg_response"
-
-          # Test get users
-          get_users_response=$(curl -X POST -H "Content-Type: application/json" -H "operationID: imAdmin" -H "token: $adminToken" -d '{
-            "pagination": {
-               "pageNumber": 1,
-               "showNumber": 100
-             }
-            }' http://127.0.0.1:10002/user/get_users)
-          check_error "$get_users_response"
-
   go-test:
     name: Benchmark Test with go ${{ matrix.go_version }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -170,11 +93,11 @@ jobs:
     env:
       SDK_DIR: openim-sdk-core
       CONFIG_PATH: config/notification.yml
-
+    #   pull-requests: write
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        go_version: ["1.22.x"]
+        os: [ ubuntu-latest ]
+        go_version: [ "1.22.x" ]
 
     steps:
       - name: Checkout Server repository
@@ -183,8 +106,7 @@ jobs:
       - name: Checkout SDK repository
         uses: actions/checkout@v4
         with:
-          repository: "openimsdk/openim-sdk-core"
-          ref: "release-v3.8"
+          repository: 'openimsdk/openim-sdk-core'
           path: ${{ env.SDK_DIR }}
 
       - name: Set up Go ${{ matrix.go_version }}
@@ -197,10 +119,15 @@ jobs:
           go install github.com/magefile/mage@latest
           go mod download
 
+      - name: Install yq
+        run: |
+          sudo wget https://github.com/mikefarah/yq/releases/download/v4.34.1/yq_linux_amd64 -O /usr/bin/yq
+          sudo chmod +x /usr/bin/yq
+
       - name: Modify Server Configuration
         run: |
-          yq e '.groupCreated.isSendMsg = true' -i ${{ env.CONFIG_PATH }}
-          yq e '.friendApplicationApproved.isSendMsg = true' -i ${{ env.CONFIG_PATH }}
+          yq e '.groupCreated.unreadCount = true' -i ${{ env.CONFIG_PATH }}
+          yq e '.friendApplicationApproved.unreadCount = true' -i ${{ env.CONFIG_PATH }}
 
       - name: Start Server Services
         run: |
@@ -256,3 +183,11 @@ jobs:
         run: |
           CONTAINER_NAME="${{ github.event.repository.name }}-container"
           docker logs $CONTAINER_NAME
+
+      # - name: Cleanup Docker Container
+      #   run: |
+      #     CONTAINER_NAME="${{ github.event.repository.name }}-container"
+      #     IMAGE_NAME="${{ github.event.repository.name }}-test"
+      #     docker stop $CONTAINER_NAME
+      #     docker rm $CONTAINER_NAME
+      #     docker rmi $IMAGE_NAME

.github/workflows/merge-from-milestone.yml

@@ -1,4 +1,4 @@
-name: Create Individual PRs from Milestone
+name: Create Pre-Release PR from Milestone
 
 permissions:
   contents: write
@@ -9,24 +9,24 @@ on:
   workflow_dispatch:
     inputs:
       milestone_name:
-        description: "Milestone name to collect closed PRs from"
+        description: 'Milestone name to collect closed PRs from'
         required: true
-        default: "v3.8.4"
+        default: 'v3.8.2'
       target_branch:
-        description: "Target branch to merge the consolidated PR"
+        description: 'Target branch to merge the consolidated PR'
         required: true
-        default: "pre-release-v3.8.4"
+        default: 'pre-release-v3.8.2'
 
 env:
-  MILESTONE_NAME: ${{ github.event.inputs.milestone_name || 'v3.8.4' }}
-  TARGET_BRANCH: ${{ github.event.inputs.target_branch || 'pre-release-v3.8.4' }}
+  MILESTONE_NAME: ${{ github.event.inputs.milestone_name || 'v3.8.2' }}
+  TARGET_BRANCH: ${{ github.event.inputs.target_branch || 'pre-release-v3.8.2' }}
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
   LABEL_NAME: cherry-picked
-  TEMP_DIR: /tmp
+  TEMP_DIR: /tmp  # Using /tmp as the temporary directory
 
 jobs:
-  merge_milestone_prs:
+  cherry_pick_milestone_prs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup temp directory
@@ -47,6 +47,7 @@ jobs:
 
       - name: Setup Git User for OpenIM-Robot
         run: |
+          # Set up Git credentials for the bot
           git config --global user.email "OpenIM-Robot@users.noreply.github.com"
           git config --global user.name "OpenIM-Robot"
 
@@ -82,65 +83,136 @@ jobs:
             if ! echo "$labels" | grep -q "${LABEL_NAME}"; then
               echo "PR #$pr_number does not have the 'cherry-picked' label. Adding to the list."
               echo "$pr_number" >> ${{ env.TEMP_DIR }}/pr_numbers.txt
+            else
+              echo "PR #$pr_number already has the 'cherry-picked' label. Skipping."
             fi
           done
 
+          # Sort the filtered PR numbers
           sort -n ${{ env.TEMP_DIR }}/pr_numbers.txt -o ${{ env.TEMP_DIR }}/pr_numbers.txt
 
-      - name: Create Individual PRs
+          echo "Filtered and sorted PR numbers:"
+          cat ${{ env.TEMP_DIR }}/pr_numbers.txt || echo "No closed PR numbers found for milestone."
+
+      - name: Fetch Merge Commits for PRs and Generate Title and Body
         run: |
+          # Ensure the files are initialized
+          > ${{ env.TEMP_DIR }}/commit_hashes.txt
+          > ${{ env.TEMP_DIR }}/pr_title.txt
+          > ${{ env.TEMP_DIR }}/pr_body.txt
+
+          # Write description to the PR body
+          echo "### Description:" >> ${{ env.TEMP_DIR }}/pr_body.txt
+          echo "Merging PRs from milestone \`$MILESTONE_NAME\` into target branch \`$TARGET_BRANCH\`." >> ${{ env.TEMP_DIR }}/pr_body.txt
+          echo "" >> ${{ env.TEMP_DIR }}/pr_body.txt
+          echo "### Need Merge PRs:" >> ${{ env.TEMP_DIR }}/pr_body.txt
+
+          pr_numbers_in_title=""
+
+          # Process sorted PR numbers and generate commit hashes
           for pr_number in $(cat ${{ env.TEMP_DIR }}/pr_numbers.txt); do
+            echo "Processing PR #$pr_number"
             pr_details=$(curl -s -H "Authorization: token $BOT_TOKEN" \
               -H "Accept: application/vnd.github+json" \
               "https://api.github.com/repos/${{ github.repository }}/pulls/$pr_number")
             pr_title=$(echo "$pr_details" | jq -r '.title')
-            pr_body=$(echo "$pr_details" | jq -r '.body')
-            pr_creator=$(echo "$pr_details" | jq -r '.user.login')
             merge_commit=$(echo "$pr_details" | jq -r '.merge_commit_sha')
             short_commit_hash=$(echo "$merge_commit" | cut -c 1-7)
 
-            if [ "$merge_commit" != "null" ]; then
-              git fetch origin
-              
-              echo "Checking out target branch: $TARGET_BRANCH"
-              git checkout $TARGET_BRANCH
+            # Append PR details to the body
+            echo "- $pr_title: (#$pr_number) ($short_commit_hash)" >> ${{ env.TEMP_DIR }}/pr_body.txt
 
-              echo "Pulling latest changes from target branch: $TARGET_BRANCH"
-              git pull origin $TARGET_BRANCH
-              
-              cherry_pick_branch="cherry-pick-${short_commit_hash}"
-              git checkout -b $cherry_pick_branch
-
-              echo "Cherry-picking commit: $merge_commit"
-              if ! git cherry-pick "$merge_commit" --strategy=recursive -X theirs; then
-                echo "Cherry-pick encountered conflicts, attempting to continue..."
-                git cherry-pick --continue || { echo "Cherry-pick failed"; exit 1; }
-              fi
-
-              git remote set-url origin "https://${BOT_TOKEN}@github.com/${{ github.repository }}.git"
-              
-              echo "Pushing branch: $cherry_pick_branch"
-              git push origin $cherry_pick_branch --force || { echo "Push failed"; exit 1; }
-
-              new_pr_title="$pr_title [Created by @$pr_creator from #$pr_number]"
-              new_pr_body="$pr_body
-              > This PR is created from original PR #$pr_number."
-
-              response=$(curl -s -X POST -H "Authorization: token $BOT_TOKEN" \
-                -H "Accept: application/vnd.github+json" \
-                https://api.github.com/repos/${{ github.repository }}/pulls \
-                -d "$(jq -n --arg title "$new_pr_title" \
-                  --arg head "$cherry_pick_branch" \
-                  --arg base "$TARGET_BRANCH" \
-                  --arg body "$new_pr_body" \
-                  '{title: $title, head: $head, base: $base, body: $body}')")
-
-              new_pr_number=$(echo "$response" | jq -r '.number')
-              echo "Created PR #$new_pr_number"
-
-              curl -s -X POST -H "Authorization: token $GITHUB_TOKEN" \
-                -H "Accept: application/vnd.github+json" \
-                -d '{"labels": ["milestone-merge"]}' \
-                "https://api.github.com/repos/${{ github.repository }}/issues/$new_pr_number/labels"
+            if [ "$merge_commit" != "null" ];then
+              echo "$merge_commit" >> ${{ env.TEMP_DIR }}/commit_hashes.txt
+              echo "#$pr_number" >> ${{ env.TEMP_DIR }}/pr_title.txt
+              pr_numbers_in_title="$pr_numbers_in_title #$pr_number"
             fi
           done
+
+          commit_hashes=$(cat ${{ env.TEMP_DIR }}/commit_hashes.txt | tr '\n' ' ')
+          first_commit_hash=$(head -n 1 ${{ env.TEMP_DIR }}/commit_hashes.txt)
+          cherry_pick_branch="cherry-pick-${first_commit_hash:0:7}"
+          echo "COMMIT_HASHES=$commit_hashes" >> $GITHUB_ENV
+          echo "CHERRY_PICK_BRANCH=$cherry_pick_branch" >> $GITHUB_ENV
+          echo "pr_numbers_in_title=$pr_numbers_in_title" >> $GITHUB_ENV
+
+      - name: Pull and Cherry-pick Commits, Then Push
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
+        run: |
+          # Fetch and pull the latest changes from the target branch
+          git fetch origin
+          git checkout $TARGET_BRANCH
+          git pull origin $TARGET_BRANCH
+
+          # Create a new branch for cherry-picking
+          git checkout -b $CHERRY_PICK_BRANCH
+
+          # Cherry-pick the commits and handle conflicts
+          for commit_hash in $COMMIT_HASHES; do
+            echo "Attempting to cherry-pick commit $commit_hash"
+            if ! git cherry-pick "$commit_hash" --strategy=recursive -X theirs; then
+              echo "Conflict detected for $commit_hash. Resolving with incoming changes."
+              conflict_files=$(git diff --name-only --diff-filter=U)
+              echo "Conflicting files:"
+              echo "$conflict_files"
+
+              for file in $conflict_files; do
+                if [ -f "$file" ]; then
+                  echo "Resolving conflict for $file"
+                  git add "$file"
+                else
+                  echo "File $file has been deleted. Skipping."
+                  git rm "$file"
+                fi
+              done
+
+              echo "Conflicts resolved. Continuing cherry-pick."
+              git cherry-pick --continue
+            else
+              echo "Cherry-pick successful for commit $commit_hash."
+            fi
+          done
+
+          # Push the cherry-pick branch to the repository
+          git remote set-url origin "https://${BOT_TOKEN}@github.com/${{ github.repository }}.git"
+          git push origin $CHERRY_PICK_BRANCH --force
+
+      - name: Create Pull Request
+        run: |
+          # Prepare and create the PR
+          pr_title="deps: Merge ${{ env.pr_numbers_in_title }} PRs into $TARGET_BRANCH"
+          pr_body=$(cat ${{ env.TEMP_DIR }}/pr_body.txt)
+
+          echo "Prepared PR title:"
+          echo "$pr_title"
+          echo "Prepared PR body:"
+          echo "$pr_body"
+
+          # Create the PR using the GitHub API
+          response=$(curl -s -X POST -H "Authorization: token $BOT_TOKEN" \
+            -H "Accept: application/vnd.github+json" \
+            https://api.github.com/repos/${{ github.repository }}/pulls \
+            -d "$(jq -n --arg title "$pr_title" \
+              --arg head "$CHERRY_PICK_BRANCH" \
+              --arg base "$TARGET_BRANCH" \
+              --arg body "$pr_body" \
+              '{title: $title, head: $head, base: $base, body: $body}')")
+
+          pr_number=$(echo "$response" | jq -r '.number')
+          echo "$pr_number" > ${{ env.TEMP_DIR }}/created_pr_number.txt
+          echo "Created PR #$pr_number"
+
+      - name: Add Label to Created Pull Request
+        run: |
+          # Add 'milestone-merge' label to the created PR
+          pr_number=$(cat ${{ env.TEMP_DIR }}/created_pr_number.txt)
+          echo "Adding label to PR #$pr_number"
+
+          curl -s -X POST -H "Authorization: token $GITHUB_TOKEN" \
+            -H "Accept: application/vnd.github+json" \
+            -d '{"labels": ["milestone-merge"]}' \
+            "https://api.github.com/repos/${{ github.repository }}/issues/$pr_number/labels"
+
+          echo "Added 'milestone-merge' label to PR #$pr_number."

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

@@ -25,11 +25,11 @@ jobs:
         with:
           path: main-repo
 
-      # - name: Set up QEMU
-      #   uses: docker/setup-qemu-action@v3.3.0
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.8.0
+        uses: docker/setup-buildx-action@v3
 
       - name: Build Docker image
         id: build
@@ -38,8 +38,11 @@ jobs:
           context: ./main-repo
           load: true
           tags: "openim/openim-server:local"
-          cache-from: type=gha,scope=build
-          cache-to: type=gha,mode=max,scope=build
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Save Docker image to file
+        run: docker save -o image.tar openim/openim-server:local
 
       - name: Checkout compose repository
         uses: actions/checkout@v4
@@ -63,12 +66,43 @@ jobs:
         run: |
           cd ${{ github.workspace }}/compose-repo
           docker compose up -d
+          sleep 60
 
-          docker compose ps
+      # - name: Check openim-server health
+      #   run: |
+      #     timeout=300
+      #     interval=30
+      #     elapsed=0
+      #     while [[ $elapsed -le $timeout ]]; do
+      #       if ! docker exec openim-server mage check; then
+      #         echo "openim-server is not ready, waiting..."
+      #         sleep $interval
+      #         elapsed=$(($elapsed + $interval))
+      #       else
+      #         echo "Health check successful"
+      #         exit 0
+      #       fi
+      #     done
+      #     echo "Health check failed after 5 minutes"
+      #     exit 1
+
+      # - name: Check openim-chat health
+      #   if: success()
+      #   run: |
+      #     if ! docker exec openim-chat mage check; then
+      #         echo "openim-chat check failed"
+      #         exit 1
+      #       else
+      #         echo "Health check successful"
+      #         exit 0
+      #       fi
+
+      - name: Load Docker image from file
+        run: docker load -i image.tar
 
       - name: Extract metadata for Docker (tags, labels)
         id: meta
-        uses: docker/metadata-action@v5.6.0
+        uses: docker/metadata-action@v5.5.1
         with:
           images: |
             openim/openim-server
@@ -78,27 +112,29 @@ jobs:
             type=ref,event=tag
             type=schedule
             type=ref,event=branch
-            # type=semver,pattern={{version}}
+            type=semver,pattern={{version}}
             type=semver,pattern=v{{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
             type=semver,pattern=release-{{raw}}
             type=sha
             type=raw,value=${{ github.event.inputs.tag }}
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Log in to Aliyun Container Registry
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v2
         with:
           registry: registry.cn-hangzhou.aliyuncs.com
           username: ${{ secrets.ALIREGISTRY_USERNAME }}
@@ -112,28 +148,3 @@ jobs:
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha,scope=build
-          cache-to: type=gha,mode=max,scope=build
-
-      - name: Verify multi-platform support
-        run: |
-          images=("openim/openim-server" "ghcr.io/openimsdk/openim-server" "registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server")
-          for image in "${images[@]}"; do
-              for tag in $(echo "${{ steps.meta.outputs.tags }}" | tr ',' '\n'); do
-                  manifest=$(docker manifest inspect "$image:$tag" || echo "error")
-                  if [[ "$manifest" == "error" ]]; then
-                      echo "Manifest not found for $image:$tag"
-                      exit 1
-                  fi
-                  amd64_found=$(echo "$manifest" | jq '.manifests[] | select(.platform.architecture == "amd64")')
-                  arm64_found=$(echo "$manifest" | jq '.manifests[] | select(.platform.architecture == "arm64")')
-                  if [[ -z "$amd64_found" ]]; then
-                      echo "Multi-platform support check failed for $image:$tag - missing amd64"
-                      exit 1
-                  fi
-                  if [[ -z "$arm64_found" ]]; then
-                      echo "Multi-platform support check failed for $image:$tag - missing arm64"
-                      exit 1
-                  fi
-              done
-          done

config/discovery.yml

@@ -5,13 +5,4 @@ etcd:
   username: ''
   password: ''
 
-rpcService:
-  user: user-rpc-service
-  friend: friend-rpc-service
-  msg: msg-rpc-service
-  push: push-rpc-service
-  messageGateway: messagegateway-rpc-service
-  group: group-rpc-service
-  auth: auth-rpc-service
-  conversation: conversation-rpc-service
-  third: third-rpc-service
+

config/notification.yml

@@ -1,10 +1,12 @@
 groupCreated:
   isSendMsg: true
-  # Deprecated. Fixed as 1.
+# Reliability level of the message sending.
+# Set to 1 to send only when online, 2 for guaranteed delivery.
   reliabilityLevel: 1
-  # Deprecated. Fixed as false.
+# This setting is effective only when 'isSendMsg' is true.
+# It controls whether to count unread messages.
   unreadCount: false
-  # Configuration for offline push notifications.
+# Configuration for offline push notifications.
   offlinePush:
     # Enables or disables offline push notifications.
     enable: false
@@ -323,4 +325,4 @@ conversationSetPrivate:
     enable: true
     title: burn after reading
     desc: burn after reading
-    ext: burn after reading
+    ext: burn after reading

config/share.yml

@@ -1,9 +1,18 @@
 secret: openIM123
+rpcRegisterName:
+  user: user
+  friend: friend
+  msg: msg
+  push: push
+  messageGateway: messageGateway
+  group: group
+  auth: auth
+  conversation: conversation
+  third: third
 
 imAdminUserID: [ imAdmin ]
 
 # 1: For Android, iOS, Windows, Mac, and web platforms, only one instance can be online at a time
 multiLogin:
   policy: 1
-  # max num of tokens in one end
   maxNumOneEnd: 30

docker-compose.yml

@@ -37,7 +37,6 @@ services:
       - "${DATA_DIR}/components/mongodb/data/db:/data/db"
       - "${DATA_DIR}/components/mongodb/data/logs:/data/logs"
       - "${DATA_DIR}/components/mongodb/data/conf:/etc/mongo"
-      - "${MONGO_BACKUP_DIR}:/data/backup"
     environment:
       - TZ=Asia/Shanghai
       - wiredTigerCacheSizeGB=1

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/openimsdk/protocol v0.0.72-alpha.71
-	github.com/openimsdk/tools v0.0.50-alpha.72
+	github.com/openimsdk/tools v0.0.50-alpha.67
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.18.0
 	github.com/stretchr/testify v1.9.0
@@ -40,12 +40,10 @@ require (
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/shirou/gopsutil v3.21.11+incompatible
 	github.com/spf13/viper v1.18.2
+	github.com/stathat/consistent v1.0.0
 	go.etcd.io/etcd/client/v3 v3.5.13
 	go.uber.org/automaxprocs v1.5.3
 	golang.org/x/sync v0.8.0
-	k8s.io/api v0.31.2
-	k8s.io/apimachinery v0.31.2
-	k8s.io/client-go v0.31.2
 )
 
 require (
@@ -90,27 +88,19 @@ require (
 	github.com/eapache/go-resiliency v1.6.0 // indirect
 	github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
 	github.com/eapache/queue v1.1.0 // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.4 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-zookeeper/zk v1.0.3 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/gnostic-models v0.6.8 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/s2a-go v0.1.7 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
 	github.com/googleapis/gax-go/v2 v2.12.3 // indirect
@@ -127,7 +117,6 @@ require (
 	github.com/jinzhu/copier v0.4.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kelindar/simd v1.1.2 // indirect
 	github.com/klauspost/compress v1.17.7 // indirect
@@ -137,7 +126,6 @@ require (
 	github.com/lithammer/shortuuid v3.0.0+incompatible // indirect
 	github.com/magefile/mage v1.15.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
@@ -147,7 +135,6 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
 	github.com/mozillazg/go-httpheader v0.4.0 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/pierrec/lz4/v4 v4.1.21 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -169,7 +156,6 @@ require (
 	github.com/tklauser/go-sysconf v0.3.13 // indirect
 	github.com/tklauser/numcpus v0.7.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
@@ -191,22 +177,14 @@ require (
 	golang.org/x/net v0.29.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
 	golang.org/x/sys v0.25.0 // indirect
-	golang.org/x/term v0.24.0 // indirect
 	golang.org/x/text v0.18.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	google.golang.org/appengine/v2 v2.0.2 // indirect
 	google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gorm.io/gorm v1.25.8 // indirect
-	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
-	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
-	sigs.k8s.io/yaml v1.4.0 // indirect
+	stathat.com/c/consistent v1.0.0 // indirect
 )
 
 require (

go.sum

@@ -103,8 +103,6 @@ github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4A
 github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0=
 github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
-github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
-github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -119,8 +117,6 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
-github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
-github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
 github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
 github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
 github.com/gin-contrib/gzip v1.0.1 h1:HQ8ENHODeLY7a4g1Au/46Z92bdGFl74OhxcZble9WJE=
@@ -136,13 +132,6 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
-github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
-github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
-github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
-github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=
-github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
@@ -161,8 +150,6 @@ github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGK
 github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
 github.com/go-redis/redismock/v9 v9.2.0 h1:ZrMYQeKPECZPjOj5u9eyOjg8Nnb0BS9lkVIZ6IpsKLw=
 github.com/go-redis/redismock/v9 v9.2.0/go.mod h1:18KHfGDK4Y6c2R0H38EUGWAdc7ZQS9gfYxc94k7rWT0=
-github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
-github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg=
 github.com/go-zookeeper/zk v1.0.3/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
@@ -192,8 +179,6 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
-github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -201,19 +186,14 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
-github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
 github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
-github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM=
-github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
 github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
 github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -264,8 +244,6 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4=
 github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kelindar/bitmap v1.5.2 h1:XwX7CTvJtetQZ64zrOkApoZZHBJRkjE23NfqUALA/HE=
@@ -307,8 +285,6 @@ github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg=
 github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
@@ -335,22 +311,18 @@ github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJ
 github.com/mozillazg/go-httpheader v0.2.1/go.mod h1:jJ8xECTlalr6ValeXYdOF8fFUISeBAdw6E61aqQma60=
 github.com/mozillazg/go-httpheader v0.4.0 h1:aBn6aRXtFzyDLZ4VIRLsZbbJloagQfMnCiYgOq6hK4w=
 github.com/mozillazg/go-httpheader v0.4.0/go.mod h1:PuT8h0pw6efvp8ZeUec1Rs7dwjK08bt6gKSReGMqtdA=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
-github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=
-github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
 github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
 github.com/onsi/gomega v1.25.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
 github.com/openimsdk/gomake v0.0.14-alpha.5 h1:VY9c5x515lTfmdhhPjMvR3BBRrRquAUCFsz7t7vbv7Y=
 github.com/openimsdk/gomake v0.0.14-alpha.5/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI=
 github.com/openimsdk/protocol v0.0.72-alpha.71 h1:R3utzOlqepaJWTAmnfJi4ccUM/XIoFasSyjQMOipM70=
 github.com/openimsdk/protocol v0.0.72-alpha.71/go.mod h1:WF7EuE55vQvpyUAzDXcqg+B+446xQyEba0X35lTINmw=
-github.com/openimsdk/tools v0.0.50-alpha.72 h1:d/vaZjIfvrNp3EeRJEIiamBO7HiPx6CP4wiuq8NpfzY=
-github.com/openimsdk/tools v0.0.50-alpha.72/go.mod h1:B+oqV0zdewN7OiEHYJm+hW+8/Te7B8tHHgD8rK5ZLZk=
+github.com/openimsdk/tools v0.0.50-alpha.67 h1:K7kguqvPbjldHAi7pGhcG2ERkctCqG9ZFlteT7UKaxM=
+github.com/openimsdk/tools v0.0.50-alpha.67/go.mod h1:B+oqV0zdewN7OiEHYJm+hW+8/Te7B8tHHgD8rK5ZLZk=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
@@ -384,8 +356,8 @@ github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
-github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
-github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -407,6 +379,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ=
 github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk=
+github.com/stathat/consistent v1.0.0 h1:ZFJ1QTRn8npNBKW065raSZ8xfOqhpb8vLOkfp4CcL/U=
+github.com/stathat/consistent v1.0.0/go.mod h1:uajTPbgSygZBJ+V+0mY7meZ8i0XAcZs7AQ6V121XSxw=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
@@ -436,8 +410,6 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
 github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
-github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
@@ -477,8 +449,8 @@ go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8=
 go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
-go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
-go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
+go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
@@ -555,8 +527,6 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
-golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -578,8 +548,6 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -624,14 +592,11 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
-gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -642,23 +607,7 @@ gorm.io/gorm v1.25.8 h1:WAGEZ/aEcznN4D03laj8DKnehe1e9gYQAjW8xyPRdeo=
 gorm.io/gorm v1.25.8/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0=
-k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk=
-k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw=
-k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
-k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc=
-k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs=
-k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
-k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
-k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
-k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
-k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
-sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
-sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
+stathat.com/c/consistent v1.0.0 h1:ezyc51EGcRPJUxfHGSgJjWzJdj3NiMU9pNfLNGiXV0c=
+stathat.com/c/consistent v1.0.0/go.mod h1:QkzMWzcbB+yQBL2AttO6sgsQS/JSTapcDISJalmCDS0=

internal/api/config_manager.go

@@ -1,312 +1,313 @@
 package api
 
-import (
-	"encoding/json"
-	"reflect"
-	"strconv"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/openimsdk/open-im-server/v3/pkg/apistruct"
-	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/discovery/etcd"
-	"github.com/openimsdk/open-im-server/v3/version"
-	"github.com/openimsdk/tools/apiresp"
-	"github.com/openimsdk/tools/errs"
-	"github.com/openimsdk/tools/log"
-	"github.com/openimsdk/tools/utils/runtimeenv"
-	clientv3 "go.etcd.io/etcd/client/v3"
-)
-
-const (
-	// wait for Restart http call return
-	waitHttp = time.Millisecond * 200
-)
-
-type ConfigManager struct {
-	imAdminUserID []string
-	config        *config.AllConfig
-	client        *clientv3.Client
-
-	configPath string
-	runtimeEnv string
-}
-
-func NewConfigManager(IMAdminUserID []string, cfg *config.AllConfig, client *clientv3.Client, configPath string, runtimeEnv string) *ConfigManager {
-	cm := &ConfigManager{
-		imAdminUserID: IMAdminUserID,
-		config:        cfg,
-		client:        client,
-		configPath:    configPath,
-		runtimeEnv:    runtimeEnv,
-	}
-	return cm
-}
-
-func (cm *ConfigManager) CheckAdmin(c *gin.Context) {
-	if err := authverify.CheckAdmin(c, cm.imAdminUserID); err != nil {
-		apiresp.GinError(c, err)
-		c.Abort()
-	}
-}
-
-func (cm *ConfigManager) GetConfig(c *gin.Context) {
-	var req apistruct.GetConfigReq
-	if err := c.BindJSON(&req); err != nil {
-		apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
-		return
-	}
-	conf := cm.config.Name2Config(req.ConfigName)
-	if conf == nil {
-		apiresp.GinError(c, errs.ErrArgs.WithDetail("config name not found").Wrap())
-		return
-	}
-	b, err := json.Marshal(conf)
-	if err != nil {
-		apiresp.GinError(c, err)
-		return
-	}
-	apiresp.GinSuccess(c, string(b))
-}
-
-func (cm *ConfigManager) GetConfigList(c *gin.Context) {
-	var resp apistruct.GetConfigListResp
-	resp.ConfigNames = cm.config.GetConfigNames()
-	resp.Environment = runtimeenv.PrintRuntimeEnvironment()
-	resp.Version = version.Version
-
-	apiresp.GinSuccess(c, resp)
-}
-
-func (cm *ConfigManager) SetConfig(c *gin.Context) {
-	if cm.config.Discovery.Enable != config.ETCD {
-		apiresp.GinError(c, errs.New("only etcd support set config").Wrap())
-		return
-	}
-	var req apistruct.SetConfigReq
-	if err := c.BindJSON(&req); err != nil {
-		apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
-		return
-	}
-	var err error
-	switch req.ConfigName {
-	case cm.config.Discovery.GetConfigFileName():
-		err = compareAndSave[config.Discovery](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.Kafka.GetConfigFileName():
-		err = compareAndSave[config.Kafka](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.LocalCache.GetConfigFileName():
-		err = compareAndSave[config.LocalCache](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.Log.GetConfigFileName():
-		err = compareAndSave[config.Log](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.Minio.GetConfigFileName():
-		err = compareAndSave[config.Minio](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.Mongo.GetConfigFileName():
-		err = compareAndSave[config.Mongo](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.Notification.GetConfigFileName():
-		err = compareAndSave[config.Notification](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.API.GetConfigFileName():
-		err = compareAndSave[config.API](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.CronTask.GetConfigFileName():
-		err = compareAndSave[config.CronTask](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.MsgGateway.GetConfigFileName():
-		err = compareAndSave[config.MsgGateway](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.MsgTransfer.GetConfigFileName():
-		err = compareAndSave[config.MsgTransfer](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.Push.GetConfigFileName():
-		err = compareAndSave[config.Push](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.Auth.GetConfigFileName():
-		err = compareAndSave[config.Auth](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.Conversation.GetConfigFileName():
-		err = compareAndSave[config.Conversation](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.Friend.GetConfigFileName():
-		err = compareAndSave[config.Friend](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.Group.GetConfigFileName():
-		err = compareAndSave[config.Group](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.Msg.GetConfigFileName():
-		err = compareAndSave[config.Msg](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.Third.GetConfigFileName():
-		err = compareAndSave[config.Third](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.User.GetConfigFileName():
-		err = compareAndSave[config.User](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.Redis.GetConfigFileName():
-		err = compareAndSave[config.Redis](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.Share.GetConfigFileName():
-		err = compareAndSave[config.Share](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	case cm.config.Webhooks.GetConfigFileName():
-		err = compareAndSave[config.Webhooks](c, cm.config.Name2Config(req.ConfigName), &req, cm)
-	default:
-		apiresp.GinError(c, errs.ErrArgs.Wrap())
-		return
-	}
-	if err != nil {
-		apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
-		return
-	}
-	apiresp.GinSuccess(c, nil)
-}
-
-func compareAndSave[T any](c *gin.Context, old any, req *apistruct.SetConfigReq, cm *ConfigManager) error {
-	conf := new(T)
-	err := json.Unmarshal([]byte(req.Data), &conf)
-	if err != nil {
-		return errs.ErrArgs.WithDetail(err.Error()).Wrap()
-	}
-	eq := reflect.DeepEqual(old, conf)
-	if eq {
-		return nil
-	}
-	data, err := json.Marshal(conf)
-	if err != nil {
-		return errs.ErrArgs.WithDetail(err.Error()).Wrap()
-	}
-	_, err = cm.client.Put(c, etcd.BuildKey(req.ConfigName), string(data))
-	if err != nil {
-		return errs.WrapMsg(err, "save to etcd failed")
-	}
-	return nil
-}
-
-func (cm *ConfigManager) ResetConfig(c *gin.Context) {
-	go func() {
-		if err := cm.resetConfig(c, true); err != nil {
-			log.ZError(c, "reset config err", err)
-		}
-	}()
-	apiresp.GinSuccess(c, nil)
-}
-
-func (cm *ConfigManager) resetConfig(c *gin.Context, checkChange bool, ops ...clientv3.Op) error {
-	txn := cm.client.Txn(c)
-	type initConf struct {
-		old any
-		new any
-	}
-	configMap := map[string]*initConf{
-		cm.config.Discovery.GetConfigFileName():    {old: &cm.config.Discovery, new: new(config.Discovery)},
-		cm.config.Kafka.GetConfigFileName():        {old: &cm.config.Kafka, new: new(config.Kafka)},
-		cm.config.LocalCache.GetConfigFileName():   {old: &cm.config.LocalCache, new: new(config.LocalCache)},
-		cm.config.Log.GetConfigFileName():          {old: &cm.config.Log, new: new(config.Log)},
-		cm.config.Minio.GetConfigFileName():        {old: &cm.config.Minio, new: new(config.Minio)},
-		cm.config.Mongo.GetConfigFileName():        {old: &cm.config.Mongo, new: new(config.Mongo)},
-		cm.config.Notification.GetConfigFileName(): {old: &cm.config.Notification, new: new(config.Notification)},
-		cm.config.API.GetConfigFileName():          {old: &cm.config.API, new: new(config.API)},
-		cm.config.CronTask.GetConfigFileName():     {old: &cm.config.CronTask, new: new(config.CronTask)},
-		cm.config.MsgGateway.GetConfigFileName():   {old: &cm.config.MsgGateway, new: new(config.MsgGateway)},
-		cm.config.MsgTransfer.GetConfigFileName():  {old: &cm.config.MsgTransfer, new: new(config.MsgTransfer)},
-		cm.config.Push.GetConfigFileName():         {old: &cm.config.Push, new: new(config.Push)},
-		cm.config.Auth.GetConfigFileName():         {old: &cm.config.Auth, new: new(config.Auth)},
-		cm.config.Conversation.GetConfigFileName(): {old: &cm.config.Conversation, new: new(config.Conversation)},
-		cm.config.Friend.GetConfigFileName():       {old: &cm.config.Friend, new: new(config.Friend)},
-		cm.config.Group.GetConfigFileName():        {old: &cm.config.Group, new: new(config.Group)},
-		cm.config.Msg.GetConfigFileName():          {old: &cm.config.Msg, new: new(config.Msg)},
-		cm.config.Third.GetConfigFileName():        {old: &cm.config.Third, new: new(config.Third)},
-		cm.config.User.GetConfigFileName():         {old: &cm.config.User, new: new(config.User)},
-		cm.config.Redis.GetConfigFileName():        {old: &cm.config.Redis, new: new(config.Redis)},
-		cm.config.Share.GetConfigFileName():        {old: &cm.config.Share, new: new(config.Share)},
-		cm.config.Webhooks.GetConfigFileName():     {old: &cm.config.Webhooks, new: new(config.Webhooks)},
-	}
-
-	changedKeys := make([]string, 0, len(configMap))
-	for k, v := range configMap {
-		err := config.Load(
-			cm.configPath,
-			k,
-			config.EnvPrefixMap[k],
-			cm.runtimeEnv,
-			v.new,
-		)
-		if err != nil {
-			log.ZError(c, "load config failed", err)
-			continue
-		}
-		equal := reflect.DeepEqual(v.old, v.new)
-		if !checkChange || !equal {
-			changedKeys = append(changedKeys, k)
-		}
-	}
-
-	for _, k := range changedKeys {
-		data, err := json.Marshal(configMap[k].new)
-		if err != nil {
-			log.ZError(c, "marshal config failed", err)
-			continue
-		}
-		ops = append(ops, clientv3.OpPut(etcd.BuildKey(k), string(data)))
-	}
-	if len(ops) > 0 {
-		txn.Then(ops...)
-		_, err := txn.Commit()
-		if err != nil {
-			return errs.WrapMsg(err, "commit etcd txn failed")
-		}
-	}
-	return nil
-}
-
-func (cm *ConfigManager) Restart(c *gin.Context) {
-	go cm.restart(c)
-	apiresp.GinSuccess(c, nil)
-}
-
-func (cm *ConfigManager) restart(c *gin.Context) {
-	time.Sleep(waitHttp) // wait for Restart http call return
-	t := time.Now().Unix()
-	_, err := cm.client.Put(c, etcd.BuildKey(etcd.RestartKey), strconv.Itoa(int(t)))
-	if err != nil {
-		log.ZError(c, "restart etcd put key failed", err)
-	}
-}
-
-func (cm *ConfigManager) SetEnableConfigManager(c *gin.Context) {
-	if cm.config.Discovery.Enable != config.ETCD {
-		apiresp.GinError(c, errs.New("only etcd support config manager").Wrap())
-		return
-	}
-	var req apistruct.SetEnableConfigManagerReq
-	if err := c.BindJSON(&req); err != nil {
-		apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
-		return
-	}
-	var enableStr string
-	if req.Enable {
-		enableStr = etcd.Enable
-	} else {
-		enableStr = etcd.Disable
-	}
-	resp, err := cm.client.Get(c, etcd.BuildKey(etcd.EnableConfigCenterKey))
-	if err != nil {
-		apiresp.GinError(c, errs.WrapMsg(err, "getEnableConfigManager failed"))
-		return
-	}
-	if !(resp.Count > 0 && string(resp.Kvs[0].Value) == etcd.Enable) && req.Enable {
-		go func() {
-			time.Sleep(waitHttp) // wait for Restart http call return
-			err := cm.resetConfig(c, false, clientv3.OpPut(etcd.BuildKey(etcd.EnableConfigCenterKey), enableStr))
-			if err != nil {
-				log.ZError(c, "resetConfig failed", err)
-			}
-		}()
-	} else {
-		_, err = cm.client.Put(c, etcd.BuildKey(etcd.EnableConfigCenterKey), enableStr)
-		if err != nil {
-			apiresp.GinError(c, errs.WrapMsg(err, "setEnableConfigManager failed"))
-			return
-		}
-	}
-
-	apiresp.GinSuccess(c, nil)
-}
-
-func (cm *ConfigManager) GetEnableConfigManager(c *gin.Context) {
-	resp, err := cm.client.Get(c, etcd.BuildKey(etcd.EnableConfigCenterKey))
-	if err != nil {
-		apiresp.GinError(c, errs.WrapMsg(err, "getEnableConfigManager failed"))
-		return
-	}
-	var enable bool
-	if resp.Count > 0 && string(resp.Kvs[0].Value) == etcd.Enable {
-		enable = true
-	}
-	apiresp.GinSuccess(c, &apistruct.GetEnableConfigManagerResp{Enable: enable})
-}
+//
+//import (
+//	"encoding/json"
+//	"reflect"
+//	"strconv"
+//	"time"
+//
+//	"github.com/gin-gonic/gin"
+//	"github.com/openimsdk/open-im-server/v3/pkg/apistruct"
+//	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
+//	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
+//	"github.com/openimsdk/open-im-server/v3/pkg/common/discovery/etcd"
+//	"github.com/openimsdk/open-im-server/v3/version"
+//	"github.com/openimsdk/tools/apiresp"
+//	"github.com/openimsdk/tools/errs"
+//	"github.com/openimsdk/tools/log"
+//	"github.com/openimsdk/tools/utils/runtimeenv"
+//	clientv3 "go.etcd.io/etcd/client/v3"
+//)
+//
+//const (
+//	// wait for Restart http call return
+//	waitHttp = time.Millisecond * 200
+//)
+//
+//type ConfigManager struct {
+//	imAdminUserID []string
+//	config        *config.AllConfig
+//	client        *clientv3.Client
+//
+//	configPath string
+//	runtimeEnv string
+//}
+//
+//func NewConfigManager(IMAdminUserID []string, cfg *config.AllConfig, client *clientv3.Client, configPath string, runtimeEnv string) *ConfigManager {
+//	cm := &ConfigManager{
+//		imAdminUserID: IMAdminUserID,
+//		config:        cfg,
+//		client:        client,
+//		configPath:    configPath,
+//		runtimeEnv:    runtimeEnv,
+//	}
+//	return cm
+//}
+//
+//func (cm *ConfigManager) CheckAdmin(c *gin.Context) {
+//	if err := authverify.CheckAdmin(c, cm.imAdminUserID); err != nil {
+//		apiresp.GinError(c, err)
+//		c.Abort()
+//	}
+//}
+//
+//func (cm *ConfigManager) GetConfig(c *gin.Context) {
+//	var req apistruct.GetConfigReq
+//	if err := c.BindJSON(&req); err != nil {
+//		apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
+//		return
+//	}
+//	conf := cm.config.Name2Config(req.ConfigName)
+//	if conf == nil {
+//		apiresp.GinError(c, errs.ErrArgs.WithDetail("config name not found").Wrap())
+//		return
+//	}
+//	b, err := json.Marshal(conf)
+//	if err != nil {
+//		apiresp.GinError(c, err)
+//		return
+//	}
+//	apiresp.GinSuccess(c, string(b))
+//}
+//
+//func (cm *ConfigManager) GetConfigList(c *gin.Context) {
+//	var resp apistruct.GetConfigListResp
+//	resp.ConfigNames = cm.config.GetConfigNames()
+//	resp.Environment = runtimeenv.PrintRuntimeEnvironment()
+//	resp.Version = version.Version
+//
+//	apiresp.GinSuccess(c, resp)
+//}
+//
+//func (cm *ConfigManager) SetConfig(c *gin.Context) {
+//	if cm.config.Discovery.Enable != config.ETCD {
+//		apiresp.GinError(c, errs.New("only etcd support set config").Wrap())
+//		return
+//	}
+//	var req apistruct.SetConfigReq
+//	if err := c.BindJSON(&req); err != nil {
+//		apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
+//		return
+//	}
+//	var err error
+//	switch req.ConfigName {
+//	case cm.config.Discovery.GetConfigFileName():
+//		err = compareAndSave[config.Discovery](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.Kafka.GetConfigFileName():
+//		err = compareAndSave[config.Kafka](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.LocalCache.GetConfigFileName():
+//		err = compareAndSave[config.LocalCache](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.Log.GetConfigFileName():
+//		err = compareAndSave[config.Log](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.Minio.GetConfigFileName():
+//		err = compareAndSave[config.Minio](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.Mongo.GetConfigFileName():
+//		err = compareAndSave[config.Mongo](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.Notification.GetConfigFileName():
+//		err = compareAndSave[config.Notification](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.API.GetConfigFileName():
+//		err = compareAndSave[config.API](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.CronTask.GetConfigFileName():
+//		err = compareAndSave[config.CronTask](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.MsgGateway.GetConfigFileName():
+//		err = compareAndSave[config.MsgGateway](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.MsgTransfer.GetConfigFileName():
+//		err = compareAndSave[config.MsgTransfer](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.Push.GetConfigFileName():
+//		err = compareAndSave[config.Push](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.Auth.GetConfigFileName():
+//		err = compareAndSave[config.Auth](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.Conversation.GetConfigFileName():
+//		err = compareAndSave[config.Conversation](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.Friend.GetConfigFileName():
+//		err = compareAndSave[config.Friend](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.Group.GetConfigFileName():
+//		err = compareAndSave[config.Group](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.Msg.GetConfigFileName():
+//		err = compareAndSave[config.Msg](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.Third.GetConfigFileName():
+//		err = compareAndSave[config.Third](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.User.GetConfigFileName():
+//		err = compareAndSave[config.User](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.Redis.GetConfigFileName():
+//		err = compareAndSave[config.Redis](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.Share.GetConfigFileName():
+//		err = compareAndSave[config.Share](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	case cm.config.Webhooks.GetConfigFileName():
+//		err = compareAndSave[config.Webhooks](c, cm.config.Name2Config(req.ConfigName), &req, cm)
+//	default:
+//		apiresp.GinError(c, errs.ErrArgs.Wrap())
+//		return
+//	}
+//	if err != nil {
+//		apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
+//		return
+//	}
+//	apiresp.GinSuccess(c, nil)
+//}
+//
+//func compareAndSave[T any](c *gin.Context, old any, req *apistruct.SetConfigReq, cm *ConfigManager) error {
+//	conf := new(T)
+//	err := json.Unmarshal([]byte(req.Data), &conf)
+//	if err != nil {
+//		return errs.ErrArgs.WithDetail(err.Error()).Wrap()
+//	}
+//	eq := reflect.DeepEqual(old, conf)
+//	if eq {
+//		return nil
+//	}
+//	data, err := json.Marshal(conf)
+//	if err != nil {
+//		return errs.ErrArgs.WithDetail(err.Error()).Wrap()
+//	}
+//	_, err = cm.client.Put(c, etcd.BuildKey(req.ConfigName), string(data))
+//	if err != nil {
+//		return errs.WrapMsg(err, "save to etcd failed")
+//	}
+//	return nil
+//}
+//
+//func (cm *ConfigManager) ResetConfig(c *gin.Context) {
+//	go func() {
+//		if err := cm.resetConfig(c, true); err != nil {
+//			log.ZError(c, "reset config err", err)
+//		}
+//	}()
+//	apiresp.GinSuccess(c, nil)
+//}
+//
+//func (cm *ConfigManager) resetConfig(c *gin.Context, checkChange bool, ops ...clientv3.Op) error {
+//	txn := cm.client.Txn(c)
+//	type initConf struct {
+//		old any
+//		new any
+//	}
+//	configMap := map[string]*initConf{
+//		cm.config.Discovery.GetConfigFileName():    {old: &cm.config.Discovery, new: new(config.Discovery)},
+//		cm.config.Kafka.GetConfigFileName():        {old: &cm.config.Kafka, new: new(config.Kafka)},
+//		cm.config.LocalCache.GetConfigFileName():   {old: &cm.config.LocalCache, new: new(config.LocalCache)},
+//		cm.config.Log.GetConfigFileName():          {old: &cm.config.Log, new: new(config.Log)},
+//		cm.config.Minio.GetConfigFileName():        {old: &cm.config.Minio, new: new(config.Minio)},
+//		cm.config.Mongo.GetConfigFileName():        {old: &cm.config.Mongo, new: new(config.Mongo)},
+//		cm.config.Notification.GetConfigFileName(): {old: &cm.config.Notification, new: new(config.Notification)},
+//		cm.config.API.GetConfigFileName():          {old: &cm.config.API, new: new(config.API)},
+//		cm.config.CronTask.GetConfigFileName():     {old: &cm.config.CronTask, new: new(config.CronTask)},
+//		cm.config.MsgGateway.GetConfigFileName():   {old: &cm.config.MsgGateway, new: new(config.MsgGateway)},
+//		cm.config.MsgTransfer.GetConfigFileName():  {old: &cm.config.MsgTransfer, new: new(config.MsgTransfer)},
+//		cm.config.Push.GetConfigFileName():         {old: &cm.config.Push, new: new(config.Push)},
+//		cm.config.Auth.GetConfigFileName():         {old: &cm.config.Auth, new: new(config.Auth)},
+//		cm.config.Conversation.GetConfigFileName(): {old: &cm.config.Conversation, new: new(config.Conversation)},
+//		cm.config.Friend.GetConfigFileName():       {old: &cm.config.Friend, new: new(config.Friend)},
+//		cm.config.Group.GetConfigFileName():        {old: &cm.config.Group, new: new(config.Group)},
+//		cm.config.Msg.GetConfigFileName():          {old: &cm.config.Msg, new: new(config.Msg)},
+//		cm.config.Third.GetConfigFileName():        {old: &cm.config.Third, new: new(config.Third)},
+//		cm.config.User.GetConfigFileName():         {old: &cm.config.User, new: new(config.User)},
+//		cm.config.Redis.GetConfigFileName():        {old: &cm.config.Redis, new: new(config.Redis)},
+//		cm.config.Share.GetConfigFileName():        {old: &cm.config.Share, new: new(config.Share)},
+//		cm.config.Webhooks.GetConfigFileName():     {old: &cm.config.Webhooks, new: new(config.Webhooks)},
+//	}
+//
+//	changedKeys := make([]string, 0, len(configMap))
+//	for k, v := range configMap {
+//		err := config.Load(
+//			cm.configPath,
+//			k,
+//			config.EnvPrefixMap[k],
+//			cm.runtimeEnv,
+//			v.new,
+//		)
+//		if err != nil {
+//			log.ZError(c, "load config failed", err)
+//			continue
+//		}
+//		equal := reflect.DeepEqual(v.old, v.new)
+//		if !checkChange || !equal {
+//			changedKeys = append(changedKeys, k)
+//		}
+//	}
+//
+//	for _, k := range changedKeys {
+//		data, err := json.Marshal(configMap[k].new)
+//		if err != nil {
+//			log.ZError(c, "marshal config failed", err)
+//			continue
+//		}
+//		ops = append(ops, clientv3.OpPut(etcd.BuildKey(k), string(data)))
+//	}
+//	if len(ops) > 0 {
+//		txn.Then(ops...)
+//		_, err := txn.Commit()
+//		if err != nil {
+//			return errs.WrapMsg(err, "commit etcd txn failed")
+//		}
+//	}
+//	return nil
+//}
+//
+//func (cm *ConfigManager) Restart(c *gin.Context) {
+//	go cm.restart(c)
+//	apiresp.GinSuccess(c, nil)
+//}
+//
+//func (cm *ConfigManager) restart(c *gin.Context) {
+//	time.Sleep(waitHttp) // wait for Restart http call return
+//	t := time.Now().Unix()
+//	_, err := cm.client.Put(c, etcd.BuildKey(etcd.RestartKey), strconv.Itoa(int(t)))
+//	if err != nil {
+//		log.ZError(c, "restart etcd put key failed", err)
+//	}
+//}
+//
+//func (cm *ConfigManager) SetEnableConfigManager(c *gin.Context) {
+//	if cm.config.Discovery.Enable != config.ETCD {
+//		apiresp.GinError(c, errs.New("only etcd support config manager").Wrap())
+//		return
+//	}
+//	var req apistruct.SetEnableConfigManagerReq
+//	if err := c.BindJSON(&req); err != nil {
+//		apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
+//		return
+//	}
+//	var enableStr string
+//	if req.Enable {
+//		enableStr = etcd.Enable
+//	} else {
+//		enableStr = etcd.Disable
+//	}
+//	resp, err := cm.client.Get(c, etcd.BuildKey(etcd.EnableConfigCenterKey))
+//	if err != nil {
+//		apiresp.GinError(c, errs.WrapMsg(err, "getEnableConfigManager failed"))
+//		return
+//	}
+//	if !(resp.Count > 0 && string(resp.Kvs[0].Value) == etcd.Enable) && req.Enable {
+//		go func() {
+//			time.Sleep(waitHttp) // wait for Restart http call return
+//			err := cm.resetConfig(c, false, clientv3.OpPut(etcd.BuildKey(etcd.EnableConfigCenterKey), enableStr))
+//			if err != nil {
+//				log.ZError(c, "resetConfig failed", err)
+//			}
+//		}()
+//	} else {
+//		_, err = cm.client.Put(c, etcd.BuildKey(etcd.EnableConfigCenterKey), enableStr)
+//		if err != nil {
+//			apiresp.GinError(c, errs.WrapMsg(err, "setEnableConfigManager failed"))
+//			return
+//		}
+//	}
+//
+//	apiresp.GinSuccess(c, nil)
+//}
+//
+//func (cm *ConfigManager) GetEnableConfigManager(c *gin.Context) {
+//	resp, err := cm.client.Get(c, etcd.BuildKey(etcd.EnableConfigCenterKey))
+//	if err != nil {
+//		apiresp.GinError(c, errs.WrapMsg(err, "getEnableConfigManager failed"))
+//		return
+//	}
+//	var enable bool
+//	if resp.Count > 0 && string(resp.Kvs[0].Value) == etcd.Enable {
+//		enable = true
+//	}
+//	apiresp.GinSuccess(c, &apistruct.GetEnableConfigManagerResp{Enable: enable})
+//}

internal/api/init.go

@@ -1,17 +1,3 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 package api
 
 import (
@@ -26,45 +12,46 @@ import (
 	"syscall"
 	"time"
 
-	conf "github.com/openimsdk/open-im-server/v3/pkg/common/config"
-	kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discovery"
-	disetcd "github.com/openimsdk/open-im-server/v3/pkg/common/discovery/etcd"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
+	"github.com/openimsdk/tools/mw"
+	"github.com/openimsdk/tools/utils/datautil"
+	"github.com/openimsdk/tools/utils/network"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
+
+	kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
+	"github.com/openimsdk/tools/discovery"
 	"github.com/openimsdk/tools/discovery/etcd"
 	"github.com/openimsdk/tools/errs"
 	"github.com/openimsdk/tools/log"
-	"github.com/openimsdk/tools/mw"
 	"github.com/openimsdk/tools/system/program"
-	"github.com/openimsdk/tools/utils/datautil"
 	"github.com/openimsdk/tools/utils/jsonutil"
-	"github.com/openimsdk/tools/utils/network"
-	"github.com/openimsdk/tools/utils/runtimeenv"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
 )
 
 type Config struct {
-	*conf.AllConfig
-
-	RuntimeEnv string
-	ConfigPath string
+	API       config.API
+	Share     config.Share
+	Discovery config.Discovery
 }
 
-func Start(ctx context.Context, index int, config *Config) error {
-	apiPort, err := datautil.GetElemByIndex(config.API.Api.Ports, index)
+func Start(ctx context.Context, index int, cfg *Config) error {
+	apiPort, err := datautil.GetElemByIndex(cfg.API.Api.Ports, index)
 	if err != nil {
 		return err
 	}
 
-	config.RuntimeEnv = runtimeenv.PrintRuntimeEnvironment()
+	var client discovery.SvcDiscoveryRegistry
 
-	client, err := kdisc.NewDiscoveryRegister(&config.Discovery, config.RuntimeEnv, []string{
-		config.Discovery.RpcService.MessageGateway,
+	// Determine whether zk is passed according to whether it is a clustered deployment
+	client, err = kdisc.NewDiscoveryRegister(&cfg.Discovery, &cfg.Share, []string{
+		cfg.Share.RpcRegisterName.MessageGateway,
 	})
 	if err != nil {
 		return errs.WrapMsg(err, "failed to register discovery service")
 	}
-	client.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, "round_robin")))
+	client.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()),
+		grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, "round_robin")))
 
 	var (
 		netDone        = make(chan struct{}, 1)
@@ -72,6 +59,10 @@ func Start(ctx context.Context, index int, config *Config) error {
 		prometheusPort int
 	)
 
+	router, err := newGinRouter(ctx, client, cfg)
+	if err != nil {
+		return err
+	}
 	registerIP, err := network.GetRpcRegisterIP("")
 	if err != nil {
 		return err
@@ -88,20 +79,16 @@ func Start(ctx context.Context, index int, config *Config) error {
 		return listener, port, nil
 	}
 
-	if config.API.Prometheus.AutoSetPorts && config.Discovery.Enable != conf.ETCD {
+	if cfg.API.Prometheus.AutoSetPorts && cfg.Discovery.Enable != config.ETCD {
 		return errs.New("only etcd support autoSetPorts", "RegisterName", "api").Wrap()
 	}
 
-	router, err := newGinRouter(ctx, client, config)
-	if err != nil {
-		return err
-	}
-	if config.API.Prometheus.Enable {
+	if cfg.API.Prometheus.Enable {
 		var (
 			listener net.Listener
 		)
 
-		if config.API.Prometheus.AutoSetPorts {
+		if cfg.API.Prometheus.AutoSetPorts {
 			listener, prometheusPort, err = getAutoPort()
 			if err != nil {
 				return err
@@ -114,7 +101,7 @@ func Start(ctx context.Context, index int, config *Config) error {
 				return errs.WrapMsg(err, "etcd put err")
 			}
 		} else {
-			prometheusPort, err = datautil.GetElemByIndex(config.API.Prometheus.Ports, index)
+			prometheusPort, err = datautil.GetElemByIndex(cfg.API.Prometheus.Ports, index)
 			if err != nil {
 				return err
 			}
@@ -132,41 +119,30 @@ func Start(ctx context.Context, index int, config *Config) error {
 		}()
 
 	}
-	address := net.JoinHostPort(network.GetListenIP(config.API.Api.ListenIP), strconv.Itoa(apiPort))
+	address := net.JoinHostPort(network.GetListenIP(cfg.API.Api.ListenIP), strconv.Itoa(apiPort))
 
 	server := http.Server{Addr: address, Handler: router}
-	log.CInfo(ctx, "API server is initializing", "runtimeEnv", config.RuntimeEnv, "address", address, "apiPort", apiPort, "prometheusPort", prometheusPort)
+	log.CInfo(ctx, "API server is initializing", "address", address, "apiPort", apiPort, "prometheusPort", prometheusPort)
 	go func() {
 		err = server.ListenAndServe()
 		if err != nil && !errors.Is(err, http.ErrServerClosed) {
 			netErr = errs.WrapMsg(err, fmt.Sprintf("api start err: %s", server.Addr))
 			netDone <- struct{}{}
+
 		}
 	}()
 
-	if config.Discovery.Enable == conf.ETCD {
-		cm := disetcd.NewConfigManager(client.(*etcd.SvcDiscoveryRegistryImpl).GetClient(), config.GetConfigNames())
-		cm.Watch(ctx)
-	}
-
 	sigs := make(chan os.Signal, 1)
 	signal.Notify(sigs, syscall.SIGTERM)
 
-	shutdown := func() error {
-		ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
-		defer cancel()
-		err := server.Shutdown(ctx)
-		if err != nil {
-			return errs.WrapMsg(err, "shutdown err")
-		}
-		return nil
-	}
-	disetcd.RegisterShutDown(shutdown)
+	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
+	defer cancel()
 	select {
 	case <-sigs:
 		program.SIGTERMExit()
-		if err := shutdown(); err != nil {
-			return err
+		err := server.Shutdown(ctx)
+		if err != nil {
+			return errs.WrapMsg(err, "shutdown err")
 		}
 	case <-netDone:
 		close(netDone)

internal/api/jssdk/tools.go

@@ -2,9 +2,6 @@ package jssdk
 
 import (
 	"context"
-	"io"
-	"strings"
-
 	"github.com/gin-gonic/gin"
 	"github.com/openimsdk/tools/a2r"
 	"github.com/openimsdk/tools/apiresp"
@@ -12,6 +9,8 @@ import (
 	"github.com/openimsdk/tools/errs"
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/proto"
+	"io"
+	"strings"
 )
 
 func field[A, B, C any](ctx context.Context, fn func(ctx context.Context, req *A, opts ...grpc.CallOption) (*B, error), req *A, get func(*B) C) (C, error) {

internal/api/msg.go

@@ -248,44 +248,24 @@ func (m *MessageApi) SendMessage(c *gin.Context) {
 
 func (m *MessageApi) SendBusinessNotification(c *gin.Context) {
 	req := struct {
-		Key              string `json:"key"`
-		Data             string `json:"data"`
-		SendUserID       string `json:"sendUserID" binding:"required"`
-		RecvUserID       string `json:"recvUserID"`
-		RecvGroupID      string `json:"recvGroupID"`
-		SendMsg          bool   `json:"sendMsg"`
-		ReliabilityLevel *int   `json:"reliabilityLevel"`
+		Key        string `json:"key"`
+		Data       string `json:"data"`
+		SendUserID string `json:"sendUserID" binding:"required"`
+		RecvUserID string `json:"recvUserID" binding:"required"`
 	}{}
 	if err := c.BindJSON(&req); err != nil {
 		apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
 		return
 	}
-	if req.RecvUserID == "" && req.RecvGroupID == "" {
-		apiresp.GinError(c, errs.ErrArgs.WrapMsg("recvUserID and recvGroupID cannot be empty at the same time"))
-		return
-	}
-	if req.RecvUserID != "" && req.RecvGroupID != "" {
-		apiresp.GinError(c, errs.ErrArgs.WrapMsg("recvUserID and recvGroupID cannot be set at the same time"))
-		return
-	}
-	var sessionType int32
-	if req.RecvUserID != "" {
-		sessionType = constant.SingleChatType
-	} else {
-		sessionType = constant.ReadGroupChatType
-	}
-	if req.ReliabilityLevel == nil {
-		req.ReliabilityLevel = datautil.ToPtr(1)
-	}
+
 	if !authverify.IsAppManagerUid(c, m.imAdminUserID) {
 		apiresp.GinError(c, errs.ErrNoPermission.WrapMsg("only app manager can send message"))
 		return
 	}
 	sendMsgReq := msg.SendMsgReq{
 		MsgData: &sdkws.MsgData{
-			SendID:  req.SendUserID,
-			RecvID:  req.RecvUserID,
-			GroupID: req.RecvGroupID,
+			SendID: req.SendUserID,
+			RecvID: req.RecvUserID,
 			Content: []byte(jsonutil.StructToJsonString(&sdkws.NotificationElem{
 				Detail: jsonutil.StructToJsonString(&struct {
 					Key  string `json:"key"`
@@ -294,12 +274,12 @@ func (m *MessageApi) SendBusinessNotification(c *gin.Context) {
 			})),
 			MsgFrom:     constant.SysMsgType,
 			ContentType: constant.BusinessNotification,
-			SessionType: sessionType,
+			SessionType: constant.SingleChatType,
 			CreateTime:  timeutil.GetCurrentTimestampByMill(),
 			ClientMsgID: idutil.GetMsgIDByMD5(mcontext.GetOpUserID(c)),
 			Options: config.GetOptionsByNotification(config.NotificationConfig{
-				IsSendMsg:        req.SendMsg,
-				ReliabilityLevel: *req.ReliabilityLevel,
+				IsSendMsg:        false,
+				ReliabilityLevel: 1,
 				UnreadCount:      false,
 			}),
 		},
@@ -391,3 +371,11 @@ func (m *MessageApi) SearchMsg(c *gin.Context) {
 func (m *MessageApi) GetServerTime(c *gin.Context) {
 	a2r.Call(c, msg.MsgClient.GetServerTime, m.Client)
 }
+
+func (m *MessageApi) GetStreamMsg(c *gin.Context) {
+	a2r.Call(c, msg.MsgClient.GetServerTime, m.Client)
+}
+
+func (m *MessageApi) AppendStreamMsg(c *gin.Context) {
+	a2r.Call(c, msg.MsgClient.GetServerTime, m.Client)
+}

internal/api/prometheus_discovery.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	conf "github.com/openimsdk/open-im-server/v3/pkg/common/config"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
 	"github.com/openimsdk/tools/apiresp"
 	"github.com/openimsdk/tools/discovery"
@@ -20,18 +20,18 @@ type PrometheusDiscoveryApi struct {
 	client *clientv3.Client
 }
 
-func NewPrometheusDiscoveryApi(config *Config, client discovery.SvcDiscoveryRegistry) *PrometheusDiscoveryApi {
+func NewPrometheusDiscoveryApi(cfg *Config, client discovery.SvcDiscoveryRegistry) *PrometheusDiscoveryApi {
 	api := &PrometheusDiscoveryApi{
-		config: config,
+		config: cfg,
 	}
-	if config.Discovery.Enable == conf.ETCD {
+	if cfg.Discovery.Enable == config.ETCD {
 		api.client = client.(*etcd.SvcDiscoveryRegistryImpl).GetClient()
 	}
 	return api
 }
 
 func (p *PrometheusDiscoveryApi) Enable(c *gin.Context) {
-	if p.config.Discovery.Enable != conf.ETCD {
+	if p.config.Discovery.Enable != config.ETCD {
 		c.JSON(http.StatusOK, []struct{}{})
 		c.Abort()
 	}
@@ -74,39 +74,39 @@ func (p *PrometheusDiscoveryApi) Api(c *gin.Context) {
 }
 
 func (p *PrometheusDiscoveryApi) User(c *gin.Context) {
-	p.discovery(c, p.config.Discovery.RpcService.User)
+	p.discovery(c, p.config.Share.RpcRegisterName.User)
 }
 
 func (p *PrometheusDiscoveryApi) Group(c *gin.Context) {
-	p.discovery(c, p.config.Discovery.RpcService.Group)
+	p.discovery(c, p.config.Share.RpcRegisterName.Group)
 }
 
 func (p *PrometheusDiscoveryApi) Msg(c *gin.Context) {
-	p.discovery(c, p.config.Discovery.RpcService.Msg)
+	p.discovery(c, p.config.Share.RpcRegisterName.Msg)
 }
 
 func (p *PrometheusDiscoveryApi) Friend(c *gin.Context) {
-	p.discovery(c, p.config.Discovery.RpcService.Friend)
+	p.discovery(c, p.config.Share.RpcRegisterName.Friend)
 }
 
 func (p *PrometheusDiscoveryApi) Conversation(c *gin.Context) {
-	p.discovery(c, p.config.Discovery.RpcService.Conversation)
+	p.discovery(c, p.config.Share.RpcRegisterName.Conversation)
 }
 
 func (p *PrometheusDiscoveryApi) Third(c *gin.Context) {
-	p.discovery(c, p.config.Discovery.RpcService.Third)
+	p.discovery(c, p.config.Share.RpcRegisterName.Third)
 }
 
 func (p *PrometheusDiscoveryApi) Auth(c *gin.Context) {
-	p.discovery(c, p.config.Discovery.RpcService.Auth)
+	p.discovery(c, p.config.Share.RpcRegisterName.Auth)
 }
 
 func (p *PrometheusDiscoveryApi) Push(c *gin.Context) {
-	p.discovery(c, p.config.Discovery.RpcService.Push)
+	p.discovery(c, p.config.Share.RpcRegisterName.Push)
 }
 
 func (p *PrometheusDiscoveryApi) MessageGateway(c *gin.Context) {
-	p.discovery(c, p.config.Discovery.RpcService.MessageGateway)
+	p.discovery(c, p.config.Share.RpcRegisterName.MessageGateway)
 }
 
 func (p *PrometheusDiscoveryApi) MessageTransfer(c *gin.Context) {

internal/api/router.go

@@ -5,29 +5,29 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/gin-contrib/gzip"
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"github.com/go-playground/validator/v10"
-	"github.com/openimsdk/open-im-server/v3/internal/api/jssdk"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/servererrs"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcli"
 	pbAuth "github.com/openimsdk/protocol/auth"
-	"github.com/openimsdk/protocol/constant"
 	"github.com/openimsdk/protocol/conversation"
 	"github.com/openimsdk/protocol/group"
 	"github.com/openimsdk/protocol/msg"
 	"github.com/openimsdk/protocol/relation"
 	"github.com/openimsdk/protocol/third"
 	"github.com/openimsdk/protocol/user"
+
+	"github.com/openimsdk/open-im-server/v3/internal/api/jssdk"
+
+	"github.com/gin-contrib/gzip"
+
+	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
+	"github.com/go-playground/validator/v10"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/servererrs"
+	"github.com/openimsdk/protocol/constant"
 	"github.com/openimsdk/tools/apiresp"
 	"github.com/openimsdk/tools/discovery"
-	"github.com/openimsdk/tools/discovery/etcd"
 	"github.com/openimsdk/tools/log"
 	"github.com/openimsdk/tools/mw"
-	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
 const (
@@ -52,32 +52,32 @@ func prommetricsGin() gin.HandlerFunc {
 	}
 }
 
-func newGinRouter(ctx context.Context, client discovery.SvcDiscoveryRegistry, cfg *Config) (*gin.Engine, error) {
-	authConn, err := client.GetConn(ctx, cfg.Discovery.RpcService.Auth)
+func newGinRouter(ctx context.Context, client discovery.SvcDiscoveryRegistry, config *Config) (*gin.Engine, error) {
+	authConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Auth)
 	if err != nil {
 		return nil, err
 	}
-	userConn, err := client.GetConn(ctx, cfg.Discovery.RpcService.User)
+	userConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.User)
 	if err != nil {
 		return nil, err
 	}
-	groupConn, err := client.GetConn(ctx, cfg.Discovery.RpcService.Group)
+	groupConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Group)
 	if err != nil {
 		return nil, err
 	}
-	friendConn, err := client.GetConn(ctx, cfg.Discovery.RpcService.Friend)
+	friendConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Friend)
 	if err != nil {
 		return nil, err
 	}
-	conversationConn, err := client.GetConn(ctx, cfg.Discovery.RpcService.Conversation)
+	conversationConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Conversation)
 	if err != nil {
 		return nil, err
 	}
-	thirdConn, err := client.GetConn(ctx, cfg.Discovery.RpcService.Third)
+	thirdConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Third)
 	if err != nil {
 		return nil, err
 	}
-	msgConn, err := client.GetConn(ctx, cfg.Discovery.RpcService.Msg)
+	msgConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Msg)
 	if err != nil {
 		return nil, err
 	}
@@ -86,7 +86,7 @@ func newGinRouter(ctx context.Context, client discovery.SvcDiscoveryRegistry, cf
 	if v, ok := binding.Validator.Engine().(*validator.Validate); ok {
 		_ = v.RegisterValidation("required_if", RequiredIf)
 	}
-	switch cfg.API.Api.CompressionLevel {
+	switch config.API.Api.CompressionLevel {
 	case NoCompression:
 	case DefaultCompression:
 		r.Use(gzip.Gzip(gzip.DefaultCompression))
@@ -95,12 +95,11 @@ func newGinRouter(ctx context.Context, client discovery.SvcDiscoveryRegistry, cf
 	case BestSpeed:
 		r.Use(gzip.Gzip(gzip.BestSpeed))
 	}
-	r.Use(prommetricsGin(), gin.RecoveryWithWriter(gin.DefaultErrorWriter, mw.GinPanicErr), mw.CorsHandler(),
-		mw.GinParseOperationID(), GinParseToken(rpcli.NewAuthClient(authConn)))
-
-	u := NewUserApi(user.NewUserClient(userConn), client, cfg.Discovery.RpcService)
+	r.Use(prommetricsGin(), gin.RecoveryWithWriter(gin.DefaultErrorWriter, mw.GinPanicErr), mw.CorsHandler(), mw.GinParseOperationID(), GinParseToken(rpcli.NewAuthClient(authConn)))
+	u := NewUserApi(user.NewUserClient(userConn), client, config.Share.RpcRegisterName)
+	m := NewMessageApi(msg.NewMsgClient(msgConn), rpcli.NewUserClient(userConn), config.Share.IMAdminUserID)
+	userRouterGroup := r.Group("/user")
 	{
-		userRouterGroup := r.Group("/user")
 		userRouterGroup.POST("/user_register", u.UserRegister)
 		userRouterGroup.POST("/update_user_info", u.UpdateUserInfo)
 		userRouterGroup.POST("/update_user_info_ex", u.UpdateUserInfoEx)
@@ -199,7 +198,7 @@ func newGinRouter(ctx context.Context, client discovery.SvcDiscoveryRegistry, cf
 	}
 	// Third service
 	{
-		t := NewThirdApi(third.NewThirdClient(thirdConn), cfg.API.Prometheus.GrafanaURL)
+		t := NewThirdApi(third.NewThirdClient(thirdConn), config.API.Prometheus.GrafanaURL)
 		thirdGroup := r.Group("/third")
 		thirdGroup.GET("/prometheus", t.GetPrometheus)
 		thirdGroup.POST("/fcm_update_token", t.FcmUpdateToken)
@@ -223,7 +222,6 @@ func newGinRouter(ctx context.Context, client discovery.SvcDiscoveryRegistry, cf
 		objectGroup.GET("/*name", t.ObjectRedirect)
 	}
 	// Message
-	m := NewMessageApi(msg.NewMsgClient(msgConn), rpcli.NewUserClient(userConn), cfg.Share.IMAdminUserID)
 	{
 		msgGroup := r.Group("/msg")
 		msgGroup.POST("/newest_seq", m.GetSeq)
@@ -280,7 +278,7 @@ func newGinRouter(ctx context.Context, client discovery.SvcDiscoveryRegistry, cf
 		jssdk.POST("/get_active_conversations", j.GetActiveConversations)
 	}
 	{
-		pd := NewPrometheusDiscoveryApi(cfg, client)
+		pd := NewPrometheusDiscoveryApi(config, client)
 		proDiscoveryGroup := r.Group("/prometheus_discovery", pd.Enable)
 		proDiscoveryGroup.GET("/api", pd.Api)
 		proDiscoveryGroup.GET("/user", pd.User)
@@ -294,25 +292,6 @@ func newGinRouter(ctx context.Context, client discovery.SvcDiscoveryRegistry, cf
 		proDiscoveryGroup.GET("/msg_gateway", pd.MessageGateway)
 		proDiscoveryGroup.GET("/msg_transfer", pd.MessageTransfer)
 	}
-
-	var etcdClient *clientv3.Client
-	if cfg.Discovery.Enable == config.ETCD {
-		etcdClient = client.(*etcd.SvcDiscoveryRegistryImpl).GetClient()
-	}
-	cm := NewConfigManager(cfg.Share.IMAdminUserID, cfg.AllConfig, etcdClient, cfg.ConfigPath, cfg.RuntimeEnv)
-	{
-
-		configGroup := r.Group("/config", cm.CheckAdmin)
-		configGroup.POST("/get_config_list", cm.GetConfigList)
-		configGroup.POST("/get_config", cm.GetConfig)
-		configGroup.POST("/set_config", cm.SetConfig)
-		configGroup.POST("/reset_config", cm.ResetConfig)
-		configGroup.POST("/set_enable_config_manager", cm.SetEnableConfigManager)
-		configGroup.POST("/get_enable_config_manager", cm.GetEnableConfigManager)
-	}
-	{
-		r.POST("/restart", cm.CheckAdmin, cm.Restart)
-	}
 	return r, nil
 }
 

internal/api/user.go

@@ -30,10 +30,10 @@ import (
 type UserApi struct {
 	Client user.UserClient
 	discov discovery.SvcDiscoveryRegistry
-	config config.RpcService
+	config config.RpcRegisterName
 }
 
-func NewUserApi(client user.UserClient, discov discovery.SvcDiscoveryRegistry, config config.RpcService) UserApi {
+func NewUserApi(client user.UserClient, discov discovery.SvcDiscoveryRegistry, config config.RpcRegisterName) UserApi {
 	return UserApi{Client: client, discov: discov, config: config}
 }
 

internal/msggateway/hub_server.go

@@ -36,7 +36,7 @@ import (
 )
 
 func (s *Server) InitServer(ctx context.Context, config *Config, disCov discovery.SvcDiscoveryRegistry, server *grpc.Server) error {
-	userConn, err := disCov.GetConn(ctx, config.Discovery.RpcService.User)
+	userConn, err := disCov.GetConn(ctx, config.Share.RpcRegisterName.User)
 	if err != nil {
 		return err
 	}
@@ -54,19 +54,13 @@ func (s *Server) InitServer(ctx context.Context, config *Config, disCov discover
 func (s *Server) Start(ctx context.Context, index int, conf *Config) error {
 	return startrpc.Start(ctx, &conf.Discovery, &conf.MsgGateway.Prometheus, conf.MsgGateway.ListenIP,
 		conf.MsgGateway.RPC.RegisterIP,
-		conf.MsgGateway.RPC.AutoSetPorts, conf.MsgGateway.RPC.Ports, index,
-		conf.Discovery.RpcService.MessageGateway,
-		nil,
+		conf.MsgGateway.RPC.AutoSetPorts,
+		conf.MsgGateway.RPC.Ports, index,
+		conf.Share.RpcRegisterName.MessageGateway,
+		&conf.Share,
 		conf,
 		[]string{
-			conf.Share.GetConfigFileName(),
-			conf.Discovery.GetConfigFileName(),
-			conf.MsgGateway.GetConfigFileName(),
-			conf.WebhooksConfig.GetConfigFileName(),
-			conf.RedisConfig.GetConfigFileName(),
-		},
-		[]string{
-			conf.Discovery.RpcService.MessageGateway,
+			conf.Share.RpcRegisterName.MessageGateway,
 		},
 		s.InitServer,
 	)
@@ -74,7 +68,7 @@ func (s *Server) Start(ctx context.Context, index int, conf *Config) error {
 
 type Server struct {
 	msggateway.UnimplementedMsgGatewayServer
-
+	rpcPort        int
 	LongConnServer LongConnServer
 	config         *Config
 	pushTerminal   map[int]struct{}

internal/msggateway/ws_server.go

@@ -2,29 +2,25 @@ package msggateway
 
 import (
 	"context"
-	"errors"
 	"fmt"
+	"github.com/openimsdk/open-im-server/v3/pkg/rpcli"
 	"net/http"
 	"sync"
 	"sync/atomic"
 	"time"
 
-	"github.com/openimsdk/open-im-server/v3/pkg/rpcli"
-
-	"github.com/openimsdk/open-im-server/v3/pkg/common/discovery/etcd"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/webhook"
-	"github.com/openimsdk/open-im-server/v3/pkg/rpccache"
-	pbAuth "github.com/openimsdk/protocol/auth"
-	"github.com/openimsdk/tools/mcontext"
-
 	"github.com/go-playground/validator/v10"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/servererrs"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/webhook"
+	"github.com/openimsdk/open-im-server/v3/pkg/rpccache"
+	pbAuth "github.com/openimsdk/protocol/auth"
 	"github.com/openimsdk/protocol/constant"
 	"github.com/openimsdk/protocol/msggateway"
 	"github.com/openimsdk/tools/discovery"
 	"github.com/openimsdk/tools/errs"
 	"github.com/openimsdk/tools/log"
+	"github.com/openimsdk/tools/mcontext"
 	"github.com/openimsdk/tools/utils/stringutil"
 	"golang.org/x/sync/errgroup"
 )
@@ -76,19 +72,19 @@ type kickHandler struct {
 }
 
 func (ws *WsServer) SetDiscoveryRegistry(ctx context.Context, disCov discovery.SvcDiscoveryRegistry, config *Config) error {
-	userConn, err := disCov.GetConn(ctx, config.Discovery.RpcService.User)
+	userConn, err := disCov.GetConn(ctx, config.Share.RpcRegisterName.User)
 	if err != nil {
 		return err
 	}
-	pushConn, err := disCov.GetConn(ctx, config.Discovery.RpcService.Push)
+	pushConn, err := disCov.GetConn(ctx, config.Share.RpcRegisterName.Push)
 	if err != nil {
 		return err
 	}
-	authConn, err := disCov.GetConn(ctx, config.Discovery.RpcService.Auth)
+	authConn, err := disCov.GetConn(ctx, config.Share.RpcRegisterName.Auth)
 	if err != nil {
 		return err
 	}
-	msgConn, err := disCov.GetConn(ctx, config.Discovery.RpcService.Msg)
+	msgConn, err := disCov.GetConn(ctx, config.Share.RpcRegisterName.Msg)
 	if err != nil {
 		return err
 	}
@@ -133,7 +129,7 @@ func NewWsServer(msgGatewayConfig *Config, opts ...Option) *WsServer {
 	for _, o := range opts {
 		o(&config)
 	}
-	//userRpcClient := rpcclient.NewUserRpcClient(client, config.Discovery.RpcService.User, config.Share.IMAdminUserID)
+	//userRpcClient := rpcclient.NewUserRpcClient(client, config.Share.RpcRegisterName.User, config.Share.IMAdminUserID)
 
 	v := validator.New()
 	return &WsServer{
@@ -185,28 +181,21 @@ func (ws *WsServer) Run(done chan error) error {
 	go func() {
 		http.HandleFunc("/", ws.wsHandler)
 		err := server.ListenAndServe()
-		if err != nil && !errors.Is(err, http.ErrServerClosed) {
+		defer close(netDone)
+		if err != nil && err != http.ErrServerClosed {
 			netErr = errs.WrapMsg(err, "ws start err", server.Addr)
-			netDone <- struct{}{}
 		}
 	}()
 	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
-	shutDown := func() error {
+	defer cancel()
+	var err error
+	select {
+	case err = <-done:
 		sErr := server.Shutdown(ctx)
 		if sErr != nil {
 			return errs.WrapMsg(sErr, "shutdown err")
 		}
 		close(shutdownDone)
-		return nil
-	}
-	etcd.RegisterShutDown(shutDown)
-	defer cancel()
-	var err error
-	select {
-	case err = <-done:
-		if err := shutDown(); err != nil {
-			return err
-		}
 		if err != nil {
 			return err
 		}
@@ -219,7 +208,7 @@ func (ws *WsServer) Run(done chan error) error {
 var concurrentRequest = 3
 
 func (ws *WsServer) sendUserOnlineInfoToOtherNode(ctx context.Context, client *Client) error {
-	conns, err := ws.disCov.GetConns(ctx, ws.msgGatewayConfig.Discovery.RpcService.MessageGateway)
+	conns, err := ws.disCov.GetConns(ctx, ws.msgGatewayConfig.Share.RpcRegisterName.MessageGateway)
 	if err != nil {
 		return err
 	}

internal/msgtransfer/init.go

@@ -25,8 +25,6 @@ import (
 	"strconv"
 	"syscall"
 
-	disetcd "github.com/openimsdk/open-im-server/v3/pkg/common/discovery/etcd"
-	"github.com/openimsdk/tools/discovery"
 	"github.com/openimsdk/tools/discovery/etcd"
 	"github.com/openimsdk/tools/utils/jsonutil"
 	"github.com/openimsdk/tools/utils/network"
@@ -37,10 +35,10 @@ import (
 	"github.com/openimsdk/tools/db/mongoutil"
 	"github.com/openimsdk/tools/db/redisutil"
 	"github.com/openimsdk/tools/utils/datautil"
-	"github.com/openimsdk/tools/utils/runtimeenv"
 
 	conf "github.com/openimsdk/open-im-server/v3/pkg/common/config"
-	discRegister "github.com/openimsdk/open-im-server/v3/pkg/common/discovery"
+	discRegister "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister"
+	kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/controller"
 	"github.com/openimsdk/tools/errs"
 	"github.com/openimsdk/tools/log"
@@ -59,8 +57,6 @@ type MsgTransfer struct {
 	historyMongoCH *OnlineHistoryMongoConsumerHandler
 	ctx            context.Context
 	cancel         context.CancelFunc
-
-	runTimeEnv string
 }
 
 type Config struct {
@@ -74,9 +70,8 @@ type Config struct {
 }
 
 func Start(ctx context.Context, index int, config *Config) error {
-	runTimeEnv := runtimeenv.PrintRuntimeEnvironment()
 
-	log.CInfo(ctx, "MSG-TRANSFER server is initializing", "runTimeEnv", runTimeEnv, "prometheusPorts",
+	log.CInfo(ctx, "MSG-TRANSFER server is initializing", "prometheusPorts",
 		config.MsgTransfer.Prometheus.Ports, "index", index)
 
 	mgocli, err := mongoutil.NewMongoDB(ctx, config.MongodbConfig.Build())
@@ -87,27 +82,13 @@ func Start(ctx context.Context, index int, config *Config) error {
 	if err != nil {
 		return err
 	}
-	client, err := discRegister.NewDiscoveryRegister(&config.Discovery, runTimeEnv, nil)
+	client, err := discRegister.NewDiscoveryRegister(&config.Discovery, &config.Share, nil)
 	if err != nil {
 		return err
 	}
 	client.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()),
 		grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, "round_robin")))
 
-	if config.Discovery.Enable == conf.ETCD {
-		cm := disetcd.NewConfigManager(client.(*etcd.SvcDiscoveryRegistryImpl).GetClient(), []string{
-			config.MsgTransfer.GetConfigFileName(),
-			config.RedisConfig.GetConfigFileName(),
-			config.MongodbConfig.GetConfigFileName(),
-			config.KafkaConfig.GetConfigFileName(),
-			config.Share.GetConfigFileName(),
-			config.WebhooksConfig.GetConfigFileName(),
-			config.Discovery.GetConfigFileName(),
-			conf.LogConfigFileName,
-		})
-		cm.Watch(ctx)
-	}
-
 	msgDocModel, err := mgo.NewMsgMongo(mgocli.GetDB())
 	if err != nil {
 		return err
@@ -139,13 +120,11 @@ func Start(ctx context.Context, index int, config *Config) error {
 	msgTransfer := &MsgTransfer{
 		historyCH:      historyCH,
 		historyMongoCH: historyMongoCH,
-		runTimeEnv:     runTimeEnv,
 	}
-
-	return msgTransfer.Start(index, config, client)
+	return msgTransfer.Start(index, config)
 }
 
-func (m *MsgTransfer) Start(index int, config *Config, client discovery.SvcDiscoveryRegistry) error {
+func (m *MsgTransfer) Start(index int, cfg *Config) error {
 	m.ctx, m.cancel = context.WithCancel(context.Background())
 	var (
 		netDone = make(chan struct{}, 1)
@@ -160,6 +139,11 @@ func (m *MsgTransfer) Start(index int, config *Config, client discovery.SvcDisco
 		return err
 	}
 
+	client, err := kdisc.NewDiscoveryRegister(&cfg.Discovery, &cfg.Share, nil)
+	if err != nil {
+		return errs.WrapMsg(err, "failed to register discovery service")
+	}
+
 	registerIP, err := network.GetRpcRegisterIP("")
 	if err != nil {
 		return err
@@ -176,17 +160,17 @@ func (m *MsgTransfer) Start(index int, config *Config, client discovery.SvcDisco
 		return listener, port, nil
 	}
 
-	if config.MsgTransfer.Prometheus.AutoSetPorts && config.Discovery.Enable != conf.ETCD {
+	if cfg.MsgTransfer.Prometheus.AutoSetPorts && cfg.Discovery.Enable != conf.ETCD {
 		return errs.New("only etcd support autoSetPorts", "RegisterName", "api").Wrap()
 	}
 
-	if config.MsgTransfer.Prometheus.Enable {
+	if cfg.MsgTransfer.Prometheus.Enable {
 		var (
 			listener       net.Listener
 			prometheusPort int
 		)
 
-		if config.MsgTransfer.Prometheus.AutoSetPorts {
+		if cfg.MsgTransfer.Prometheus.AutoSetPorts {
 			listener, prometheusPort, err = getAutoPort()
 			if err != nil {
 				return err
@@ -199,7 +183,7 @@ func (m *MsgTransfer) Start(index int, config *Config, client discovery.SvcDisco
 				return errs.WrapMsg(err, "etcd put err")
 			}
 		} else {
-			prometheusPort, err = datautil.GetElemByIndex(config.MsgTransfer.Prometheus.Ports, index)
+			prometheusPort, err = datautil.GetElemByIndex(cfg.MsgTransfer.Prometheus.Ports, index)
 			if err != nil {
 				return err
 			}

internal/msgtransfer/online_history_msg_handler.go

@@ -25,9 +25,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
+
 	"github.com/IBM/sarama"
 	"github.com/go-redis/redis"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/controller"
 	"github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"
 	"github.com/openimsdk/open-im-server/v3/pkg/tools/batcher"
@@ -82,11 +83,11 @@ func NewOnlineHistoryRedisConsumerHandler(ctx context.Context, client discovery.
 	if err != nil {
 		return nil, err
 	}
-	groupConn, err := client.GetConn(ctx, config.Discovery.RpcService.Group)
+	groupConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Group)
 	if err != nil {
 		return nil, err
 	}
-	conversationConn, err := client.GetConn(ctx, config.Discovery.RpcService.Conversation)
+	conversationConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Conversation)
 	if err != nil {
 		return nil, err
 	}

internal/push/offlinepush/fcm/push.go

@@ -16,12 +16,14 @@ package fcm
 
 import (
 	"context"
+	"errors"
 	"fmt"
-	"github.com/openimsdk/open-im-server/v3/internal/push/offlinepush/options"
-	"github.com/openimsdk/tools/utils/httputil"
 	"path/filepath"
 	"strings"
 
+	"github.com/openimsdk/open-im-server/v3/internal/push/offlinepush/options"
+	"github.com/openimsdk/tools/utils/httputil"
+
 	firebase "firebase.google.com/go/v4"
 	"firebase.google.com/go/v4/messaging"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
@@ -133,7 +135,7 @@ func (f *Fcm) Push(ctx context.Context, userIDs []string, title, content string,
 			unreadCountSum, err := f.cache.GetUserBadgeUnreadCountSum(ctx, userID)
 			if err == nil && unreadCountSum != 0 {
 				apns.Payload.Aps.Badge = &unreadCountSum
-			} else if err == redis.Nil || unreadCountSum == 0 {
+			} else if errors.Is(err, redis.Nil) || unreadCountSum == 0 {
 				zero := 1
 				apns.Payload.Aps.Badge = &zero
 			} else {

internal/push/offlinepush/getui/body.go

@@ -18,6 +18,16 @@ import (
 	"fmt"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
+	"github.com/openimsdk/tools/utils/datautil"
+)
+
+var (
+	incOne          = datautil.ToPtr("+1")
+	addNum          = "1"
+	defaultStrategy = strategy{
+		Default: 1,
+	}
+	msgCategory = "CATEGORY_MESSAGE"
 )
 
 type Resp struct {
@@ -58,7 +68,24 @@ type TaskResp struct {
 }
 
 type Settings struct {
-	TTL *int64 `json:"ttl"`
+	TTL      *int64   `json:"ttl"`
+	Strategy strategy `json:"strategy"`
+}
+
+type strategy struct {
+	Default int64 `json:"default"`
+	//IOS     int64 `json:"ios"`
+	//St      int64 `json:"st"`
+	//Hw      int64 `json:"hw"`
+	//Ho      int64 `json:"ho"`
+	//XM      int64 `json:"xm"`
+	//XMG     int64 `json:"xmg"`
+	//VV      int64 `json:"vv"`
+	//Op      int64 `json:"op"`
+	//OpG     int64 `json:"opg"`
+	//MZ      int64 `json:"mz"`
+	//HosHw   int64 `json:"hoshw"`
+	//WX      int64 `json:"wx"`
 }
 
 type Audience struct {
@@ -112,6 +139,8 @@ type Notification struct {
 	ChannelID   string `json:"channelID"`
 	ChannelName string `json:"ChannelName"`
 	ClickType   string `json:"click_type"`
+	BadgeAddNum string `json:"badge_add_num"`
+	Category    string `json:"category"`
 }
 
 type Options struct {
@@ -120,6 +149,7 @@ type Options struct {
 		ChannelID    string `json:"/message/android/notification/channel_id"`
 		Sound        string `json:"/message/android/notification/sound"`
 		Importance   string `json:"/message/android/notification/importance"`
+		Category     string `json:"/message/android/category"`
 	} `json:"HW"`
 	XM struct {
 		ChannelID string `json:"/extra.channel_id"`
@@ -140,6 +170,8 @@ func newPushReq(pushConf *config.Push, title, content string) PushReq {
 		ClickType:   "startapp",
 		ChannelID:   pushConf.GeTui.ChannelID,
 		ChannelName: pushConf.GeTui.ChannelName,
+		BadgeAddNum: addNum,
+		Category:    msgCategory,
 	}}}
 	return pushReq
 }
@@ -156,6 +188,7 @@ func (pushReq *PushReq) setPushChannel(title string, body string) {
 	notify := "notify"
 	pushReq.PushChannel.Ios.NotificationType = &notify
 	pushReq.PushChannel.Ios.Aps.Sound = "default"
+	pushReq.PushChannel.Ios.AutoBadge = incOne
 	pushReq.PushChannel.Ios.Aps.Alert = Alert{
 		Title: title,
 		Body:  body,
@@ -172,7 +205,8 @@ func (pushReq *PushReq) setPushChannel(title string, body string) {
 			ChannelID    string `json:"/message/android/notification/channel_id"`
 			Sound        string `json:"/message/android/notification/sound"`
 			Importance   string `json:"/message/android/notification/importance"`
-		}{ChannelID: "RingRing4", Sound: "/raw/ring001", Importance: "NORMAL"},
+			Category     string `json:"/message/android/category"`
+		}{ChannelID: "RingRing4", Sound: "/raw/ring001", Importance: "NORMAL", Category: "IM"},
 		XM: struct {
 			ChannelID string `json:"/extra.channel_id"`
 		}{ChannelID: "high_system"},

internal/push/offlinepush/getui/push.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"crypto/sha256"
 	"encoding/hex"
+	"errors"
 	"strconv"
 	"sync"
 	"time"
@@ -70,7 +71,7 @@ func NewClient(pushConf *config.Push, cache cache.ThirdCache) *Client {
 func (g *Client) Push(ctx context.Context, userIDs []string, title, content string, opts *options.Opts) error {
 	token, err := g.cache.GetGetuiToken(ctx)
 	if err != nil {
-		if errs.Unwrap(err) == redis.Nil {
+		if errors.Is(err, redis.Nil) {
 			log.ZDebug(ctx, "getui token not exist in redis")
 			token, err = g.getTokenAndSave2Redis(ctx)
 			if err != nil {
@@ -144,7 +145,7 @@ func (g *Client) Auth(ctx context.Context, timeStamp int64) (token string, expir
 func (g *Client) GetTaskID(ctx context.Context, token string, pushReq PushReq) (string, error) {
 	respTask := TaskResp{}
 	ttl := int64(1000 * 60 * 5)
-	pushReq.Settings = &Settings{TTL: &ttl}
+	pushReq.Settings = &Settings{TTL: &ttl, Strategy: defaultStrategy}
 	err := g.request(ctx, taskURL, pushReq, token, &respTask)
 	if err != nil {
 		return "", errs.Wrap(err)
@@ -188,6 +189,7 @@ func (g *Client) postReturn(
 	if err != nil {
 		return err
 	}
+	log.ZDebug(ctx, "postReturn", "url", url, "header", header, "input", input, "timeout", timeout, "output", output)
 	return output.parseError()
 }
 
@@ -204,7 +206,7 @@ func (g *Client) getTokenAndSave2Redis(ctx context.Context) (token string, err e
 }
 
 func (g *Client) GetTaskIDAndSave2Redis(ctx context.Context, token string, pushReq PushReq) (taskID string, err error) {
-	pushReq.Settings = &Settings{TTL: &g.taskIDTTL}
+	pushReq.Settings = &Settings{TTL: &g.taskIDTTL, Strategy: defaultStrategy}
 	taskID, err = g.GetTaskID(ctx, token, pushReq)
 	if err != nil {
 		return

internal/push/onlinepusher.go

@@ -2,19 +2,14 @@ package push
 
 import (
 	"context"
-	"errors"
-	"sync"
-
 	"github.com/openimsdk/protocol/msggateway"
 	"github.com/openimsdk/protocol/sdkws"
 	"github.com/openimsdk/tools/discovery"
-	"github.com/openimsdk/tools/errs"
 	"github.com/openimsdk/tools/log"
 	"github.com/openimsdk/tools/utils/datautil"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
-
-	conf "github.com/openimsdk/open-im-server/v3/pkg/common/config"
+	"sync"
 )
 
 type OnlinePusher interface {
@@ -42,16 +37,15 @@ func (u emptyOnlinePusher) GetOnlinePushFailedUserIDs(ctx context.Context, msg *
 }
 
 func NewOnlinePusher(disCov discovery.SvcDiscoveryRegistry, config *Config) OnlinePusher {
-
-	if config.runTimeEnv == conf.KUBERNETES {
-		return NewDefaultAllNode(disCov, config)
-	}
 	switch config.Discovery.Enable {
-	case conf.ETCD:
+	case "k8s":
+		return NewK8sStaticConsistentHash(disCov, config)
+	case "zookeeper":
+		return NewDefaultAllNode(disCov, config)
+	case "etcd":
 		return NewDefaultAllNode(disCov, config)
 	default:
-		log.ZError(context.Background(), "NewOnlinePusher is error", errs.Wrap(errors.New("unsupported discovery type")), "type", config.Discovery.Enable)
-		return nil
+		return newEmptyOnlinePusher()
 	}
 }
 
@@ -66,7 +60,7 @@ func NewDefaultAllNode(disCov discovery.SvcDiscoveryRegistry, config *Config) *D
 
 func (d *DefaultAllNode) GetConnsAndOnlinePush(ctx context.Context, msg *sdkws.MsgData,
 	pushToUserIDs []string) (wsResults []*msggateway.SingleMsgToUserResults, err error) {
-	conns, err := d.disCov.GetConns(ctx, d.config.Discovery.RpcService.MessageGateway)
+	conns, err := d.disCov.GetConns(ctx, d.config.Share.RpcRegisterName.MessageGateway)
 	if len(conns) == 0 {
 		log.ZWarn(ctx, "get gateway conn 0 ", nil)
 	} else {

internal/push/push_handler.go

@@ -3,12 +3,11 @@ package push
 import (
 	"context"
 	"encoding/json"
+	"github.com/openimsdk/open-im-server/v3/pkg/rpcli"
 	"math/rand"
 	"strconv"
 	"time"
 
-	"github.com/openimsdk/open-im-server/v3/pkg/rpcli"
-
 	"github.com/IBM/sarama"
 	"github.com/openimsdk/open-im-server/v3/internal/push/offlinepush"
 	"github.com/openimsdk/open-im-server/v3/internal/push/offlinepush/options"
@@ -58,19 +57,19 @@ func NewConsumerHandler(ctx context.Context, config *Config, database controller
 	if err != nil {
 		return nil, err
 	}
-	userConn, err := client.GetConn(ctx, config.Discovery.RpcService.User)
+	userConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.User)
 	if err != nil {
 		return nil, err
 	}
-	groupConn, err := client.GetConn(ctx, config.Discovery.RpcService.Group)
+	groupConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Group)
 	if err != nil {
 		return nil, err
 	}
-	msgConn, err := client.GetConn(ctx, config.Discovery.RpcService.Msg)
+	msgConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Msg)
 	if err != nil {
 		return nil, err
 	}
-	conversationConn, err := client.GetConn(ctx, config.Discovery.RpcService.Conversation)
+	conversationConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Conversation)
 	if err != nil {
 		return nil, err
 	}
@@ -153,24 +152,24 @@ func (c *ConsumerHandler) Push2User(ctx context.Context, userIDs []string, msg *
 	log.ZInfo(ctx, "Get msg from msg_transfer And push msg", "userIDs", userIDs, "msg", msg.String())
 	defer func(duration time.Time) {
 		t := time.Since(duration)
-		log.ZInfo(ctx, "Get msg from msg_transfer And push msg end", "msg", msg.String(), "time cost", t)
+		log.ZInfo(ctx, "Get msg from msg_transfer And push msg", "msg", msg.String(), "time cost", t)
 	}(time.Now())
 	if err := c.webhookBeforeOnlinePush(ctx, &c.config.WebhooksConfig.BeforeOnlinePush, userIDs, msg); err != nil {
 		return err
 	}
+	log.ZInfo(ctx, "webhookBeforeOnlinePush end")
 
 	wsResults, err := c.GetConnsAndOnlinePush(ctx, msg, userIDs)
 	if err != nil {
 		return err
 	}
 
-	log.ZDebug(ctx, "single and notification push result", "result", wsResults, "msg", msg, "push_to_userID", userIDs)
-	log.ZInfo(ctx, "single and notification push end")
+	log.ZInfo(ctx, "single and notification push result", "result", wsResults, "msg", msg, "push_to_userID", userIDs)
 
 	if !c.shouldPushOffline(ctx, msg) {
 		return nil
 	}
-	log.ZInfo(ctx, "pushOffline start")
+	log.ZInfo(ctx, "shouldPushOffline end")
 
 	for _, v := range wsResults {
 		//message sender do not need offline push
@@ -189,14 +188,14 @@ func (c *ConsumerHandler) Push2User(ctx context.Context, userIDs []string, msg *
 	if err = c.webhookBeforeOfflinePush(ctx, &c.config.WebhooksConfig.BeforeOfflinePush, needOfflinePushUserID, msg, &offlinePushUserID); err != nil {
 		return err
 	}
+	log.ZInfo(ctx, "webhookBeforeOfflinePush end")
 
 	if len(offlinePushUserID) > 0 {
 		needOfflinePushUserID = offlinePushUserID
 	}
 	err = c.offlinePushMsg(ctx, msg, needOfflinePushUserID)
 	if err != nil {
-		log.ZDebug(ctx, "offlinePushMsg failed", err, "needOfflinePushUserID", needOfflinePushUserID, "msg", msg)
-		log.ZWarn(ctx, "offlinePushMsg failed", err, "needOfflinePushUserID length", len(needOfflinePushUserID), "msg", msg)
+		log.ZWarn(ctx, "offlinePushMsg failed", err, "needOfflinePushUserID", needOfflinePushUserID, "msg", msg)
 		return nil
 	}
 
@@ -251,24 +250,26 @@ func (c *ConsumerHandler) Push2Group(ctx context.Context, groupID string, msg *s
 		&pushToUserIDs); err != nil {
 		return err
 	}
+	log.ZInfo(ctx, "webhookBeforeGroupOnlinePush end")
 
 	err = c.groupMessagesHandler(ctx, groupID, &pushToUserIDs, msg)
 	if err != nil {
 		return err
 	}
+	log.ZInfo(ctx, "groupMessagesHandler end")
 
 	wsResults, err := c.GetConnsAndOnlinePush(ctx, msg, pushToUserIDs)
 	if err != nil {
 		return err
 	}
 
-	log.ZDebug(ctx, "group push result", "result", wsResults, "msg", msg)
-	log.ZInfo(ctx, "online group push end")
+	log.ZInfo(ctx, "group push result", "result", wsResults, "msg", msg)
 
 	if !c.shouldPushOffline(ctx, msg) {
 		return nil
 	}
 	needOfflinePushUserIDs := c.onlinePusher.GetOnlinePushFailedUserIDs(ctx, msg, wsResults, &pushToUserIDs)
+	log.ZInfo(ctx, "GetOnlinePushFailedUserIDs end")
 	//filter some user, like don not disturb or don't need offline push etc.
 	needOfflinePushUserIDs, err = c.filterGroupMessageOfflinePush(ctx, groupID, msg, needOfflinePushUserIDs)
 	if err != nil {
@@ -296,11 +297,9 @@ func (c *ConsumerHandler) asyncOfflinePush(ctx context.Context, needOfflinePushU
 		needOfflinePushUserIDs = offlinePushUserIDs
 	}
 	if err := c.pushDatabase.MsgToOfflinePushMQ(ctx, conversationutil.GenConversationUniqueKeyForSingle(msg.SendID, msg.RecvID), needOfflinePushUserIDs, msg); err != nil {
-		log.ZDebug(ctx, "Msg To OfflinePush MQ error", err, "needOfflinePushUserIDs",
+		log.ZError(ctx, "Msg To OfflinePush MQ error", err, "needOfflinePushUserIDs",
 			needOfflinePushUserIDs, "msg", msg)
-		log.ZWarn(ctx, "Msg To OfflinePush MQ error", err, "needOfflinePushUserIDs length",
-			len(needOfflinePushUserIDs), "msg", msg)
-		prommetrics.GroupChatMsgProcessFailedCounter.Inc()
+		prommetrics.SingleChatMsgProcessFailedCounter.Inc()
 		return
 	}
 }

internal/rpc/auth/auth.go

@@ -60,7 +60,7 @@ func Start(ctx context.Context, config *Config, client discovery.SvcDiscoveryReg
 	if err != nil {
 		return err
 	}
-	userConn, err := client.GetConn(ctx, config.Discovery.RpcService.User)
+	userConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.User)
 	if err != nil {
 		return err
 	}
@@ -187,7 +187,7 @@ func (s *authServer) ForceLogout(ctx context.Context, req *pbauth.ForceLogoutReq
 }
 
 func (s *authServer) forceKickOff(ctx context.Context, userID string, platformID int32) error {
-	conns, err := s.RegisterCenter.GetConns(ctx, s.config.Discovery.RpcService.MessageGateway)
+	conns, err := s.RegisterCenter.GetConns(ctx, s.config.Share.RpcRegisterName.MessageGateway)
 	if err != nil {
 		return err
 	}

internal/rpc/conversation/conversation.go

@@ -16,11 +16,10 @@ package conversation
 
 import (
 	"context"
+	"github.com/openimsdk/open-im-server/v3/pkg/rpcli"
 	"sort"
 	"time"
 
-	"github.com/openimsdk/open-im-server/v3/pkg/rpcli"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache/redis"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/database/mgo"
@@ -79,15 +78,15 @@ func Start(ctx context.Context, config *Config, client discovery.SvcDiscoveryReg
 	if err != nil {
 		return err
 	}
-	userConn, err := client.GetConn(ctx, config.Discovery.RpcService.User)
+	userConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.User)
 	if err != nil {
 		return err
 	}
-	groupConn, err := client.GetConn(ctx, config.Discovery.RpcService.Group)
+	groupConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Group)
 	if err != nil {
 		return err
 	}
-	msgConn, err := client.GetConn(ctx, config.Discovery.RpcService.Msg)
+	msgConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Msg)
 	if err != nil {
 		return err
 	}
@@ -238,14 +237,12 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbconver
 	if req.Conversation == nil {
 		return nil, errs.ErrArgs.WrapMsg("conversation must not be nil")
 	}
+
 	if req.Conversation.ConversationType == constant.WriteGroupChatType {
 		groupInfo, err := c.groupClient.GetGroupInfo(ctx, req.Conversation.GroupID)
 		if err != nil {
 			return nil, err
 		}
-		if groupInfo == nil {
-			return nil, servererrs.ErrGroupIDNotFound.WrapMsg(req.Conversation.GroupID)
-		}
 		if groupInfo.Status == constant.GroupStatusDismissed {
 			return nil, servererrs.ErrDismissedAlready.WrapMsg("group dismissed")
 		}
@@ -774,7 +771,7 @@ func (c *conversationServer) ClearUserConversationMsg(ctx context.Context, req *
 		if conversation.IsMsgDestruct == false || conversation.MsgDestructTime == 0 {
 			continue
 		}
-		seq, err := c.msgClient.GetLastMessageSeqByTime(ctx, conversation.ConversationID, req.Timestamp-(conversation.MsgDestructTime*1000))
+		seq, err := c.msgClient.GetLastMessageSeqByTime(ctx, conversation.ConversationID, req.Timestamp-conversation.MsgDestructTime)
 		if err != nil {
 			return nil, err
 		}

internal/rpc/group/group.go

@@ -24,21 +24,22 @@ import (
 	"strings"
 	"time"
 
-	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
-	"github.com/openimsdk/open-im-server/v3/pkg/callbackstruct"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/convert"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/servererrs"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/common"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/controller"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/database/mgo"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/webhook"
 	"github.com/openimsdk/open-im-server/v3/pkg/localcache"
+
+	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
+	"github.com/openimsdk/open-im-server/v3/pkg/callbackstruct"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/convert"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/servererrs"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/controller"
 	"github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"
 	"github.com/openimsdk/open-im-server/v3/pkg/notification/grouphash"
 	"github.com/openimsdk/protocol/constant"
-	pbconv "github.com/openimsdk/protocol/conversation"
+	pbconversation "github.com/openimsdk/protocol/conversation"
 	pbgroup "github.com/openimsdk/protocol/group"
 	"github.com/openimsdk/protocol/sdkws"
 	"github.com/openimsdk/protocol/wrapperspb"
@@ -102,15 +103,15 @@ func Start(ctx context.Context, config *Config, client discovery.SvcDiscoveryReg
 	//msgRpcClient := rpcclient.NewMessageRpcClient(client, config.Share.RpcRegisterName.Msg)
 	//conversationRpcClient := rpcclient.NewConversationRpcClient(client, config.Share.RpcRegisterName.Conversation)
 
-	userConn, err := client.GetConn(ctx, config.Discovery.RpcService.User)
+	userConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.User)
 	if err != nil {
 		return err
 	}
-	msgConn, err := client.GetConn(ctx, config.Discovery.RpcService.Msg)
+	msgConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Msg)
 	if err != nil {
 		return err
 	}
-	conversationConn, err := client.GetConn(ctx, config.Discovery.RpcService.Conversation)
+	conversationConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Conversation)
 	if err != nil {
 		return err
 	}
@@ -1014,7 +1015,7 @@ func (g *groupServer) SetGroupInfo(ctx context.Context, req *pbgroup.SetGroupInf
 	if req.GroupInfoForSet.Notification != "" {
 		num -= 3
 		func() {
-			conversation := &pbconv.ConversationReq{
+			conversation := &pbconversation.ConversationReq{
 				ConversationID:   msgprocessor.GetConversationIDBySessionType(constant.ReadGroupChatType, req.GroupInfoForSet.GroupID),
 				ConversationType: constant.ReadGroupChatType,
 				GroupID:          req.GroupInfoForSet.GroupID,
@@ -1125,7 +1126,7 @@ func (g *groupServer) SetGroupInfoEx(ctx context.Context, req *pbgroup.SetGroupI
 
 		if req.Notification.Value != "" {
 			func() {
-				conversation := &pbconv.ConversationReq{
+				conversation := &pbconversation.ConversationReq{
 					ConversationID:   msgprocessor.GetConversationIDBySessionType(constant.ReadGroupChatType, req.GroupID),
 					ConversationType: constant.ReadGroupChatType,
 					GroupID:          req.GroupID,

internal/rpc/msg/revoke.go

@@ -17,9 +17,8 @@ package msg
 import (
 	"context"
 	"encoding/json"
-	"time"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
+	"time"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/servererrs"
@@ -80,10 +79,8 @@ func (m *msgServer) RevokeMsg(ctx context.Context, req *msg.RevokeMsgReq) (*msg.
 				switch members[req.UserID].RoleLevel {
 				case constant.GroupOwner:
 				case constant.GroupAdmin:
-					if sendMember, ok := members[msgs[0].SendID]; ok {
-						if sendMember.RoleLevel != constant.GroupOrdinaryUsers {
-							return nil, errs.ErrNoPermission.WrapMsg("no permission")
-						}
+					if members[msgs[0].SendID].RoleLevel != constant.GroupOrdinaryUsers {
+						return nil, errs.ErrNoPermission.WrapMsg("no permission")
 					}
 				default:
 					return nil, errs.ErrNoPermission.WrapMsg("no permission")

internal/rpc/msg/server.go

@@ -16,7 +16,6 @@ package msg
 
 import (
 	"context"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcli"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
@@ -104,19 +103,19 @@ func Start(ctx context.Context, config *Config, client discovery.SvcDiscoveryReg
 	if err != nil {
 		return err
 	}
-	userConn, err := client.GetConn(ctx, config.Discovery.RpcService.User)
+	userConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.User)
 	if err != nil {
 		return err
 	}
-	groupConn, err := client.GetConn(ctx, config.Discovery.RpcService.Group)
+	groupConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Group)
 	if err != nil {
 		return err
 	}
-	friendConn, err := client.GetConn(ctx, config.Discovery.RpcService.Friend)
+	friendConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Friend)
 	if err != nil {
 		return err
 	}
-	conversationConn, err := client.GetConn(ctx, config.Discovery.RpcService.Conversation)
+	conversationConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Conversation)
 	if err != nil {
 		return err
 	}

internal/rpc/relation/friend.go

@@ -16,7 +16,6 @@ package relation
 
 import (
 	"context"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcli"
 
 	"github.com/openimsdk/tools/mq/memamq"
@@ -92,11 +91,11 @@ func Start(ctx context.Context, config *Config, client discovery.SvcDiscoveryReg
 		return err
 	}
 
-	userConn, err := client.GetConn(ctx, config.Discovery.RpcService.User)
+	userConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.User)
 	if err != nil {
 		return err
 	}
-	msgConn, err := client.GetConn(ctx, config.Discovery.RpcService.Msg)
+	msgConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Msg)
 	if err != nil {
 		return err
 	}

internal/rpc/third/third.go

@@ -22,18 +22,16 @@ import (
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache/redis"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/controller"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/database/mgo"
 	"github.com/openimsdk/open-im-server/v3/pkg/localcache"
-	"github.com/openimsdk/tools/s3/aws"
-	"github.com/openimsdk/tools/s3/kodo"
-
-	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/controller"
 	"github.com/openimsdk/protocol/third"
 	"github.com/openimsdk/tools/db/mongoutil"
 	"github.com/openimsdk/tools/db/redisutil"
 	"github.com/openimsdk/tools/discovery"
 	"github.com/openimsdk/tools/s3"
 	"github.com/openimsdk/tools/s3/cos"
+	"github.com/openimsdk/tools/s3/kodo"
 	"github.com/openimsdk/tools/s3/minio"
 	"github.com/openimsdk/tools/s3/oss"
 	"google.golang.org/grpc"
@@ -92,15 +90,13 @@ func Start(ctx context.Context, config *Config, client discovery.SvcDiscoveryReg
 		o, err = oss.NewOSS(*config.RpcConfig.Object.Oss.Build())
 	case "kodo":
 		o, err = kodo.NewKodo(*config.RpcConfig.Object.Kodo.Build())
-	case "aws":
-		o, err = aws.NewAws(*config.RpcConfig.Object.Aws.Build())
 	default:
 		err = fmt.Errorf("invalid object enable: %s", enable)
 	}
 	if err != nil {
 		return err
 	}
-	userConn, err := client.GetConn(ctx, config.Discovery.RpcService.User)
+	userConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.User)
 	if err != nil {
 		return err
 	}

internal/rpc/user/user.go

@@ -94,15 +94,15 @@ func Start(ctx context.Context, config *Config, client registry.SvcDiscoveryRegi
 	if err != nil {
 		return err
 	}
-	msgConn, err := client.GetConn(ctx, config.Discovery.RpcService.Msg)
+	msgConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Msg)
 	if err != nil {
 		return err
 	}
-	groupConn, err := client.GetConn(ctx, config.Discovery.RpcService.Group)
+	groupConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Group)
 	if err != nil {
 		return err
 	}
-	friendConn, err := client.GetConn(ctx, config.Discovery.RpcService.Friend)
+	friendConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Friend)
 	if err != nil {
 		return err
 	}

internal/tools/cron_task.go

@@ -1,19 +1,30 @@
+// Copyright © 2023 OpenIM. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package tools
 
 import (
 	"context"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
-	kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discovery"
-	disetcd "github.com/openimsdk/open-im-server/v3/pkg/common/discovery/etcd"
+	kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister"
 	pbconversation "github.com/openimsdk/protocol/conversation"
 	"github.com/openimsdk/protocol/msg"
 	"github.com/openimsdk/protocol/third"
-	"github.com/openimsdk/tools/discovery/etcd"
 
 	"github.com/openimsdk/tools/mcontext"
 	"github.com/openimsdk/tools/mw"
-	"github.com/openimsdk/tools/utils/runtimeenv"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
@@ -26,51 +37,38 @@ type CronTaskConfig struct {
 	CronTask  config.CronTask
 	Share     config.Share
 	Discovery config.Discovery
-
-	runTimeEnv string
 }
 
-func Start(ctx context.Context, conf *CronTaskConfig) error {
-	conf.runTimeEnv = runtimeenv.PrintRuntimeEnvironment()
-
-	log.CInfo(ctx, "CRON-TASK server is initializing", "runTimeEnv", conf.runTimeEnv, "chatRecordsClearTime", conf.CronTask.CronExecuteTime, "msgDestructTime", conf.CronTask.RetainChatRecords)
-	if conf.CronTask.RetainChatRecords < 1 {
+func Start(ctx context.Context, config *CronTaskConfig) error {
+	log.CInfo(ctx, "CRON-TASK server is initializing", "chatRecordsClearTime", config.CronTask.CronExecuteTime, "msgDestructTime", config.CronTask.RetainChatRecords)
+	if config.CronTask.RetainChatRecords < 1 {
 		return errs.New("msg destruct time must be greater than 1").Wrap()
 	}
-	client, err := kdisc.NewDiscoveryRegister(&conf.Discovery, conf.runTimeEnv, nil)
+	client, err := kdisc.NewDiscoveryRegister(&config.Discovery, &config.Share, nil)
 	if err != nil {
 		return errs.WrapMsg(err, "failed to register discovery service")
 	}
 	client.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()))
-	ctx = mcontext.SetOpUserID(ctx, conf.Share.IMAdminUserID[0])
+	ctx = mcontext.SetOpUserID(ctx, config.Share.IMAdminUserID[0])
 
-	msgConn, err := client.GetConn(ctx, conf.Discovery.RpcService.Msg)
+	msgConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Msg)
 	if err != nil {
 		return err
 	}
 
-	thirdConn, err := client.GetConn(ctx, conf.Discovery.RpcService.Third)
+	thirdConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Third)
 	if err != nil {
 		return err
 	}
 
-	conversationConn, err := client.GetConn(ctx, conf.Discovery.RpcService.Conversation)
+	conversationConn, err := client.GetConn(ctx, config.Share.RpcRegisterName.Conversation)
 	if err != nil {
 		return err
 	}
 
-	if conf.Discovery.Enable == config.ETCD {
-		cm := disetcd.NewConfigManager(client.(*etcd.SvcDiscoveryRegistryImpl).GetClient(), []string{
-			conf.CronTask.GetConfigFileName(),
-			conf.Share.GetConfigFileName(),
-			conf.Discovery.GetConfigFileName(),
-		})
-		cm.Watch(ctx)
-	}
-
 	srv := &cronServer{
 		ctx:                ctx,
-		config:             conf,
+		config:             config,
 		cron:               cron.New(),
 		msgClient:          msg.NewMsgClient(msgConn),
 		conversationClient: pbconversation.NewConversationClient(conversationConn),
@@ -86,7 +84,7 @@ func Start(ctx context.Context, conf *CronTaskConfig) error {
 	if err := srv.registerClearUserMsg(); err != nil {
 		return err
 	}
-	log.ZDebug(ctx, "start cron task", "CronExecuteTime", conf.CronTask.CronExecuteTime)
+	log.ZDebug(ctx, "start cron task", "CronExecuteTime", config.CronTask.CronExecuteTime)
 	srv.cron.Start()
 	<-ctx.Done()
 	return nil

internal/tools/cron_test.go

@@ -0,0 +1,63 @@
+package tools
+
+import (
+	"context"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
+	kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister"
+	pbconversation "github.com/openimsdk/protocol/conversation"
+	"github.com/openimsdk/protocol/msg"
+	"github.com/openimsdk/protocol/third"
+	"github.com/openimsdk/tools/mcontext"
+	"github.com/openimsdk/tools/mw"
+	"github.com/robfig/cron/v3"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
+	"testing"
+)
+
+func TestName(t *testing.T) {
+	conf := &config.Discovery{
+		Enable: config.ETCD,
+		Etcd: config.Etcd{
+			RootDirectory: "openim",
+			Address:       []string{"localhost:12379"},
+		},
+	}
+	client, err := kdisc.NewDiscoveryRegister(conf, "source")
+	if err != nil {
+		panic(err)
+	}
+	client.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()))
+	ctx := mcontext.SetOpUserID(context.Background(), "imAdmin")
+	msgConn, err := client.GetConn(ctx, "msg-rpc-service")
+	if err != nil {
+		panic(err)
+	}
+	thirdConn, err := client.GetConn(ctx, "third-rpc-service")
+	if err != nil {
+		panic(err)
+	}
+
+	conversationConn, err := client.GetConn(ctx, "conversation-rpc-service")
+	if err != nil {
+		panic(err)
+	}
+
+	srv := &cronServer{
+		ctx: ctx,
+		config: &CronTaskConfig{
+			CronTask: config.CronTask{
+				RetainChatRecords: 1,
+				FileExpireTime:    1,
+				DeleteObjectType:  []string{"msg-picture", "msg-file", "msg-voice", "msg-video", "msg-video-snapshot", "sdklog", ""},
+			},
+		},
+		cron:               cron.New(),
+		msgClient:          msg.NewMsgClient(msgConn),
+		conversationClient: pbconversation.NewConversationClient(conversationConn),
+		thirdClient:        third.NewThirdClient(thirdConn),
+	}
+	srv.deleteMsg()
+	//srv.clearS3()
+	//srv.clearUserMsg()
+}

pkg/apistruct/config_manager.go

@@ -1,24 +0,0 @@
-package apistruct
-
-type GetConfigReq struct {
-	ConfigName string `json:"configName"`
-}
-
-type GetConfigListResp struct {
-	Environment string   `json:"environment"`
-	Version     string   `json:"version"`
-	ConfigNames []string `json:"configNames"`
-}
-
-type SetConfigReq struct {
-	ConfigName string `json:"configName"`
-	Data       string `json:"data"`
-}
-
-type SetEnableConfigManagerReq struct {
-	Enable bool `json:"enable"`
-}
-
-type GetEnableConfigManagerResp struct {
-	Enable bool `json:"enable"`
-}

pkg/common/cmd/api.go

@@ -18,7 +18,6 @@ import (
 	"context"
 
 	"github.com/openimsdk/open-im-server/v3/internal/api"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/version"
 	"github.com/openimsdk/tools/system/program"
 	"github.com/spf13/cobra"
@@ -32,36 +31,16 @@ type ApiCmd struct {
 }
 
 func NewApiCmd() *ApiCmd {
-	apiConfig := api.Config{AllConfig: &config.AllConfig{}}
+	var apiConfig api.Config
 	ret := &ApiCmd{apiConfig: &apiConfig}
 	ret.configMap = map[string]any{
-		config.DiscoveryConfigFilename:          &apiConfig.Discovery,
-		config.KafkaConfigFileName:              &apiConfig.Kafka,
-		config.LocalCacheConfigFileName:         &apiConfig.LocalCache,
-		config.LogConfigFileName:                &apiConfig.Log,
-		config.MinioConfigFileName:              &apiConfig.Minio,
-		config.MongodbConfigFileName:            &apiConfig.Mongo,
-		config.NotificationFileName:             &apiConfig.Notification,
-		config.OpenIMAPICfgFileName:             &apiConfig.API,
-		config.OpenIMCronTaskCfgFileName:        &apiConfig.CronTask,
-		config.OpenIMMsgGatewayCfgFileName:      &apiConfig.MsgGateway,
-		config.OpenIMMsgTransferCfgFileName:     &apiConfig.MsgTransfer,
-		config.OpenIMPushCfgFileName:            &apiConfig.Push,
-		config.OpenIMRPCAuthCfgFileName:         &apiConfig.Auth,
-		config.OpenIMRPCConversationCfgFileName: &apiConfig.Conversation,
-		config.OpenIMRPCFriendCfgFileName:       &apiConfig.Friend,
-		config.OpenIMRPCGroupCfgFileName:        &apiConfig.Group,
-		config.OpenIMRPCMsgCfgFileName:          &apiConfig.Msg,
-		config.OpenIMRPCThirdCfgFileName:        &apiConfig.Third,
-		config.OpenIMRPCUserCfgFileName:         &apiConfig.User,
-		config.RedisConfigFileName:              &apiConfig.Redis,
-		config.ShareFileName:                    &apiConfig.Share,
-		config.WebhooksConfigFileName:           &apiConfig.Webhooks,
+		OpenIMAPICfgFileName:    &apiConfig.API,
+		ShareFileName:           &apiConfig.Share,
+		DiscoveryConfigFilename: &apiConfig.Discovery,
 	}
 	ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
 	ret.ctx = context.WithValue(context.Background(), "version", version.Version)
 	ret.Command.RunE = func(cmd *cobra.Command, args []string) error {
-		apiConfig.ConfigPath = ret.configPath
 		return ret.runE()
 	}
 	return ret

pkg/common/cmd/auth.go

@@ -18,7 +18,6 @@ import (
 	"context"
 
 	"github.com/openimsdk/open-im-server/v3/internal/rpc/auth"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/startrpc"
 	"github.com/openimsdk/open-im-server/v3/version"
 	"github.com/openimsdk/tools/system/program"
@@ -36,10 +35,10 @@ func NewAuthRpcCmd() *AuthRpcCmd {
 	var authConfig auth.Config
 	ret := &AuthRpcCmd{authConfig: &authConfig}
 	ret.configMap = map[string]any{
-		config.OpenIMRPCAuthCfgFileName: &authConfig.RpcConfig,
-		config.RedisConfigFileName:      &authConfig.RedisConfig,
-		config.ShareFileName:            &authConfig.Share,
-		config.DiscoveryConfigFilename:  &authConfig.Discovery,
+		OpenIMRPCAuthCfgFileName: &authConfig.RpcConfig,
+		RedisConfigFileName:      &authConfig.RedisConfig,
+		ShareFileName:            &authConfig.Share,
+		DiscoveryConfigFilename:  &authConfig.Discovery,
 	}
 	ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
 	ret.ctx = context.WithValue(context.Background(), "version", version.Version)
@@ -57,15 +56,9 @@ func (a *AuthRpcCmd) Exec() error {
 func (a *AuthRpcCmd) runE() error {
 	return startrpc.Start(a.ctx, &a.authConfig.Discovery, &a.authConfig.RpcConfig.Prometheus, a.authConfig.RpcConfig.RPC.ListenIP,
 		a.authConfig.RpcConfig.RPC.RegisterIP, a.authConfig.RpcConfig.RPC.AutoSetPorts, a.authConfig.RpcConfig.RPC.Ports,
-		a.Index(), a.authConfig.Discovery.RpcService.Auth, nil, a.authConfig,
+		a.Index(), a.authConfig.Share.RpcRegisterName.Auth, &a.authConfig.Share, a.authConfig,
 		[]string{
-			a.authConfig.RpcConfig.GetConfigFileName(),
-			a.authConfig.Share.GetConfigFileName(),
-			a.authConfig.RedisConfig.GetConfigFileName(),
-			a.authConfig.Discovery.GetConfigFileName(),
-		},
-		[]string{
-			a.authConfig.Discovery.RpcService.MessageGateway,
+			a.authConfig.Share.RpcRegisterName.MessageGateway,
 		},
 		auth.Start)
 }

pkg/common/cmd/conversation.go

@@ -18,7 +18,6 @@ import (
 	"context"
 
 	"github.com/openimsdk/open-im-server/v3/internal/rpc/conversation"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/startrpc"
 	"github.com/openimsdk/open-im-server/v3/version"
 	"github.com/openimsdk/tools/system/program"
@@ -36,13 +35,13 @@ func NewConversationRpcCmd() *ConversationRpcCmd {
 	var conversationConfig conversation.Config
 	ret := &ConversationRpcCmd{conversationConfig: &conversationConfig}
 	ret.configMap = map[string]any{
-		config.OpenIMRPCConversationCfgFileName: &conversationConfig.RpcConfig,
-		config.RedisConfigFileName:              &conversationConfig.RedisConfig,
-		config.MongodbConfigFileName:            &conversationConfig.MongodbConfig,
-		config.ShareFileName:                    &conversationConfig.Share,
-		config.NotificationFileName:             &conversationConfig.NotificationConfig,
-		config.LocalCacheConfigFileName:         &conversationConfig.LocalCacheConfig,
-		config.DiscoveryConfigFilename:          &conversationConfig.Discovery,
+		OpenIMRPCConversationCfgFileName: &conversationConfig.RpcConfig,
+		RedisConfigFileName:              &conversationConfig.RedisConfig,
+		MongodbConfigFileName:            &conversationConfig.MongodbConfig,
+		ShareFileName:                    &conversationConfig.Share,
+		NotificationFileName:             &conversationConfig.NotificationConfig,
+		LocalCacheConfigFileName:         &conversationConfig.LocalCacheConfig,
+		DiscoveryConfigFilename:          &conversationConfig.Discovery,
 	}
 	ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
 	ret.ctx = context.WithValue(context.Background(), "version", version.Version)
@@ -59,15 +58,7 @@ func (a *ConversationRpcCmd) Exec() error {
 func (a *ConversationRpcCmd) runE() error {
 	return startrpc.Start(a.ctx, &a.conversationConfig.Discovery, &a.conversationConfig.RpcConfig.Prometheus, a.conversationConfig.RpcConfig.RPC.ListenIP,
 		a.conversationConfig.RpcConfig.RPC.RegisterIP, a.conversationConfig.RpcConfig.RPC.AutoSetPorts, a.conversationConfig.RpcConfig.RPC.Ports,
-		a.Index(), a.conversationConfig.Discovery.RpcService.Conversation, &a.conversationConfig.NotificationConfig, a.conversationConfig,
-		[]string{
-			a.conversationConfig.RpcConfig.GetConfigFileName(),
-			a.conversationConfig.RedisConfig.GetConfigFileName(),
-			a.conversationConfig.MongodbConfig.GetConfigFileName(),
-			a.conversationConfig.NotificationConfig.GetConfigFileName(),
-			a.conversationConfig.Share.GetConfigFileName(),
-			a.conversationConfig.LocalCacheConfig.GetConfigFileName(),
-			a.conversationConfig.Discovery.GetConfigFileName(),
-		}, nil,
+		a.Index(), a.conversationConfig.Share.RpcRegisterName.Conversation, &a.conversationConfig.Share, a.conversationConfig,
+		nil,
 		conversation.Start)
 }

pkg/common/cmd/cron_task.go

@@ -18,7 +18,6 @@ import (
 	"context"
 
 	"github.com/openimsdk/open-im-server/v3/internal/tools"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/version"
 	"github.com/openimsdk/tools/system/program"
 	"github.com/spf13/cobra"
@@ -35,9 +34,9 @@ func NewCronTaskCmd() *CronTaskCmd {
 	var cronTaskConfig tools.CronTaskConfig
 	ret := &CronTaskCmd{cronTaskConfig: &cronTaskConfig}
 	ret.configMap = map[string]any{
-		config.OpenIMCronTaskCfgFileName: &cronTaskConfig.CronTask,
-		config.ShareFileName:             &cronTaskConfig.Share,
-		config.DiscoveryConfigFilename:   &cronTaskConfig.Discovery,
+		OpenIMCronTaskCfgFileName: &cronTaskConfig.CronTask,
+		ShareFileName:             &cronTaskConfig.Share,
+		DiscoveryConfigFilename:   &cronTaskConfig.Discovery,
 	}
 	ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
 	ret.ctx = context.WithValue(context.Background(), "version", version.Version)

pkg/common/cmd/friend.go

@@ -18,7 +18,6 @@ import (
 	"context"
 
 	"github.com/openimsdk/open-im-server/v3/internal/rpc/relation"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/startrpc"
 	"github.com/openimsdk/open-im-server/v3/version"
 	"github.com/openimsdk/tools/system/program"
@@ -36,14 +35,14 @@ func NewFriendRpcCmd() *FriendRpcCmd {
 	var relationConfig relation.Config
 	ret := &FriendRpcCmd{relationConfig: &relationConfig}
 	ret.configMap = map[string]any{
-		config.OpenIMRPCFriendCfgFileName: &relationConfig.RpcConfig,
-		config.RedisConfigFileName:        &relationConfig.RedisConfig,
-		config.MongodbConfigFileName:      &relationConfig.MongodbConfig,
-		config.ShareFileName:              &relationConfig.Share,
-		config.NotificationFileName:       &relationConfig.NotificationConfig,
-		config.WebhooksConfigFileName:     &relationConfig.WebhooksConfig,
-		config.LocalCacheConfigFileName:   &relationConfig.LocalCacheConfig,
-		config.DiscoveryConfigFilename:    &relationConfig.Discovery,
+		OpenIMRPCFriendCfgFileName: &relationConfig.RpcConfig,
+		RedisConfigFileName:        &relationConfig.RedisConfig,
+		MongodbConfigFileName:      &relationConfig.MongodbConfig,
+		ShareFileName:              &relationConfig.Share,
+		NotificationFileName:       &relationConfig.NotificationConfig,
+		WebhooksConfigFileName:     &relationConfig.WebhooksConfig,
+		LocalCacheConfigFileName:   &relationConfig.LocalCacheConfig,
+		DiscoveryConfigFilename:    &relationConfig.Discovery,
 	}
 	ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
 	ret.ctx = context.WithValue(context.Background(), "version", version.Version)
@@ -60,16 +59,7 @@ func (a *FriendRpcCmd) Exec() error {
 func (a *FriendRpcCmd) runE() error {
 	return startrpc.Start(a.ctx, &a.relationConfig.Discovery, &a.relationConfig.RpcConfig.Prometheus, a.relationConfig.RpcConfig.RPC.ListenIP,
 		a.relationConfig.RpcConfig.RPC.RegisterIP, a.relationConfig.RpcConfig.RPC.AutoSetPorts, a.relationConfig.RpcConfig.RPC.Ports,
-		a.Index(), a.relationConfig.Discovery.RpcService.Friend, &a.relationConfig.NotificationConfig, a.relationConfig,
-		[]string{
-			a.relationConfig.RpcConfig.GetConfigFileName(),
-			a.relationConfig.RedisConfig.GetConfigFileName(),
-			a.relationConfig.MongodbConfig.GetConfigFileName(),
-			a.relationConfig.NotificationConfig.GetConfigFileName(),
-			a.relationConfig.Share.GetConfigFileName(),
-			a.relationConfig.WebhooksConfig.GetConfigFileName(),
-			a.relationConfig.LocalCacheConfig.GetConfigFileName(),
-			a.relationConfig.Discovery.GetConfigFileName(),
-		}, nil,
+		a.Index(), a.relationConfig.Share.RpcRegisterName.Friend, &a.relationConfig.Share, a.relationConfig,
+		nil,
 		relation.Start)
 }

pkg/common/cmd/group.go

@@ -18,7 +18,6 @@ import (
 	"context"
 
 	"github.com/openimsdk/open-im-server/v3/internal/rpc/group"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/startrpc"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/versionctx"
 	"github.com/openimsdk/open-im-server/v3/version"
@@ -37,14 +36,14 @@ func NewGroupRpcCmd() *GroupRpcCmd {
 	var groupConfig group.Config
 	ret := &GroupRpcCmd{groupConfig: &groupConfig}
 	ret.configMap = map[string]any{
-		config.OpenIMRPCGroupCfgFileName: &groupConfig.RpcConfig,
-		config.RedisConfigFileName:       &groupConfig.RedisConfig,
-		config.MongodbConfigFileName:     &groupConfig.MongodbConfig,
-		config.ShareFileName:             &groupConfig.Share,
-		config.NotificationFileName:      &groupConfig.NotificationConfig,
-		config.WebhooksConfigFileName:    &groupConfig.WebhooksConfig,
-		config.LocalCacheConfigFileName:  &groupConfig.LocalCacheConfig,
-		config.DiscoveryConfigFilename:   &groupConfig.Discovery,
+		OpenIMRPCGroupCfgFileName: &groupConfig.RpcConfig,
+		RedisConfigFileName:       &groupConfig.RedisConfig,
+		MongodbConfigFileName:     &groupConfig.MongodbConfig,
+		ShareFileName:             &groupConfig.Share,
+		NotificationFileName:      &groupConfig.NotificationConfig,
+		WebhooksConfigFileName:    &groupConfig.WebhooksConfig,
+		LocalCacheConfigFileName:  &groupConfig.LocalCacheConfig,
+		DiscoveryConfigFilename:   &groupConfig.Discovery,
 	}
 	ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
 	ret.ctx = context.WithValue(context.Background(), "version", version.Version)
@@ -61,16 +60,7 @@ func (a *GroupRpcCmd) Exec() error {
 func (a *GroupRpcCmd) runE() error {
 	return startrpc.Start(a.ctx, &a.groupConfig.Discovery, &a.groupConfig.RpcConfig.Prometheus, a.groupConfig.RpcConfig.RPC.ListenIP,
 		a.groupConfig.RpcConfig.RPC.RegisterIP, a.groupConfig.RpcConfig.RPC.AutoSetPorts, a.groupConfig.RpcConfig.RPC.Ports,
-		a.Index(), a.groupConfig.Discovery.RpcService.Group, &a.groupConfig.NotificationConfig, a.groupConfig,
-		[]string{
-			a.groupConfig.RpcConfig.GetConfigFileName(),
-			a.groupConfig.RedisConfig.GetConfigFileName(),
-			a.groupConfig.MongodbConfig.GetConfigFileName(),
-			a.groupConfig.NotificationConfig.GetConfigFileName(),
-			a.groupConfig.Share.GetConfigFileName(),
-			a.groupConfig.WebhooksConfig.GetConfigFileName(),
-			a.groupConfig.LocalCacheConfig.GetConfigFileName(),
-			a.groupConfig.Discovery.GetConfigFileName(),
-		}, nil,
+		a.Index(), a.groupConfig.Share.RpcRegisterName.Group, &a.groupConfig.Share, a.groupConfig,
+		nil,
 		group.Start, versionctx.EnableVersionCtx())
 }

pkg/common/cmd/msg.go

@@ -18,7 +18,6 @@ import (
 	"context"
 
 	"github.com/openimsdk/open-im-server/v3/internal/rpc/msg"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/startrpc"
 	"github.com/openimsdk/open-im-server/v3/version"
 	"github.com/openimsdk/tools/system/program"
@@ -36,15 +35,15 @@ func NewMsgRpcCmd() *MsgRpcCmd {
 	var msgConfig msg.Config
 	ret := &MsgRpcCmd{msgConfig: &msgConfig}
 	ret.configMap = map[string]any{
-		config.OpenIMRPCMsgCfgFileName:  &msgConfig.RpcConfig,
-		config.RedisConfigFileName:      &msgConfig.RedisConfig,
-		config.MongodbConfigFileName:    &msgConfig.MongodbConfig,
-		config.KafkaConfigFileName:      &msgConfig.KafkaConfig,
-		config.ShareFileName:            &msgConfig.Share,
-		config.NotificationFileName:     &msgConfig.NotificationConfig,
-		config.WebhooksConfigFileName:   &msgConfig.WebhooksConfig,
-		config.LocalCacheConfigFileName: &msgConfig.LocalCacheConfig,
-		config.DiscoveryConfigFilename:  &msgConfig.Discovery,
+		OpenIMRPCMsgCfgFileName:  &msgConfig.RpcConfig,
+		RedisConfigFileName:      &msgConfig.RedisConfig,
+		MongodbConfigFileName:    &msgConfig.MongodbConfig,
+		KafkaConfigFileName:      &msgConfig.KafkaConfig,
+		ShareFileName:            &msgConfig.Share,
+		NotificationFileName:     &msgConfig.NotificationConfig,
+		WebhooksConfigFileName:   &msgConfig.WebhooksConfig,
+		LocalCacheConfigFileName: &msgConfig.LocalCacheConfig,
+		DiscoveryConfigFilename:  &msgConfig.Discovery,
 	}
 	ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
 	ret.ctx = context.WithValue(context.Background(), "version", version.Version)
@@ -61,17 +60,7 @@ func (a *MsgRpcCmd) Exec() error {
 func (a *MsgRpcCmd) runE() error {
 	return startrpc.Start(a.ctx, &a.msgConfig.Discovery, &a.msgConfig.RpcConfig.Prometheus, a.msgConfig.RpcConfig.RPC.ListenIP,
 		a.msgConfig.RpcConfig.RPC.RegisterIP, a.msgConfig.RpcConfig.RPC.AutoSetPorts, a.msgConfig.RpcConfig.RPC.Ports,
-		a.Index(), a.msgConfig.Discovery.RpcService.Msg, &a.msgConfig.NotificationConfig, a.msgConfig,
-		[]string{
-			a.msgConfig.RpcConfig.GetConfigFileName(),
-			a.msgConfig.RedisConfig.GetConfigFileName(),
-			a.msgConfig.MongodbConfig.GetConfigFileName(),
-			a.msgConfig.KafkaConfig.GetConfigFileName(),
-			a.msgConfig.NotificationConfig.GetConfigFileName(),
-			a.msgConfig.Share.GetConfigFileName(),
-			a.msgConfig.WebhooksConfig.GetConfigFileName(),
-			a.msgConfig.LocalCacheConfig.GetConfigFileName(),
-			a.msgConfig.Discovery.GetConfigFileName(),
-		}, nil,
+		a.Index(), a.msgConfig.Share.RpcRegisterName.Msg, &a.msgConfig.Share, a.msgConfig,
+		nil,
 		msg.Start)
 }

pkg/common/cmd/msg_gateway.go

@@ -18,7 +18,6 @@ import (
 	"context"
 
 	"github.com/openimsdk/open-im-server/v3/internal/msggateway"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/version"
 
 	"github.com/openimsdk/tools/system/program"
@@ -36,11 +35,11 @@ func NewMsgGatewayCmd() *MsgGatewayCmd {
 	var msgGatewayConfig msggateway.Config
 	ret := &MsgGatewayCmd{msgGatewayConfig: &msgGatewayConfig}
 	ret.configMap = map[string]any{
-		config.OpenIMMsgGatewayCfgFileName: &msgGatewayConfig.MsgGateway,
-		config.ShareFileName:               &msgGatewayConfig.Share,
-		config.RedisConfigFileName:         &msgGatewayConfig.RedisConfig,
-		config.WebhooksConfigFileName:      &msgGatewayConfig.WebhooksConfig,
-		config.DiscoveryConfigFilename:     &msgGatewayConfig.Discovery,
+		OpenIMMsgGatewayCfgFileName: &msgGatewayConfig.MsgGateway,
+		ShareFileName:               &msgGatewayConfig.Share,
+		RedisConfigFileName:         &msgGatewayConfig.RedisConfig,
+		WebhooksConfigFileName:      &msgGatewayConfig.WebhooksConfig,
+		DiscoveryConfigFilename:     &msgGatewayConfig.Discovery,
 	}
 	ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
 	ret.ctx = context.WithValue(context.Background(), "version", version.Version)

pkg/common/cmd/msg_transfer.go

@@ -18,7 +18,6 @@ import (
 	"context"
 
 	"github.com/openimsdk/open-im-server/v3/internal/msgtransfer"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/version"
 	"github.com/openimsdk/tools/system/program"
 	"github.com/spf13/cobra"
@@ -35,13 +34,13 @@ func NewMsgTransferCmd() *MsgTransferCmd {
 	var msgTransferConfig msgtransfer.Config
 	ret := &MsgTransferCmd{msgTransferConfig: &msgTransferConfig}
 	ret.configMap = map[string]any{
-		config.OpenIMMsgTransferCfgFileName: &msgTransferConfig.MsgTransfer,
-		config.RedisConfigFileName:          &msgTransferConfig.RedisConfig,
-		config.MongodbConfigFileName:        &msgTransferConfig.MongodbConfig,
-		config.KafkaConfigFileName:          &msgTransferConfig.KafkaConfig,
-		config.ShareFileName:                &msgTransferConfig.Share,
-		config.WebhooksConfigFileName:       &msgTransferConfig.WebhooksConfig,
-		config.DiscoveryConfigFilename:      &msgTransferConfig.Discovery,
+		OpenIMMsgTransferCfgFileName: &msgTransferConfig.MsgTransfer,
+		RedisConfigFileName:          &msgTransferConfig.RedisConfig,
+		MongodbConfigFileName:        &msgTransferConfig.MongodbConfig,
+		KafkaConfigFileName:          &msgTransferConfig.KafkaConfig,
+		ShareFileName:                &msgTransferConfig.Share,
+		WebhooksConfigFileName:       &msgTransferConfig.WebhooksConfig,
+		DiscoveryConfigFilename:      &msgTransferConfig.Discovery,
 	}
 	ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
 	ret.ctx = context.WithValue(context.Background(), "version", version.Version)

pkg/common/cmd/msg_utils.go

@@ -15,7 +15,6 @@
 package cmd
 
 import (
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/spf13/cobra"
 )
 
@@ -27,11 +26,11 @@ func (m *MsgUtilsCmd) AddUserIDFlag() {
 	m.Command.PersistentFlags().StringP("userID", "u", "", "openIM userID")
 }
 func (m *MsgUtilsCmd) AddIndexFlag() {
-	m.Command.PersistentFlags().IntP(config.FlagTransferIndex, "i", 0, "process startup sequence number")
+	m.Command.PersistentFlags().IntP(FlagTransferIndex, "i", 0, "process startup sequence number")
 }
 
 func (m *MsgUtilsCmd) AddConfigDirFlag() {
-	m.Command.PersistentFlags().StringP(config.FlagConf, "c", "", "path of config directory")
+	m.Command.PersistentFlags().StringP(FlagConf, "c", "", "path of config directory")
 
 }
 

pkg/common/cmd/push.go

@@ -18,7 +18,6 @@ import (
 	"context"
 
 	"github.com/openimsdk/open-im-server/v3/internal/push"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/startrpc"
 	"github.com/openimsdk/open-im-server/v3/version"
 	"github.com/openimsdk/tools/system/program"
@@ -36,14 +35,14 @@ func NewPushRpcCmd() *PushRpcCmd {
 	var pushConfig push.Config
 	ret := &PushRpcCmd{pushConfig: &pushConfig}
 	ret.configMap = map[string]any{
-		config.OpenIMPushCfgFileName:    &pushConfig.RpcConfig,
-		config.RedisConfigFileName:      &pushConfig.RedisConfig,
-		config.KafkaConfigFileName:      &pushConfig.KafkaConfig,
-		config.ShareFileName:            &pushConfig.Share,
-		config.NotificationFileName:     &pushConfig.NotificationConfig,
-		config.WebhooksConfigFileName:   &pushConfig.WebhooksConfig,
-		config.LocalCacheConfigFileName: &pushConfig.LocalCacheConfig,
-		config.DiscoveryConfigFilename:  &pushConfig.Discovery,
+		OpenIMPushCfgFileName:    &pushConfig.RpcConfig,
+		RedisConfigFileName:      &pushConfig.RedisConfig,
+		KafkaConfigFileName:      &pushConfig.KafkaConfig,
+		ShareFileName:            &pushConfig.Share,
+		NotificationFileName:     &pushConfig.NotificationConfig,
+		WebhooksConfigFileName:   &pushConfig.WebhooksConfig,
+		LocalCacheConfigFileName: &pushConfig.LocalCacheConfig,
+		DiscoveryConfigFilename:  &pushConfig.Discovery,
 	}
 	ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
 	ret.ctx = context.WithValue(context.Background(), "version", version.Version)
@@ -61,19 +60,9 @@ func (a *PushRpcCmd) Exec() error {
 func (a *PushRpcCmd) runE() error {
 	return startrpc.Start(a.ctx, &a.pushConfig.Discovery, &a.pushConfig.RpcConfig.Prometheus, a.pushConfig.RpcConfig.RPC.ListenIP,
 		a.pushConfig.RpcConfig.RPC.RegisterIP, a.pushConfig.RpcConfig.RPC.AutoSetPorts, a.pushConfig.RpcConfig.RPC.Ports,
-		a.Index(), a.pushConfig.Discovery.RpcService.Push, &a.pushConfig.NotificationConfig, a.pushConfig,
+		a.Index(), a.pushConfig.Share.RpcRegisterName.Push, &a.pushConfig.Share, a.pushConfig,
 		[]string{
-			a.pushConfig.RpcConfig.GetConfigFileName(),
-			a.pushConfig.RedisConfig.GetConfigFileName(),
-			a.pushConfig.KafkaConfig.GetConfigFileName(),
-			a.pushConfig.NotificationConfig.GetConfigFileName(),
-			a.pushConfig.Share.GetConfigFileName(),
-			a.pushConfig.WebhooksConfig.GetConfigFileName(),
-			a.pushConfig.LocalCacheConfig.GetConfigFileName(),
-			a.pushConfig.Discovery.GetConfigFileName(),
-		},
-		[]string{
-			a.pushConfig.Discovery.RpcService.MessageGateway,
+			a.pushConfig.Share.RpcRegisterName.MessageGateway,
 		},
 		push.Start)
 }

pkg/common/cmd/root.go

@@ -1,20 +1,28 @@
+// Copyright © 2023 OpenIM. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package cmd
 
 import (
-	"context"
-	"encoding/json"
 	"fmt"
+	"path/filepath"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
-	kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discovery"
-	disetcd "github.com/openimsdk/open-im-server/v3/pkg/common/discovery/etcd"
 	"github.com/openimsdk/open-im-server/v3/version"
-	"github.com/openimsdk/tools/discovery/etcd"
 	"github.com/openimsdk/tools/errs"
 	"github.com/openimsdk/tools/log"
-	"github.com/openimsdk/tools/utils/runtimeenv"
 	"github.com/spf13/cobra"
-	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
 type RootCmd struct {
@@ -25,7 +33,6 @@ type RootCmd struct {
 	log            config.Log
 	index          int
 	configPath     string
-	etcdClient     *clientv3.Client
 }
 
 func (r *RootCmd) ConfigPath() string {
@@ -73,49 +80,23 @@ func NewRootCmd(processName string, opts ...func(*CmdOpts)) *RootCmd {
 		SilenceUsage:  true,
 		SilenceErrors: false,
 	}
-	cmd.Flags().StringP(config.FlagConf, "c", "", "path of config directory")
-	cmd.Flags().IntP(config.FlagTransferIndex, "i", 0, "process startup sequence number")
+	cmd.Flags().StringP(FlagConf, "c", "", "path of config directory")
+	cmd.Flags().IntP(FlagTransferIndex, "i", 0, "process startup sequence number")
 
 	rootCmd.Command = cmd
 	return rootCmd
 }
 
-func (r *RootCmd) initEtcd() error {
-	configDirectory, _, err := r.getFlag(&r.Command)
-	if err != nil {
-		return err
-	}
-	disConfig := config.Discovery{}
-	env := runtimeenv.PrintRuntimeEnvironment()
-	err = config.Load(configDirectory, config.DiscoveryConfigFilename, config.EnvPrefixMap[config.DiscoveryConfigFilename],
-		env, &disConfig)
-	if err != nil {
-		return err
-	}
-	if disConfig.Enable == config.ETCD {
-		discov, _ := kdisc.NewDiscoveryRegister(&disConfig, env, nil)
-		r.etcdClient = discov.(*etcd.SvcDiscoveryRegistryImpl).GetClient()
-	}
-	return nil
-}
-
 func (r *RootCmd) persistentPreRun(cmd *cobra.Command, opts ...func(*CmdOpts)) error {
-	if err := r.initEtcd(); err != nil {
-		return err
-	}
 	cmdOpts := r.applyOptions(opts...)
 	if err := r.initializeConfiguration(cmd, cmdOpts); err != nil {
 		return err
 	}
-	if err := r.updateConfigFromEtcd(cmdOpts); err != nil {
-		return err
-	}
+
 	if err := r.initializeLogger(cmdOpts); err != nil {
 		return errs.WrapMsg(err, "failed to initialize logger")
 	}
-	if err := r.etcdClient.Close(); err != nil {
-		return errs.WrapMsg(err, "failed to close etcd client")
-	}
+
 	return nil
 }
 
@@ -124,77 +105,18 @@ func (r *RootCmd) initializeConfiguration(cmd *cobra.Command, opts *CmdOpts) err
 	if err != nil {
 		return err
 	}
-
-	runtimeEnv := runtimeenv.PrintRuntimeEnvironment()
-
 	// Load common configuration file
 	//opts.configMap[ShareFileName] = StructEnvPrefix{EnvPrefix: shareEnvPrefix, ConfigStruct: &r.share}
 	for configFileName, configStruct := range opts.configMap {
-		err := config.Load(configDirectory, configFileName, config.EnvPrefixMap[configFileName], runtimeEnv, configStruct)
+		err := config.LoadConfig(filepath.Join(configDirectory, configFileName),
+			ConfigEnvPrefixMap[configFileName], configStruct)
 		if err != nil {
 			return err
 		}
 	}
 	// Load common log configuration file
-	return config.Load(configDirectory, config.LogConfigFileName, config.EnvPrefixMap[config.LogConfigFileName], runtimeEnv, &r.log)
-}
-
-func (r *RootCmd) updateConfigFromEtcd(opts *CmdOpts) error {
-	if r.etcdClient == nil {
-		return nil
-	}
-	ctx := context.TODO()
-
-	res, err := r.etcdClient.Get(ctx, disetcd.BuildKey(disetcd.EnableConfigCenterKey))
-	if err != nil {
-		log.ZWarn(ctx, "root cmd updateConfigFromEtcd, etcd Get EnableConfigCenterKey err: %v", errs.Wrap(err))
-		return nil
-	}
-	if res.Count == 0 {
-		return nil
-	} else {
-		if string(res.Kvs[0].Value) == disetcd.Disable {
-			return nil
-		} else if string(res.Kvs[0].Value) != disetcd.Enable {
-			return errs.New("unknown EnableConfigCenter value").Wrap()
-		}
-	}
-
-	update := func(configFileName string, configStruct any) error {
-		key := disetcd.BuildKey(configFileName)
-		etcdRes, err := r.etcdClient.Get(ctx, key)
-		if err != nil {
-			log.ZWarn(ctx, "root cmd updateConfigFromEtcd, etcd Get err: %v", errs.Wrap(err))
-			return nil
-		}
-		if etcdRes.Count == 0 {
-			data, err := json.Marshal(configStruct)
-			if err != nil {
-				return errs.ErrArgs.WithDetail(err.Error()).Wrap()
-			}
-			_, err = r.etcdClient.Put(ctx, disetcd.BuildKey(configFileName), string(data))
-			if err != nil {
-				log.ZWarn(ctx, "root cmd updateConfigFromEtcd, etcd Put err: %v", errs.Wrap(err))
-			}
-			return nil
-		}
-		err = json.Unmarshal(etcdRes.Kvs[0].Value, configStruct)
-		if err != nil {
-			return errs.WrapMsg(err, "failed to unmarshal config from etcd")
-		}
-		return nil
-	}
-	for configFileName, configStruct := range opts.configMap {
-		if err := update(configFileName, configStruct); err != nil {
-			return err
-		}
-	}
-	if err := update(config.LogConfigFileName, &r.log); err != nil {
-		return err
-	}
-	// Load common log configuration file
-	return nil
-
+	return config.LoadConfig(filepath.Join(configDirectory, LogConfigFileName),
+		ConfigEnvPrefixMap[LogConfigFileName], &r.log)
 }
 
 func (r *RootCmd) applyOptions(opts ...func(*CmdOpts)) *CmdOpts {
@@ -235,12 +157,12 @@ func defaultCmdOpts() *CmdOpts {
 }
 
 func (r *RootCmd) getFlag(cmd *cobra.Command) (string, int, error) {
-	configDirectory, err := cmd.Flags().GetString(config.FlagConf)
+	configDirectory, err := cmd.Flags().GetString(FlagConf)
 	if err != nil {
 		return "", 0, errs.Wrap(err)
 	}
 	r.configPath = configDirectory
-	index, err := cmd.Flags().GetInt(config.FlagTransferIndex)
+	index, err := cmd.Flags().GetInt(FlagTransferIndex)
 	if err != nil {
 		return "", 0, errs.Wrap(err)
 	}

pkg/common/cmd/third.go

@@ -18,7 +18,6 @@ import (
 	"context"
 
 	"github.com/openimsdk/open-im-server/v3/internal/rpc/third"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/startrpc"
 	"github.com/openimsdk/open-im-server/v3/version"
 	"github.com/openimsdk/tools/system/program"
@@ -36,14 +35,14 @@ func NewThirdRpcCmd() *ThirdRpcCmd {
 	var thirdConfig third.Config
 	ret := &ThirdRpcCmd{thirdConfig: &thirdConfig}
 	ret.configMap = map[string]any{
-		config.OpenIMRPCThirdCfgFileName: &thirdConfig.RpcConfig,
-		config.RedisConfigFileName:       &thirdConfig.RedisConfig,
-		config.MongodbConfigFileName:     &thirdConfig.MongodbConfig,
-		config.ShareFileName:             &thirdConfig.Share,
-		config.NotificationFileName:      &thirdConfig.NotificationConfig,
-		config.MinioConfigFileName:       &thirdConfig.MinioConfig,
-		config.LocalCacheConfigFileName:  &thirdConfig.LocalCacheConfig,
-		config.DiscoveryConfigFilename:   &thirdConfig.Discovery,
+		OpenIMRPCThirdCfgFileName: &thirdConfig.RpcConfig,
+		RedisConfigFileName:       &thirdConfig.RedisConfig,
+		MongodbConfigFileName:     &thirdConfig.MongodbConfig,
+		ShareFileName:             &thirdConfig.Share,
+		NotificationFileName:      &thirdConfig.NotificationConfig,
+		MinioConfigFileName:       &thirdConfig.MinioConfig,
+		LocalCacheConfigFileName:  &thirdConfig.LocalCacheConfig,
+		DiscoveryConfigFilename:   &thirdConfig.Discovery,
 	}
 	ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
 	ret.ctx = context.WithValue(context.Background(), "version", version.Version)
@@ -60,16 +59,7 @@ func (a *ThirdRpcCmd) Exec() error {
 func (a *ThirdRpcCmd) runE() error {
 	return startrpc.Start(a.ctx, &a.thirdConfig.Discovery, &a.thirdConfig.RpcConfig.Prometheus, a.thirdConfig.RpcConfig.RPC.ListenIP,
 		a.thirdConfig.RpcConfig.RPC.RegisterIP, a.thirdConfig.RpcConfig.RPC.AutoSetPorts, a.thirdConfig.RpcConfig.RPC.Ports,
-		a.Index(), a.thirdConfig.Discovery.RpcService.Third, &a.thirdConfig.NotificationConfig, a.thirdConfig,
-		[]string{
-			a.thirdConfig.RpcConfig.GetConfigFileName(),
-			a.thirdConfig.RedisConfig.GetConfigFileName(),
-			a.thirdConfig.MongodbConfig.GetConfigFileName(),
-			a.thirdConfig.NotificationConfig.GetConfigFileName(),
-			a.thirdConfig.Share.GetConfigFileName(),
-			a.thirdConfig.MinioConfig.GetConfigFileName(),
-			a.thirdConfig.LocalCacheConfig.GetConfigFileName(),
-			a.thirdConfig.Discovery.GetConfigFileName(),
-		}, nil,
+		a.Index(), a.thirdConfig.Share.RpcRegisterName.Third, &a.thirdConfig.Share, a.thirdConfig,
+		nil,
 		third.Start)
 }

pkg/common/cmd/user.go

@@ -18,7 +18,6 @@ import (
 	"context"
 
 	"github.com/openimsdk/open-im-server/v3/internal/rpc/user"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/startrpc"
 	"github.com/openimsdk/open-im-server/v3/version"
 	"github.com/openimsdk/tools/system/program"
@@ -36,15 +35,15 @@ func NewUserRpcCmd() *UserRpcCmd {
 	var userConfig user.Config
 	ret := &UserRpcCmd{userConfig: &userConfig}
 	ret.configMap = map[string]any{
-		config.OpenIMRPCUserCfgFileName: &userConfig.RpcConfig,
-		config.RedisConfigFileName:      &userConfig.RedisConfig,
-		config.MongodbConfigFileName:    &userConfig.MongodbConfig,
-		config.KafkaConfigFileName:      &userConfig.KafkaConfig,
-		config.ShareFileName:            &userConfig.Share,
-		config.NotificationFileName:     &userConfig.NotificationConfig,
-		config.WebhooksConfigFileName:   &userConfig.WebhooksConfig,
-		config.LocalCacheConfigFileName: &userConfig.LocalCacheConfig,
-		config.DiscoveryConfigFilename:  &userConfig.Discovery,
+		OpenIMRPCUserCfgFileName: &userConfig.RpcConfig,
+		RedisConfigFileName:      &userConfig.RedisConfig,
+		MongodbConfigFileName:    &userConfig.MongodbConfig,
+		KafkaConfigFileName:      &userConfig.KafkaConfig,
+		ShareFileName:            &userConfig.Share,
+		NotificationFileName:     &userConfig.NotificationConfig,
+		WebhooksConfigFileName:   &userConfig.WebhooksConfig,
+		LocalCacheConfigFileName: &userConfig.LocalCacheConfig,
+		DiscoveryConfigFilename:  &userConfig.Discovery,
 	}
 	ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
 	ret.ctx = context.WithValue(context.Background(), "version", version.Version)
@@ -61,17 +60,7 @@ func (a *UserRpcCmd) Exec() error {
 func (a *UserRpcCmd) runE() error {
 	return startrpc.Start(a.ctx, &a.userConfig.Discovery, &a.userConfig.RpcConfig.Prometheus, a.userConfig.RpcConfig.RPC.ListenIP,
 		a.userConfig.RpcConfig.RPC.RegisterIP, a.userConfig.RpcConfig.RPC.AutoSetPorts, a.userConfig.RpcConfig.RPC.Ports,
-		a.Index(), a.userConfig.Discovery.RpcService.User, &a.userConfig.NotificationConfig, a.userConfig,
-		[]string{
-			a.userConfig.RpcConfig.GetConfigFileName(),
-			a.userConfig.RedisConfig.GetConfigFileName(),
-			a.userConfig.MongodbConfig.GetConfigFileName(),
-			a.userConfig.KafkaConfig.GetConfigFileName(),
-			a.userConfig.NotificationConfig.GetConfigFileName(),
-			a.userConfig.Share.GetConfigFileName(),
-			a.userConfig.WebhooksConfig.GetConfigFileName(),
-			a.userConfig.LocalCacheConfig.GetConfigFileName(),
-			a.userConfig.Discovery.GetConfigFileName(),
-		}, nil,
+		a.Index(), a.userConfig.Share.RpcRegisterName.User, &a.userConfig.Share, a.userConfig,
+		nil,
 		user.Start)
 }

pkg/common/config/config.go

@@ -380,9 +380,10 @@ type AfterConfig struct {
 }
 
 type Share struct {
-	Secret        string     `mapstructure:"secret"`
-	IMAdminUserID []string   `mapstructure:"imAdminUserID"`
-	MultiLogin    MultiLogin `mapstructure:"multiLogin"`
+	Secret          string          `mapstructure:"secret"`
+	RpcRegisterName RpcRegisterName `mapstructure:"rpcRegisterName"`
+	IMAdminUserID   []string        `mapstructure:"imAdminUserID"`
+	MultiLogin      MultiLogin      `mapstructure:"multiLogin"`
 }
 
 type MultiLogin struct {
@@ -477,41 +478,11 @@ type ZooKeeper struct {
 }
 
 type Discovery struct {
-	Enable     string     `mapstructure:"enable"`
-	Etcd       Etcd       `mapstructure:"etcd"`
-	Kubernetes Kubernetes `mapstructure:"kubernetes"`
-	RpcService RpcService `mapstructure:"rpcService"`
+	Enable    string    `mapstructure:"enable"`
+	Etcd      Etcd      `mapstructure:"etcd"`
+	ZooKeeper ZooKeeper `mapstructure:"zooKeeper"`
 }
 
-type RpcService struct {
-	User           string `mapstructure:"user"`
-	Friend         string `mapstructure:"friend"`
-	Msg            string `mapstructure:"msg"`
-	Push           string `mapstructure:"push"`
-	MessageGateway string `mapstructure:"messageGateway"`
-	Group          string `mapstructure:"group"`
-	Auth           string `mapstructure:"auth"`
-	Conversation   string `mapstructure:"conversation"`
-	Third          string `mapstructure:"third"`
-}
-
-func (r *RpcService) GetServiceNames() []string {
-	return []string{
-		r.User,
-		r.Friend,
-		r.Msg,
-		r.Push,
-		r.MessageGateway,
-		r.Group,
-		r.Auth,
-		r.Conversation,
-		r.Third,
-	}
-}
-
-type Kubernetes struct {
-	Namespace string `yaml:"namespace"`
-}
 type Etcd struct {
 	RootDirectory string   `mapstructure:"rootDirectory"`
 	Address       []string `mapstructure:"address"`
@@ -635,7 +606,7 @@ func (l *CacheConfig) Enable() bool {
 	return l.Topic != "" && l.SlotNum > 0 && l.SlotSize > 0
 }
 
-const (
+var (
 	DiscoveryConfigFilename          = "discovery.yml"
 	KafkaConfigFileName              = "kafka.yml"
 	LocalCacheConfigFileName         = "local-cache.yml"
@@ -657,7 +628,6 @@ const (
 	RedisConfigFileName              = "redis.yml"
 	ShareFileName                    = "share.yml"
 	WebhooksConfigFileName           = "webhooks.yml"
-	NotificationFileName             = "notification.yml"
 )
 
 func (d *Discovery) GetConfigFileName() string {
@@ -747,175 +717,3 @@ func (s *Share) GetConfigFileName() string {
 func (w *Webhooks) GetConfigFileName() string {
 	return WebhooksConfigFileName
 }
-
-func InitNotification(notification *Notification) {
-	notification.GroupCreated.UnreadCount = false
-	notification.GroupCreated.ReliabilityLevel = 1
-	notification.GroupInfoSet.UnreadCount = false
-	notification.GroupInfoSet.ReliabilityLevel = 1
-	notification.JoinGroupApplication.UnreadCount = false
-	notification.JoinGroupApplication.ReliabilityLevel = 1
-	notification.MemberQuit.UnreadCount = false
-	notification.MemberQuit.ReliabilityLevel = 1
-	notification.GroupApplicationAccepted.UnreadCount = false
-	notification.GroupApplicationAccepted.ReliabilityLevel = 1
-	notification.GroupApplicationRejected.UnreadCount = false
-	notification.GroupApplicationRejected.ReliabilityLevel = 1
-	notification.GroupOwnerTransferred.UnreadCount = false
-	notification.GroupOwnerTransferred.ReliabilityLevel = 1
-	notification.MemberKicked.UnreadCount = false
-	notification.MemberKicked.ReliabilityLevel = 1
-	notification.MemberInvited.UnreadCount = false
-	notification.MemberInvited.ReliabilityLevel = 1
-	notification.MemberEnter.UnreadCount = false
-	notification.MemberEnter.ReliabilityLevel = 1
-	notification.GroupDismissed.UnreadCount = false
-	notification.GroupDismissed.ReliabilityLevel = 1
-	notification.GroupMuted.UnreadCount = false
-	notification.GroupMuted.ReliabilityLevel = 1
-	notification.GroupCancelMuted.UnreadCount = false
-	notification.GroupCancelMuted.ReliabilityLevel = 1
-	notification.GroupMemberMuted.UnreadCount = false
-	notification.GroupMemberMuted.ReliabilityLevel = 1
-	notification.GroupMemberCancelMuted.UnreadCount = false
-	notification.GroupMemberCancelMuted.ReliabilityLevel = 1
-	notification.GroupMemberInfoSet.UnreadCount = false
-	notification.GroupMemberInfoSet.ReliabilityLevel = 1
-	notification.GroupMemberSetToAdmin.UnreadCount = false
-	notification.GroupMemberSetToAdmin.ReliabilityLevel = 1
-	notification.GroupMemberSetToOrdinary.UnreadCount = false
-	notification.GroupMemberSetToOrdinary.ReliabilityLevel = 1
-	notification.GroupInfoSetAnnouncement.UnreadCount = false
-	notification.GroupInfoSetAnnouncement.ReliabilityLevel = 1
-	notification.GroupInfoSetName.UnreadCount = false
-	notification.GroupInfoSetName.ReliabilityLevel = 1
-	notification.FriendApplicationAdded.UnreadCount = false
-	notification.FriendApplicationAdded.ReliabilityLevel = 1
-	notification.FriendApplicationApproved.UnreadCount = false
-	notification.FriendApplicationApproved.ReliabilityLevel = 1
-	notification.FriendApplicationRejected.UnreadCount = false
-	notification.FriendApplicationRejected.ReliabilityLevel = 1
-	notification.FriendAdded.UnreadCount = false
-	notification.FriendAdded.ReliabilityLevel = 1
-	notification.FriendDeleted.UnreadCount = false
-	notification.FriendDeleted.ReliabilityLevel = 1
-	notification.FriendRemarkSet.UnreadCount = false
-	notification.FriendRemarkSet.ReliabilityLevel = 1
-	notification.BlackAdded.UnreadCount = false
-	notification.BlackAdded.ReliabilityLevel = 1
-	notification.BlackDeleted.UnreadCount = false
-	notification.BlackDeleted.ReliabilityLevel = 1
-	notification.FriendInfoUpdated.UnreadCount = false
-	notification.FriendInfoUpdated.ReliabilityLevel = 1
-	notification.UserInfoUpdated.UnreadCount = false
-	notification.UserInfoUpdated.ReliabilityLevel = 1
-	notification.UserStatusChanged.UnreadCount = false
-	notification.UserStatusChanged.ReliabilityLevel = 1
-	notification.ConversationChanged.UnreadCount = false
-	notification.ConversationChanged.ReliabilityLevel = 1
-	notification.ConversationSetPrivate.UnreadCount = false
-	notification.ConversationSetPrivate.ReliabilityLevel = 1
-}
-
-type AllConfig struct {
-	Discovery    Discovery
-	Kafka        Kafka
-	LocalCache   LocalCache
-	Log          Log
-	Minio        Minio
-	Mongo        Mongo
-	Notification Notification
-	API          API
-	CronTask     CronTask
-	MsgGateway   MsgGateway
-	MsgTransfer  MsgTransfer
-	Push         Push
-	Auth         Auth
-	Conversation Conversation
-	Friend       Friend
-	Group        Group
-	Msg          Msg
-	Third        Third
-	User         User
-	Redis        Redis
-	Share        Share
-	Webhooks     Webhooks
-}
-
-func (a *AllConfig) Name2Config(name string) any {
-	switch name {
-	case a.Discovery.GetConfigFileName():
-		return a.Discovery
-	case a.Kafka.GetConfigFileName():
-		return a.Kafka
-	case a.LocalCache.GetConfigFileName():
-		return a.LocalCache
-	case a.Log.GetConfigFileName():
-		return a.Log
-	case a.Minio.GetConfigFileName():
-		return a.Minio
-	case a.Mongo.GetConfigFileName():
-		return a.Mongo
-	case a.Notification.GetConfigFileName():
-		return a.Notification
-	case a.API.GetConfigFileName():
-		return a.API
-	case a.CronTask.GetConfigFileName():
-		return a.CronTask
-	case a.MsgGateway.GetConfigFileName():
-		return a.MsgGateway
-	case a.MsgTransfer.GetConfigFileName():
-		return a.MsgTransfer
-	case a.Push.GetConfigFileName():
-		return a.Push
-	case a.Auth.GetConfigFileName():
-		return a.Auth
-	case a.Conversation.GetConfigFileName():
-		return a.Conversation
-	case a.Friend.GetConfigFileName():
-		return a.Friend
-	case a.Group.GetConfigFileName():
-		return a.Group
-	case a.Msg.GetConfigFileName():
-		return a.Msg
-	case a.Third.GetConfigFileName():
-		return a.Third
-	case a.User.GetConfigFileName():
-		return a.User
-	case a.Redis.GetConfigFileName():
-		return a.Redis
-	case a.Share.GetConfigFileName():
-		return a.Share
-	case a.Webhooks.GetConfigFileName():
-		return a.Webhooks
-	default:
-		return nil
-	}
-}
-
-func (a *AllConfig) GetConfigNames() []string {
-	return []string{
-		a.Discovery.GetConfigFileName(),
-		a.Kafka.GetConfigFileName(),
-		a.LocalCache.GetConfigFileName(),
-		a.Log.GetConfigFileName(),
-		a.Minio.GetConfigFileName(),
-		a.Mongo.GetConfigFileName(),
-		a.Notification.GetConfigFileName(),
-		a.API.GetConfigFileName(),
-		a.CronTask.GetConfigFileName(),
-		a.MsgGateway.GetConfigFileName(),
-		a.MsgTransfer.GetConfigFileName(),
-		a.Push.GetConfigFileName(),
-		a.Auth.GetConfigFileName(),
-		a.Conversation.GetConfigFileName(),
-		a.Friend.GetConfigFileName(),
-		a.Group.GetConfigFileName(),
-		a.Msg.GetConfigFileName(),
-		a.Third.GetConfigFileName(),
-		a.User.GetConfigFileName(),
-		a.Redis.GetConfigFileName(),
-		a.Share.GetConfigFileName(),
-		a.Webhooks.GetConfigFileName(),
-	}
-}

pkg/common/config/constant.go

@@ -14,13 +14,9 @@
 
 package config
 
-const ConfKey = "conf"
-
 const (
-	MountConfigFilePath = "CONFIG_PATH"
-	DeploymentType      = "DEPLOYMENT_TYPE"
-	KUBERNETES          = "kubernetes"
-	ETCD                = "etcd"
+	ConfKey = "conf"
+	ETCD    = "etcd"
 )
 
 const (

pkg/common/config/env.go

@@ -1,30 +0,0 @@
-package config
-
-import "strings"
-
-var EnvPrefixMap map[string]string
-
-func init() {
-	EnvPrefixMap = make(map[string]string)
-	fileNames := []string{
-		FileName, NotificationFileName, ShareFileName, WebhooksConfigFileName,
-		KafkaConfigFileName, RedisConfigFileName,
-		MongodbConfigFileName, MinioConfigFileName, LogConfigFileName,
-		OpenIMAPICfgFileName, OpenIMCronTaskCfgFileName, OpenIMMsgGatewayCfgFileName,
-		OpenIMMsgTransferCfgFileName, OpenIMPushCfgFileName, OpenIMRPCAuthCfgFileName,
-		OpenIMRPCConversationCfgFileName, OpenIMRPCFriendCfgFileName, OpenIMRPCGroupCfgFileName,
-		OpenIMRPCMsgCfgFileName, OpenIMRPCThirdCfgFileName, OpenIMRPCUserCfgFileName, DiscoveryConfigFilename,
-	}
-
-	for _, fileName := range fileNames {
-		envKey := strings.TrimSuffix(strings.TrimSuffix(fileName, ".yml"), ".yaml")
-		envKey = "IMENV_" + envKey
-		envKey = strings.ToUpper(strings.ReplaceAll(envKey, "-", "_"))
-		EnvPrefixMap[fileName] = envKey
-	}
-}
-
-const (
-	FlagConf          = "config_folder_path"
-	FlagTransferIndex = "index"
-)

pkg/common/config/load_config.go

@@ -1,29 +1,13 @@
 package config
 
 import (
-	"os"
-	"path/filepath"
-	"strings"
-
 	"github.com/mitchellh/mapstructure"
 	"github.com/openimsdk/tools/errs"
 	"github.com/spf13/viper"
+	"strings"
 )
 
-func Load(configDirectory string, configFileName string, envPrefix string, runtimeEnv string, config any) error {
-	if runtimeEnv == KUBERNETES {
-		mountPath := os.Getenv(MountConfigFilePath)
-		if mountPath == "" {
-			return errs.ErrArgs.WrapMsg(MountConfigFilePath + " env is empty")
-		}
-
-		return loadConfig(filepath.Join(mountPath, configFileName), envPrefix, config)
-	}
-
-	return loadConfig(filepath.Join(configDirectory, configFileName), envPrefix, config)
-}
-
-func loadConfig(path string, envPrefix string, config any) error {
+func LoadConfig(path string, envPrefix string, config any) error {
 	v := viper.New()
 	v.SetConfigFile(path)
 	v.SetEnvPrefix(envPrefix)

pkg/common/config/parse.go

@@ -26,7 +26,9 @@ import (
 )
 
 const (
-	FileName = "config.yaml"
+	FileName             = "config.yaml"
+	NotificationFileName = "notification.yaml"
+	DefaultFolderPath    = "../config/"
 )
 
 // return absolude path join ../config/, this is k8s container config path.

pkg/common/discovery/etcd/config_manager.go

@@ -1,106 +0,0 @@
-package etcd
-
-import (
-	"context"
-	"os"
-	"os/exec"
-	"runtime"
-	"sync"
-	"syscall"
-
-	"github.com/openimsdk/tools/errs"
-	"github.com/openimsdk/tools/log"
-	"github.com/openimsdk/tools/utils/datautil"
-	clientv3 "go.etcd.io/etcd/client/v3"
-)
-
-var (
-	ShutDowns []func() error
-)
-
-func RegisterShutDown(shutDown ...func() error) {
-	ShutDowns = append(ShutDowns, shutDown...)
-}
-
-type ConfigManager struct {
-	client           *clientv3.Client
-	watchConfigNames []string
-	lock             sync.Mutex
-}
-
-func BuildKey(s string) string {
-	return ConfigKeyPrefix + s
-}
-
-func NewConfigManager(client *clientv3.Client, configNames []string) *ConfigManager {
-	return &ConfigManager{
-		client:           client,
-		watchConfigNames: datautil.Batch(func(s string) string { return BuildKey(s) }, append(configNames, RestartKey))}
-}
-
-func (c *ConfigManager) Watch(ctx context.Context) {
-	chans := make([]clientv3.WatchChan, 0, len(c.watchConfigNames))
-	for _, name := range c.watchConfigNames {
-		chans = append(chans, c.client.Watch(ctx, name, clientv3.WithPrefix()))
-	}
-
-	doWatch := func(watchChan clientv3.WatchChan) {
-		for watchResp := range watchChan {
-			if watchResp.Err() != nil {
-				log.ZError(ctx, "watch err", errs.Wrap(watchResp.Err()))
-				continue
-			}
-			for _, event := range watchResp.Events {
-				if event.IsModify() {
-					if datautil.Contain(string(event.Kv.Key), c.watchConfigNames...) {
-						c.lock.Lock()
-						err := restartServer(ctx)
-						if err != nil {
-							log.ZError(ctx, "restart server err", err)
-						}
-						c.lock.Unlock()
-					}
-				}
-			}
-		}
-	}
-	for _, ch := range chans {
-		go doWatch(ch)
-	}
-}
-
-func restartServer(ctx context.Context) error {
-	exePath, err := os.Executable()
-	if err != nil {
-		return errs.New("get executable path fail").Wrap()
-	}
-
-	args := os.Args
-	env := os.Environ()
-
-	cmd := exec.Command(exePath, args[1:]...)
-	cmd.Env = env
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	cmd.Stdin = os.Stdin
-
-	if runtime.GOOS != "windows" {
-		cmd.SysProcAttr = &syscall.SysProcAttr{}
-	}
-	log.ZInfo(ctx, "shutdown server")
-	for _, f := range ShutDowns {
-		if err = f(); err != nil {
-			log.ZError(ctx, "shutdown fail", err)
-		}
-	}
-
-	log.ZInfo(ctx, "restart server")
-	err = cmd.Start()
-	if err != nil {
-		return errs.New("restart server fail").Wrap()
-	}
-	log.ZInfo(ctx, "cmd start over")
-
-	os.Exit(0)
-	return nil
-}

pkg/common/discovery/etcd/const.go

@@ -1,9 +0,0 @@
-package etcd
-
-const (
-	ConfigKeyPrefix       = "/open-im/config/"
-	RestartKey            = "restart"
-	EnableConfigCenterKey = "enable-config-center"
-	Enable                = "enable"
-	Disable               = "disable"
-)

pkg/common/discovery/kubernetes/kubernetes.go

@@ -1,270 +0,0 @@
-package kubernetes
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"os"
-	"sync"
-	"time"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/informers"
-	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/cache"
-)
-
-type KubernetesConnManager struct {
-	clientset   *kubernetes.Clientset
-	namespace   string
-	dialOptions []grpc.DialOption
-
-	rpcTargets map[string]string
-	selfTarget string
-
-	mu      sync.RWMutex
-	connMap map[string][]*grpc.ClientConn
-}
-
-// NewKubernetesConnManager creates a new connection manager that uses Kubernetes services for service discovery.
-func NewKubernetesConnManager(namespace string, options ...grpc.DialOption) (*KubernetesConnManager, error) {
-	config, err := rest.InClusterConfig()
-	if err != nil {
-		return nil, fmt.Errorf("failed to create in-cluster config: %v", err)
-	}
-
-	clientset, err := kubernetes.NewForConfig(config)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create clientset: %v", err)
-	}
-
-	k := &KubernetesConnManager{
-		clientset:   clientset,
-		namespace:   namespace,
-		dialOptions: options,
-		connMap:     make(map[string][]*grpc.ClientConn),
-	}
-
-	go k.watchEndpoints()
-
-	return k, nil
-}
-
-func (k *KubernetesConnManager) initializeConns(serviceName string) error {
-	port, err := k.getServicePort(serviceName)
-	if err != nil {
-		return err
-	}
-
-	endpoints, err := k.clientset.CoreV1().Endpoints(k.namespace).Get(context.Background(), serviceName, metav1.GetOptions{})
-	if err != nil {
-		return fmt.Errorf("failed to get endpoints for service %s: %v", serviceName, err)
-	}
-
-	// fmt.Println("Endpoints:", endpoints, "endpoints.Subsets:", endpoints.Subsets)
-
-	var conns []*grpc.ClientConn
-	for _, subset := range endpoints.Subsets {
-		for _, address := range subset.Addresses {
-			target := fmt.Sprintf("%s:%d", address.IP, port)
-			// fmt.Println("IP target:", target)
-			conn, err := grpc.Dial(target, append(k.dialOptions, grpc.WithTransportCredentials(insecure.NewCredentials()))...)
-			if err != nil {
-				return fmt.Errorf("failed to dial endpoint %s: %v", target, err)
-			}
-			conns = append(conns, conn)
-		}
-	}
-
-	k.mu.Lock()
-	k.connMap[serviceName] = conns
-	k.mu.Unlock()
-
-	return nil
-}
-
-// GetConns returns gRPC client connections for a given Kubernetes service name.
-func (k *KubernetesConnManager) GetConns(ctx context.Context, serviceName string, opts ...grpc.DialOption) ([]*grpc.ClientConn, error) {
-	k.mu.RLock()
-
-	conns, exists := k.connMap[serviceName]
-	k.mu.RUnlock()
-	if exists {
-		return conns, nil
-	}
-
-	k.mu.Lock()
-	// Check if another goroutine has already initialized the connections when we released the read lock
-	conns, exists = k.connMap[serviceName]
-	if exists {
-		return conns, nil
-	}
-	k.mu.Unlock()
-
-	if err := k.initializeConns(serviceName); err != nil {
-		fmt.Println("Failed to initialize connections:", err)
-		return nil, fmt.Errorf("failed to initialize connections for service %s: %v", serviceName, err)
-	}
-
-	return k.connMap[serviceName], nil
-}
-
-// GetConn returns a single gRPC client connection for a given Kubernetes service name.
-func (k *KubernetesConnManager) GetConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) {
-	var target string
-
-	if k.rpcTargets[serviceName] == "" {
-		var err error
-
-		svcPort, err := k.getServicePort(serviceName)
-		if err != nil {
-			return nil, err
-		}
-
-		target = fmt.Sprintf("%s.%s.svc.cluster.local:%d", serviceName, k.namespace, svcPort)
-
-		// fmt.Println("SVC target:", target)
-	} else {
-		target = k.rpcTargets[serviceName]
-	}
-
-	return grpc.DialContext(
-		ctx,
-		target,
-		append([]grpc.DialOption{
-			grpc.WithTransportCredentials(insecure.NewCredentials()),
-			grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(1024*1024*10), grpc.MaxCallSendMsgSize(1024*1024*20)),
-		}, k.dialOptions...)...,
-	)
-}
-
-// GetSelfConnTarget returns the connection target for the current service.
-func (k *KubernetesConnManager) GetSelfConnTarget() string {
-	if k.selfTarget == "" {
-		hostName := os.Getenv("HOSTNAME")
-
-		pod, err := k.clientset.CoreV1().Pods(k.namespace).Get(context.Background(), hostName, metav1.GetOptions{})
-		if err != nil {
-			log.Printf("failed to get pod %s: %v \n", hostName, err)
-		}
-
-		for pod.Status.PodIP == "" {
-			pod, err = k.clientset.CoreV1().Pods(k.namespace).Get(context.TODO(), hostName, metav1.GetOptions{})
-			if err != nil {
-				log.Printf("Error getting pod: %v \n", err)
-			}
-
-			time.Sleep(3 * time.Second)
-		}
-
-		var selfPort int32
-
-		for _, port := range pod.Spec.Containers[0].Ports {
-			if port.ContainerPort != 10001 {
-				selfPort = port.ContainerPort
-				break
-			}
-		}
-
-		k.selfTarget = fmt.Sprintf("%s:%d", pod.Status.PodIP, selfPort)
-	}
-
-	return k.selfTarget
-}
-
-// AddOption appends gRPC dial options to the existing options.
-func (k *KubernetesConnManager) AddOption(opts ...grpc.DialOption) {
-	k.mu.Lock()
-	defer k.mu.Unlock()
-	k.dialOptions = append(k.dialOptions, opts...)
-}
-
-// CloseConn closes a given gRPC client connection.
-func (k *KubernetesConnManager) CloseConn(conn *grpc.ClientConn) {
-	conn.Close()
-}
-
-// Close closes all gRPC connections managed by KubernetesConnManager.
-func (k *KubernetesConnManager) Close() {
-	k.mu.Lock()
-	defer k.mu.Unlock()
-	for _, conns := range k.connMap {
-		for _, conn := range conns {
-			_ = conn.Close()
-		}
-	}
-	k.connMap = make(map[string][]*grpc.ClientConn)
-}
-
-func (k *KubernetesConnManager) Register(serviceName, host string, port int, opts ...grpc.DialOption) error {
-	return nil
-}
-
-func (k *KubernetesConnManager) UnRegister() error {
-	return nil
-}
-
-func (k *KubernetesConnManager) GetUserIdHashGatewayHost(ctx context.Context, userId string) (string, error) {
-	return "", nil
-}
-
-func (k *KubernetesConnManager) getServicePort(serviceName string) (int32, error) {
-	var svcPort int32
-
-	svc, err := k.clientset.CoreV1().Services(k.namespace).Get(context.Background(), serviceName, metav1.GetOptions{})
-	if err != nil {
-		fmt.Print("namespace:", k.namespace)
-		return 0, fmt.Errorf("failed to get service %s: %v", serviceName, err)
-	}
-
-	if len(svc.Spec.Ports) == 0 {
-		return 0, fmt.Errorf("service %s has no ports defined", serviceName)
-	}
-
-	for _, port := range svc.Spec.Ports {
-		// fmt.Println(serviceName, " Now Get Port:", port.Port)
-		if port.Port != 10001 {
-			svcPort = port.Port
-			break
-		}
-	}
-
-	return svcPort, nil
-}
-
-// watchEndpoints listens for changes in Pod resources.
-func (k *KubernetesConnManager) watchEndpoints() {
-	informerFactory := informers.NewSharedInformerFactory(k.clientset, time.Minute*10)
-	informer := informerFactory.Core().V1().Pods().Informer()
-
-	// Watch for Pod changes (add, update, delete)
-	informer.AddEventHandler(cache.ResourceEventHandlerFuncs{
-		AddFunc: func(obj interface{}) {
-			k.handleEndpointChange(obj)
-		},
-		UpdateFunc: func(oldObj, newObj interface{}) {
-			k.handleEndpointChange(newObj)
-		},
-		DeleteFunc: func(obj interface{}) {
-			k.handleEndpointChange(obj)
-		},
-	})
-
-	informerFactory.Start(context.Background().Done())
-	<-context.Background().Done() // Block forever
-}
-
-func (k *KubernetesConnManager) handleEndpointChange(obj interface{}) {
-	endpoint, ok := obj.(*v1.Endpoints)
-	if !ok {
-		return
-	}
-	serviceName := endpoint.Name
-	if err := k.initializeConns(serviceName); err != nil {
-		fmt.Printf("Error initializing connections for %s: %v\n", serviceName, err)
-	}
-}

pkg/common/discoveryregister/direct/doc.go

@@ -12,4 +12,4 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package direct // import "github.com/openimsdk/open-im-server/v3/pkg/common/discovery/direct"
+package direct // import "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister/direct"

pkg/common/discoveryregister/discoveryregister.go

@@ -12,33 +12,24 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package discovery
+package discoveryregister
 
 import (
 	"time"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister/kubernetes"
 	"github.com/openimsdk/tools/discovery"
-	"google.golang.org/grpc"
-
-	"github.com/openimsdk/tools/discovery/kubernetes"
-
 	"github.com/openimsdk/tools/discovery/etcd"
 	"github.com/openimsdk/tools/errs"
 )
 
 // NewDiscoveryRegister creates a new service discovery and registry client based on the provided environment type.
-func NewDiscoveryRegister(discovery *config.Discovery, runtimeEnv string, watchNames []string) (discovery.SvcDiscoveryRegistry, error) {
-	if runtimeEnv == config.KUBERNETES {
-		return kubernetes.NewKubernetesConnManager(discovery.Kubernetes.Namespace,
-			grpc.WithDefaultCallOptions(
-				grpc.MaxCallSendMsgSize(1024*1024*20),
-			),
-		)
-	}
-
+func NewDiscoveryRegister(discovery *config.Discovery, share *config.Share, watchNames []string) (discovery.SvcDiscoveryRegistry, error) {
 	switch discovery.Enable {
-	case config.ETCD:
+	case "k8s":
+		return kubernetes.NewK8sDiscoveryRegister(share.RpcRegisterName.MessageGateway)
+	case "etcd":
 		return etcd.NewSvcDiscoveryRegistry(
 			discovery.Etcd.RootDirectory,
 			discovery.Etcd.Address,

pkg/common/discoveryregister/discoveryregister_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package discovery
+package discoveryregister
 
 import (
 	"os"

pkg/common/discoveryregister/doc.go

@@ -12,4 +12,4 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package discovery // import "github.com/openimsdk/open-im-server/v3/pkg/common/discovery"
+package discoveryregister // import "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister"

pkg/common/discoveryregister/etcd/doc.go

@@ -12,4 +12,4 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package kubernetes // import "github.com/openimsdk/open-im-server/v3/pkg/common/discovery/kubernetes"
+package kubernetes // import "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister/etcd"

pkg/common/discoveryregister/kubernetes/doc.go

@@ -0,0 +1,15 @@
+// Copyright © 2024 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 kubernetes // import "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister/kubernetes"

pkg/common/discoveryregister/kubernetes/kubernetes.go

@@ -0,0 +1,199 @@
+// 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 kubernetes
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"os"
+	"strconv"
+	"strings"
+
+	"github.com/openimsdk/tools/discovery"
+	"github.com/openimsdk/tools/log"
+	"github.com/stathat/consistent"
+	"google.golang.org/grpc"
+)
+
+// K8sDR represents the Kubernetes service discovery and registration client.
+type K8sDR struct {
+	options               []grpc.DialOption
+	rpcRegisterAddr       string
+	gatewayHostConsistent *consistent.Consistent
+	gatewayName           string
+}
+
+func NewK8sDiscoveryRegister(gatewayName string) (discovery.SvcDiscoveryRegistry, error) {
+	gatewayConsistent := consistent.New()
+	gatewayHosts := getMsgGatewayHost(context.Background(), gatewayName)
+	for _, v := range gatewayHosts {
+		gatewayConsistent.Add(v)
+	}
+	return &K8sDR{gatewayHostConsistent: gatewayConsistent}, nil
+}
+
+func (cli *K8sDR) Register(serviceName, host string, port int, opts ...grpc.DialOption) error {
+	if serviceName != cli.gatewayName {
+		cli.rpcRegisterAddr = serviceName
+	} else {
+		cli.rpcRegisterAddr = getSelfHost(context.Background(), cli.gatewayName)
+	}
+
+	return nil
+}
+
+func (cli *K8sDR) UnRegister() error {
+
+	return nil
+}
+
+func (cli *K8sDR) CreateRpcRootNodes(serviceNames []string) error {
+
+	return nil
+}
+
+func (cli *K8sDR) RegisterConf2Registry(key string, conf []byte) error {
+
+	return nil
+}
+
+func (cli *K8sDR) GetConfFromRegistry(key string) ([]byte, error) {
+
+	return nil, nil
+}
+
+func (cli *K8sDR) GetUserIdHashGatewayHost(ctx context.Context, userId string) (string, error) {
+	host, err := cli.gatewayHostConsistent.Get(userId)
+	if err != nil {
+		log.ZError(ctx, "GetUserIdHashGatewayHost error", err)
+	}
+	return host, err
+}
+
+func getSelfHost(ctx context.Context, gatewayName string) string {
+	port := 88
+	instance := "openimserver"
+	selfPodName := os.Getenv("MY_POD_NAME")
+	ns := os.Getenv("MY_POD_NAMESPACE")
+	statefuleIndex := 0
+	gatewayEnds := strings.Split(gatewayName, ":")
+	if len(gatewayEnds) != 2 {
+		log.ZError(ctx, "msggateway RpcRegisterName is error:config.RpcRegisterName.OpenImMessageGatewayName", errors.New("config error"))
+	} else {
+		port, _ = strconv.Atoi(gatewayEnds[1])
+	}
+	podInfo := strings.Split(selfPodName, "-")
+	instance = podInfo[0]
+	count := len(podInfo)
+	statefuleIndex, _ = strconv.Atoi(podInfo[count-1])
+	host := fmt.Sprintf("%s-openim-msggateway-%d.%s-openim-msggateway-headless.%s.svc.cluster.local:%d", instance, statefuleIndex, instance, ns, port)
+	return host
+}
+
+// like openimserver-openim-msggateway-0.openimserver-openim-msggateway-headless.openim-lin.svc.cluster.local:88.
+// Replica set in kubernetes environment
+func getMsgGatewayHost(ctx context.Context, gatewayName string) []string {
+	port := 88
+	instance := "openimserver"
+	selfPodName := os.Getenv("MY_POD_NAME")
+	replicas := os.Getenv("MY_MSGGATEWAY_REPLICACOUNT")
+	ns := os.Getenv("MY_POD_NAMESPACE")
+	gatewayEnds := strings.Split(gatewayName, ":")
+	if len(gatewayEnds) != 2 {
+		log.ZError(ctx, "msggateway RpcRegisterName is error:config.RpcRegisterName.OpenImMessageGatewayName", errors.New("config error"))
+	} else {
+		port, _ = strconv.Atoi(gatewayEnds[1])
+	}
+	nReplicas, _ := strconv.Atoi(replicas)
+	podInfo := strings.Split(selfPodName, "-")
+	instance = podInfo[0]
+	var ret []string
+	for i := 0; i < nReplicas; i++ {
+		host := fmt.Sprintf("%s-openim-msggateway-%d.%s-openim-msggateway-headless.%s.svc.cluster.local:%d", instance, i, instance, ns, port)
+		ret = append(ret, host)
+	}
+	log.ZDebug(ctx, "getMsgGatewayHost", "instance", instance, "selfPodName", selfPodName, "replicas", replicas, "ns", ns, "ret", ret)
+	return ret
+}
+
+// GetConns returns the gRPC client connections to the specified service.
+func (cli *K8sDR) GetConns(ctx context.Context, serviceName string, opts ...grpc.DialOption) ([]*grpc.ClientConn, error) {
+
+	// This conditional checks if the serviceName is not the OpenImMessageGatewayName.
+	// It seems to handle a special case for the OpenImMessageGateway.
+	if serviceName != cli.gatewayName {
+		// DialContext creates a client connection to the given target (serviceName) using the specified context.
+		// 'cli.options' are likely default or common options for all connections in this struct.
+		// 'opts...' allows for additional gRPC dial options to be passed and used.
+		conn, err := grpc.DialContext(ctx, serviceName, append(cli.options, opts...)...)
+
+		// The function returns a slice of client connections with the new connection, or an error if occurred.
+		return []*grpc.ClientConn{conn}, err
+	} else {
+		// This block is executed if the serviceName is OpenImMessageGatewayName.
+		// 'ret' will accumulate the connections to return.
+		var ret []*grpc.ClientConn
+
+		// getMsgGatewayHost presumably retrieves hosts for the message gateway service.
+		// The context is passed, likely for cancellation and timeout control.
+		gatewayHosts := getMsgGatewayHost(ctx, cli.gatewayName)
+
+		// Iterating over the retrieved gateway hosts.
+		for _, host := range gatewayHosts {
+			// Establishes a connection to each host.
+			// Again, appending cli.options with any additional opts provided.
+			conn, err := grpc.DialContext(ctx, host, append(cli.options, opts...)...)
+
+			// If there's an error while dialing any host, the function returns immediately with the error.
+			if err != nil {
+				return nil, err
+			} else {
+				// If the connection is successful, it is added to the 'ret' slice.
+				ret = append(ret, conn)
+			}
+		}
+		// After all hosts are processed, the slice of connections is returned.
+		return ret, nil
+	}
+}
+
+func (cli *K8sDR) GetConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) {
+
+	return grpc.DialContext(ctx, serviceName, append(cli.options, opts...)...)
+}
+
+func (cli *K8sDR) GetSelfConnTarget() string {
+
+	return cli.rpcRegisterAddr
+}
+
+func (cli *K8sDR) AddOption(opts ...grpc.DialOption) {
+	cli.options = append(cli.options, opts...)
+}
+
+func (cli *K8sDR) CloseConn(conn *grpc.ClientConn) {
+	conn.Close()
+}
+
+// do not use this method for call rpc.
+func (cli *K8sDR) GetClientLocalConns() map[string][]*grpc.ClientConn {
+	log.ZError(context.Background(), "should not call this function!", nil)
+	return nil
+}
+
+func (cli *K8sDR) Close() {
+
+}

pkg/common/discoveryregister/zookeeper/doc.go

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

pkg/common/prommetrics/rpc.go

@@ -43,25 +43,25 @@ func GetGrpcServerMetrics() *gp.ServerMetrics {
 	return grpcMetrics
 }
 
-func GetGrpcCusMetrics(registerName string, discovery *config.Discovery) []prometheus.Collector {
+func GetGrpcCusMetrics(registerName string, share *config.Share) []prometheus.Collector {
 	switch registerName {
-	case discovery.RpcService.MessageGateway:
+	case share.RpcRegisterName.MessageGateway:
 		return []prometheus.Collector{OnlineUserGauge}
-	case discovery.RpcService.Msg:
+	case share.RpcRegisterName.Msg:
 		return []prometheus.Collector{
 			SingleChatMsgProcessSuccessCounter,
 			SingleChatMsgProcessFailedCounter,
 			GroupChatMsgProcessSuccessCounter,
 			GroupChatMsgProcessFailedCounter,
 		}
-	case discovery.RpcService.Push:
+	case share.RpcRegisterName.Push:
 		return []prometheus.Collector{
 			MsgOfflinePushFailedCounter,
 			MsgLoneTimePushCounter,
 		}
-	case discovery.RpcService.Auth:
+	case share.RpcRegisterName.Auth:
 		return []prometheus.Collector{UserLoginCounter}
-	case discovery.RpcService.User:
+	case share.RpcRegisterName.User:
 		return []prometheus.Collector{UserRegisterCounter}
 	default:
 		return nil

pkg/common/startrpc/start.go

@@ -27,15 +27,12 @@ import (
 	"time"
 
 	conf "github.com/openimsdk/open-im-server/v3/pkg/common/config"
-	disetcd "github.com/openimsdk/open-im-server/v3/pkg/common/discovery/etcd"
 	"github.com/openimsdk/tools/discovery/etcd"
 	"github.com/openimsdk/tools/utils/datautil"
 	"github.com/openimsdk/tools/utils/jsonutil"
 	"google.golang.org/grpc/status"
 
-	"github.com/openimsdk/tools/utils/runtimeenv"
-
-	kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discovery"
+	kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
 	"github.com/openimsdk/tools/discovery"
 	"github.com/openimsdk/tools/errs"
@@ -48,12 +45,11 @@ import (
 
 // Start rpc server.
 func Start[T any](ctx context.Context, discovery *conf.Discovery, prometheusConfig *conf.Prometheus, listenIP,
-	registerIP string, autoSetPorts bool, rpcPorts []int, index int, rpcRegisterName string, notification *conf.Notification, config T,
-	watchConfigNames []string, watchServiceNames []string,
+	registerIP string, autoSetPorts bool, rpcPorts []int, index int, rpcRegisterName string, share *conf.Share, config T,
+	watchServiceNames []string,
 	rpcFn func(ctx context.Context, config T, client discovery.SvcDiscoveryRegistry, server *grpc.Server) error,
 	options ...grpc.ServerOption) error {
 
-	watchConfigNames = append(watchConfigNames, conf.LogConfigFileName)
 	var (
 		rpcTcpAddr     string
 		netDone        = make(chan struct{}, 2)
@@ -61,17 +57,11 @@ func Start[T any](ctx context.Context, discovery *conf.Discovery, prometheusConf
 		prometheusPort int
 	)
 
-	if notification != nil {
-		conf.InitNotification(notification)
-	}
-
 	registerIP, err := network.GetRpcRegisterIP(registerIP)
 	if err != nil {
 		return err
 	}
 
-	runTimeEnv := runtimeenv.PrintRuntimeEnvironment()
-
 	if !autoSetPorts {
 		rpcPort, err := datautil.GetElemByIndex(rpcPorts, index)
 		if err != nil {
@@ -95,7 +85,7 @@ func Start[T any](ctx context.Context, discovery *conf.Discovery, prometheusConf
 	if autoSetPorts && discovery.Enable != conf.ETCD {
 		return errs.New("only etcd support autoSetPorts", "rpcRegisterName", rpcRegisterName).Wrap()
 	}
-	client, err := kdisc.NewDiscoveryRegister(discovery, runTimeEnv, watchServiceNames)
+	client, err := kdisc.NewDiscoveryRegister(discovery, share, watchServiceNames)
 	if err != nil {
 		return err
 	}
@@ -142,7 +132,7 @@ func Start[T any](ctx context.Context, discovery *conf.Discovery, prometheusConf
 				return errs.WrapMsg(err, "listen err", "rpcTcpAddr", rpcTcpAddr)
 			}
 		}
-		cs := prommetrics.GetGrpcCusMetrics(rpcRegisterName, discovery)
+		cs := prommetrics.GetGrpcCusMetrics(rpcRegisterName, share)
 		go func() {
 			if err := prommetrics.RpcInit(cs, listener); err != nil && !errors.Is(err, http.ErrServerClosed) {
 				netErr = errs.WrapMsg(err, fmt.Sprintf("rpc %s prometheus start err: %d", rpcRegisterName, prometheusPort))
@@ -194,11 +184,6 @@ func Start[T any](ctx context.Context, discovery *conf.Discovery, prometheusConf
 		}
 	}()
 
-	if discovery.Enable == conf.ETCD {
-		cm := disetcd.NewConfigManager(client.(*etcd.SvcDiscoveryRegistryImpl).GetClient(), watchConfigNames)
-		cm.Watch(ctx)
-	}
-
 	sigs := make(chan os.Signal, 1)
 	signal.Notify(sigs, syscall.SIGTERM)
 	select {

pkg/common/storage/cache/redis/lua_script.go

@@ -2,7 +2,9 @@ package redis
 
 import (
 	"context"
+	"errors"
 	"fmt"
+
 	"github.com/openimsdk/open-im-server/v3/pkg/common/servererrs"
 	"github.com/openimsdk/tools/errs"
 	"github.com/openimsdk/tools/log"
@@ -56,7 +58,7 @@ func callLua(ctx context.Context, rdb redis.Scripter, script *redis.Script, keys
 		}
 	}
 	v, err := r.Result()
-	if err == redis.Nil {
+	if errors.Is(err, redis.Nil) {
 		err = nil
 	}
 	return v, errs.WrapMsg(err, "call lua err", "scriptHash", script.Hash(), "keys", keys, "args", args)

pkg/common/storage/controller/auth.go

@@ -59,15 +59,16 @@ func (a *authDatabase) BatchSetTokenMapByUidPid(ctx context.Context, tokens []st
 	setMap := make(map[string]map[string]any)
 	for _, token := range tokens {
 		claims, err := tokenverify.GetClaimFromToken(token, authverify.Secret(a.accessSecret))
+		key := cachekey.GetTokenKey(claims.UserID, claims.PlatformID)
 		if err != nil {
 			continue
-		}
-		key := cachekey.GetTokenKey(claims.UserID, claims.PlatformID)
-		if v, ok := setMap[key]; ok {
-			v[token] = constant.KickedToken
 		} else {
-			setMap[key] = map[string]any{
-				token: constant.KickedToken,
+			if v, ok := setMap[key]; ok {
+				v[token] = constant.KickedToken
+			} else {
+				setMap[key] = map[string]any{
+					token: constant.KickedToken,
+				}
 			}
 		}
 	}

pkg/common/storage/controller/msg.go

@@ -18,12 +18,11 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"github.com/openimsdk/tools/utils/jsonutil"
 	"strconv"
 	"strings"
 	"time"
 
-	"github.com/openimsdk/tools/utils/jsonutil"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/database"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
 
@@ -723,13 +722,13 @@ func (db *commonMsgDatabase) DeleteDoc(ctx context.Context, docID string) error
 	if index <= 0 {
 		return errs.ErrInternalServer.WrapMsg("docID is invalid", "docID", docID)
 	}
-	docIndex, err := strconv.Atoi(docID[index+1:])
+	index, err := strconv.Atoi(docID[index+1:])
 	if err != nil {
 		return errs.WrapMsg(err, "strconv.Atoi", "docID", docID)
 	}
 	conversationID := docID[:index]
 	seqs := make([]int64, db.msgTable.GetSingleGocMsgNum())
-	minSeq := db.msgTable.GetMinSeq(docIndex)
+	minSeq := db.msgTable.GetMinSeq(index)
 	for i := range seqs {
 		seqs[i] = minSeq + int64(i)
 	}

pkg/common/storage/database/mgo/conversation.go

@@ -243,14 +243,7 @@ func (c *ConversationMgo) FindRandConversation(ctx context.Context, ts int64, li
 					"$add": []any{
 						bson.M{
 							"$toLong": "$latest_msg_destruct_time",
-						},
-						bson.M{
-							"$multiply": []any{
-								"$msg_destruct_time",
-								1000, // convert to milliseconds
-							},
-						},
-					},
+						}, "$msg_destruct_time"},
 				},
 			},
 		},

pkg/common/storage/database/mgo/msg.go

@@ -1091,148 +1091,22 @@ func (m *MsgMgo) onlyFindDocIndex(ctx context.Context, docID string, indexes []i
 	return msgDocModel[0].Msg, nil
 }
 
-//func (m *MsgMgo) FindSeqs(ctx context.Context, conversationID string, seqs []int64) ([]*model.MsgInfoModel, error) {
-//	if len(seqs) == 0 {
-//		return nil, nil
-//	}
-//	result := make([]*model.MsgInfoModel, 0, len(seqs))
-//	for docID, seqs := range m.model.GetDocIDSeqsMap(conversationID, seqs) {
-//		res, err := m.onlyFindDocIndex(ctx, docID, datautil.Slice(seqs, m.model.GetMsgIndex))
-//		if err != nil {
-//			return nil, err
-//		}
-//		for i, re := range res {
-//			if re == nil || re.Msg == nil {
-//				continue
-//			}
-//			result = append(result, res[i])
-//		}
-//	}
-//	return result, nil
-//}
-
-func (m *MsgMgo) findBeforeDocSendTime(ctx context.Context, docID string, limit int64) (int64, int64, error) {
-	if limit == 0 {
-		return 0, 0, nil
-	}
-	pipeline := []bson.M{
-		{
-			"$match": bson.M{
-				"doc_id": docID,
-			},
-		},
-		{
-			"$project": bson.M{
-				"_id":    0,
-				"doc_id": 0,
-			},
-		},
-		{
-			"$unwind": "$msgs",
-		},
-		{
-			"$project": bson.M{
-				//"_id":                0,
-				//"doc_id":             0,
-				"msgs.msg.send_time": 1,
-				"msgs.msg.seq":       1,
-			},
-		},
-	}
-	if limit > 0 {
-		pipeline = append(pipeline, bson.M{"$limit": limit})
-	}
-	type Result struct {
-		Msgs *model.MsgInfoModel `bson:"msgs"`
-	}
-	res, err := mongoutil.Aggregate[Result](ctx, m.coll, pipeline)
-	if err != nil {
-		return 0, 0, err
-	}
-	for i := len(res) - 1; i > 0; i-- {
-		v := res[i]
-		if v.Msgs != nil && v.Msgs.Msg != nil && v.Msgs.Msg.SendTime > 0 {
-			return v.Msgs.Msg.Seq, v.Msgs.Msg.SendTime, nil
-		}
-	}
-	return 0, 0, nil
-}
-
-func (m *MsgMgo) findBeforeSendTime(ctx context.Context, conversationID string, seq int64) (int64, int64, error) {
-	first := true
-	for i := m.model.GetDocIndex(seq); i >= 0; i-- {
-		limit := int64(-1)
-		if first {
-			first = false
-			limit = m.model.GetMsgIndex(seq)
-		}
-		docID := m.model.BuildDocIDByIndex(conversationID, i)
-		msgSeq, msgSendTime, err := m.findBeforeDocSendTime(ctx, docID, limit)
-		if err != nil {
-			return 0, 0, err
-		}
-		if msgSendTime > 0 {
-			return msgSeq, msgSendTime, nil
-		}
-	}
-	return 0, 0, nil
-}
-
 func (m *MsgMgo) FindSeqs(ctx context.Context, conversationID string, seqs []int64) ([]*model.MsgInfoModel, error) {
 	if len(seqs) == 0 {
 		return nil, nil
 	}
-	var abnormalSeq []int64
 	result := make([]*model.MsgInfoModel, 0, len(seqs))
-	for docID, docSeqs := range m.model.GetDocIDSeqsMap(conversationID, seqs) {
-		res, err := m.onlyFindDocIndex(ctx, docID, datautil.Slice(docSeqs, m.model.GetMsgIndex))
+	for docID, seqs := range m.model.GetDocIDSeqsMap(conversationID, seqs) {
+		res, err := m.onlyFindDocIndex(ctx, docID, datautil.Slice(seqs, m.model.GetMsgIndex))
 		if err != nil {
 			return nil, err
 		}
-		if len(res) == 0 {
-			abnormalSeq = append(abnormalSeq, docSeqs...)
-			continue
-		}
 		for i, re := range res {
-			if re == nil || re.Msg == nil || re.Msg.SendTime == 0 {
-				abnormalSeq = append(abnormalSeq, docSeqs[i])
+			if re == nil || re.Msg == nil {
 				continue
 			}
 			result = append(result, res[i])
 		}
 	}
-	if len(abnormalSeq) > 0 {
-		datautil.Sort(abnormalSeq, false)
-		sendTime := make(map[int64]int64)
-		var (
-			lastSeq      int64
-			lastSendTime int64
-		)
-		for _, seq := range abnormalSeq {
-			if lastSendTime > 0 && lastSeq <= seq {
-				sendTime[seq] = lastSendTime
-				continue
-			}
-			msgSeq, msgSendTime, err := m.findBeforeSendTime(ctx, conversationID, seq)
-			if err != nil {
-				return nil, err
-			}
-			if msgSendTime <= 0 {
-				break
-			}
-			sendTime[seq] = msgSendTime
-			lastSeq = msgSeq
-			lastSendTime = msgSendTime
-		}
-		for _, seq := range abnormalSeq {
-			result = append(result, &model.MsgInfoModel{
-				Msg: &model.MsgDataModel{
-					Seq:      seq,
-					Status:   constant.MsgStatusHasDeleted,
-					SendTime: sendTime[seq],
-				},
-			})
-		}
-	}
 	return result, nil
 }

pkg/common/storage/model/msg.go

@@ -15,10 +15,9 @@
 package model
 
 import (
-	"strconv"
-
 	"github.com/openimsdk/protocol/sdkws"
 	"github.com/openimsdk/tools/errs"
+	"strconv"
 )
 
 const (
@@ -109,10 +108,6 @@ func (m *MsgDocModel) IsFull() bool {
 	return m.Msg[len(m.Msg)-1].Msg != nil
 }
 
-func (m *MsgDocModel) GetDocIndex(seq int64) int64 {
-	return (seq - 1) / singleGocMsgNum
-}
-
 func (m *MsgDocModel) GetDocID(conversationID string, seq int64) string {
 	seqSuffix := (seq - 1) / singleGocMsgNum
 	return m.indexGen(conversationID, seqSuffix)
@@ -140,10 +135,6 @@ func (*MsgDocModel) indexGen(conversationID string, seqSuffix int64) string {
 	return conversationID + ":" + strconv.FormatInt(seqSuffix, 10)
 }
 
-func (*MsgDocModel) BuildDocIDByIndex(conversationID string, index int64) string {
-	return conversationID + ":" + strconv.FormatInt(index, 10)
-}
-
 func (*MsgDocModel) GenExceptionMessageBySeqs(seqs []int64) (exceptionMsg []*sdkws.MsgData) {
 	for _, v := range seqs {
 		msgModel := new(sdkws.MsgData)

pkg/rpcli/tool.go

@@ -2,7 +2,6 @@ package rpcli
 
 import (
 	"context"
-
 	"github.com/openimsdk/tools/errs"
 	"google.golang.org/grpc"
 )

pkg/rpcli/user.go

@@ -2,7 +2,6 @@ package rpcli
 
 import (
 	"context"
-
 	"github.com/openimsdk/protocol/sdkws"
 	"github.com/openimsdk/protocol/user"
 	"github.com/openimsdk/tools/errs"

tools/check-component/main.go

@@ -18,12 +18,13 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
 	"time"
 
+	"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/tools/db/mongoutil"
 	"github.com/openimsdk/tools/db/redisutil"
@@ -32,21 +33,14 @@ import (
 	"github.com/openimsdk/tools/mq/kafka"
 	"github.com/openimsdk/tools/s3/minio"
 	"github.com/openimsdk/tools/system/program"
-	"github.com/openimsdk/tools/utils/runtimeenv"
 )
 
 const maxRetry = 180
 
-const (
-	MountConfigFilePath = "CONFIG_PATH"
-	DeploymentType      = "DEPLOYMENT_TYPE"
-	KUBERNETES          = "kubernetes"
-)
-
 func CheckZookeeper(ctx context.Context, config *config.ZooKeeper) error {
 	// Temporary disable logging
 	originalLogger := log.Default().Writer()
-	log.SetOutput(io.Discard)
+	log.SetOutput(ioutil.Discard)
 	defer log.SetOutput(originalLogger) // Ensure logging is restored
 	return zookeeper.Check(ctx, config.Address, config.Schema, zookeeper.WithUserNameAndPassword(config.Username, config.Password))
 }
@@ -84,37 +78,35 @@ func initConfig(configDir string) (*config.Mongo, *config.Redis, *config.Kafka,
 		discovery   = &config.Discovery{}
 		thirdConfig = &config.Third{}
 	)
-	runtimeEnv := runtimeenv.PrintRuntimeEnvironment()
-
-	err := config.Load(configDir, config.MongodbConfigFileName, config.EnvPrefixMap[config.MongodbConfigFileName], runtimeEnv, mongoConfig)
+	err := config.LoadConfig(filepath.Join(configDir, cmd.MongodbConfigFileName), cmd.ConfigEnvPrefixMap[cmd.MongodbConfigFileName], mongoConfig)
 	if err != nil {
 		return nil, nil, nil, nil, nil, err
 	}
 
-	err = config.Load(configDir, config.RedisConfigFileName, config.EnvPrefixMap[config.RedisConfigFileName], runtimeEnv, redisConfig)
+	err = config.LoadConfig(filepath.Join(configDir, cmd.RedisConfigFileName), cmd.ConfigEnvPrefixMap[cmd.RedisConfigFileName], redisConfig)
 	if err != nil {
 		return nil, nil, nil, nil, nil, err
 	}
 
-	err = config.Load(configDir, config.KafkaConfigFileName, config.EnvPrefixMap[config.KafkaConfigFileName], runtimeEnv, kafkaConfig)
+	err = config.LoadConfig(filepath.Join(configDir, cmd.KafkaConfigFileName), cmd.ConfigEnvPrefixMap[cmd.KafkaConfigFileName], kafkaConfig)
 	if err != nil {
 		return nil, nil, nil, nil, nil, err
 	}
 
-	err = config.Load(configDir, config.OpenIMRPCThirdCfgFileName, config.EnvPrefixMap[config.OpenIMRPCThirdCfgFileName], runtimeEnv, thirdConfig)
+	err = config.LoadConfig(filepath.Join(configDir, cmd.OpenIMRPCThirdCfgFileName), cmd.ConfigEnvPrefixMap[cmd.OpenIMRPCThirdCfgFileName], thirdConfig)
 	if err != nil {
 		return nil, nil, nil, nil, nil, err
 	}
 
 	if thirdConfig.Object.Enable == "minio" {
-		err = config.Load(configDir, config.MinioConfigFileName, config.EnvPrefixMap[config.MinioConfigFileName], runtimeEnv, minioConfig)
+		err = config.LoadConfig(filepath.Join(configDir, cmd.MinioConfigFileName), cmd.ConfigEnvPrefixMap[cmd.MinioConfigFileName], minioConfig)
 		if err != nil {
 			return nil, nil, nil, nil, nil, err
 		}
 	} else {
 		minioConfig = nil
 	}
-	err = config.Load(configDir, config.DiscoveryConfigFilename, config.EnvPrefixMap[config.DiscoveryConfigFilename], runtimeEnv, discovery)
+	err = config.LoadConfig(filepath.Join(configDir, cmd.DiscoveryConfigFilename), cmd.ConfigEnvPrefixMap[cmd.DiscoveryConfigFilename], discovery)
 	if err != nil {
 		return nil, nil, nil, nil, nil, err
 	}
@@ -168,6 +160,10 @@ func performChecks(ctx context.Context, mongoConfig *config.Mongo, redisConfig *
 		checks["Etcd"] = func(ctx context.Context) error {
 			return CheckEtcd(ctx, &discovery.Etcd)
 		}
+	} else if discovery.Enable == "zookeeper" {
+		checks["Zookeeper"] = func(ctx context.Context) error {
+			return CheckZookeeper(ctx, &discovery.ZooKeeper)
+		}
 	}
 
 	for i := 0; i < maxRetry; i++ {

tools/seq/internal/main.go

@@ -5,6 +5,16 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/database/mgo"
+	"github.com/openimsdk/tools/db/mongoutil"
+	"github.com/openimsdk/tools/db/redisutil"
+	"github.com/redis/go-redis/v9"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+	"gopkg.in/yaml.v3"
 	"os"
 	"os/signal"
 	"path/filepath"
@@ -14,18 +24,6 @@ import (
 	"sync/atomic"
 	"syscall"
 	"time"
-
-	"github.com/mitchellh/mapstructure"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/database/mgo"
-	"github.com/openimsdk/tools/db/mongoutil"
-	"github.com/openimsdk/tools/db/redisutil"
-	"github.com/openimsdk/tools/utils/runtimeenv"
-	"github.com/redis/go-redis/v9"
-	"github.com/spf13/viper"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
 )
 
 const (
@@ -43,33 +41,23 @@ const (
 )
 
 func readConfig[T any](dir string, name string) (*T, error) {
-	if runtimeenv.PrintRuntimeEnvironment() == config.KUBERNETES {
-		dir = os.Getenv(config.MountConfigFilePath)
-	}
-	v := viper.New()
-	v.SetEnvPrefix(config.EnvPrefixMap[name])
-	v.AutomaticEnv()
-	v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
-	v.SetConfigFile(filepath.Join(dir, name))
-	if err := v.ReadInConfig(); err != nil {
+	data, err := os.ReadFile(filepath.Join(dir, name))
+	if err != nil {
 		return nil, err
 	}
-	fn := func(config *mapstructure.DecoderConfig) {
-		config.TagName = "mapstructure"
-	}
 	var conf T
-	if err := v.Unmarshal(&conf, fn); err != nil {
+	if err := yaml.Unmarshal(data, &conf); err != nil {
 		return nil, err
 	}
 	return &conf, nil
 }
 
 func Main(conf string, del time.Duration) error {
-	redisConfig, err := readConfig[config.Redis](conf, config.RedisConfigFileName)
+	redisConfig, err := readConfig[config.Redis](conf, cmd.RedisConfigFileName)
 	if err != nil {
 		return err
 	}
-	mongodbConfig, err := readConfig[config.Mongo](conf, config.MongodbConfigFileName)
+	mongodbConfig, err := readConfig[config.Mongo](conf, cmd.MongodbConfigFileName)
 	if err != nil {
 		return err
 	}

tools/seq/main.go

@@ -3,10 +3,8 @@ package main
 import (
 	"flag"
 	"fmt"
-	"os"
-	"time"
-
 	"github.com/openimsdk/open-im-server/v3/tools/seq/internal"
+	"time"
 )
 
 func main() {
@@ -19,8 +17,6 @@ func main() {
 	flag.Parse()
 	if err := internal.Main(config, time.Duration(second)*time.Second); err != nil {
 		fmt.Println("seq task", err)
-		os.Exit(1)
-		return
 	}
 	fmt.Println("seq task success!")
 }

version/version

@@ -1 +1 @@
-v3.8.4-alpha.1
+v3.8.3