Merge remote-tracking branch 'upstream/main'

# Conflicts:
#	pkg/common/db/cache/conversation.go
#	pkg/common/db/cache/group.go
#	pkg/common/db/cache/meta_cache.go
#	pkg/common/db/cache/msg.go
#	pkg/common/db/cache/user.go

.dockerignore

@@ -1,4 +1,4 @@
-<!-- # Ignore files and directories starting with a dot
+# Ignore files and directories starting with a dot
 
 # Ignore specific files
 .dockerignore
@@ -29,4 +29,4 @@ assets/
 components/
 
 # Ignore tools and scripts
-.github/ -->
+.github/

.github/workflows/bot-cherry-pick.yml

@@ -19,7 +19,8 @@ on:
 jobs:
   cherry-pick:
     name: Cherry Pick
-    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/cherry-pick') && github.event.comment.user.login=='kubbot'
+    # && github.event.comment.user.login=='kubbot'
+    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/cherry-pick')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the latest code

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

@@ -120,6 +120,15 @@ jobs:
         uses: docker/metadata-action@v5.0.0
         with:
           images: ghcr.io/openimsdk/openim-server
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
 
       - name: Log in to GitHub Container Registry
         uses: docker/login-action@v3

.github/workflows/build-openim-web-image.yml

@@ -114,15 +114,12 @@ jobs:
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+# ghcr.io/openimsdk/openim-web:latest
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta2
+        uses: docker/metadata-action@v5.0.0
         with:
-          install: true
-      - name: Cache Docker layers
-        uses: actions/cache@v3
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
+          images: ghcr.io/openimsdk/openim-web
 
       - name: Log in to GitHub Container Registry
         uses: docker/login-action@v3
@@ -131,38 +128,12 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Extract metadata (tags, labels) for Docker openim-web
-        id: meta1
-        uses: docker/metadata-action@v5.0.0
-        with:
-          images: ghcr.io/openimsdk/openim-web
-
-      - name: Build and push Docker image for openim-web
+      - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
           context: .
           file: ./build/images/openim-tools/openim-web/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta1.outputs.tags }}
-          labels: ${{ steps.meta1.outputs.labels }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
-
-      - name: Extract metadata (tags, labels) for Docker openim-web
-        id: meta2
-        uses: docker/metadata-action@v5.0.0
-        with:
-          images: ghcr.io/openimsdk/component
-
-      - name: Build and push Docker image for component
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./build/images/openim-tools/component/Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta2.outputs.tags }}
           labels: ${{ steps.meta2.outputs.labels }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache

.github/workflows/openimci.yml

@@ -48,7 +48,7 @@ jobs:
 
     strategy:
       matrix:
-        go_version: ["1.18","1.19","1.20","1.21"]
+        go_version: ["1.19","1.20","1.21"]
         os: [ubuntu-latest]
 
     steps:

.golangci.yml

@@ -510,7 +510,7 @@ linters-settings:
 
   nestif:
     # minimal complexity of if statements to report, 5 by default
-    min-complexity: 4
+    min-complexity: 6
 
   nilnil:
     # By default, nilnil checks all returned types below.

README-zh_CN.md

@@ -98,6 +98,11 @@ OpenIM 我们的目标是建立一个顶级的开源社区。我们有一套标
 
 + [接口标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/interface.md)
 
++ [OpenIM配置和环境变量设置](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md)
+
+> **Note**
+> 针对中国的用户，阅读我们的 [Docker 镜像标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/images.md) 以便使用国内 aliyun 的镜像地址。OpenIM 也有针对中国的 gitee 同步仓库，你可以在 [gitee.com](https://gitee.com/openimsdk) 上找到它。
+
 ## :link: 链接
 
   + **[完整文档](https://doc.rentsoft.cn/)**

README.md

@@ -126,7 +126,7 @@ It is recommended to use Docker Compose for deployment, which can easily and qui
 <details>  <summary>Compile from Source</summary>
 
 
-Ur need `Go 1.18` or higher version, and `make`.
+Ur need `Go 1.20` or higher version, and `make`.
 
 
 ```bash
@@ -212,6 +212,8 @@ Before you start, please make sure your changes are in demand. The best for that
 - [Interface Standards](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/api.md)
 - [Log Standards](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/logging.md)
 - [Error Code Standards](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/error_code.md)
+- [OpenIM configuration and environment variable Settings](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md)
+
 
 ## :busts_in_silhouette: Community
 

build/images/Dockerfile

@@ -0,0 +1,10 @@
+FROM BASE_IMAGE
+
+WORKDIR ${SERVER_WORKDIR}
+
+# Set HTTP proxy
+ARG BINARY_NAME
+
+COPY BINARY_NAME ./bin/BINARY_NAME
+
+ENTRYPOINT ["./bin/BINARY_NAME"]

build/images/openim-api/Dockerfile

@@ -31,20 +31,15 @@ RUN go mod download
 
 COPY . .
 
-RUN make clean
 RUN make build BINS=openim-api
 
+RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-api /usr/bin/openim-api
+
 # FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms
-COPY --from=builder /openim/openim-server/config /openim/openim-server/config
+COPY --from=builder /usr/bin/openim-api ./bin/openim-api
 
-ENV PORT 10002
-EXPOSE 10002
-
-RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-api /usr/bin/openim-api
-
-ENTRYPOINT ["bash", "-c", "openim-api -c $OPENIM_SERVER_CONFIG_NAME --port $PORT"]
+ENTRYPOINT ["./bin/openim-api"]

build/images/openim-api/Dockerfile.release

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

build/images/openim-cmdutils/Dockerfile

@@ -31,19 +31,15 @@ RUN go mod download
 
 COPY . .
 
-RUN go mod download
-RUN make clean
 RUN make build BINS=openim-cmdutils
+RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-cmdutils /usr/bin/openim-cmdutils
 
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-COPY --from=builder $OPENIM_SERVER_BINDIR/platforms /openim/openim-server/_output/bin/platforms
-COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config
+COPY --from=builder /usr/bin/openim-cmdutils ./bin/openim-cmdutils
 
-RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-cmdutils /usr/bin/openim-cmdutils
-
-ENTRYPOINT ["openim-cmdutils"]
+ENTRYPOINT ["./bin/openim-cmdutils"]
 
 CMD ["--help"]

build/images/openim-crontask/Dockerfile

@@ -31,18 +31,15 @@ RUN go mod download
 
 COPY . .
 
-RUN make clean
 RUN make build BINS=openim-crontask
 
+RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-crontask /usr/bin/openim-crontask
+
+# FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms
-COPY --from=builder /openim/openim-server/config /openim/openim-server/config
+COPY --from=builder /usr/bin/openim-crontask ./bin/openim-crontask
 
-ENV OPENIM_SERVER_CONFIG_NAME=/openim/openim-server/config
-
-RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-crontask /usr/bin/openim-crontask
-
-CMD ["bash", "-c", "openim-crontask -c $OPENIM_SERVER_CONFIG_NAME"]
+ENTRYPOINT ["./bin/openim-crontask"]

build/images/openim-msggateway/Dockerfile

@@ -31,22 +31,15 @@ RUN go mod download
 
 COPY . .
 
-RUN make clean
 RUN make build BINS=openim-msggateway
 
+RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-msggateway /usr/bin/openim-msggateway
+
+# FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms
-COPY --from=builder /openim/openim-server/config /openim/openim-server/config
+COPY --from=builder /usr/bin/openim-msggateway ./bin/openim-msggateway
 
-ENV PORT 10140 \
-    WS_PORT 10001
-
-EXPOSE 10140
-EXPOSE 10001
-
-RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-msggateway /usr/bin/openim-msggateway
-
-CMD ["bash", "-c", "openim-msggateway -c $OPENIM_SERVER_CONFIG_NAME --port $PORT --ws_port $WS_PORT"]
+ENTRYPOINT ["./bin/openim-msggateway"]

build/images/openim-msgtransfer/Dockerfile

@@ -31,16 +31,15 @@ RUN go mod download
 
 COPY . .
 
-RUN make clean
 RUN make build BINS=openim-msgtransfer
 
+RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-msgtransfer /usr/bin/openim-msgtransfer
+
+# FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms
-COPY --from=builder /openim/openim-server/config /openim/openim-server/config
+COPY --from=builder /usr/bin/openim-msgtransfer ./bin/openim-msgtransfer
 
-RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-msgtransfer /usr/bin/openim-msgtransfer
-
-ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then openim-msgtransfer -c $OPENIM_SERVER_CONFIG_NAME --prometheus_port $PROMETHEUS_PORT; else openim-msgtransfer -c $OPENIM_SERVER_CONFIG_NAME; fi"]
+ENTRYPOINT ["./bin/openim-msgtransfer"]

build/images/openim-push/Dockerfile

@@ -15,7 +15,6 @@
 # OpenIM base image: https://github.com/openim-sigs/openim-base-image
 
 # Set go mod installation source and proxy
-# docker run -e "PORT=10003" -e "PROMETHEUSORT=4321"  --network host  -it 67ef891ad1ff
 
 FROM golang:1.20 AS builder
 
@@ -32,21 +31,15 @@ RUN go mod download
 
 COPY . .
 
-RUN make clean
 RUN make build BINS=openim-push
 
+RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-push /usr/bin/openim-push
+
+# FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms
-COPY --from=builder /openim/openim-server/config /openim/openim-server/config
+COPY --from=builder /usr/bin/openim-push ./bin/openim-push
 
-ENV PORT 10170 \
-    PROMETHEUS_PORT 20170
-
-EXPOSE 10170
-
-RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-push /usr/bin/openim-push
-
-ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then openim-push -c $OPENIM_SERVER_CONFIG_NAME --port $PORT --prometheus_port $PROMETHEUS_PORT; else openim-push -c $OPENIM_SERVER_CONFIG_NAME --port $PORT; fi"]
+ENTRYPOINT ["./bin/openim-push"]

build/images/openim-rpc-auth/Dockerfile

@@ -31,22 +31,15 @@ RUN go mod download
 
 COPY . .
 
-RUN make clean
-
 RUN make build BINS=openim-rpc-auth
 
+RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-auth /usr/bin/openim-rpc-auth
+
+# FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
-COPY --from=builder /openim/openim-server/config /openim/openim-server/config
+COPY --from=builder /usr/bin/openim-rpc-auth ./bin/openim-rpc-auth
 
-ENV PORT 10160 \
-    PROMETHEUS_PORT 20160
-
-EXPOSE 10160
-
-RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-auth /usr/bin/openim-rpc-auth
-
-ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-auth --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-auth --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"]
+ENTRYPOINT ["./bin/openim-rpc-auth"]

build/images/openim-rpc-conversation/Dockerfile

@@ -31,22 +31,15 @@ RUN go mod download
 
 COPY . .
 
-RUN make clean
-
 RUN make build BINS=openim-rpc-conversation
 
+RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-conversation /usr/bin/openim-rpc-conversation
+
+# FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
-COPY --from=builder /openim/openim-server/config /openim/openim-server/config
+COPY --from=builder /usr/bin/openim-rpc-conversation ./bin/openim-rpc-conversation
 
-ENV PORT 10230 \
-    PROMETHEUS_PORT 20230
-
-EXPOSE 10230
-
-RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-conversation /usr/bin/openim-rpc-conversation
-
-ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-conversation --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-conversation --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"]
+ENTRYPOINT ["./bin/openim-rpc-conversation"]

build/images/openim-rpc-friend/Dockerfile

@@ -31,22 +31,15 @@ RUN go mod download
 
 COPY . .
 
-RUN make clean
-
 RUN make build BINS=openim-rpc-friend
 
+RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-friend /usr/bin/openim-rpc-friend
+
+# FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
-COPY --from=builder /openim/openim-server/config /openim/openim-server/config
+COPY --from=builder /usr/bin/openim-rpc-friend ./bin/openim-rpc-friend
 
-ENV PORT 10120 \
-    PROMETHEUS_PORT 20120
-
-EXPOSE 10120
-
-RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-friend /usr/bin/openim-rpc-friend
-
-ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-friend --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-friend --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"]
+ENTRYPOINT ["./bin/openim-rpc-friend"]

build/images/openim-rpc-group/Dockerfile

@@ -31,22 +31,15 @@ RUN go mod download
 
 COPY . .
 
-RUN make clean
-
 RUN make build BINS=openim-rpc-group
 
+RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-group /usr/bin/openim-rpc-group
+
+# FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
-COPY --from=builder /openim/openim-server/config /openim/openim-server/config
+COPY --from=builder /usr/bin/openim-rpc-group ./bin/openim-rpc-group
 
-ENV PORT 10150 \
-    PROMETHEUS_PORT 20150
-
-EXPOSE 10150
-
-RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-group /usr/bin/openim-rpc-group
-
-ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-group --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-group --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"]
+ENTRYPOINT ["./bin/openim-rpc-group"]

build/images/openim-rpc-msg/Dockerfile

@@ -31,22 +31,15 @@ RUN go mod download
 
 COPY . .
 
-RUN make clean
-
 RUN make build BINS=openim-rpc-msg
 
+RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-msg /usr/bin/openim-rpc-msg
+
+# FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
-COPY --from=builder /openim/openim-server/config /openim/openim-server/config
+COPY --from=builder /usr/bin/openim-rpc-msg ./bin/openim-rpc-msg
 
-ENV PORT 10130 \
-    PROMETHEUS_PORT 20130
-
-EXPOSE 10130
-
-RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-msg /usr/bin/openim-rpc-msg
-
-ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-msg --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-msg --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"]
+ENTRYPOINT ["./bin/openim-rpc-msg"]

build/images/openim-rpc-third/Dockerfile

@@ -31,23 +31,15 @@ RUN go mod download
 
 COPY . .
 
-RUN make clean
-
 RUN make build BINS=openim-rpc-third
 
+RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-third /usr/bin/openim-rpc-third
 
+# FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
-COPY --from=builder /openim/openim-server/config /openim/openim-server/config
+COPY --from=builder /usr/bin/openim-rpc-third ./bin/openim-rpc-third
 
-ENV PORT 10190 \
-    PROMETHEUS_PORT 21301
-
-EXPOSE 10190
-
-RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-third /usr/bin/openim-rpc-third
-
-ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-third --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-third --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"]
+ENTRYPOINT ["./bin/openim-rpc-third"]

build/images/openim-rpc-user/Dockerfile

@@ -31,22 +31,15 @@ RUN go mod download
 
 COPY . .
 
-RUN make clean
-
 RUN make build BINS=openim-rpc-user
 
+RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-user /usr/bin/openim-rpc-user
+
+# FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
-COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
-COPY --from=builder /openim/openim-server/config /openim/openim-server/config
+COPY --from=builder /usr/bin/openim-rpc-user ./bin/openim-rpc-user
 
-ENV PORT 10110 \
-    PROMETHEUS_PORT 20110
-
-EXPOSE 10110
-
-RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-user /usr/bin/openim-rpc-user
-
-ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-user --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-user --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"]
+ENTRYPOINT ["./bin/openim-rpc-user"]

cmd/openim-api/main.go

@@ -17,72 +17,83 @@ package main
 import (
 	"context"
 	"fmt"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register"
 	"net"
 	_ "net/http/pprof"
 	"strconv"
 
+	"github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register"
+
 	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 	"github.com/OpenIMSDK/tools/log"
-
 	"github.com/openimsdk/open-im-server/v3/internal/api"
 	"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/db/cache"
 )
 
+
 func main() {
 	apiCmd := cmd.NewApiCmd()
 	apiCmd.AddPortFlag()
 	apiCmd.AddApi(run)
 	if err := apiCmd.Execute(); err != nil {
+		log.ZError(context.Background(), "API command execution failed", err)
 		panic(err.Error())
 	}
 }
 
 func run(port int) error {
-	fmt.Println("*****openimapi port:", port)
+	log.ZInfo(context.Background(), "Openim api port:", "port", port)
+
 	if port == 0 {
-		return fmt.Errorf("port is empty")
+		err := "port is empty"
+		log.ZError(context.Background(), err, nil)
+
+		return fmt.Errorf(err)
 	}
 	rdb, err := cache.NewRedis()
 	if err != nil {
+		log.ZError(context.Background(), "Failed to initialize Redis", err)
+
 		return err
 	}
-	fmt.Println("api start init discov client")
+	log.ZInfo(context.Background(), "api start init discov client")
+
 	var client discoveryregistry.SvcDiscoveryRegistry
+
+	// Determine whether zk is passed according to whether it is a clustered deployment
 	client, err = discovery_register.NewDiscoveryRegister(config.Config.Envs.Discovery)
-	/*
-		client, err = openkeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema,
-			openkeeper.WithFreq(time.Hour), openkeeper.WithUserNameAndPassword(
-				config.Config.Zookeeper.Username,
-				config.Config.Zookeeper.Password,
-			), openkeeper.WithRoundRobin(), openkeeper.WithTimeout(10), openkeeper.WithLogger(log.NewZkLogger()))*/
 	if err != nil {
+		log.ZError(context.Background(), "Failed to initialize discovery register", err)
+
 		return err
 	}
 	if err = client.CreateRpcRootNodes(config.Config.GetServiceNames()); err != nil {
+		log.ZError(context.Background(), "Failed to create RPC root nodes", err)
+
 		return err
 	}
-	fmt.Println("api register public config to discov")
+	log.ZInfo(context.Background(), "api register public config to discov")
 	if err = client.RegisterConf2Registry(constant.OpenIMCommonConfigKey, config.Config.EncodeConfig()); err != nil {
+		log.ZError(context.Background(), "Failed to register public config to discov", err)
+
 		return err
 	}
-	fmt.Println("api register public config to discov success")
+	log.ZInfo(context.Background(), "api register public config to discov success")
 	router := api.NewGinRouter(client, rdb)
-	fmt.Println("api init router success")
+	log.ZInfo(context.Background(), "api init router success")
 	var address string
 	if config.Config.Api.ListenIP != "" {
 		address = net.JoinHostPort(config.Config.Api.ListenIP, strconv.Itoa(port))
 	} else {
 		address = net.JoinHostPort("0.0.0.0", strconv.Itoa(port))
 	}
-	fmt.Println("start api server, address: ", address, ", OpenIM version: ", config.Version)
-	log.ZInfo(context.Background(), "start server success", "address", address, "version", config.Version)
+	log.ZInfo(context.Background(), "start api server", "address", address, "OpenIM version", config.Version)
+
 	err = router.Run(address)
 	if err != nil {
-		log.ZError(context.Background(), "api run failed ", err, "address", address)
+		log.ZError(context.Background(), "api run failed", err, "address", address)
 
 		return err
 	}

deployments/README.md

@@ -80,6 +80,12 @@ $ sudo sealos run labring/kubernetes:v1.25.0 labring/helm:v3.8.2 labring/calico:
     -p "$CLUSTER_PASSWORD"
 ```
 
+> **Node**
+> 卸载的方式：使用 `kubeadm` 卸载并不会清除 `etcd` 和 `cni` 相关，所以需要手动清除，或者使用 `sealos` 卸载。
+> ```bash
+> sealos reset
+> ```
+
 ### 安装 helm
 
 helm通过打包的方式，支持发布的版本管理和控制，很大程度上简化了Kubernetes应用的部署和管理。
@@ -97,11 +103,17 @@ $ curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bas
 $ helm repo add brigade https://openimsdk.github.io/openim-charts
 ```
 
+### OpenIM 的镜像策略
+
+自动化提供的 aliyun, ghcr, docker hub: https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/images.md
+
+**本地化测试构建方法：**
+
+```bash
+$ make image
+```
+
 
 ### 容器化安装
 
 具体安装步骤如下：
-
-
-
-### Helm安装

deployments/openim-chat/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

deployments/openim-chat/Chart.yaml

@@ -1,38 +0,0 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v2
-name: openim-chat
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "1.16.0"

deployments/openim-chat/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.

deployments/openim-chat/templates/NOTES.txt

@@ -1,22 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
-  {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "openim-chat.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "openim-chat.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "openim-chat.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "openim-chat.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
-{{- end }}

deployments/openim-chat/templates/_helpers.tpl

@@ -1,62 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "openim-chat.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "openim-chat.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "openim-chat.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "openim-chat.labels" -}}
-helm.sh/chart: {{ include "openim-chat.chart" . }}
-{{ include "openim-chat.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "openim-chat.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "openim-chat.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "openim-chat.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "openim-chat.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}

deployments/openim-chat/templates/deployment.yaml

@@ -1,75 +0,0 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "openim-chat.fullname" . }}
-  labels:
-    {{- include "openim-chat.labels" . | nindent 4 }}
-spec:
-  {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "openim-chat.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "openim-chat.selectorLabels" . | nindent 8 }}
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "openim-chat.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: http
-              containerPort: 80
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /
-              port: http
-          readinessProbe:
-            httpGet:
-              path: /
-              port: http
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}

deployments/openim-chat/templates/hpa.yaml

@@ -1,42 +0,0 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "openim-chat.fullname" . }}
-  labels:
-    {{- include "openim-chat.labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "openim-chat.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
-{{- end }}

deployments/openim-chat/templates/ingress.yaml

@@ -1,75 +0,0 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "openim-chat.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
-{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
-  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
-  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
-  {{- end }}
-{{- end }}
-{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{- include "openim-chat.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
-  ingressClassName: {{ .Values.ingress.className }}
-  {{- end }}
-  {{- if .Values.ingress.tls }}
-  tls:
-    {{- range .Values.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
-  rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
-            pathType: {{ .pathType }}
-            {{- end }}
-            backend:
-              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: {{ $svcPort }}
-              {{- else }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-              {{- end }}
-          {{- end }}
-    {{- end }}
-{{- end }}

deployments/openim-chat/templates/service.yaml

@@ -1,29 +0,0 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "openim-chat.fullname" . }}
-  labels:
-    {{- include "openim-chat.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    {{- include "openim-chat.selectorLabels" . | nindent 4 }}

deployments/openim-chat/templates/serviceaccount.yaml

@@ -1,26 +0,0 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "openim-chat.serviceAccountName" . }}
-  labels:
-    {{- include "openim-chat.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}

deployments/openim-chat/values.yaml

@@ -1,96 +0,0 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Default values for openim-chat.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  repository: nginx
-  pullPolicy: IfNotPresent
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
-
-imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: ""
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
-podAnnotations: {}
-
-podSecurityContext: {}
-  # fsGroup: 2000
-
-securityContext: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
-
-ingress:
-  enabled: false
-  className: ""
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  hosts:
-    - host: chart-example.local
-      paths:
-        - path: /
-          pathType: ImplementationSpecific
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-autoscaling:
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 100
-  targetCPUUtilizationPercentage: 80
-  # targetMemoryUtilizationPercentage: 80
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}

docs/contrib/environment.md

@@ -1,20 +1,19 @@
-# OpenIM enviroment
+# OpenIM ENVIRONMENT CONFIGURATION
 
 <!-- vscode-markdown-toc -->
-
 * 1. [OpenIM Deployment Guide](#OpenIMDeploymentGuide)
 	* 1.1. [Deployment Strategies](#DeploymentStrategies)
 	* 1.2. [Source Code Deployment](#SourceCodeDeployment)
 	* 1.3. [Docker Compose Deployment](#DockerComposeDeployment)
 	* 1.4. [Environment Variable Configuration](#EnvironmentVariableConfiguration)
-		* 1.4.1. [[1. Recommended using environment variables:](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#1-recommended-using-environment-variables)](#1.Recommendedusingenvironmentvariables:https:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.md1-recommended-using-environment-variables)
-		* 1.4.2. [[Additional Configuration](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#additional-configuration)](#AdditionalConfigurationhttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdadditional-configuration)
-		* 1.4.3. [[Security Considerations](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#security-considerations)](#SecurityConsiderationshttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdsecurity-considerations)
-		* 1.4.4. [[Data Management](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#data-management)](#DataManagementhttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mddata-management)
-		* 1.4.5. [[Monitoring and Logging](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#monitoring-and-logging)](#MonitoringandLogginghttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdmonitoring-and-logging)
-		* 1.4.6. [[Troubleshooting](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#troubleshooting)](#Troubleshootinghttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdtroubleshooting)
-		* 1.4.7. [[Conclusion](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#conclusion)](#Conclusionhttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdconclusion)
-		* 1.4.8. [[Additional Resources](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#additional-resources)](#AdditionalResourceshttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdadditional-resources)
+		* 1.4.1. [Recommended using environment variables](#Recommendedusingenvironmentvariables)
+		* 1.4.2. [Additional Configuration](#AdditionalConfiguration)
+		* 1.4.3. [Security Considerations](#SecurityConsiderations)
+		* 1.4.4. [Data Management](#DataManagement)
+		* 1.4.5. [Monitoring and Logging](#MonitoringandLogging)
+		* 1.4.6. [Troubleshooting](#Troubleshooting)
+		* 1.4.7. [Conclusion](#Conclusion)
+		* 1.4.8. [Additional Resources](#AdditionalResources)
 * 2. [Further Configuration](#FurtherConfiguration)
 	* 2.1. [Image Registry Configuration](#ImageRegistryConfiguration)
 	* 2.2. [OpenIM Docker Network Configuration](#OpenIMDockerNetworkConfiguration)
@@ -39,11 +38,38 @@
 		* 2.20.1. [General Configuration](#GeneralConfiguration)
 		* 2.20.2. [Service-Specific Prometheus Ports](#Service-SpecificPrometheusPorts)
 
-<!-- vscode-markdown-toc-config
-	numbering=true
-	autoSave=true
-	/vscode-markdown-toc-config -->
-<!-- /vscode-markdown-toc -->
+## 0. <a name='TableofContents'></a>OpenIM Config File
+
+Ensuring that OpenIM operates smoothly requires clear direction on the configuration file's location. Here's a detailed step-by-step guide on how to provide this essential path to OpenIM:
+
+1. **Using the Command-line Argument**:
+
+   + **For Configuration Path**: When initializing OpenIM, you can specify the path to the configuration file directly using the `-c` or `--config_folder_path` option.
+
+     ```bash
+     ❯ _output/bin/platforms/linux/amd64/openim-api --config_folder_path="/your/config/folder/path"
+     ```
+
+   + **For Port Specification**: Similarly, if you wish to designate a particular port, utilize the `-p` option followed by the desired port number.
+
+     ```bash
+     ❯ _output/bin/platforms/linux/amd64/openim-api -p 1234
+     ```
+
+     Note: If the port is not specified here, OpenIM will fetch it from the configuration file. Setting the port via environment variables isn't supported. We recommend consolidating settings in the configuration file for a more consistent and streamlined setup.
+
+2. **Leveraging the Environment Variable**:
+
+   You have the flexibility to determine OpenIM's configuration path by setting an `OPENIMCONFIG` environment variable. This method provides a seamless way to instruct OpenIM without command-line parameters every time.
+
+   ```bash
+   export OPENIMCONFIG="/path/to/your/config"
+   ```
+
+3. **Relying on the Default Path**:
+
+   In scenarios where neither command-line arguments nor environment variables are provided, OpenIM will intuitively revert to the `config/` directory to locate its configuration.
+
 
 
 ##  1. <a name='OpenIMDeploymentGuide'></a>OpenIM Deployment Guide
@@ -96,7 +122,7 @@ Setting a variable, e.g., `export CHAT_BRANCH="release-v1.3"`, will prioritize `
 
 For convenience, configuration through modifying environment variables is recommended:
 
-####  1.4.1. <a name='1.Recommendedusingenvironmentvariables:https:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.md1-recommended-using-environment-variables'></a>[1. Recommended using environment variables:](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#1-recommended-using-environment-variables)
+####  1.4.1. <a name='Recommendedusingenvironmentvariables'></a>Recommended using environment variables
 
 + PASSWORD
 
@@ -137,9 +163,9 @@ For convenience, configuration through modifying environment variables is recomm
   export DATA_DIR="/data/openim"
   ```
 
-####  1.4.2. <a name='AdditionalConfigurationhttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdadditional-configuration'></a>[Additional Configuration](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#additional-configuration)
+####  1.4.2. <a name='AdditionalConfiguration'></a>Additional Configuration
 
-##### [MinIO Access and Secret Key](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#minio-access-and-secret-key)
+##### MinIO Access and Secret Key
 
 To secure your MinIO server, you should set up an access key and secret key. These credentials are used to authenticate requests to your MinIO server.
 
@@ -148,7 +174,7 @@ export MINIO_ACCESS_KEY="YourAccessKey"
 export MINIO_SECRET_KEY="YourSecretKey"
 ```
 
-##### [MinIO Browser](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#minio-browser)
+##### MinIO Browser
 
 MinIO comes with an embedded web-based object browser. You can control the availability of the MinIO browser by setting the `MINIO_BROWSER` environment variable.
 
@@ -156,9 +182,9 @@ MinIO comes with an embedded web-based object browser. You can control the avail
 export MINIO_BROWSER="on"
 ```
 
-####  1.4.3. <a name='SecurityConsiderationshttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdsecurity-considerations'></a>[Security Considerations](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#security-considerations)
+####  1.4.3. <a name='SecurityConsiderations'></a>Security Considerations
 
-##### [TLS/SSL Configuration](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#tls-ssl-configuration)
+##### TLS/SSL Configuration
 
 For secure communication, it's recommended to enable TLS/SSL for your MinIO server. You can do this by providing the path to the SSL certificate and key files.
 
@@ -166,9 +192,9 @@ For secure communication, it's recommended to enable TLS/SSL for your MinIO serv
 export MINIO_CERTS_DIR="/path/to/certs/directory"
 ```
 
-####  1.4.4. <a name='DataManagementhttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mddata-management'></a>[Data Management](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#data-management)
+####  1.4.4. <a name='DataManagement'></a>Data Management
 
-##### [Data Retention Policy](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#data-retention-policy)
+##### Data Retention Policy
 
 You may want to set up a data retention policy to automatically delete objects after a specified period.
 
@@ -176,7 +202,7 @@ You may want to set up a data retention policy to automatically delete objects a
 export MINIO_RETENTION_DAYS="30"
 ```
 
-####  1.4.5. <a name='MonitoringandLogginghttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdmonitoring-and-logging'></a>[Monitoring and Logging](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#monitoring-and-logging)
+####  1.4.5. <a name='MonitoringandLogging'></a>Monitoring and Logging
 
 ##### [Audit Logging](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#audit-logging)
 
@@ -186,9 +212,9 @@ Enable audit logging to keep track of access and changes to your data.
 export MINIO_AUDIT="on"
 ```
 
-####  1.4.6. <a name='Troubleshootinghttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdtroubleshooting'></a>[Troubleshooting](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#troubleshooting)
+####  1.4.6. <a name='Troubleshooting'></a>Troubleshooting
 
-##### [Debug Mode](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#debug-mode)
+##### Debug Mode
 
 In case of issues, you may enable debug mode to get more detailed logs to assist in troubleshooting.
 
@@ -196,11 +222,11 @@ In case of issues, you may enable debug mode to get more detailed logs to assist
 export MINIO_DEBUG="on"
 ```
 
-####  1.4.7. <a name='Conclusionhttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdconclusion'></a>[Conclusion](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#conclusion)
+####  1.4.7. <a name='Conclusion'></a>Conclusion
 
 With the environment variables configured as per your requirements, your MinIO server should be ready to securely store and manage your object data. Ensure to verify the setup and monitor the logs for any unusual activities or errors. Regularly update the MinIO server and review your configuration to adapt to any changes or improvements in the MinIO system.
 
-####  1.4.8. <a name='AdditionalResourceshttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdadditional-resources'></a>[Additional Resources](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#additional-resources)
+####  1.4.8. <a name='AdditionalResources'></a>Additional Resources
 
 + [MinIO Client Quickstart Guide](https://docs.min.io/docs/minio-client-quickstart-guide)
 + [MinIO Admin Complete Guide](https://docs.min.io/docs/minio-admin-complete-guide)

go.mod

@@ -1,6 +1,6 @@
 module github.com/openimsdk/open-im-server/v3
 
-go 1.18
+go 1.19
 
 require (
 	firebase.google.com/go v3.13.0+incompatible
@@ -25,7 +25,7 @@ require (
 	github.com/stretchr/testify v1.8.4
 	go.mongodb.org/mongo-driver v1.12.1
 	golang.org/x/image v0.13.0
-	google.golang.org/api v0.147.0
+	google.golang.org/api v0.148.0
 	google.golang.org/grpc v1.59.0
 	google.golang.org/protobuf v1.31.0
 	gopkg.in/yaml.v3 v3.0.1
@@ -37,7 +37,7 @@ require github.com/google/uuid v1.3.1
 
 require (
 	github.com/IBM/sarama v1.41.3
-	github.com/OpenIMSDK/protocol v0.0.27
+	github.com/OpenIMSDK/protocol v0.0.30
 	github.com/OpenIMSDK/tools v0.0.14
 	github.com/aliyun/aliyun-oss-go-sdk v2.2.9+incompatible
 	github.com/go-redis/redis v6.15.9+incompatible
@@ -128,7 +128,7 @@ require (
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a // indirect
 )
 
 require (

go.sum

@@ -18,8 +18,8 @@ firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIw
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/IBM/sarama v1.41.3 h1:MWBEJ12vHC8coMjdEXFq/6ftO6DUZnQlFYcxtOJFa7c=
 github.com/IBM/sarama v1.41.3/go.mod h1:Xxho9HkHd4K/MDUo/T/sOqwtX/17D33++E9Wib6hUdQ=
-github.com/OpenIMSDK/protocol v0.0.27 h1:ee1Y6idLahgJrTHkgWPboKIvCT9zvf7jitavVpffpPw=
-github.com/OpenIMSDK/protocol v0.0.27/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y=
+github.com/OpenIMSDK/protocol v0.0.30 h1:MiHO6PyQMR9ojBHNnSFxCHLmsoE2xZqaiYj975JiZnM=
+github.com/OpenIMSDK/protocol v0.0.30/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y=
 github.com/OpenIMSDK/tools v0.0.14 h1:WLof/+WxyPyRST+QkoTKubYCiV73uCLiL8pgnpH/yKQ=
 github.com/OpenIMSDK/tools v0.0.14/go.mod h1:eg+q4A34Qmu73xkY0mt37FHGMCMfC6CtmOnm0kFEGFI=
 github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM=
@@ -131,7 +131,7 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 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.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 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=
@@ -428,8 +428,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-google.golang.org/api v0.147.0 h1:Can3FaQo9LlVqxJCodNmeZW/ib3/qKAY3rFeXiHo5gc=
-google.golang.org/api v0.147.0/go.mod h1:pQ/9j83DcmPd/5C9e2nFOdjjNkDZ1G+zkbK2uvdkJMs=
+google.golang.org/api v0.148.0 h1:HBq4TZlN4/1pNcu0geJZ/Q50vIwIXT532UIMYoo0vOs=
+google.golang.org/api v0.148.0/go.mod h1:8/TBgwaKjfqTdacOJrOv2+2Q6fBDU1uHKK06oGSkxzU=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -441,8 +441,8 @@ google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 h1:SeZZZx0cP0fqUyA
 google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97/go.mod h1:t1VqOqqvce95G3hIDCT5FeO3YUc6Q4Oe24L/+rNMxRk=
 google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 h1:W18sezcAYs+3tDZX4F80yctqa12jcP1PUS2gQu1zTPU=
 google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c h1:jHkCUWkseRf+W+edG5hMzr/Uh1xkDREY4caybAq4dpY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c/go.mod h1:4cYg8o5yUbm77w8ZX00LhMVNl/YVBFJRYWDc0uYWMs0=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a h1:a2MQQVoTo96JC9PMGtGBymLp7+/RzpFc2yX/9WfFg1c=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:4cYg8o5yUbm77w8ZX00LhMVNl/YVBFJRYWDc0uYWMs0=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=

go.work

@@ -1,16 +1,18 @@
-go 1.18
+go 1.19
+
 
 use (
 	.
 	./test/typecheck
 	./tools/changelog
+	./tools/component
+	./tools/data-conversion
+	./tools/imctl
 	//./tools/imctl
 	./tools/infra
 	./tools/ncpu
 	./tools/openim-web
+	./tools/url2im
 	./tools/versionchecker
 	./tools/yamlfmt
-	./tools/component
-	./tools/url2im
-	./tools/data-conversion
 )

install.sh

@@ -40,7 +40,7 @@ REPO="Open-IM-Server"
 
 # Version of Go you want to use, make sure it is compatible with your OpenIM-Server requirements.
 # Default is 1.18, if you want to use a different version, replace accordingly.
-GO_VERSION="1.18"
+GO_VERSION="1.20"
 
 # Default HTTP_PORT is 80. If you want to use a different port, uncomment and replace the value.
 # HTTP_PORT=80
@@ -168,7 +168,7 @@ function install_go() {
     command -v go >/dev/null 2>&1
     # Determines if GO_VERSION is defined
     if [ -z "$GO_VERSION" ]; then
-        GO_VERSION="1.18"
+        GO_VERSION="1.20"
     fi
 
     if [[ $? -ne 0 ]]; then
@@ -309,7 +309,7 @@ function cmd_help() {
     color_echo ${BLUE_PREFIX} "-t,  --tag           ${CYAN_PREFIX}specify the tag (default option, set to latest if not specified)${COLOR_SUFFIX}"
     color_echo ${BLUE_PREFIX} "-r,  --release       ${CYAN_PREFIX}specify the release branch (cannot be used with the tag option)${COLOR_SUFFIX}"
     color_echo ${BLUE_PREFIX} "-gt, --github-token  ${CYAN_PREFIX}set the GITHUB_TOKEN (default: not set)${COLOR_SUFFIX}"
-    color_echo ${BLUE_PREFIX} "-g,  --go-version    ${CYAN_PREFIX}set the Go language version (default: GO_VERSION=\"1.18\")${COLOR_SUFFIX}"
+    color_echo ${BLUE_PREFIX} "-g,  --go-version    ${CYAN_PREFIX}set the Go language version (default: GO_VERSION=\"1.20\")${COLOR_SUFFIX}"
     color_echo ${BLUE_PREFIX} "--install-dir        ${CYAN_PREFIX}set the OpenIM installation directory (default: /tmp)${COLOR_SUFFIX}"
     color_echo ${BLUE_PREFIX} "--cpu                ${CYAN_PREFIX}set the number of concurrent processes${COLOR_SUFFIX}"
     echo
@@ -329,7 +329,7 @@ function parseinput() {
     # CHINA=false
     # TAG=latest
     # RELEASE=""
-    # GO_VERSION=1.18
+    # GO_VERSION=1.20
     # INSTALL_DIR=/tmp
     # GITHUB_TOKEN=""
     # CPU=$(nproc)

internal/msggateway/init.go

@@ -18,9 +18,12 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/OpenIMSDK/tools/utils"
+
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 )
 
+// RunWsAndServer run ws server
 func RunWsAndServer(rpcPort, wsPort, prometheusPort int) error {
 	fmt.Println(
 		"start rpc/msg_gateway server, port: ",
@@ -42,7 +45,7 @@ func RunWsAndServer(rpcPort, wsPort, prometheusPort int) error {
 	go func() {
 		err := hubServer.Start()
 		if err != nil {
-			panic(err.Error())
+			panic(utils.Wrap1(err))
 		}
 	}()
 	return hubServer.LongConnServer.Run()

internal/msgtransfer/init.go

@@ -16,10 +16,11 @@ package msgtransfer
 
 import (
 	"fmt"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register"
+
+	"sync"
+
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
-	"sync"
 
 	"github.com/OpenIMSDK/tools/mw"
 
@@ -29,6 +30,7 @@ import (
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/relation"
 	relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/prome"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
 )
@@ -63,8 +65,7 @@ func StartTransfer(prometheusPort int) error {
 	/*
 		client, err := openkeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema,
 			openkeeper.WithFreq(time.Hour), openkeeper.WithRoundRobin(), openkeeper.WithUserNameAndPassword(config.Config.Zookeeper.Username,
-				config.Config.Zookeeper.Password), openkeeper.WithTimeout(10), openkeeper.WithLogger(log.NewZkLogger()))*/
-	if err != nil {
+				config.Config.Zookeeper.Password), openkeeper.WithTimeout(10), openkeeper.WithLogger(log.NewZkLogger()))*/if err != nil {
 		return err
 	}
 	if err := client.CreateRpcRootNodes(config.Config.GetServiceNames()); err != nil {

internal/push/offlinepush/fcm/push.go

@@ -18,8 +18,6 @@ import (
 	"context"
 	"path/filepath"
 
-	config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config"
-
 	firebase "firebase.google.com/go"
 	"firebase.google.com/go/messaging"
 	"github.com/redis/go-redis/v9"
@@ -42,20 +40,17 @@ type Fcm struct {
 }
 
 func NewClient(cache cache.MsgModel) *Fcm {
-	opt := option.WithCredentialsFile(filepath.Join(config2.Root, "config", config.Config.Push.Fcm.ServiceAccount))
+	projectRoot := config.GetProjectRoot()
+	credentialsFilePath := filepath.Join(projectRoot, "config", config.Config.Push.Fcm.ServiceAccount)
+	opt := option.WithCredentialsFile(credentialsFilePath)
 	fcmApp, err := firebase.NewApp(context.Background(), nil, opt)
 	if err != nil {
 		return nil
 	}
-	// auth
-	// fcmClient, err := fcmApp.Auth(context.Background())
-	// if err != nil {
-	// 	return
-	// }
+
 	ctx := context.Background()
 	fcmMsgClient, err := fcmApp.Messaging(ctx)
 	if err != nil {
-		panic(err.Error())
 		return nil
 	}
 	return &Fcm{fcmMsgCli: fcmMsgClient, cache: cache}

internal/rpc/msg/as_read.go

@@ -165,7 +165,6 @@ func (m *msgServer) MarkConversationAsRead(
 			m.conversationAndGetRecvID(conversation, req.UserID), seqs, hasReadSeq); err != nil {
 			return nil, err
 		}
-
 	} else if conversation.ConversationType == constant.SuperGroupChatType {
 		if req.HasReadSeq > hasReadSeq {
 			err = m.MsgDatabase.SetHasReadSeq(ctx, req.UserID, req.ConversationID, req.HasReadSeq)
@@ -178,7 +177,6 @@ func (m *msgServer) MarkConversationAsRead(
 			req.UserID, seqs, hasReadSeq); err != nil {
 			return nil, err
 		}
-
 	}
 
 	return &msg.MarkConversationAsReadResp{}, nil

internal/rpc/user/user.go

@@ -290,7 +290,8 @@ func (s *userServer) SubscribeOrCancelUsersStatus(ctx context.Context, req *pbus
 
 // GetUserStatus Get the online status of the user.
 func (s *userServer) GetUserStatus(ctx context.Context, req *pbuser.GetUserStatusReq) (resp *pbuser.GetUserStatusResp,
-	err error) {
+	err error,
+) {
 	onlineStatusList, err := s.UserDatabase.GetUserStatus(ctx, req.UserIDs)
 	if err != nil {
 		return nil, err
@@ -300,7 +301,8 @@ func (s *userServer) GetUserStatus(ctx context.Context, req *pbuser.GetUserStatu
 
 // SetUserStatus Synchronize user's online status.
 func (s *userServer) SetUserStatus(ctx context.Context, req *pbuser.SetUserStatusReq) (resp *pbuser.SetUserStatusResp,
-	err error) {
+	err error,
+) {
 	err = s.UserDatabase.SetUserStatus(ctx, req.UserID, req.Status, req.PlatformID)
 	if err != nil {
 		return nil, err
@@ -324,7 +326,8 @@ func (s *userServer) SetUserStatus(ctx context.Context, req *pbuser.SetUserStatu
 
 // GetSubscribeUsersStatus Get the online status of subscribers.
 func (s *userServer) GetSubscribeUsersStatus(ctx context.Context,
-	req *pbuser.GetSubscribeUsersStatusReq) (*pbuser.GetSubscribeUsersStatusResp, error) {
+	req *pbuser.GetSubscribeUsersStatusReq,
+) (*pbuser.GetSubscribeUsersStatusResp, error) {
 	userList, err := s.UserDatabase.GetAllSubscribeList(ctx, req.UserID)
 	if err != nil {
 		return nil, err

internal/tools/msg.go

@@ -17,11 +17,11 @@ package tools
 import (
 	"context"
 	"fmt"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register"
+	"math"
+
 	"github.com/redis/go-redis/v9"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
-	"math"
 
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
@@ -35,6 +35,7 @@ import (
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/controller"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/relation"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification"
 )
@@ -76,8 +77,7 @@ func InitMsgTool() (*MsgTool, error) {
 	/*
 		discov, err := zookeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema,
 			zookeeper.WithFreq(time.Hour), zookeeper.WithRoundRobin(), zookeeper.WithUserNameAndPassword(config.Config.Zookeeper.Username,
-				config.Config.Zookeeper.Password), zookeeper.WithTimeout(10), zookeeper.WithLogger(log.NewZkLogger()))*/
-	if err != nil {
+				config.Config.Zookeeper.Password), zookeeper.WithTimeout(10), zookeeper.WithLogger(log.NewZkLogger()))*/if err != nil {
 		return nil, err
 	}
 	discov.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()))

pkg/authverify/token.go

@@ -41,6 +41,7 @@ func CheckAccessV3(ctx context.Context, ownerUserID string) (err error) {
 	if opUserID == ownerUserID {
 		return nil
 	}
+
 	return errs.ErrNoPermission.Wrap(utils.GetSelfFuncName())
 }
 
@@ -52,6 +53,7 @@ func CheckAdmin(ctx context.Context) error {
 	if utils.IsContain(mcontext.GetOpUserID(ctx), config.Config.Manager.UserID) {
 		return nil
 	}
+
 	return errs.ErrNoPermission.Wrap(fmt.Sprintf("user %s is not admin userID", mcontext.GetOpUserID(ctx)))
 }
 
@@ -74,5 +76,6 @@ func WsVerifyToken(token, userID string, platformID int) error {
 	if claim.PlatformID != platformID {
 		return errs.ErrTokenInvalid.Wrap(fmt.Sprintf("token platform %d != %d", claim.PlatformID, platformID))
 	}
+
 	return nil
 }

pkg/callbackstruct/common.go

@@ -61,6 +61,7 @@ func (c CommonCallbackResp) Parse() error {
 	if c.ActionCode != errs.NoError || c.ErrCode != errs.NoError {
 		return errs.NewCodeError(int(c.ErrCode), c.ErrMsg).WithDetail(c.ErrDlt)
 	}
+
 	return nil
 }
 

pkg/common/cmd/api.go

@@ -16,9 +16,11 @@ package cmd
 
 import (
 	"fmt"
+
 	"github.com/OpenIMSDK/protocol/constant"
-	config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/spf13/cobra"
+
+	config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config"
 )
 
 type ApiCmd struct {
@@ -28,6 +30,7 @@ type ApiCmd struct {
 func NewApiCmd() *ApiCmd {
 	ret := &ApiCmd{NewRootCmd("api")}
 	ret.SetRootCmdPt(ret)
+
 	return ret
 }
 
@@ -36,11 +39,12 @@ func (a *ApiCmd) AddApi(f func(port int) error) {
 		return f(a.getPortFlag(cmd))
 	}
 }
+
 func (a *ApiCmd) GetPortFromConfig(portType string) int {
 	fmt.Println("GetPortFromConfig:", portType)
 	if portType == constant.FlagPort {
 		return config2.Config.Api.OpenImApiPort[0]
-	} else {
-		return 0
 	}
+
+	return 0
 }

pkg/common/cmd/cron_task.go

@@ -23,6 +23,7 @@ type CronTaskCmd struct {
 func NewCronTaskCmd() *CronTaskCmd {
 	ret := &CronTaskCmd{NewRootCmd("cronTask", WithCronTaskLogName())}
 	ret.SetRootCmdPt(ret)
+
 	return ret
 }
 
@@ -34,5 +35,6 @@ func (c *CronTaskCmd) addRunE(f func() error) {
 
 func (c *CronTaskCmd) Exec(f func() error) error {
 	c.addRunE(f)
+
 	return c.Execute()
 }

pkg/common/cmd/msg_gateway.go

@@ -31,6 +31,7 @@ type MsgGatewayCmd struct {
 func NewMsgGatewayCmd() *MsgGatewayCmd {
 	ret := &MsgGatewayCmd{NewRootCmd("msgGateway")}
 	ret.SetRootCmdPt(ret)
+
 	return ret
 }
 
@@ -43,6 +44,7 @@ func (m *MsgGatewayCmd) getWsPortFlag(cmd *cobra.Command) int {
 	if port == 0 {
 		port = m.PortFromConfig(constant.FlagWsPort)
 	}
+
 	return port
 }
 
@@ -54,8 +56,10 @@ func (m *MsgGatewayCmd) addRunE() {
 
 func (m *MsgGatewayCmd) Exec() error {
 	m.addRunE()
+
 	return m.Execute()
 }
+
 func (m *MsgGatewayCmd) GetPortFromConfig(portType string) int {
 	if portType == constant.FlagWsPort {
 		return config2.Config.LongConnSvr.OpenImWsPort[0]

pkg/common/cmd/msg_transfer.go

@@ -27,6 +27,7 @@ type MsgTransferCmd struct {
 func NewMsgTransferCmd() *MsgTransferCmd {
 	ret := &MsgTransferCmd{NewRootCmd("msgTransfer")}
 	ret.SetRootCmdPt(ret)
+
 	return ret
 }
 
@@ -38,5 +39,6 @@ func (m *MsgTransferCmd) addRunE() {
 
 func (m *MsgTransferCmd) Exec() error {
 	m.addRunE()
+
 	return m.Execute()
 }

pkg/common/cmd/msg_utils.go

@@ -22,7 +22,7 @@ import (
 
 type MsgUtilsCmd struct {
 	cobra.Command
-	msgTool *tools.MsgTool
+	// msgTool *tools.MsgTool
 }
 
 func (m *MsgUtilsCmd) AddUserIDFlag() {
@@ -31,6 +31,7 @@ func (m *MsgUtilsCmd) AddUserIDFlag() {
 
 func (m *MsgUtilsCmd) getUserIDFlag(cmdLines *cobra.Command) string {
 	userID, _ := cmdLines.Flags().GetString("userID")
+
 	return userID
 }
 
@@ -38,26 +39,17 @@ func (m *MsgUtilsCmd) AddFixAllFlag() {
 	m.Command.PersistentFlags().BoolP("fixAll", "f", false, "openIM fix all seqs")
 }
 
-func (m *MsgUtilsCmd) getFixAllFlag(cmdLines *cobra.Command) bool {
-	fixAll, _ := cmdLines.Flags().GetBool("fixAll")
-	return fixAll
-}
-
 func (m *MsgUtilsCmd) AddClearAllFlag() {
 	m.Command.PersistentFlags().BoolP("clearAll", "c", false, "openIM clear all seqs")
 }
 
-func (m *MsgUtilsCmd) getClearAllFlag(cmdLines *cobra.Command) bool {
-	clearAll, _ := cmdLines.Flags().GetBool("clearAll")
-	return clearAll
-}
-
 func (m *MsgUtilsCmd) AddSuperGroupIDFlag() {
 	m.Command.PersistentFlags().StringP("superGroupID", "g", "", "openIM superGroupID")
 }
 
 func (m *MsgUtilsCmd) getSuperGroupIDFlag(cmdLines *cobra.Command) string {
 	superGroupID, _ := cmdLines.Flags().GetString("superGroupID")
+
 	return superGroupID
 }
 
@@ -65,20 +57,10 @@ func (m *MsgUtilsCmd) AddBeginSeqFlag() {
 	m.Command.PersistentFlags().Int64P("beginSeq", "b", 0, "openIM beginSeq")
 }
 
-func (m *MsgUtilsCmd) getBeginSeqFlag(cmdLines *cobra.Command) int64 {
-	beginSeq, _ := cmdLines.Flags().GetInt64("beginSeq")
-	return beginSeq
-}
-
 func (m *MsgUtilsCmd) AddLimitFlag() {
 	m.Command.PersistentFlags().Int64P("limit", "l", 0, "openIM limit")
 }
 
-func (m *MsgUtilsCmd) getLimitFlag(cmdLines *cobra.Command) int64 {
-	limit, _ := cmdLines.Flags().GetInt64("limit")
-	return limit
-}
-
 func (m *MsgUtilsCmd) Execute() error {
 	return m.Command.Execute()
 }
@@ -131,6 +113,7 @@ func NewSeqCmd() *SeqCmd {
 	seqCmd := &SeqCmd{
 		NewMsgUtilsCmd("seq", "seq", nil),
 	}
+
 	return seqCmd
 }
 
@@ -158,6 +141,7 @@ func (s *SeqCmd) GetSeqCmd() *cobra.Command {
 			// println(seq)
 		}
 	}
+
 	return &s.Command
 }
 
@@ -173,6 +157,7 @@ func NewMsgCmd() *MsgCmd {
 	msgCmd := &MsgCmd{
 		NewMsgUtilsCmd("msg", "msg", nil),
 	}
+
 	return msgCmd
 }
 

pkg/common/cmd/root.go

@@ -17,12 +17,11 @@ package cmd
 import (
 	"fmt"
 
-	config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config"
-
 	"github.com/spf13/cobra"
 
 	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/log"
+
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 )
 
@@ -53,10 +52,10 @@ func WithLogName(logName string) func(*CmdOpts) {
 	}
 }
 
-func NewRootCmd(name string, opts ...func(*CmdOpts)) (rootCmd *RootCmd) {
-	rootCmd = &RootCmd{Name: name}
-	c := cobra.Command{
-		Use:   "start openIM application",
+func NewRootCmd(name string, opts ...func(*CmdOpts)) *RootCmd {
+	rootCmd := &RootCmd{Name: name}
+	cmd := cobra.Command{
+		Use:   "Start openIM application",
 		Short: fmt.Sprintf(`Start %s `, name),
 		Long:  fmt.Sprintf(`Start %s `, name),
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
@@ -70,21 +69,78 @@ func NewRootCmd(name string, opts ...func(*CmdOpts)) (rootCmd *RootCmd) {
 			if cmdOpts.loggerPrefixName == "" {
 				cmdOpts.loggerPrefixName = "OpenIM.log.all"
 			}
-			if err := log.InitFromConfig(cmdOpts.loggerPrefixName, name, config.Config.Log.RemainLogLevel, config.Config.Log.IsStdout, config.Config.Log.IsJson, config.Config.Log.StorageLocation, config.Config.Log.RemainRotationCount, config.Config.Log.RotationTime); err != nil {
+			err := log.InitFromConfig(cmdOpts.loggerPrefixName, name, config.Config.Log.RemainLogLevel,
+				config.Config.Log.IsStdout, config.Config.Log.IsJson, config.Config.Log.StorageLocation,
+				config.Config.Log.RemainRotationCount, config.Config.Log.RotationTime)
+			if err != nil {
 				panic(err)
 			}
+
 			return nil
 		},
 	}
-	rootCmd.Command = c
+	rootCmd.Command = cmd
 	rootCmd.addConfFlag()
+
 	return rootCmd
 }
+
+// func (rc *RootCmd) persistentPreRun(cmd *cobra.Command, opts ...func(*CmdOpts)) error {
+// 	if err := rc.initializeConfiguration(cmd); err != nil {
+// 		return fmt.Errorf("failed to get configuration from command: %w", err)
+// 	}
+
+// 	cmdOpts := rc.applyOptions(opts...)
+
+// 	if err := rc.initializeLogger(cmdOpts); err != nil {
+// 		return fmt.Errorf("failed to initialize from config: %w", err)
+// 	}
+
+// 	return nil
+// }
+
+//nolint:unused		//unused work wrongly
+func (rc *RootCmd) initializeConfiguration(cmd *cobra.Command) error {
+	return rc.getConfFromCmdAndInit(cmd)
+}
+
+// func (rc *RootCmd) applyOptions(opts ...func(*CmdOpts)) *CmdOpts {
+// 	cmdOpts := defaultCmdOpts()
+// 	for _, opt := range opts {
+// 		opt(cmdOpts)
+// 	}
+
+// 	return cmdOpts
+// }
+
+// func (rc *RootCmd) initializeLogger(cmdOpts *CmdOpts) error {
+// 	logConfig := config.Config.Log
+
+// 	return log.InitFromConfig(
+
+// 		cmdOpts.loggerPrefixName,
+// 		rc.Name,
+// 		logConfig.RemainLogLevel,
+// 		logConfig.IsStdout,
+// 		logConfig.IsJson,
+// 		logConfig.StorageLocation,
+// 		logConfig.RemainRotationCount,
+// 		logConfig.RotationTime,
+// 	)
+// }
+
+// func defaultCmdOpts() *CmdOpts {
+// 	return &CmdOpts{
+// 		loggerPrefixName: "OpenIM.log.all",
+// 	}
+// }
+
 func (r *RootCmd) SetRootCmdPt(cmdItf RootCmdPt) {
 	r.cmdItf = cmdItf
 }
+
 func (r *RootCmd) addConfFlag() {
-	r.Command.Flags().StringP(constant.FlagConf, "c", "", "Path to config file folder")
+	r.Command.Flags().StringP(constant.FlagConf, "c", "", "path to config file folder")
 }
 
 func (r *RootCmd) AddPortFlag() {
@@ -96,6 +152,7 @@ func (r *RootCmd) getPortFlag(cmd *cobra.Command) int {
 	if port == 0 {
 		port = r.PortFromConfig(constant.FlagPort)
 	}
+
 	return port
 }
 
@@ -112,6 +169,7 @@ func (r *RootCmd) getPrometheusPortFlag(cmd *cobra.Command) int {
 	if port == 0 {
 		port = r.PortFromConfig(constant.FlagPrometheusPort)
 	}
+
 	return port
 }
 
@@ -122,7 +180,8 @@ func (r *RootCmd) GetPrometheusPortFlag() int {
 func (r *RootCmd) getConfFromCmdAndInit(cmdLines *cobra.Command) error {
 	configFolderPath, _ := cmdLines.Flags().GetString(constant.FlagConf)
 	fmt.Println("configFolderPath:", configFolderPath)
-	return config2.InitConfig(configFolderPath)
+
+	return config.InitConfig(configFolderPath)
 }
 
 func (r *RootCmd) Execute() error {
@@ -135,9 +194,12 @@ func (r *RootCmd) AddCommand(cmds ...*cobra.Command) {
 
 func (r *RootCmd) GetPortFromConfig(portType string) int {
 	fmt.Println("RootCmd.GetPortFromConfig:", portType)
+
 	return 0
 }
+
 func (r *RootCmd) PortFromConfig(portType string) int {
 	fmt.Println("PortFromConfig:", portType)
+
 	return r.cmdItf.GetPortFromConfig(portType)
 }

pkg/common/cmd/rpc.go

@@ -16,11 +16,13 @@ package cmd
 
 import (
 	"errors"
+
 	"github.com/OpenIMSDK/protocol/constant"
-	config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
 
+	config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config"
+
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/startrpc"
@@ -33,6 +35,7 @@ type RpcCmd struct {
 func NewRpcCmd(name string) *RpcCmd {
 	ret := &RpcCmd{NewRootCmd(name)}
 	ret.SetRootCmdPt(ret)
+
 	return ret
 }
 
@@ -41,6 +44,7 @@ func (a *RpcCmd) Exec() error {
 		a.port = a.getPortFlag(cmd)
 		a.prometheusPort = a.getPrometheusPortFlag(cmd)
 	}
+
 	return a.Execute()
 }
 
@@ -51,8 +55,10 @@ func (a *RpcCmd) StartSvr(
 	if a.GetPortFlag() == 0 {
 		return errors.New("port is required")
 	}
+
 	return startrpc.Start(a.GetPortFlag(), name, a.GetPrometheusPortFlag(), rpcFn)
 }
+
 func (a *RpcCmd) GetPortFromConfig(portType string) int {
 	switch a.Name {
 	case RpcPushServer:
@@ -88,5 +94,6 @@ func (a *RpcCmd) GetPortFromConfig(portType string) int {
 			return config2.Config.RpcPort.OpenImUserPort[0]
 		}
 	}
+
 	return 0
 }

pkg/common/config/config.go

@@ -336,6 +336,7 @@ func (c *configStruct) RegisterConf2Registry(registry discoveryregistry.SvcDisco
 	if err != nil {
 		return err
 	}
+
 	return registry.RegisterConf2Registry(ConfKey, data)
 }
 
@@ -348,5 +349,6 @@ func (c *configStruct) EncodeConfig() []byte {
 	if err := yaml.NewEncoder(buf).Encode(c); err != nil {
 		panic(err)
 	}
+
 	return buf.Bytes()
 }

pkg/common/config/parse.go

@@ -19,32 +19,32 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"runtime"
-
-	"github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"
-
-	"gopkg.in/yaml.v3"
 
 	"github.com/OpenIMSDK/protocol/constant"
+	"gopkg.in/yaml.v3"
+
+	"github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"
 )
 
 //go:embed version
 var Version string
 
-var (
-	_, b, _, _ = runtime.Caller(0)
-	// Root folder of this project.
-	Root = filepath.Join(filepath.Dir(b), "../../..")
-)
-
 const (
 	FileName             = "config.yaml"
 	NotificationFileName = "notification.yaml"
 	DefaultFolderPath    = "../config/"
 )
 
+// getProjectRoot returns the absolute path of the project root directory.
+func GetProjectRoot() string {
+	b, _ := filepath.Abs(os.Args[0])
+
+	return filepath.Join(filepath.Dir(b), "../../..")
+}
+
 func GetOptionsByNotification(cfg NotificationConf) msgprocessor.Options {
 	opts := msgprocessor.NewOptions()
+
 	if cfg.UnreadCount {
 		opts = msgprocessor.WithOptions(opts, msgprocessor.WithUnreadCount(true))
 	}
@@ -57,44 +57,44 @@ func GetOptionsByNotification(cfg NotificationConf) msgprocessor.Options {
 		opts = msgprocessor.WithOptions(opts, msgprocessor.WithHistory(true), msgprocessor.WithPersistent())
 	}
 	opts = msgprocessor.WithOptions(opts, msgprocessor.WithSendMsg(cfg.IsSendMsg))
+
 	return opts
 }
 
 func initConfig(config interface{}, configName, configFolderPath string) error {
-	if configFolderPath == "" {
-		configFolderPath = DefaultFolderPath
-	}
-	configPath := filepath.Join(configFolderPath, configName)
-	defer func() {
-		fmt.Println("use config", configPath)
-	}()
-	_, err := os.Stat(configPath)
+	configFolderPath = filepath.Join(configFolderPath, configName)
+	_, err := os.Stat(configFolderPath)
 	if err != nil {
 		if !os.IsNotExist(err) {
-			return err
+			return fmt.Errorf("stat config path error: %w", err)
 		}
-		configPath = filepath.Join(Root, "config", configName)
-	} else {
-		Root = filepath.Dir(configPath)
+		configFolderPath = filepath.Join(GetProjectRoot(), "config", configName)
 	}
-	data, err := os.ReadFile(configPath)
+	data, err := os.ReadFile(configFolderPath)
 	if err != nil {
-		return err
+		return fmt.Errorf("read file error: %w", err)
 	}
 	if err = yaml.Unmarshal(data, config); err != nil {
-		return err
+		return fmt.Errorf("unmarshal yaml error: %w", err)
 	}
+	fmt.Println("use config", configFolderPath)
+
 	return nil
 }
 
 func InitConfig(configFolderPath string) error {
-	err := initConfig(&Config, FileName, configFolderPath)
-	if err != nil {
-		return err
-	}
-	err = initConfig(&Config.Notification, NotificationFileName, configFolderPath)
-	if err != nil {
+	if configFolderPath == "" {
+		envConfigPath := os.Getenv("OPENIMCONFIG")
+		if envConfigPath != "" {
+			configFolderPath = envConfigPath
+		} else {
+			configFolderPath = DefaultFolderPath
+		}
+	}
+
+	if err := initConfig(&Config, FileName, configFolderPath); err != nil {
 		return err
 	}
+
 	return nil
 }

pkg/common/config/version

@@ -1 +1 @@
-v3.2.0
+v3.3.0

pkg/common/convert/black.go

@@ -18,7 +18,6 @@ import (
 	"context"
 
 	"github.com/OpenIMSDK/protocol/sdkws"
-	sdk "github.com/OpenIMSDK/protocol/sdkws"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 )
@@ -27,11 +26,11 @@ func BlackDB2Pb(
 	ctx context.Context,
 	blackDBs []*relation.BlackModel,
 	f func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error),
-) (blackPbs []*sdk.BlackInfo, err error) {
+) (blackPbs []*sdkws.BlackInfo, err error) {
 	if len(blackDBs) == 0 {
 		return nil, nil
 	}
-	var userIDs []string
+	userIDs := make([]string, 0, len(blackDBs))
 	for _, blackDB := range blackDBs {
 		userIDs = append(userIDs, blackDB.BlockUserID)
 	}
@@ -40,7 +39,7 @@ func BlackDB2Pb(
 		return nil, err
 	}
 	for _, blackDB := range blackDBs {
-		blackPb := &sdk.BlackInfo{
+		blackPb := &sdkws.BlackInfo{
 			OwnerUserID:    blackDB.OwnerUserID,
 			CreateTime:     blackDB.CreateTime.Unix(),
 			AddSource:      blackDB.AddSource,
@@ -55,5 +54,6 @@ func BlackDB2Pb(
 		}
 		blackPbs = append(blackPbs, blackPb)
 	}
+
 	return blackPbs, nil
 }

pkg/common/convert/conversation.go

@@ -27,6 +27,7 @@ func ConversationDB2Pb(conversationDB *relation.ConversationModel) *conversation
 	if err := utils.CopyStructFields(conversationPB, conversationDB); err != nil {
 		return nil
 	}
+
 	return conversationPB
 }
 
@@ -39,6 +40,7 @@ func ConversationsDB2Pb(conversationsDB []*relation.ConversationModel) (conversa
 		conversationPB.LatestMsgDestructTime = conversationDB.LatestMsgDestructTime.Unix()
 		conversationsPB = append(conversationsPB, conversationPB)
 	}
+
 	return conversationsPB
 }
 
@@ -47,6 +49,7 @@ func ConversationPb2DB(conversationPB *conversation.Conversation) *relation.Conv
 	if err := utils.CopyStructFields(conversationDB, conversationPB); err != nil {
 		return nil
 	}
+
 	return conversationDB
 }
 
@@ -58,5 +61,6 @@ func ConversationsPb2DB(conversationsPB []*conversation.Conversation) (conversat
 		}
 		conversationsDB = append(conversationsDB, conversationDB)
 	}
+
 	return conversationsDB
 }

pkg/common/convert/friend.go

@@ -16,6 +16,7 @@ package convert
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/OpenIMSDK/protocol/sdkws"
 	"github.com/OpenIMSDK/tools/utils"
@@ -25,9 +26,13 @@ import (
 
 func FriendPb2DB(friend *sdkws.FriendInfo) *relation.FriendModel {
 	dbFriend := &relation.FriendModel{}
-	utils.CopyStructFields(dbFriend, friend)
+	err := utils.CopyStructFields(dbFriend, friend)
+	if err != nil {
+		panic(err)
+	}
 	dbFriend.FriendUserID = friend.FriendUser.UserID
 	dbFriend.CreateTime = utils.UnixSecondToTime(friend.CreateTime)
+
 	return dbFriend
 }
 
@@ -37,7 +42,10 @@ func FriendDB2Pb(
 	getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error),
 ) (*sdkws.FriendInfo, error) {
 	pbfriend := &sdkws.FriendInfo{FriendUser: &sdkws.UserInfo{}}
-	utils.CopyStructFields(pbfriend, friendDB)
+	err := utils.CopyStructFields(pbfriend, friendDB)
+	if err != nil {
+		panic(err)
+	}
 	users, err := getUsers(ctx, []string{friendDB.FriendUserID})
 	if err != nil {
 		return nil, err
@@ -47,6 +55,7 @@ func FriendDB2Pb(
 	pbfriend.FriendUser.FaceURL = users[friendDB.FriendUserID].FaceURL
 	pbfriend.FriendUser.Ex = users[friendDB.FriendUserID].Ex
 	pbfriend.CreateTime = friendDB.CreateTime.Unix()
+
 	return pbfriend, nil
 }
 
@@ -58,7 +67,7 @@ func FriendsDB2Pb(
 	if len(friendsDB) == 0 {
 		return nil, nil
 	}
-	var userID []string
+	userID := make([]string, 0, len(friendsDB))
 	for _, friendDB := range friendsDB {
 		userID = append(userID, friendDB.FriendUserID)
 	}
@@ -68,7 +77,8 @@ func FriendsDB2Pb(
 	}
 	for _, friend := range friendsDB {
 		friendPb := &sdkws.FriendInfo{FriendUser: &sdkws.UserInfo{}}
-		utils.CopyStructFields(friendPb, friend)
+		err2 := utils.CopyStructFields(friendPb, friend)
+		err = fmt.Errorf("%w, %w", err, err2)
 		friendPb.FriendUser.UserID = users[friend.FriendUserID].UserID
 		friendPb.FriendUser.Nickname = users[friend.FriendUserID].Nickname
 		friendPb.FriendUser.FaceURL = users[friend.FriendUserID].FaceURL
@@ -76,7 +86,8 @@ func FriendsDB2Pb(
 		friendPb.CreateTime = friend.CreateTime.Unix()
 		friendsPb = append(friendsPb, friendPb)
 	}
-	return friendsPb, nil
+
+	return friendsPb, err
 }
 
 func FriendRequestDB2Pb(
@@ -116,5 +127,6 @@ func FriendRequestDB2Pb(
 			Ex:            friendRequest.Ex,
 		})
 	}
+
 	return res, nil
 }

pkg/common/convert/msg.go

@@ -55,6 +55,7 @@ func MsgPb2DB(msg *sdkws.MsgData) *unrelation.MsgDataModel {
 	msgDataModel.AtUserIDList = msg.AtUserIDList
 	msgDataModel.AttachedInfo = msg.AttachedInfo
 	msgDataModel.Ex = msg.Ex
+
 	return &msgDataModel
 }
 
@@ -95,5 +96,6 @@ func MsgDB2Pb(msgModel *unrelation.MsgDataModel) *sdkws.MsgData {
 	msg.AtUserIDList = msgModel.AtUserIDList
 	msg.AttachedInfo = msgModel.AttachedInfo
 	msg.Ex = msgModel.Ex
+
 	return &msg
 }

pkg/common/convert/user.go

@@ -34,6 +34,7 @@ func UsersDB2Pb(users []*relationtb.UserModel) (result []*sdkws.UserInfo) {
 		userPb.GlobalRecvMsgOpt = user.GlobalRecvMsgOpt
 		result = append(result, &userPb)
 	}
+
 	return result
 }
 
@@ -46,5 +47,6 @@ func UserPb2DB(user *sdkws.UserInfo) *relationtb.UserModel {
 	userDB.CreateTime = time.UnixMilli(user.CreateTime)
 	userDB.AppMangerLevel = user.AppMangerLevel
 	userDB.GlobalRecvMsgOpt = user.GlobalRecvMsgOpt
+
 	return &userDB
 }

pkg/common/db/cache/black.go

@@ -52,6 +52,7 @@ func NewBlackCacheRedis(
 	options rockscache.Options,
 ) BlackCache {
 	rcClient := rockscache.NewClient(rdb, options)
+
 	return &BlackCacheRedis{
 		expireTime: blackExpireTime,
 		rcClient:   rcClient,
@@ -77,5 +78,6 @@ func (b *BlackCacheRedis) GetBlackIDs(ctx context.Context, userID string) (black
 func (b *BlackCacheRedis) DelBlackIDs(ctx context.Context, userID string) BlackCache {
 	cache := b.NewCache()
 	cache.AddKeys(b.getBlackIDsKey(userID))
+
 	return cache
 }

pkg/common/db/cache/conversation.go

@@ -85,6 +85,7 @@ type ConversationCache interface {
 
 func NewConversationRedis(rdb redis.UniversalClient, opts rockscache.Options, db relationtb.ConversationModelInterface) ConversationCache {
 	rcClient := rockscache.NewClient(rdb, opts)
+
 	return &ConversationRedisCache{
 		rcClient:       rcClient,
 		metaCache:      NewMetaCacheRedis(rcClient),
@@ -106,6 +107,7 @@ func NewNewConversationRedis(
 	options rockscache.Options,
 ) ConversationCache {
 	rcClient := rockscache.NewClient(rdb, options)
+
 	return &ConversationRedisCache{
 		rcClient:       rcClient,
 		metaCache:      NewMetaCacheRedis(rcClient),
@@ -158,12 +160,13 @@ func (c *ConversationRedisCache) GetUserConversationIDs(ctx context.Context, own
 }
 
 func (c *ConversationRedisCache) DelConversationIDs(userIDs ...string) ConversationCache {
-	var keys []string
+	keys := make([]string, 0, len(userIDs))
 	for _, userID := range userIDs {
 		keys = append(keys, c.getConversationIDsKey(userID))
 	}
 	cache := c.NewCache()
 	cache.AddKeys(keys...)
+
 	return cache
 }
 
@@ -191,12 +194,13 @@ func (c *ConversationRedisCache) GetUserConversationIDsHash(ctx context.Context,
 }
 
 func (c *ConversationRedisCache) DelUserConversationIDsHash(ownerUserIDs ...string) ConversationCache {
-	var keys []string
+	keys := make([]string, 0, len(ownerUserIDs))
 	for _, ownerUserID := range ownerUserIDs {
 		keys = append(keys, c.getUserConversationIDsHashKey(ownerUserID))
 	}
 	cache := c.NewCache()
 	cache.AddKeys(keys...)
+
 	return cache
 }
 
@@ -207,12 +211,13 @@ func (c *ConversationRedisCache) GetConversation(ctx context.Context, ownerUserI
 }
 
 func (c *ConversationRedisCache) DelConversations(ownerUserID string, conversationIDs ...string) ConversationCache {
-	var keys []string
+	keys := make([]string, 0, len(conversationIDs))
 	for _, conversationID := range conversationIDs {
 		keys = append(keys, c.getConversationKey(ownerUserID, conversationID))
 	}
 	cache := c.NewCache()
 	cache.AddKeys(keys...)
+
 	return cache
 }
 
@@ -223,6 +228,7 @@ func (c *ConversationRedisCache) getConversationIndex(convsation *relationtb.Con
 			return _i, nil
 		}
 	}
+
 	return 0, errors.New("not found key:" + key + " in keys")
 }
 
@@ -283,24 +289,27 @@ func (c *ConversationRedisCache) GetSuperGroupRecvMsgNotNotifyUserIDs(ctx contex
 }
 
 func (c *ConversationRedisCache) DelUsersConversation(conversationID string, ownerUserIDs ...string) ConversationCache {
-	var keys []string
+	keys := make([]string, 0, len(ownerUserIDs))
 	for _, ownerUserID := range ownerUserIDs {
 		keys = append(keys, c.getConversationKey(ownerUserID, conversationID))
 	}
 	cache := c.NewCache()
 	cache.AddKeys(keys...)
+
 	return cache
 }
 
 func (c *ConversationRedisCache) DelUserRecvMsgOpt(ownerUserID, conversationID string) ConversationCache {
 	cache := c.NewCache()
 	cache.AddKeys(c.getRecvMsgOptKey(ownerUserID, conversationID))
+
 	return cache
 }
 
 func (c *ConversationRedisCache) DelSuperGroupRecvMsgNotNotifyUserIDs(groupID string) ConversationCache {
 	cache := c.NewCache()
 	cache.AddKeys(c.getSuperGroupRecvNotNotifyUserIDsKey(groupID))
+
 	return cache
 }
 
@@ -321,6 +330,7 @@ func (c *ConversationRedisCache) GetSuperGroupRecvMsgNotNotifyUserIDsHash(ctx co
 func (c *ConversationRedisCache) DelSuperGroupRecvMsgNotNotifyUserIDsHash(groupID string) ConversationCache {
 	cache := c.NewCache()
 	cache.AddKeys(c.getSuperGroupRecvNotNotifyUserIDsHashKey(groupID))
+
 	return cache
 }
 
@@ -330,6 +340,7 @@ func (c *ConversationRedisCache) getUserAllHasReadSeqsIndex(conversationID strin
 			return _i, nil
 		}
 	}
+
 	return 0, errors.New("not found key:" + conversationID + " in keys")
 }
 
@@ -352,6 +363,7 @@ func (c *ConversationRedisCache) DelUserAllHasReadSeqs(ownerUserID string, conve
 	for _, conversationID := range conversationIDs {
 		cache.AddKeys(c.getConversationHasReadSeqKey(ownerUserID, conversationID))
 	}
+
 	return cache
 }
 
@@ -374,5 +386,6 @@ func (c *ConversationRedisCache) DelConversationNotReceiveMessageUserIDs(convers
 	for _, conversationID := range conversationIDs {
 		cache.AddKeys(c.getConversationNotReceiveMessageUserIDsKey(conversationID))
 	}
+
 	return cache
 }

pkg/common/db/cache/friend.go

@@ -55,6 +55,7 @@ type FriendCacheRedis struct {
 
 func NewFriendCacheRedis(rdb redis.UniversalClient, friendDB relationtb.FriendModelInterface, options rockscache.Options) FriendCache {
 	rcClient := rockscache.NewClient(rdb, options)
+
 	return &FriendCacheRedis{
 		metaCache:  NewMetaCacheRedis(rcClient),
 		friendDB:   friendDB,
@@ -90,14 +91,15 @@ func (f *FriendCacheRedis) GetFriendIDs(ctx context.Context, ownerUserID string)
 	})
 }
 
-func (f *FriendCacheRedis) DelFriendIDs(ownerUserID ...string) FriendCache {
-	new := f.NewCache()
-	var keys []string
-	for _, userID := range ownerUserID {
+func (f *FriendCacheRedis) DelFriendIDs(ownerUserIDs ...string) FriendCache {
+	newGroupCache := f.NewCache()
+	keys := make([]string, 0, len(ownerUserIDs))
+	for _, userID := range ownerUserIDs {
 		keys = append(keys, f.getFriendIDsKey(userID))
 	}
-	new.AddKeys(keys...)
-	return new
+	newGroupCache.AddKeys(keys...)
+
+	return newGroupCache
 }
 
 // todo.
@@ -115,13 +117,15 @@ func (f *FriendCacheRedis) GetTwoWayFriendIDs(ctx context.Context, ownerUserID s
 			twoWayFriendIDs = append(twoWayFriendIDs, ownerUserID)
 		}
 	}
+
 	return twoWayFriendIDs, nil
 }
 
 func (f *FriendCacheRedis) DelTwoWayFriendIDs(ctx context.Context, ownerUserID string) FriendCache {
-	new := f.NewCache()
-	new.AddKeys(f.getTwoWayFriendsIDsKey(ownerUserID))
-	return new
+	newFriendCache := f.NewCache()
+	newFriendCache.AddKeys(f.getTwoWayFriendsIDsKey(ownerUserID))
+
+	return newFriendCache
 }
 
 func (f *FriendCacheRedis) GetFriend(ctx context.Context, ownerUserID, friendUserID string) (friend *relationtb.FriendModel, err error) {
@@ -131,7 +135,8 @@ func (f *FriendCacheRedis) GetFriend(ctx context.Context, ownerUserID, friendUse
 }
 
 func (f *FriendCacheRedis) DelFriend(ownerUserID, friendUserID string) FriendCache {
-	new := f.NewCache()
-	new.AddKeys(f.getFriendKey(ownerUserID, friendUserID))
-	return new
+	newFriendCache := f.NewCache()
+	newFriendCache.AddKeys(f.getFriendKey(ownerUserID, friendUserID))
+
+	return newFriendCache
 }

pkg/common/db/cache/group.go

@@ -97,6 +97,7 @@ func NewGroupCacheRedis(
 	opts rockscache.Options,
 ) GroupCache {
 	rcClient := rockscache.NewClient(rdb, opts)
+
 	return &GroupCacheRedis{
 		rcClient: rcClient, expireTime: groupExpireTime,
 		groupDB: groupDB, groupMemberDB: groupMemberDB, groupRequestDB: groupRequestDB,
@@ -157,6 +158,7 @@ func (g *GroupCacheRedis) GetGroupIndex(group *relationtb.GroupModel, keys []str
 			return i, nil
 		}
 	}
+
 	return 0, errIndex
 }
 
@@ -167,6 +169,7 @@ func (g *GroupCacheRedis) GetGroupMemberIndex(groupMember *relationtb.GroupMembe
 			return i, nil
 		}
 	}
+
 	return 0, errIndex
 }
 
@@ -193,13 +196,14 @@ func (g *GroupCacheRedis) GetGroupInfo(ctx context.Context, groupID string) (gro
 }
 
 func (g *GroupCacheRedis) DelGroupsInfo(groupIDs ...string) GroupCache {
-	new := g.NewCache()
-	var keys []string
+	newGroupCache := g.NewCache()
+	keys := make([]string, 0, len(groupIDs))
 	for _, groupID := range groupIDs {
 		keys = append(keys, g.getGroupInfoKey(groupID))
 	}
-	new.AddKeys(keys...)
-	return new
+	newGroupCache.AddKeys(keys...)
+
+	return newGroupCache
 }
 
 func (g *GroupCacheRedis) GetJoinedSuperGroupIDs(ctx context.Context, userID string) (joinedSuperGroupIDs []string, err error) {
@@ -238,23 +242,25 @@ func (g *GroupCacheRedis) GetSuperGroupMemberIDs(ctx context.Context, groupIDs .
 
 // userJoinSuperGroup.
 func (g *GroupCacheRedis) DelJoinedSuperGroupIDs(userIDs ...string) GroupCache {
-	new := g.NewCache()
-	var keys []string
+	newGroupCache := g.NewCache()
+	keys := make([]string, 0, len(userIDs))
 	for _, userID := range userIDs {
 		keys = append(keys, g.getJoinedSuperGroupsIDKey(userID))
 	}
-	new.AddKeys(keys...)
-	return new
+	newGroupCache.AddKeys(keys...)
+
+	return newGroupCache
 }
 
 func (g *GroupCacheRedis) DelSuperGroupMemberIDs(groupIDs ...string) GroupCache {
-	new := g.NewCache()
-	var keys []string
+	newGroupCache := g.NewCache()
+	keys := make([]string, 0, len(groupIDs))
 	for _, groupID := range groupIDs {
 		keys = append(keys, g.getSuperGroupMemberIDsKey(groupID))
 	}
-	new.AddKeys(keys...)
-	return new
+	newGroupCache.AddKeys(keys...)
+
+	return newGroupCache
 }
 
 // groupMembersHash.
@@ -330,12 +336,14 @@ func (g *GroupCacheRedis) GetGroupMemberHashMap(ctx context.Context, groupIDs []
 		}
 		res[groupID] = &relationtb.GroupSimpleUserID{Hash: hash, MemberNum: uint32(num)}
 	}
+
 	return res, nil
 }
 
 func (g *GroupCacheRedis) DelGroupMembersHash(groupID string) GroupCache {
 	cache := g.NewCache()
 	cache.AddKeys(g.getGroupMembersHashKey(groupID))
+
 	return cache
 }
 
@@ -355,12 +363,14 @@ func (g *GroupCacheRedis) GetGroupsMemberIDs(ctx context.Context, groupIDs []str
 		}
 		m[groupID] = userIDs
 	}
+
 	return m, nil
 }
 
 func (g *GroupCacheRedis) DelGroupMemberIDs(groupID string) GroupCache {
 	cache := g.NewCache()
 	cache.AddKeys(g.getGroupMemberIDsKey(groupID))
+
 	return cache
 }
 
@@ -371,12 +381,13 @@ func (g *GroupCacheRedis) GetJoinedGroupIDs(ctx context.Context, userID string)
 }
 
 func (g *GroupCacheRedis) DelJoinedGroupID(userIDs ...string) GroupCache {
-	var keys []string
+	keys := make([]string, 0, len(userIDs))
 	for _, userID := range userIDs {
 		keys = append(keys, g.getJoinedGroupsKey(userID))
 	}
 	cache := g.NewCache()
 	cache.AddKeys(keys...)
+
 	return cache
 }
 
@@ -412,6 +423,7 @@ func (g *GroupCacheRedis) GetGroupMembersPage(ctx context.Context, groupID strin
 		userIDs = groupMemberIDs
 	}
 	groupMembers, err = g.GetGroupMembersInfo(ctx, groupID, utils.Paginate(userIDs, int(showNumber), int(showNumber)))
+
 	return uint32(len(userIDs)), groupMembers, err
 }
 
@@ -420,6 +432,7 @@ func (g *GroupCacheRedis) GetAllGroupMembersInfo(ctx context.Context, groupID st
 	if err != nil {
 		return nil, err
 	}
+
 	return g.GetGroupMembersInfo(ctx, groupID, groupMemberIDs)
 }
 
@@ -439,12 +452,13 @@ func (g *GroupCacheRedis) GetAllGroupMemberInfo(ctx context.Context, groupID str
 }
 
 func (g *GroupCacheRedis) DelGroupMembersInfo(groupID string, userIDs ...string) GroupCache {
-	var keys []string
+	keys := make([]string, 0, len(userIDs))
 	for _, userID := range userIDs {
 		keys = append(keys, g.getGroupMemberInfoKey(groupID, userID))
 	}
 	cache := g.NewCache()
 	cache.AddKeys(keys...)
+
 	return cache
 }
 
@@ -455,11 +469,12 @@ func (g *GroupCacheRedis) GetGroupMemberNum(ctx context.Context, groupID string)
 }
 
 func (g *GroupCacheRedis) DelGroupsMemberNum(groupID ...string) GroupCache {
-	var keys []string
+	keys := make([]string, 0, len(groupID))
 	for _, groupID := range groupID {
 		keys = append(keys, g.getGroupMemberNumKey(groupID))
 	}
 	cache := g.NewCache()
 	cache.AddKeys(keys...)
+
 	return cache
 }

pkg/common/db/cache/meta_cache.go

@@ -91,6 +91,7 @@ func (m *metaCacheRedis) ExecDel(ctx context.Context) error {
 			//}
 		}
 	}
+
 	return nil
 }
 
@@ -114,6 +115,7 @@ func GetDefaultOpt() rockscache.Options {
 	opts := rockscache.NewDefaultOptions()
 	opts.StrongConsistency = true
 	opts.RandomExpireAdjustment = 0.2
+
 	return opts
 }
 
@@ -130,6 +132,7 @@ func getCache[T any](ctx context.Context, rcClient *rockscache.Client, key strin
 			return "", utils.Wrap(err, "")
 		}
 		write = true
+
 		return string(bs), nil
 	})
 	if err != nil {
@@ -144,8 +147,10 @@ func getCache[T any](ctx context.Context, rcClient *rockscache.Client, key strin
 	err = json.Unmarshal([]byte(v), &t)
 	if err != nil {
 		log.ZError(ctx, "cache json.Unmarshal failed", err, "key", key, "value", v, "expire", expire)
+
 		return t, utils.Wrap(err, "")
 	}
+
 	return t, nil
 }
 
@@ -200,6 +205,7 @@ func batchGetCache2[T any, K comparable](ctx context.Context, rcClient *rockscac
 		}
 		res = append(res, val)
 	}
+
 	return res, nil
 }
 

pkg/common/db/cache/msg.go

@@ -16,13 +16,12 @@ package cache
 
 import (
 	"context"
+	"errors"
 	"strconv"
 	"time"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"
 
-	"github.com/dtm-labs/rockscache"
-
 	"github.com/OpenIMSDK/tools/errs"
 
 	"github.com/gogo/protobuf/jsonpb"
@@ -33,7 +32,6 @@ import (
 	"github.com/OpenIMSDK/tools/utils"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
-	unrelationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation"
 
 	"github.com/redis/go-redis/v9"
 )
@@ -169,6 +167,7 @@ func (c *msgCache) getSeqs(ctx context.Context, items []string, getkey func(s st
 			m[items[i]] = val
 		}
 	}
+
 	return m, nil
 
 	//pipe := c.rdb.Pipeline()
@@ -299,6 +298,7 @@ func (c *msgCache) GetHasReadSeq(ctx context.Context, userID string, conversatio
 
 func (c *msgCache) AddTokenFlag(ctx context.Context, userID string, platformID int, token string, flag int) error {
 	key := uidPidToken + userID + ":" + constant.PlatformIDToName(platformID)
+
 	return errs.Wrap(c.rdb.HSet(ctx, key, token, flag).Err())
 }
 
@@ -312,6 +312,7 @@ func (c *msgCache) GetTokensWithoutError(ctx context.Context, userID string, pla
 	for k, v := range m {
 		mm[k] = utils.StringToInt(v)
 	}
+
 	return mm, nil
 }
 
@@ -321,11 +322,13 @@ func (c *msgCache) SetTokenMapByUidPid(ctx context.Context, userID string, platf
 	for k, v := range m {
 		mm[k] = v
 	}
+
 	return errs.Wrap(c.rdb.HSet(ctx, key, mm).Err())
 }
 
 func (c *msgCache) DeleteTokenByUidPid(ctx context.Context, userID string, platform int, fields []string) error {
 	key := uidPidToken + userID + ":" + constant.PlatformIDToName(platform)
+
 	return errs.Wrap(c.rdb.HDel(ctx, key, fields...).Err())
 }
 
@@ -357,6 +360,7 @@ func (c *msgCache) GetMessagesBySeq(ctx context.Context, conversationID string,
 		}
 		seqMsgs = append(seqMsgs, &msg)
 	}
+
 	return
 	//pipe := c.rdb.Pipeline()
 	//for _, v := range seqs {
@@ -445,6 +449,7 @@ func (c *msgCache) UserDeleteMsgs(ctx context.Context, conversationID string, se
 			return errs.Wrap(err)
 		}
 	}
+
 	return nil
 	//pipe := c.rdb.Pipeline()
 	//for _, seq := range seqs {
@@ -478,6 +483,7 @@ func (c *msgCache) GetUserDelList(ctx context.Context, userID, conversationID st
 	for i, v := range result {
 		seqs[i] = utils.StringToInt64(v)
 	}
+
 	return seqs, nil
 }
 
@@ -486,6 +492,7 @@ func (c *msgCache) DelUserDeleteMsgsList(ctx context.Context, conversationID str
 		delUsers, err := c.rdb.SMembers(ctx, c.getMessageDelUserListKey(conversationID, seq)).Result()
 		if err != nil {
 			log.ZWarn(ctx, "DelUserDeleteMsgsList failed", err, "conversationID", conversationID, "seq", seq)
+
 			continue
 		}
 		if len(delUsers) > 0 {
@@ -561,7 +568,7 @@ func (c *msgCache) DeleteMessages(ctx context.Context, conversationID string, se
 
 func (c *msgCache) CleanUpOneConversationAllMsg(ctx context.Context, conversationID string) error {
 	vals, err := c.rdb.Keys(ctx, c.allMessageCacheKey(conversationID)).Result()
-	if err == redis.Nil {
+	if errors.Is(err, redis.Nil) {
 		return nil
 	}
 	if err != nil {
@@ -588,13 +595,15 @@ func (c *msgCache) DelMsgFromCache(ctx context.Context, userID string, seqs []in
 		key := c.getMessageCacheKey(userID, seq)
 		result, err := c.rdb.Get(ctx, key).Result()
 		if err != nil {
-			if err == redis.Nil {
+			if errors.Is(err, redis.Nil) {
 				continue
 			}
+
 			return errs.Wrap(err)
 		}
 		var msg sdkws.MsgData
-		if err := jsonpb.UnmarshalString(result, &msg); err != nil {
+		err = jsonpb.UnmarshalString(result, &msg)
+		if err != nil {
 			return err
 		}
 		msg.Status = constant.MsgDeleted
@@ -606,6 +615,7 @@ func (c *msgCache) DelMsgFromCache(ctx context.Context, userID string, seqs []in
 			return errs.Wrap(err)
 		}
 	}
+
 	return nil
 }
 
@@ -631,6 +641,7 @@ func (c *msgCache) SetSendMsgStatus(ctx context.Context, id string, status int32
 
 func (c *msgCache) GetSendMsgStatus(ctx context.Context, id string) (int32, error) {
 	result, err := c.rdb.Get(ctx, sendMsgFailedFlag+id).Int()
+
 	return int32(result), errs.Wrap(err)
 }
 
@@ -648,6 +659,7 @@ func (c *msgCache) DelFcmToken(ctx context.Context, account string, platformID i
 
 func (c *msgCache) IncrUserBadgeUnreadCountSum(ctx context.Context, userID string) (int, error) {
 	seq, err := c.rdb.Incr(ctx, userBadgeUnreadCountSum+userID).Result()
+
 	return int(seq), errs.Wrap(err)
 }
 
@@ -661,11 +673,13 @@ func (c *msgCache) GetUserBadgeUnreadCountSum(ctx context.Context, userID string
 
 func (c *msgCache) LockMessageTypeKey(ctx context.Context, clientMsgID string, TypeKey string) error {
 	key := exTypeKeyLocker + clientMsgID + "_" + TypeKey
+
 	return errs.Wrap(c.rdb.SetNX(ctx, key, 1, time.Minute).Err())
 }
 
 func (c *msgCache) UnLockMessageTypeKey(ctx context.Context, clientMsgID string, TypeKey string) error {
 	key := exTypeKeyLocker + clientMsgID + "_" + TypeKey
+
 	return errs.Wrap(c.rdb.Del(ctx, key).Err())
 }
 
@@ -680,6 +694,7 @@ func (c *msgCache) getMessageReactionExPrefix(clientMsgID string, sessionType in
 	case constant.NotificationChatType:
 		return "EX_NOTIFICATION" + clientMsgID
 	}
+
 	return ""
 }
 
@@ -688,6 +703,7 @@ func (c *msgCache) JudgeMessageReactionExist(ctx context.Context, clientMsgID st
 	if err != nil {
 		return false, utils.Wrap(err, "")
 	}
+
 	return n > 0, nil
 }
 

pkg/common/db/cache/user.go

@@ -70,6 +70,7 @@ func NewUserCacheRedis(
 	options rockscache.Options,
 ) UserCache {
 	rcClient := rockscache.NewClient(rdb, options)
+
 	return &UserCacheRedis{
 		rdb:        rdb,
 		metaCache:  NewMetaCacheRedis(rcClient),
@@ -97,10 +98,6 @@ func (u *UserCacheRedis) getUserGlobalRecvMsgOptKey(userID string) string {
 	return userGlobalRecvMsgOptKey + userID
 }
 
-func (u *UserCacheRedis) getUserStatusHashKey(userID string, Id int32) string {
-	return userID + "_" + string(Id) + platformID
-}
-
 func (u *UserCacheRedis) GetUserInfo(ctx context.Context, userID string) (userInfo *relationtb.UserModel, err error) {
 	return getCache(
 		ctx,
@@ -143,12 +140,13 @@ func (u *UserCacheRedis) GetUsersInfo(ctx context.Context, userIDs []string) ([]
 }
 
 func (u *UserCacheRedis) DelUsersInfo(userIDs ...string) UserCache {
-	var keys []string
+	keys := make([]string, 0, len(userIDs))
 	for _, userID := range userIDs {
 		keys = append(keys, u.getUserInfoKey(userID))
 	}
 	cache := u.NewCache()
 	cache.AddKeys(keys...)
+
 	return cache
 }
 
@@ -165,22 +163,19 @@ func (u *UserCacheRedis) GetUserGlobalRecvMsgOpt(ctx context.Context, userID str
 }
 
 func (u *UserCacheRedis) DelUsersGlobalRecvMsgOpt(userIDs ...string) UserCache {
-	var keys []string
+	keys := make([]string, 0, len(userIDs))
 	for _, userID := range userIDs {
 		keys = append(keys, u.getUserGlobalRecvMsgOptKey(userID))
 	}
 	cache := u.NewCache()
 	cache.AddKeys(keys...)
-	return cache
-}
 
-func (u *UserCacheRedis) getOnlineStatusKey(userID string) string {
-	return olineStatusKey + userID
+	return cache
 }
 
 // GetUserStatus get user status.
 func (u *UserCacheRedis) GetUserStatus(ctx context.Context, userIDs []string) ([]*user.OnlineStatus, error) {
-	var res []*user.OnlineStatus
+	userStatus := make([]*user.OnlineStatus, 0, len(userIDs))
 	for _, userID := range userIDs {
 		UserIDNum := crc32.ChecksumIEEE([]byte(userID))
 		modKey := strconv.Itoa(int(UserIDNum % statusMod))
@@ -188,13 +183,14 @@ func (u *UserCacheRedis) GetUserStatus(ctx context.Context, userIDs []string) ([
 		key := olineStatusKey + modKey
 		result, err := u.rdb.HGet(ctx, key, userID).Result()
 		if err != nil {
-			if err == redis.Nil {
+			if errors.Is(err, redis.Nil) {
 				// key or field does not exist
-				res = append(res, &user.OnlineStatus{
+				userStatus = append(userStatus, &user.OnlineStatus{
 					UserID:      userID,
 					Status:      constant.Offline,
 					PlatformIDs: nil,
 				})
+
 				continue
 			} else {
 				return nil, errs.Wrap(err)
@@ -206,9 +202,10 @@ func (u *UserCacheRedis) GetUserStatus(ctx context.Context, userIDs []string) ([
 		}
 		onlineStatus.UserID = userID
 		onlineStatus.Status = constant.Online
-		res = append(res, &onlineStatus)
+		userStatus = append(userStatus, &onlineStatus)
 	}
-	return res, nil
+
+	return userStatus, nil
 }
 
 // SetUserStatus Set the user status and save it in redis.
@@ -229,15 +226,16 @@ func (u *UserCacheRedis) SetUserStatus(ctx context.Context, userID string, statu
 				Status:      constant.Online,
 				PlatformIDs: []int32{platformID},
 			}
-			jsonData, err := json.Marshal(onlineStatus)
-			if err != nil {
-				return errs.Wrap(err)
+			jsonData, err2 := json.Marshal(&onlineStatus)
+			if err2 != nil {
+				return errs.Wrap(err2)
 			}
-			_, err = u.rdb.HSet(ctx, key, userID, string(jsonData)).Result()
-			if err != nil {
-				return errs.Wrap(err)
+			_, err2 = u.rdb.HSet(ctx, key, userID, string(jsonData)).Result()
+			if err2 != nil {
+				return errs.Wrap(err2)
 			}
 			u.rdb.Expire(ctx, key, userOlineStatusExpireTime)
+
 			return nil
 		}
 	}
@@ -245,7 +243,7 @@ func (u *UserCacheRedis) SetUserStatus(ctx context.Context, userID string, statu
 	isNil := false
 	result, err := u.rdb.HGet(ctx, key, userID).Result()
 	if err != nil {
-		if err == redis.Nil {
+		if errors.Is(err, redis.Nil) {
 			isNil = true
 		} else {
 			return errs.Wrap(err)
@@ -253,9 +251,25 @@ func (u *UserCacheRedis) SetUserStatus(ctx context.Context, userID string, statu
 	}
 
 	if status == constant.Offline {
+		err = u.refreshStatusOffline(ctx, userID, status, platformID, isNil, err, result, key)
+		if err != nil {
+			return err
+		}
+	} else {
+		err = u.refreshStatusOnline(ctx, userID, platformID, isNil, err, result, key)
+		if err != nil {
+			return errs.Wrap(err)
+		}
+	}
+
+	return nil
+}
+
+func (u *UserCacheRedis) refreshStatusOffline(ctx context.Context, userID string, status, platformID int32, isNil bool, err error, result, key string) error {
 	if isNil {
 		log.ZWarn(ctx, "this user not online,maybe trigger order not right",
 			err, "userStatus", status)
+
 		return nil
 	}
 	var onlineStatus user.OnlineStatus
@@ -285,12 +299,16 @@ func (u *UserCacheRedis) SetUserStatus(ctx context.Context, userID string, statu
 			return errs.Wrap(err)
 		}
 	}
-	} else {
+
+	return nil
+}
+
+func (u *UserCacheRedis) refreshStatusOnline(ctx context.Context, userID string, platformID int32, isNil bool, err error, result, key string) error {
 	var onlineStatus user.OnlineStatus
 	if !isNil {
-			err = json.Unmarshal([]byte(result), &onlineStatus)
+		err2 := json.Unmarshal([]byte(result), &onlineStatus)
 		if err != nil {
-				return errs.Wrap(err)
+			return errs.Wrap(err2)
 		}
 		onlineStatus.PlatformIDs = RemoveRepeatedElementsInList(append(onlineStatus.PlatformIDs, platformID))
 	} else {
@@ -307,8 +325,6 @@ func (u *UserCacheRedis) SetUserStatus(ctx context.Context, userID string, statu
 		return errs.Wrap(err)
 	}
 
-	}
-
 	return nil
 }
 

pkg/common/db/controller/auth.go

@@ -69,9 +69,9 @@ func (a *authDatabase) CreateToken(ctx context.Context, userID string, platformI
 		}
 	}
 	if len(deleteTokenKey) != 0 {
-		err := a.cache.DeleteTokenByUidPid(ctx, userID, platformID, deleteTokenKey)
-		if err != nil {
-			return "", err
+		err2 := a.cache.DeleteTokenByUidPid(ctx, userID, platformID, deleteTokenKey)
+		if err2 != nil {
+			return "", err2
 		}
 	}
 	claims := tokenverify.BuildClaims(userID, platformID, a.accessExpire)
@@ -80,5 +80,6 @@ func (a *authDatabase) CreateToken(ctx context.Context, userID string, platformI
 	if err != nil {
 		return "", utils.Wrap(err, "")
 	}
+
 	return tokenString, a.cache.AddTokenFlag(ctx, userID, platformID, tokenString, constant.NormalToken)
 }

pkg/common/db/controller/black.go

@@ -55,6 +55,7 @@ func (b *blackDatabase) Create(ctx context.Context, blacks []*relation.BlackMode
 	if err := b.black.Create(ctx, blacks); err != nil {
 		return err
 	}
+
 	return b.deleteBlackIDsCache(ctx, blacks)
 }
 
@@ -63,6 +64,7 @@ func (b *blackDatabase) Delete(ctx context.Context, blacks []*relation.BlackMode
 	if err := b.black.Delete(ctx, blacks); err != nil {
 		return err
 	}
+
 	return b.deleteBlackIDsCache(ctx, blacks)
 }
 
@@ -71,6 +73,7 @@ func (b *blackDatabase) deleteBlackIDsCache(ctx context.Context, blacks []*relat
 	for _, black := range blacks {
 		cache = cache.DelBlackIDs(ctx, black.OwnerUserID)
 	}
+
 	return cache.ExecDel(ctx)
 }
 
@@ -97,6 +100,7 @@ func (b *blackDatabase) CheckIn(
 		return
 	}
 	log.ZDebug(ctx, "blackIDs", "user1BlackIDs", userID1BlackIDs, "user2BlackIDs", userID2BlackIDs)
+
 	return utils.IsContain(userID2, userID1BlackIDs), utils.IsContain(userID1, userID2BlackIDs), nil
 }
 

pkg/common/db/controller/conversation.go

@@ -99,8 +99,8 @@ func (c *conversationDatabase) SetUsersConversationFiledTx(ctx context.Context,
 		now := time.Now()
 		for _, v := range NotUserIDs {
 			temp := new(relationtb.ConversationModel)
-			if err := utils.CopyStructFields(temp, conversation); err != nil {
-				return err
+			if err2 := utils.CopyStructFields(temp, conversation); err2 != nil {
+				return err2
 			}
 			temp.OwnerUserID = v
 			temp.CreateTime = now
@@ -113,10 +113,12 @@ func (c *conversationDatabase) SetUsersConversationFiledTx(ctx context.Context,
 			}
 			cache = cache.DelConversationIDs(NotUserIDs...).DelUserConversationIDsHash(NotUserIDs...).DelConversations(conversation.ConversationID, NotUserIDs...)
 		}
+
 		return nil
 	}); err != nil {
 		return err
 	}
+
 	return cache.ExecDel(ctx)
 }
 
@@ -130,6 +132,7 @@ func (c *conversationDatabase) UpdateUsersConversationFiled(ctx context.Context,
 	if _, ok := args["recv_msg_opt"]; ok {
 		cache = cache.DelConversationNotReceiveMessageUserIDs(conversationID)
 	}
+
 	return cache.ExecDel(ctx)
 }
 
@@ -137,13 +140,14 @@ func (c *conversationDatabase) CreateConversation(ctx context.Context, conversat
 	if err := c.conversationDB.Create(ctx, conversations); err != nil {
 		return err
 	}
-	var userIDs []string
+	userIDs := make([]string, 0, len(conversations))
 	cache := c.cache.NewCache()
 	for _, conversation := range conversations {
 		cache = cache.DelConversations(conversation.OwnerUserID, conversation.ConversationID)
 		cache = cache.DelConversationNotReceiveMessageUserIDs(conversation.ConversationID)
 		userIDs = append(userIDs, conversation.OwnerUserID)
 	}
+
 	return cache.DelConversationIDs(userIDs...).DelUserConversationIDsHash(userIDs...).ExecDel(ctx)
 }
 
@@ -178,10 +182,12 @@ func (c *conversationDatabase) SyncPeerUserPrivateConversationTx(ctx context.Con
 				}
 			}
 		}
+
 		return nil
 	}); err != nil {
 		return err
 	}
+
 	return cache.ExecDel(ctx)
 }
 
@@ -234,12 +240,15 @@ func (c *conversationDatabase) SetUserConversations(ctx context.Context, ownerUs
 			if err != nil {
 				return err
 			}
-			cache = cache.DelConversationIDs(ownerUserID).DelUserConversationIDsHash(ownerUserID).DelConversationNotReceiveMessageUserIDs(utils.Slice(notExistConversations, func(e *relationtb.ConversationModel) string { return e.ConversationID })...)
+			cache = cache.DelConversationIDs(ownerUserID).DelUserConversationIDsHash(ownerUserID)
+			cache = cache.DelConversationNotReceiveMessageUserIDs(utils.Slice(notExistConversations, func(e *relationtb.ConversationModel) string { return e.ConversationID })...)
 		}
+
 		return nil
 	}); err != nil {
 		return err
 	}
+
 	return cache.ExecDel(ctx)
 }
 
@@ -276,10 +285,12 @@ func (c *conversationDatabase) CreateGroupChatConversation(ctx context.Context,
 		for _, v := range existConversationUserIDs {
 			cache = cache.DelConversations(v, conversationID)
 		}
+
 		return nil
 	}); err != nil {
 		return err
 	}
+
 	return cache.ExecDel(ctx)
 }
 

pkg/common/db/controller/friend.go

@@ -16,6 +16,7 @@ package controller
 
 import (
 	"context"
+	"errors"
 	"time"
 
 	"gorm.io/gorm"
@@ -109,6 +110,7 @@ func (f *friendDatabase) CheckIn(
 	if err != nil {
 		return
 	}
+
 	return utils.IsContain(userID2, userID1FriendIDs), utils.IsContain(userID1, userID2FriendIDs), nil
 }
 
@@ -121,8 +123,8 @@ func (f *friendDatabase) AddFriendRequest(
 ) (err error) {
 	return f.tx.Transaction(func(tx any) error {
 		_, err := f.friendRequest.NewTx(tx).Take(ctx, fromUserID, toUserID)
-		// 有db错误
-		if err != nil && errs.Unwrap(err) != gorm.ErrRecordNotFound {
+		// if there is a db error
+		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 			return err
 		}
 		// 无错误 则更新
@@ -136,12 +138,14 @@ func (f *friendDatabase) AddFriendRequest(
 			if err := f.friendRequest.NewTx(tx).UpdateByMap(ctx, fromUserID, toUserID, m); err != nil {
 				return err
 			}
+
 			return nil
 		}
 		// gorm.ErrRecordNotFound 错误，则新增
 		if err := f.friendRequest.NewTx(tx).Create(ctx, []*relation.FriendRequestModel{{FromUserID: fromUserID, ToUserID: toUserID, ReqMsg: reqMsg, Ex: ex, CreateTime: time.Now(), HandleTime: time.Unix(0, 0)}}); err != nil {
 			return err
 		}
+
 		return nil
 	})
 }
@@ -154,11 +158,11 @@ func (f *friendDatabase) BecomeFriends(
 	addSource int32,
 ) (err error) {
 	cache := f.cache.NewCache()
-	if err := f.tx.Transaction(func(tx any) error {
-		// 先find 找出重复的 去掉重复的
-		fs1, err := f.friend.NewTx(tx).FindFriends(ctx, ownerUserID, friendUserIDs)
-		if err != nil {
-			return err
+	fn := func(tx any) error {
+		// first,find and drop delete ones
+		fs1, err2 := f.friend.NewTx(tx).FindFriends(ctx, ownerUserID, friendUserIDs)
+		if err2 != nil {
+			return err2
 		}
 		opUserID := mcontext.GetOperationID(ctx)
 		for _, v := range friendUserIDs {
@@ -168,13 +172,13 @@ func (f *friendDatabase) BecomeFriends(
 			return e.FriendUserID
 		})
 
-		err = f.friend.NewTx(tx).Create(ctx, fs11)
-		if err != nil {
-			return err
+		err2 = f.friend.NewTx(tx).Create(ctx, fs11)
+		if err2 != nil {
+			return err2
 		}
-		fs2, err := f.friend.NewTx(tx).FindReversalFriends(ctx, ownerUserID, friendUserIDs)
-		if err != nil {
-			return err
+		fs2, err2 := f.friend.NewTx(tx).FindReversalFriends(ctx, ownerUserID, friendUserIDs)
+		if err2 != nil {
+			return err2
 		}
 		var newFriendIDs []string
 		for _, v := range friendUserIDs {
@@ -184,16 +188,20 @@ func (f *friendDatabase) BecomeFriends(
 		fs22 := utils.DistinctAny(fs2, func(e *relation.FriendModel) string {
 			return e.OwnerUserID
 		})
-		err = f.friend.NewTx(tx).Create(ctx, fs22)
-		if err != nil {
-			return err
+		err2 = f.friend.NewTx(tx).Create(ctx, fs22)
+		if err2 != nil {
+			return err2
 		}
 		newFriendIDs = append(newFriendIDs, ownerUserID)
 		cache = cache.DelFriendIDs(newFriendIDs...)
-		return nil
-	}); err != nil {
+
 		return nil
 	}
+	err = f.tx.Transaction(fn)
+	if err != nil {
+		return err
+	}
+
 	return cache.ExecDel(ctx)
 }
 
@@ -216,6 +224,7 @@ func (f *friendDatabase) RefuseFriendRequest(
 	if err != nil {
 		return err
 	}
+
 	return nil
 }
 
@@ -251,7 +260,7 @@ func (f *friendDatabase) AgreeFriendRequest(
 			if err != nil {
 				return err
 			}
-		} else if err != nil && errs.Unwrap(err) != gorm.ErrRecordNotFound {
+		} else if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 			return err
 		}
 
@@ -290,6 +299,7 @@ func (f *friendDatabase) AgreeFriendRequest(
 				return err
 			}
 		}
+
 		return f.cache.DelFriendIDs(friendRequest.ToUserID, friendRequest.FromUserID).ExecDel(ctx)
 	})
 }
@@ -299,6 +309,7 @@ func (f *friendDatabase) Delete(ctx context.Context, ownerUserID string, friendU
 	if err := f.friend.Delete(ctx, ownerUserID, friendUserIDs); err != nil {
 		return err
 	}
+
 	return f.cache.DelFriendIDs(append(friendUserIDs, ownerUserID)...).ExecDel(ctx)
 }
 
@@ -307,6 +318,7 @@ func (f *friendDatabase) UpdateRemark(ctx context.Context, ownerUserID, friendUs
 	if err := f.friend.UpdateRemark(ctx, ownerUserID, friendUserID, remark); err != nil {
 		return err
 	}
+
 	return f.cache.DelFriend(ownerUserID, friendUserID).ExecDel(ctx)
 }
 
@@ -359,6 +371,7 @@ func (f *friendDatabase) FindFriendsWithError(
 	if len(friends) != len(friendUserIDs) {
 		err = errs.ErrRecordNotFound.Wrap()
 	}
+
 	return
 }
 

pkg/common/db/controller/group.go

@@ -102,6 +102,7 @@ func NewGroupDatabase(
 		cache:          cache,
 		mongoDB:        superGroup,
 	}
+
 	return database
 }
 
@@ -109,6 +110,7 @@ func InitGroupDatabase(db *gorm.DB, rdb redis.UniversalClient, database *mongo.D
 	rcOptions := rockscache.NewDefaultOptions()
 	rcOptions.StrongConsistency = true
 	rcOptions.RandomExpireAdjustment = 0.2
+
 	return NewGroupDatabase(
 		relation.NewGroupDB(db),
 		relation.NewGroupMemberDB(db),
@@ -151,6 +153,7 @@ func (g *groupDatabase) FindGroupMemberNum(ctx context.Context, groupID string)
 	if err != nil {
 		return 0, err
 	}
+
 	return uint32(num), nil
 }
 
@@ -184,10 +187,12 @@ func (g *groupDatabase) CreateGroup(
 			cache = cache.DelJoinedGroupID(groupMember.UserID).DelGroupMembersInfo(groupMember.GroupID, groupMember.UserID)
 		}
 		cache = cache.DelGroupsInfo(createGroupIDs...)
+
 		return nil
 	}); err != nil {
 		return err
 	}
+
 	return cache.ExecDel(ctx)
 }
 
@@ -211,6 +216,7 @@ func (g *groupDatabase) UpdateGroup(ctx context.Context, groupID string, data ma
 	if err := g.groupDB.UpdateMap(ctx, groupID, data); err != nil {
 		return err
 	}
+
 	return g.cache.DelGroupsInfo(groupID).ExecDel(ctx)
 }
 
@@ -231,10 +237,12 @@ func (g *groupDatabase) DismissGroup(ctx context.Context, groupID string, delete
 			cache = cache.DelJoinedGroupID(userIDs...).DelGroupMemberIDs(groupID).DelGroupsMemberNum(groupID).DelGroupMembersHash(groupID)
 		}
 		cache = cache.DelGroupsInfo(groupID)
+
 		return nil
 	}); err != nil {
 		return err
 	}
+
 	return cache.ExecDel(ctx)
 }
 
@@ -276,6 +284,7 @@ func (g *groupDatabase) FindGroupMember(ctx context.Context, groupIDs []string,
 			}
 			res = append(res, v)
 		}
+
 		return res, nil
 	}
 	if len(roleLevels) == 0 {
@@ -286,8 +295,10 @@ func (g *groupDatabase) FindGroupMember(ctx context.Context, groupIDs []string,
 			}
 			totalGroupMembers = append(totalGroupMembers, groupMembers...)
 		}
+
 		return totalGroupMembers, nil
 	}
+
 	return g.groupMemberDB.Find(ctx, groupIDs, userIDs, roleLevels)
 }
 
@@ -307,6 +318,7 @@ func (g *groupDatabase) PageGetJoinGroup(
 		}
 		totalGroupMembers = append(totalGroupMembers, groupMembers...)
 	}
+
 	return uint32(len(groupIDs)), totalGroupMembers, nil
 }
 
@@ -327,6 +339,7 @@ func (g *groupDatabase) PageGetGroupMember(
 	if err != nil {
 		return 0, nil, err
 	}
+
 	return uint32(len(groupMemberIDs)), members, nil
 }
 
@@ -378,6 +391,7 @@ func (g *groupDatabase) HandlerGroupRequest(
 				return err
 			}
 		}
+
 		return nil
 	})
 }
@@ -386,6 +400,7 @@ func (g *groupDatabase) DeleteGroupMember(ctx context.Context, groupID string, u
 	if err := g.groupMemberDB.Delete(ctx, groupID, userIDs); err != nil {
 		return err
 	}
+
 	return g.cache.DelGroupMembersHash(groupID).
 		DelGroupMemberIDs(groupID).
 		DelGroupsMemberNum(groupID).
@@ -410,6 +425,7 @@ func (g *groupDatabase) MapGroupMemberNum(ctx context.Context, groupIDs []string
 		}
 		m[groupID] = uint32(num)
 	}
+
 	return m, nil
 }
 
@@ -429,6 +445,7 @@ func (g *groupDatabase) TransferGroupOwner(ctx context.Context, groupID string,
 		if rowsAffected != 1 {
 			return utils.Wrap(fmt.Errorf("newOwnerUserID %s rowsAffected = %d", newOwnerUserID, rowsAffected), "")
 		}
+
 		return g.cache.DelGroupMembersInfo(groupID, oldOwnerUserID, newOwnerUserID).DelGroupMembersHash(groupID).ExecDel(ctx)
 	})
 }
@@ -442,6 +459,7 @@ func (g *groupDatabase) UpdateGroupMember(
 	if err := g.groupMemberDB.Update(ctx, groupID, userID, data); err != nil {
 		return err
 	}
+
 	return g.cache.DelGroupMembersInfo(groupID, userID).ExecDel(ctx)
 }
 
@@ -454,10 +472,12 @@ func (g *groupDatabase) UpdateGroupMembers(ctx context.Context, data []*relation
 			}
 			cache = cache.DelGroupMembersInfo(item.GroupID, item.UserID)
 		}
+
 		return nil
 	}); err != nil {
 		return err
 	}
+
 	return cache.ExecDel(ctx)
 }
 
@@ -469,6 +489,7 @@ func (g *groupDatabase) CreateGroupRequest(ctx context.Context, requests []*rela
 				return err
 			}
 		}
+
 		return db.Create(ctx, requests)
 	})
 }
@@ -504,6 +525,7 @@ func (g *groupDatabase) CreateSuperGroup(ctx context.Context, groupID string, in
 	if err := g.mongoDB.CreateSuperGroup(ctx, groupID, initMemberIDs); err != nil {
 		return err
 	}
+
 	return g.cache.DelSuperGroupMemberIDs(groupID).DelJoinedSuperGroupIDs(initMemberIDs...).ExecDel(ctx)
 }
 
@@ -521,10 +543,12 @@ func (g *groupDatabase) DeleteSuperGroup(ctx context.Context, groupID string) er
 		if len(models) > 0 {
 			cache = cache.DelJoinedSuperGroupIDs(models[0].MemberIDs...)
 		}
+
 		return nil
 	}); err != nil {
 		return err
 	}
+
 	return cache.ExecDel(ctx)
 }
 
@@ -532,6 +556,7 @@ func (g *groupDatabase) DeleteSuperGroupMember(ctx context.Context, groupID stri
 	if err := g.mongoDB.RemoverUserFromSuperGroup(ctx, groupID, userIDs); err != nil {
 		return err
 	}
+
 	return g.cache.DelSuperGroupMemberIDs(groupID).DelJoinedSuperGroupIDs(userIDs...).ExecDel(ctx)
 }
 
@@ -539,6 +564,7 @@ func (g *groupDatabase) CreateSuperGroupMember(ctx context.Context, groupID stri
 	if err := g.mongoDB.AddUserToSuperGroup(ctx, groupID, userIDs); err != nil {
 		return err
 	}
+
 	return g.cache.DelSuperGroupMemberIDs(groupID).DelJoinedSuperGroupIDs(userIDs...).ExecDel(ctx)
 }
 

pkg/common/db/controller/msg.go

@@ -135,6 +135,7 @@ func InitCommonMsgDatabase(rdb redis.UniversalClient, database *mongo.Database)
 	cacheModel := cache.NewMsgCacheModel(rdb)
 	msgDocModel := unrelation.NewMsgMongoDriver(database)
 	CommonMsgDatabase := NewCommonMsgDatabase(msgDocModel, cacheModel)
+
 	return CommonMsgDatabase
 }
 
@@ -150,14 +151,17 @@ type commonMsgDatabase struct {
 
 func (db *commonMsgDatabase) MsgToMQ(ctx context.Context, key string, msg2mq *sdkws.MsgData) error {
 	_, _, err := db.producer.SendMessage(ctx, key, msg2mq)
+
 	return err
 }
 
 func (db *commonMsgDatabase) MsgToModifyMQ(ctx context.Context, key, conversationID string, messages []*sdkws.MsgData) error {
 	if len(messages) > 0 {
 		_, _, err := db.producerToModify.SendMessage(ctx, key, &pbmsg.MsgDataToModifyByMQ{ConversationID: conversationID, Messages: messages})
+
 		return err
 	}
+
 	return nil
 }
 
@@ -165,26 +169,26 @@ func (db *commonMsgDatabase) MsgToPushMQ(ctx context.Context, key, conversationI
 	partition, offset, err := db.producerToPush.SendMessage(ctx, key, &pbmsg.PushMsgDataToMQ{MsgData: msg2mq, ConversationID: conversationID})
 	if err != nil {
 		log.ZError(ctx, "MsgToPushMQ", err, "key", key, "msg2mq", msg2mq)
+
 		return 0, 0, err
 	}
+
 	return partition, offset, nil
 }
 
 func (db *commonMsgDatabase) MsgToMongoMQ(ctx context.Context, key, conversationID string, messages []*sdkws.MsgData, lastSeq int64) error {
 	if len(messages) > 0 {
 		_, _, err := db.producerToMongo.SendMessage(ctx, key, &pbmsg.MsgDataToMongoByMQ{LastSeq: lastSeq, ConversationID: conversationID, MsgData: messages})
+
 		return err
 	}
+
 	return nil
 }
 
-func (db *commonMsgDatabase) BatchInsertBlock(ctx context.Context, conversationID string, fields []any, key int8, firstSeq int64) error {
-	if len(fields) == 0 {
-		return nil
-	}
-	num := db.msg.GetSingleGocMsgNum()
+func checkTypeForBatchInsertBlock(fields []any, key int8, firstSeq int64) error {
 	// num = 100
-	for i, field := range fields { // 检查类型
+	for i, field := range fields { // check type
 		var ok bool
 		switch key {
 		case updateKeyMsg:
@@ -202,8 +206,11 @@ func (db *commonMsgDatabase) BatchInsertBlock(ctx context.Context, conversationI
 			return errs.ErrInternalServer.Wrap("field type is invalid")
 		}
 	}
-	// 返回值为true表示数据库存在该文档，false表示数据库不存在该文档
-	updateMsgModel := func(seq int64, i int) (bool, error) {
+
+	return nil
+}
+
+func (db *commonMsgDatabase) updateMsgModelForBatchInsertBlock(ctx context.Context, conversationID string, fields []any, key int8, seq int64, i int) (bool, error) {
 	var (
 		res *mongo.UpdateResult
 		err error
@@ -220,25 +227,16 @@ func (db *commonMsgDatabase) BatchInsertBlock(ctx context.Context, conversationI
 	if err != nil {
 		return false, err
 	}
+
 	return res.MatchedCount > 0, nil
-	}
-	tryUpdate := true
-	for i := 0; i < len(fields); i++ {
-		seq := firstSeq + int64(i) // 当前seq
-		if tryUpdate {
-			matched, err := updateMsgModel(seq, i)
-			if err != nil {
-				return err
-			}
-			if matched {
-				continue // 匹配到了，继续下一个(不一定修改)
-			}
-		}
+}
+
+func (db *commonMsgDatabase) newDocForBatchInsertBlock(conversationID string, fields []any, key int8, seq, firstSeq, num int64, i int) (unrelationtb.MsgDocModel, int) {
 	doc := unrelationtb.MsgDocModel{
 		DocID: db.msg.GetDocID(conversationID, seq),
 		Msg:   make([]*unrelationtb.MsgInfoModel, num),
 	}
-		var insert int // 插入的数量
+	var insert int // number of inserted
 	for j := i; j < len(fields); j++ {
 		seq = firstSeq + int64(j)
 		if db.msg.GetDocID(conversationID, seq) != doc.DocID {
@@ -265,17 +263,49 @@ func (db *commonMsgDatabase) BatchInsertBlock(ctx context.Context, conversationI
 			doc.Msg[i].DelList = []string{}
 		}
 	}
-		if err := db.msgDocDatabase.Create(ctx, &doc); err != nil {
-			if mongo.IsDuplicateKeyError(err) {
-				i--              // 存在并发,重试当前数据
-				tryUpdate = true // 以修改模式
-				continue
+
+	return doc, insert
+}
+
+func (db *commonMsgDatabase) BatchInsertBlock(ctx context.Context, conversationID string, fields []any, key int8, firstSeq int64) error {
+	if len(fields) == 0 {
+		return nil
 	}
+	num := db.msg.GetSingleGocMsgNum()
+	// num = 100
+	err := checkTypeForBatchInsertBlock(fields, key, firstSeq)
+	if err != nil {
 		return err
 	}
-		tryUpdate = false // 当前以插入成功,下一块优先插入模式
-		i += insert - 1   // 跳过已插入的数据
+	tryUpdate := true
+	for i := 0; i < len(fields); i++ {
+		seq := firstSeq + int64(i) // current seq
+		// try update
+		if tryUpdate {
+			matched, err := db.updateMsgModelForBatchInsertBlock(ctx, conversationID, fields, key, seq, i)
+			if err != nil {
+				return err
 			}
+			if matched {
+				continue // if matched,skip
+			}
+		}
+		doc, insert := db.newDocForBatchInsertBlock(conversationID, fields, key, seq, firstSeq, num, i)
+		// insert doc into db
+		if err := db.msgDocDatabase.Create(ctx, &doc); err != nil {
+			if mongo.IsDuplicateKeyError(err) {
+				i--              // exists concurrent,
+				tryUpdate = true // try update
+
+				continue
+			}
+
+			return err
+		}
+		tryUpdate = false // if insert success,change to insert mode
+		i += insert - 1   // skip inserted data
+	}
+
 	return nil
 }
 
@@ -322,6 +352,7 @@ func (db *commonMsgDatabase) BatchInsertChat2DB(ctx context.Context, conversatio
 			Ex:               msg.Ex,
 		}
 	}
+
 	return db.BatchInsertBlock(ctx, conversationID, msgs, updateKeyMsg, msgList[0].Seq)
 }
 
@@ -338,9 +369,11 @@ func (db *commonMsgDatabase) MarkSingleChatMsgsAsRead(ctx context.Context, userI
 		log.ZDebug(ctx, "MarkSingleChatMsgsAsRead", "userID", userID, "docID", docID, "indexes", indexes)
 		if err := db.msgDocDatabase.MarkSingleChatMsgsAsRead(ctx, userID, docID, indexes); err != nil {
 			log.ZError(ctx, "MarkSingleChatMsgsAsRead", err, "userID", userID, "docID", docID, "indexes", indexes)
+
 			return err
 		}
 	}
+
 	return nil
 }
 
@@ -354,8 +387,9 @@ func (db *commonMsgDatabase) DelUserDeleteMsgsList(ctx context.Context, conversa
 
 func (db *commonMsgDatabase) BatchInsertChat2Cache(ctx context.Context, conversationID string, msgs []*sdkws.MsgData) (seq int64, isNew bool, err error) {
 	currentMaxSeq, err := db.cache.GetMaxSeq(ctx, conversationID)
-	if err != nil && errs.Unwrap(err) != redis.Nil {
+	if err != nil && !errors.Is(err, redis.Nil) {
 		prome.Inc(prome.SeqGetFailedCounter)
+
 		return 0, false, err
 	}
 	prome.Inc(prome.SeqGetSuccessCounter)
@@ -366,7 +400,7 @@ func (db *commonMsgDatabase) BatchInsertChat2Cache(ctx context.Context, conversa
 	if lenList < 1 {
 		return 0, false, errors.New("too short as 0")
 	}
-	if errs.Unwrap(err) == redis.Nil {
+	if errors.Is(err, redis.Nil) {
 		isNew = true
 	}
 	lastMaxSeq := currentMaxSeq
@@ -396,6 +430,7 @@ func (db *commonMsgDatabase) BatchInsertChat2Cache(ctx context.Context, conversa
 	} else {
 		prome.Inc(prome.SeqSetSuccessCounter)
 	}
+
 	return lastMaxSeq, isNew, utils.Wrap(err, "")
 }
 
@@ -410,6 +445,7 @@ func (db *commonMsgDatabase) getMsgBySeqs(ctx context.Context, userID, conversat
 			totalMsgs = append(totalMsgs, convert.MsgDB2Pb(msg.Msg))
 		}
 	}
+
 	return totalMsgs, nil
 }
 
@@ -420,6 +456,7 @@ func (db *commonMsgDatabase) findMsgInfoBySeq(ctx context.Context, userID, docID
 			msg.Msg.IsRead = true
 		}
 	}
+
 	return msgs, err
 }
 
@@ -438,70 +475,29 @@ func (db *commonMsgDatabase) getMsgBySeqsRange(ctx context.Context, userID strin
 			seqMsgs = append(seqMsgs, convert.MsgDB2Pb(msg.Msg))
 		}
 	}
+
 	return seqMsgs, nil
 }
 
-func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID string, conversationID string, begin, end, num, userMaxSeq int64) (int64, int64, []*sdkws.MsgData, error) {
-	userMinSeq, err := db.cache.GetConversationUserMinSeq(ctx, conversationID, userID)
-	if err != nil && errs.Unwrap(err) != redis.Nil {
-		return 0, 0, nil, err
-	}
-	minSeq, err := db.cache.GetMinSeq(ctx, conversationID)
-	if err != nil && errs.Unwrap(err) != redis.Nil {
-		return 0, 0, nil, err
-	}
-	if userMinSeq > minSeq {
-		minSeq = userMinSeq
-	}
-	if minSeq > end {
-		log.ZInfo(ctx, "minSeq > end", "minSeq", minSeq, "end", end)
-		return 0, 0, nil, nil
-	}
-	maxSeq, err := db.cache.GetMaxSeq(ctx, conversationID)
-	if err != nil && errs.Unwrap(err) != redis.Nil {
-		return 0, 0, nil, err
-	}
-	log.ZDebug(ctx, "GetMsgBySeqsRange", "userMinSeq", userMinSeq, "conMinSeq", minSeq, "conMaxSeq", maxSeq, "userMaxSeq", userMaxSeq)
-	if userMaxSeq != 0 {
-		if userMaxSeq < maxSeq {
-			maxSeq = userMaxSeq
-		}
-	}
-	if begin < minSeq {
-		begin = minSeq
-	}
-	if end > maxSeq {
-		end = maxSeq
-	}
-	if end < begin {
-		return 0, 0, nil, errs.ErrArgs.Wrap("seq end < begin")
-	}
-	var seqs []int64
-	for i := end; i > end-num; i-- {
-		if i >= begin {
-			seqs = append([]int64{i}, seqs...)
-		} else {
-			break
-		}
-	}
-	if len(seqs) == 0 {
-		return 0, 0, nil, nil
-	}
+func (db *commonMsgDatabase) getCacheMsgForGetMsgBySeqsRange(ctx context.Context, userID string, conversationID string, begin int64, seqs []int64) ([]*sdkws.MsgData, []int64, error) {
 	newBegin := seqs[0]
 	newEnd := seqs[len(seqs)-1]
 	log.ZDebug(ctx, "GetMsgBySeqsRange", "first seqs", seqs, "newBegin", newBegin, "newEnd", newEnd)
 	cachedMsgs, failedSeqs, err := db.cache.GetMessagesBySeq(ctx, conversationID, seqs)
 	if err != nil {
-		if err != redis.Nil {
+		if !errors.Is(err, redis.Nil) {
 			prome.Add(prome.MsgPullFromRedisFailedCounter, len(failedSeqs))
 			log.ZError(ctx, "get message from redis exception", err, "conversationID", conversationID, "seqs", seqs)
 		}
 	}
 	var successMsgs []*sdkws.MsgData
-	if len(cachedMsgs) > 0 {
-		delSeqs, err := db.cache.GetUserDelList(ctx, userID, conversationID)
-		if err != nil && errs.Unwrap(err) != redis.Nil {
-			return 0, 0, nil, err
+	if len(cachedMsgs) == 0 {
+		return successMsgs, failedSeqs, err
+	}
+	// if len(cachedMsgs) > 0
+	delSeqs, err2 := db.cache.GetUserDelList(ctx, userID, conversationID)
+	if err2 != nil && !errors.Is(err2, redis.Nil) {
+		return nil, nil, err2
 	}
 	var cacheDelNum int
 	for _, msg := range cachedMsgs {
@@ -527,27 +523,94 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin
 	}
 	if len(reGetSeqsCache) > 0 {
 		log.ZDebug(ctx, "reGetSeqsCache", "reGetSeqsCache", reGetSeqsCache)
-			cachedMsgs, failedSeqs2, err := db.cache.GetMessagesBySeq(ctx, conversationID, reGetSeqsCache)
-			if err != nil {
-				if err != redis.Nil {
+		cachedMsgs, failedSeqs2, err2 := db.cache.GetMessagesBySeq(ctx, conversationID, reGetSeqsCache)
+		if err2 != nil {
+			if !errors.Is(err2, redis.Nil) {
 				prome.Add(prome.MsgPullFromRedisFailedCounter, len(failedSeqs2))
-					log.ZError(ctx, "get message from redis exception", err, "conversationID", conversationID, "seqs", reGetSeqsCache)
+				log.ZError(ctx, "get message from redis exception", err2, "conversationID", conversationID, "seqs", reGetSeqsCache)
 			}
 		}
 		failedSeqs = append(failedSeqs, failedSeqs2...)
 		successMsgs = append(successMsgs, cachedMsgs...)
 	}
+
+	return successMsgs, failedSeqs, err
+}
+
+func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID string, conversationID string, begin, end, num, userMaxSeq int64) (int64, int64, []*sdkws.MsgData, error) {
+	// 从缓存中获取最小和最大序列号，并根据给定的范围值进行调整
+	userMinSeq, err := db.cache.GetConversationUserMinSeq(ctx, conversationID, userID)
+	if err != nil && !errors.Is(err, redis.Nil) {
+		return 0, 0, nil, err
 	}
+	minSeq, err := db.cache.GetMinSeq(ctx, conversationID)
+	if err != nil && !errors.Is(err, redis.Nil) {
+		return 0, 0, nil, err
+	}
+	if userMinSeq > minSeq {
+		minSeq = userMinSeq
+	}
+	if minSeq > end {
+		log.ZInfo(ctx, "minSeq > end", "minSeq", minSeq, "end", end)
+
+		return 0, 0, nil, nil
+	}
+	maxSeq, err := db.cache.GetMaxSeq(ctx, conversationID)
+	if err != nil && !errors.Is(err, redis.Nil) {
+		return 0, 0, nil, err
+	}
+
+	// log out debug info
+	log.ZDebug(ctx, "GetMsgBySeqsRange", "userMinSeq", userMinSeq, "conMinSeq", minSeq, "conMaxSeq", maxSeq, "userMaxSeq", userMaxSeq)
+
+	// adjust maxSeq according to userMaxSeq
+	if userMaxSeq != 0 {
+		if userMaxSeq < maxSeq {
+			maxSeq = userMaxSeq
+		}
+	}
+
+	// adjust begin and end according to minSeq and maxSeq
+	if begin < minSeq {
+		begin = minSeq
+	}
+	if end > maxSeq {
+		end = maxSeq
+	}
+	if end < begin {
+		return 0, 0, nil, errs.ErrArgs.Wrap("seq end < begin")
+	}
+
+	// get seqs to search
+	var seqs []int64
+	for i := end; i > end-num; i-- {
+		if i >= begin {
+			seqs = append([]int64{i}, seqs...)
+		} else {
+			break
+		}
+	}
+	if len(seqs) == 0 {
+		return 0, 0, nil, nil
+	}
+
+	// get info from cache,and filter deleted msg
+	successMsgs, failedSeqs, err := db.getCacheMsgForGetMsgBySeqsRange(ctx, userID, conversationID, begin, seqs)
+	if err != nil {
+		return 0, 0, nil, err
+	}
+	// log out debug info
 	log.ZDebug(ctx, "get msgs from cache", "successMsgs", successMsgs)
 	if len(failedSeqs) != 0 {
 		log.ZDebug(ctx, "msgs not exist in redis", "seqs", failedSeqs)
 	}
-	// get from cache or db
+	// if not found in cache,find in mongo
 	prome.Add(prome.MsgPullFromRedisSuccessCounter, len(successMsgs))
 	if len(failedSeqs) > 0 {
 		mongoMsgs, err := db.getMsgBySeqsRange(ctx, userID, conversationID, failedSeqs, begin, end)
 		if err != nil {
 			prome.Add(prome.MsgPullFromMongoFailedCounter, len(failedSeqs))
+
 			return 0, 0, nil, err
 		}
 		prome.Add(prome.MsgPullFromMongoSuccessCounter, len(mongoMsgs))
@@ -559,15 +622,15 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin
 
 func (db *commonMsgDatabase) GetMsgBySeqs(ctx context.Context, userID string, conversationID string, seqs []int64) (int64, int64, []*sdkws.MsgData, error) {
 	userMinSeq, err := db.cache.GetConversationUserMinSeq(ctx, conversationID, userID)
-	if err != nil && errs.Unwrap(err) != redis.Nil {
+	if err != nil && !errors.Is(err, redis.Nil) {
 		return 0, 0, nil, err
 	}
 	minSeq, err := db.cache.GetMinSeq(ctx, conversationID)
-	if err != nil && errs.Unwrap(err) != redis.Nil {
+	if err != nil && !errors.Is(err, redis.Nil) {
 		return 0, 0, nil, err
 	}
 	maxSeq, err := db.cache.GetMaxSeq(ctx, conversationID)
-	if err != nil && errs.Unwrap(err) != redis.Nil {
+	if err != nil && !errors.Is(err, redis.Nil) {
 		return 0, 0, nil, err
 	}
 	if userMinSeq < minSeq {
@@ -581,7 +644,7 @@ func (db *commonMsgDatabase) GetMsgBySeqs(ctx context.Context, userID string, co
 	}
 	successMsgs, failedSeqs, err := db.cache.GetMessagesBySeq(ctx, conversationID, newSeqs)
 	if err != nil {
-		if err != redis.Nil {
+		if !errors.Is(err, redis.Nil) {
 			prome.Add(prome.MsgPullFromRedisFailedCounter, len(failedSeqs))
 			log.ZError(ctx, "get message from redis exception", err, "failedSeqs", failedSeqs, "conversationID", conversationID)
 		}
@@ -607,11 +670,13 @@ func (db *commonMsgDatabase) GetMsgBySeqs(ctx context.Context, userID string, co
 		mongoMsgs, err := db.getMsgBySeqs(ctx, userID, conversationID, failedSeqs)
 		if err != nil {
 			prome.Add(prome.MsgPullFromMongoFailedCounter, len(failedSeqs))
+
 			return 0, 0, nil, err
 		}
 		prome.Add(prome.MsgPullFromMongoSuccessCounter, len(mongoMsgs))
 		successMsgs = append(successMsgs, mongoMsgs...)
 	}
+
 	return minSeq, maxSeq, successMsgs, nil
 }
 
@@ -632,30 +697,13 @@ func (db *commonMsgDatabase) DeleteConversationMsgsAndSetMinSeq(ctx context.Cont
 			log.ZWarn(ctx, "CleanUpOneUserAllMsg", err, "conversationID", conversationID)
 		}
 	}
+
 	return db.cache.SetMinSeq(ctx, conversationID, minSeq)
 }
 
-func (db *commonMsgDatabase) UserMsgsDestruct(ctx context.Context, userID string, conversationID string, destructTime int64, lastMsgDestructTime time.Time) (seqs []int64, err error) {
-	var index int64
-	for {
-		// from oldest 2 newest
-		msgDocModel, err := db.msgDocDatabase.GetMsgDocModelByIndex(ctx, conversationID, index, 1)
-		if err != nil || msgDocModel.DocID == "" {
-			if err != nil {
-				if err == unrelation.ErrMsgListNotExist {
-					log.ZDebug(ctx, "not doc find", "conversationID", conversationID, "userID", userID, "index", index)
-				} else {
-					log.ZError(ctx, "deleteMsgRecursion GetUserMsgListByIndex failed", err, "conversationID", conversationID, "index", index)
-				}
-			}
-			// 获取报错，或者获取不到了，物理删除并且返回seq delMongoMsgsPhysical(delStruct.delDocIDList), 结束递归
-			break
-		}
-		index++
-		//&& msgDocModel.Msg[0].Msg.SendTime > lastMsgDestructTime.UnixMilli()
+func processMsgDocModel(ctx context.Context, msgDocModel *unrelationtb.MsgDocModel, userID, conversationID string, index int64, destructTime int64, lastMsgDestructTime time.Time) (seqs []int64, over bool) {
 	if len(msgDocModel.Msg) > 0 {
 		i := 0
-			var over bool
 		for _, msg := range msgDocModel.Msg {
 			i++
 			if msg != nil && msg.Msg != nil && msg.Msg.SendTime+destructTime*1000 <= time.Now().UnixMilli() {
@@ -665,20 +713,50 @@ func (db *commonMsgDatabase) UserMsgsDestruct(ctx context.Context, userID string
 			} else {
 				log.ZDebug(ctx, "all msg need destruct is found", "conversationID", conversationID, "userID", userID, "index", index, "stop index", i)
 				over = true
-					break
-				}
-			}
-			if over {
-				break
+
+				return seqs, over
 			}
 		}
 	}
 
+	return seqs, over
+}
+
+func (db *commonMsgDatabase) UserMsgsDestruct(ctx context.Context, userID, conversationID string, destructTime int64, lastMsgDestructTime time.Time) (seqs []int64, err error) {
+	var index int64
+
+	// refresh msg list
+	for {
+		// from oldest to newest
+		msgDocModel, err2 := db.msgDocDatabase.GetMsgDocModelByIndex(ctx, conversationID, index, 1)
+		if err2 != nil || msgDocModel.DocID == "" {
+			if err2 != nil {
+				if errors.Is(err2, unrelation.ErrMsgListNotExist) {
+					log.ZDebug(ctx, "not doc find", "conversationID", conversationID, "userID", userID, "index", index)
+				} else {
+					log.ZError(ctx, "deleteMsgRecursion GetUserMsgListByIndex failed", err2, "conversationID", conversationID, "index", index)
+				}
+			}
+			// If there is an error or no message document is found, delete the message physically and return the sequence number, then end the recursion.
+			break
+		}
+		index++
+		//&& msgDocModel.Msg[0].Msg.SendTime > lastMsgDestructTime.UnixMilli()
+		curSeqs, over := processMsgDocModel(ctx, msgDocModel, userID, conversationID, index, destructTime, lastMsgDestructTime)
+		seqs = append(seqs, curSeqs...)
+		if over {
+			break
+		}
+	}
+	// Log the result of the function call.
 	log.ZDebug(ctx, "UserMsgsDestruct", "conversationID", conversationID, "userID", userID, "seqs", seqs)
-	if len(seqs) > 0 {
+	if len(seqs) == 0 {
+		return seqs, nil
+	}
+	// if len(seqs) > 0
 	userMinSeq := seqs[len(seqs)-1] + 1
 	currentUserMinSeq, err := db.cache.GetConversationUserMinSeq(ctx, conversationID, userID)
-		if err != nil && errs.Unwrap(err) != redis.Nil {
+	if err != nil && !errors.Is(err, redis.Nil) {
 		return nil, err
 	}
 	if currentUserMinSeq < userMinSeq {
@@ -686,7 +764,7 @@ func (db *commonMsgDatabase) UserMsgsDestruct(ctx context.Context, userID string
 			return nil, err
 		}
 	}
-	}
+
 	return seqs, nil
 }
 
@@ -709,28 +787,43 @@ func (db *commonMsgDatabase) deleteMsgRecursion(ctx context.Context, conversatio
 	msgDocModel, err := db.msgDocDatabase.GetMsgDocModelByIndex(ctx, conversationID, index, 1)
 	if err != nil || msgDocModel.DocID == "" {
 		if err != nil {
-			if err == unrelation.ErrMsgListNotExist {
+			if errors.Is(err, unrelation.ErrMsgListNotExist) {
 				log.ZDebug(ctx, "deleteMsgRecursion ErrMsgListNotExist", "conversationID", conversationID, "index:", index)
 			} else {
 				log.ZError(ctx, "deleteMsgRecursion GetUserMsgListByIndex failed", err, "conversationID", conversationID, "index", index)
 			}
 		}
-		// 获取报错，或者获取不到了，物理删除并且返回seq delMongoMsgsPhysical(delStruct.delDocIDList), 结束递归
+		// get error or miss content, delete physically and return minSeq,delMongoMsgsPhysical(delStruct.delDocIDList), end recursion
 		err = db.msgDocDatabase.DeleteDocs(ctx, delStruct.delDocIDs)
 		if err != nil {
 			return 0, err
 		}
+
 		return delStruct.getSetMinSeq() + 1, nil
 	}
+
 	log.ZDebug(ctx, "doc info", "conversationID", conversationID, "index", index, "docID", msgDocModel.DocID, "len", len(msgDocModel.Msg))
 	if int64(len(msgDocModel.Msg)) > db.msg.GetSingleGocMsgNum() {
 		log.ZWarn(ctx, "msgs too large", nil, "lenth", len(msgDocModel.Msg), "docID:", msgDocModel.DocID)
 	}
-	if msgDocModel.IsFull() && msgDocModel.Msg[len(msgDocModel.Msg)-1].Msg.SendTime+(remainTime*1000) < utils.GetCurrentTimestampByMill() {
+	fullAndExpired := msgDocModel.IsFull() && msgDocModel.Msg[len(msgDocModel.Msg)-1].Msg.SendTime+(remainTime*1000) < utils.GetCurrentTimestampByMill()
+	if fullAndExpired {
+		handleFullAndExpiredForDeleteMsgRecursion(ctx, msgDocModel, delStruct)
+	} else {
+		handleNotFullAndExpiredForDeleteMsgRecursion(ctx, msgDocModel, remainTime, index, conversationID, delStruct, db)
+	}
+	seq, err := db.deleteMsgRecursion(ctx, conversationID, index+1, delStruct, remainTime)
+
+	return seq, err
+}
+
+func handleFullAndExpiredForDeleteMsgRecursion(ctx context.Context, msgDocModel *unrelationtb.MsgDocModel, delStruct *delMsgRecursionStruct) {
 	log.ZDebug(ctx, "doc is full and all msg is expired", "docID", msgDocModel.DocID)
 	delStruct.delDocIDs = append(delStruct.delDocIDs, msgDocModel.DocID)
 	delStruct.minSeq = msgDocModel.Msg[len(msgDocModel.Msg)-1].Msg.Seq
-	} else {
+}
+
+func handleNotFullAndExpiredForDeleteMsgRecursion(ctx context.Context, msgDocModel *unrelationtb.MsgDocModel, remainTime, index int64, conversationID string, delStruct *delMsgRecursionStruct, db *commonMsgDatabase) {
 	var delMsgIndexs []int
 	for i, MsgInfoModel := range msgDocModel.Msg {
 		if MsgInfoModel != nil && MsgInfoModel.Msg != nil {
@@ -740,14 +833,12 @@ func (db *commonMsgDatabase) deleteMsgRecursion(ctx context.Context, conversatio
 		}
 	}
 	if len(delMsgIndexs) > 0 {
-			if err := db.msgDocDatabase.DeleteMsgsInOneDocByIndex(ctx, msgDocModel.DocID, delMsgIndexs); err != nil {
-				log.ZError(ctx, "deleteMsgRecursion DeleteMsgsInOneDocByIndex failed", err, "conversationID", conversationID, "index", index)
+		err2 := db.msgDocDatabase.DeleteMsgsInOneDocByIndex(ctx, msgDocModel.DocID, delMsgIndexs)
+		if err2 != nil {
+			log.ZError(ctx, "deleteMsgRecursion DeleteMsgsInOneDocByIndex failed", err2, "conversationID", conversationID, "index", index)
 		}
-			delStruct.minSeq = int64(msgDocModel.Msg[delMsgIndexs[len(delMsgIndexs)-1]].Msg.Seq)
+		delStruct.minSeq = msgDocModel.Msg[delMsgIndexs[len(delMsgIndexs)-1]].Msg.Seq
 	}
-	}
-	seq, err := db.deleteMsgRecursion(ctx, conversationID, index+1, delStruct, remainTime)
-	return seq, err
 }
 
 func (db *commonMsgDatabase) DeleteMsgsPhysicalBySeqs(ctx context.Context, conversationID string, allSeqs []int64) error {
@@ -763,13 +854,15 @@ func (db *commonMsgDatabase) DeleteMsgsPhysicalBySeqs(ctx context.Context, conve
 			return err
 		}
 	}
+
 	return nil
 }
 
 func (db *commonMsgDatabase) DeleteUserMsgsBySeqs(ctx context.Context, userID string, conversationID string, seqs []int64) error {
 	cachedMsgs, _, err := db.cache.GetMessagesBySeq(ctx, conversationID, seqs)
-	if err != nil && errs.Unwrap(err) != redis.Nil {
+	if err != nil && errors.Is(err, redis.Nil) {
 		log.ZWarn(ctx, "DeleteUserMsgsBySeqs", err, "conversationID", conversationID, "seqs", seqs)
+
 		return err
 	}
 	if len(cachedMsgs) > 0 {
@@ -789,6 +882,7 @@ func (db *commonMsgDatabase) DeleteUserMsgsBySeqs(ctx context.Context, userID st
 			}
 		}
 	}
+
 	return nil
 }
 
@@ -800,11 +894,12 @@ func (db *commonMsgDatabase) CleanUpUserConversationsMsgs(ctx context.Context, u
 	for _, conversationID := range conversationIDs {
 		maxSeq, err := db.cache.GetMaxSeq(ctx, conversationID)
 		if err != nil {
-			if err == redis.Nil {
+			if errors.Is(err, redis.Nil) {
 				log.ZInfo(ctx, "max seq is nil", "conversationID", conversationID)
 			} else {
 				log.ZError(ctx, "get max seq failed", err, "conversationID", conversationID)
 			}
+
 			continue
 		}
 		if err := db.cache.SetMinSeq(ctx, conversationID, maxSeq+1); err != nil {
@@ -898,6 +993,7 @@ func (db *commonMsgDatabase) GetConversationMinMaxSeqInMongoAndCache(ctx context
 	if err != nil {
 		return
 	}
+
 	return
 }
 
@@ -916,6 +1012,7 @@ func (db *commonMsgDatabase) GetMinMaxSeqMongo(ctx context.Context, conversation
 		return
 	}
 	maxSeqMongo = newestMsgMongo.Msg.Seq
+
 	return
 }
 
@@ -943,7 +1040,7 @@ func (db *commonMsgDatabase) RangeGroupSendCount(
 }
 
 func (db *commonMsgDatabase) SearchMessage(ctx context.Context, req *pbmsg.SearchMessageReq) (total int32, msgData []*sdkws.MsgData, err error) {
-	var totalMsgs []*sdkws.MsgData
+	totalMsgs := make([]*sdkws.MsgData, 0)
 	total, msgs, err := db.msgDocDatabase.SearchMessage(ctx, req)
 	if err != nil {
 		return 0, nil, err
@@ -954,6 +1051,7 @@ func (db *commonMsgDatabase) SearchMessage(ctx context.Context, req *pbmsg.Searc
 		}
 		totalMsgs = append(totalMsgs, convert.MsgDB2Pb(msg.Msg))
 	}
+
 	return total, totalMsgs, nil
 }
 

pkg/common/db/controller/msg_test.go

@@ -162,6 +162,7 @@ func GetDB() *commonMsgDatabase {
 	if err != nil {
 		panic(err)
 	}
+
 	return &commonMsgDatabase{
 		msgDocDatabase: unrelation.NewMsgMongoDriver(mongo.GetDatabase()),
 	}

pkg/common/db/controller/s3.go

@@ -89,5 +89,6 @@ func (s *s3Database) AccessURL(ctx context.Context, name string, expire time.Dur
 	if err != nil {
 		return time.Time{}, "", err
 	}
+
 	return expireTime, rawURL, nil
 }

pkg/common/db/controller/user.go

@@ -90,6 +90,7 @@ func (u *userDatabase) InitOnce(ctx context.Context, users []*relation.UserModel
 	if len(miss) > 0 {
 		_ = u.userDB.Create(ctx, miss)
 	}
+
 	return nil
 }
 
@@ -102,30 +103,35 @@ func (u *userDatabase) FindWithError(ctx context.Context, userIDs []string) (use
 	if len(users) != len(userIDs) {
 		err = errs.ErrRecordNotFound.Wrap("userID not found")
 	}
+
 	return
 }
 
 // Find Get the information of the specified user. If the userID is not found, no error will be returned.
 func (u *userDatabase) Find(ctx context.Context, userIDs []string) (users []*relation.UserModel, err error) {
 	users, err = u.cache.GetUsersInfo(ctx, userIDs)
+
 	return
 }
 
 // Create Insert multiple external guarantees that the userID is not repeated and does not exist in the db.
 func (u *userDatabase) Create(ctx context.Context, users []*relation.UserModel) (err error) {
-	if err := u.tx.Transaction(func(tx any) error {
+	err = u.tx.Transaction(func(tx any) error {
 		err = u.userDB.Create(ctx, users)
 		if err != nil {
 			return err
 		}
+
 		return nil
-	}); err != nil {
+	})
+	if err != nil {
 		return err
 	}
-	var userIDs []string
+	userIDs := make([]string, 0, len(users))
 	for _, user := range users {
 		userIDs = append(userIDs, user.UserID)
 	}
+
 	return u.cache.DelUsersInfo(userIDs...).ExecDel(ctx)
 }
 
@@ -134,6 +140,7 @@ func (u *userDatabase) Update(ctx context.Context, user *relation.UserModel) (er
 	if err := u.userDB.Update(ctx, user); err != nil {
 		return err
 	}
+
 	return u.cache.DelUsersInfo(user.UserID).ExecDel(ctx)
 }
 
@@ -142,6 +149,7 @@ func (u *userDatabase) UpdateByMap(ctx context.Context, userID string, args map[
 	if err := u.userDB.UpdateByMap(ctx, userID, args); err != nil {
 		return err
 	}
+
 	return u.cache.DelUsersInfo(userID).ExecDel(ctx)
 }
 
@@ -162,6 +170,7 @@ func (u *userDatabase) IsExist(ctx context.Context, userIDs []string) (exist boo
 	if len(users) > 0 {
 		return true, nil
 	}
+
 	return false, nil
 }
 
@@ -183,12 +192,14 @@ func (u *userDatabase) CountRangeEverydayTotal(ctx context.Context, start time.T
 // SubscribeUsersStatus Subscribe or unsubscribe a user's presence status.
 func (u *userDatabase) SubscribeUsersStatus(ctx context.Context, userID string, userIDs []string) error {
 	err := u.mongoDB.AddSubscriptionList(ctx, userID, userIDs)
+
 	return err
 }
 
 // UnsubscribeUsersStatus unsubscribe a user's presence status.
 func (u *userDatabase) UnsubscribeUsersStatus(ctx context.Context, userID string, userIDs []string) error {
 	err := u.mongoDB.UnsubscriptionList(ctx, userID, userIDs)
+
 	return err
 }
 
@@ -198,6 +209,7 @@ func (u *userDatabase) GetAllSubscribeList(ctx context.Context, userID string) (
 	if err != nil {
 		return nil, err
 	}
+
 	return list, nil
 }
 
@@ -207,12 +219,14 @@ func (u *userDatabase) GetSubscribedList(ctx context.Context, userID string) ([]
 	if err != nil {
 		return nil, err
 	}
+
 	return list, nil
 }
 
 // GetUserStatus get user status.
 func (u *userDatabase) GetUserStatus(ctx context.Context, userIDs []string) ([]*user.OnlineStatus, error) {
 	onlineStatusList, err := u.cache.GetUserStatus(ctx, userIDs)
+
 	return onlineStatusList, err
 }
 

pkg/common/db/localcache/conversation.go

@@ -50,6 +50,7 @@ func (g *ConversationLocalCache) GetRecvMsgNotNotifyUserIDs(ctx context.Context,
 	if err != nil {
 		return nil, err
 	}
+
 	return resp.UserIDs, nil
 }
 

pkg/common/db/localcache/group.go

@@ -57,6 +57,7 @@ func (g *GroupLocalCache) GetGroupMemberIDs(ctx context.Context, groupID string)
 	localHashInfo, ok := g.cache[groupID]
 	if ok && localHashInfo.memberListHash == resp.GroupAbstractInfos[0].GroupMemberListHash {
 		g.lock.Unlock()
+
 		return localHashInfo.userIDs, nil
 	}
 	g.lock.Unlock()
@@ -74,5 +75,6 @@ func (g *GroupLocalCache) GetGroupMemberIDs(ctx context.Context, groupID string)
 		memberListHash: resp.GroupAbstractInfos[0].GroupMemberListHash,
 		userIDs:        groupMembersResp.UserIDs,
 	}
+
 	return g.cache[groupID].userIDs, nil
 }

pkg/common/db/relation/black_model.go

@@ -63,10 +63,11 @@ func (b *BlackGorm) Find(
 	ctx context.Context,
 	blacks []*relation.BlackModel,
 ) (blackList []*relation.BlackModel, err error) {
-	var where [][]interface{}
+	where := make([][]interface{}, 0, len(blacks))
 	for _, black := range blacks {
 		where = append(where, []interface{}{black.OwnerUserID, black.BlockUserID})
 	}
+
 	return blackList, utils.Wrap(
 		b.db(ctx).Where("(owner_user_id, block_user_id) in ?", where).Find(&blackList).Error,
 		"",
@@ -75,6 +76,7 @@ func (b *BlackGorm) Find(
 
 func (b *BlackGorm) Take(ctx context.Context, ownerUserID, blockUserID string) (black *relation.BlackModel, err error) {
 	black = &relation.BlackModel{}
+
 	return black, utils.Wrap(
 		b.db(ctx).Where("owner_user_id = ? and block_user_id = ?", ownerUserID, blockUserID).Take(black).Error,
 		"",
@@ -96,6 +98,7 @@ func (b *BlackGorm) FindOwnerBlacks(
 		showNumber,
 	)
 	total = int64(totalUint32)
+
 	return
 }
 

pkg/common/db/relation/chat_log_model.go

@@ -15,6 +15,8 @@
 package relation
 
 import (
+
+	//nolint:staticcheck  //tofix: SA1019: "github.com/golang/protobuf/jsonpb" is deprecated: Use the "google.golang.org/protobuf/encoding/protojson" package instead.
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/jinzhu/copier"
 	"google.golang.org/protobuf/proto"
@@ -38,7 +40,10 @@ func NewChatLogGorm(db *gorm.DB) relation.ChatLogModelInterface {
 
 func (c *ChatLogGorm) Create(msg *pbmsg.MsgDataToMQ) error {
 	chatLog := new(relation.ChatLogModel)
-	copier.Copy(chatLog, msg.MsgData)
+	err := copier.Copy(chatLog, msg.MsgData)
+	if err != nil {
+		return err
+	}
 	switch msg.MsgData.SessionType {
 	case constant.GroupChatType, constant.SuperGroupChatType:
 		chatLog.RecvID = msg.MsgData.GroupID
@@ -59,5 +64,6 @@ func (c *ChatLogGorm) Create(msg *pbmsg.MsgDataToMQ) error {
 	}
 	chatLog.CreateTime = utils.UnixMillSecondToTime(msg.MsgData.CreateTime)
 	chatLog.SendTime = utils.UnixMillSecondToTime(msg.MsgData.SendTime)
+
 	return c.DB.Create(chatLog).Error
 }

pkg/common/db/relation/conversation_model.go

@@ -54,6 +54,7 @@ func (c *ConversationGorm) UpdateByMap(
 	args map[string]interface{},
 ) (rows int64, err error) {
 	result := c.db(ctx).Where("owner_user_id IN (?) and  conversation_id=?", userIDList, conversationID).Updates(args)
+
 	return result.RowsAffected, utils.Wrap(result.Error, "")
 }
 
@@ -79,6 +80,7 @@ func (c *ConversationGorm) Find(
 			Error,
 		"",
 	)
+
 	return conversations, err
 }
 
@@ -87,6 +89,7 @@ func (c *ConversationGorm) Take(
 	userID, conversationID string,
 ) (conversation *relation.ConversationModel, err error) {
 	cc := &relation.ConversationModel{}
+
 	return cc, utils.Wrap(
 		c.db(ctx).Where("conversation_id = ? And owner_user_id = ?", conversationID, userID).Take(cc).Error,
 		"",
@@ -169,6 +172,7 @@ func (c *ConversationGorm) GetUserRecvMsgOpt(
 	ownerUserID, conversationID string,
 ) (opt int, err error) {
 	var conversation relation.ConversationModel
+
 	return int(
 			conversation.RecvMsgOpt,
 		), utils.Wrap(
@@ -219,6 +223,7 @@ func (c *ConversationGorm) GetConversationIDsNeedDestruct(
 
 func (c *ConversationGorm) GetConversationRecvMsgOpt(ctx context.Context, userID string, conversationID string) (int32, error) {
 	var recvMsgOpt int32
+
 	return recvMsgOpt, errs.Wrap(
 		c.db(ctx).
 			Model(&relation.ConversationModel{}).
@@ -230,6 +235,7 @@ func (c *ConversationGorm) GetConversationRecvMsgOpt(ctx context.Context, userID
 
 func (c *ConversationGorm) GetConversationNotReceiveMessageUserIDs(ctx context.Context, conversationID string) ([]string, error) {
 	var userIDs []string
+
 	return userIDs, errs.Wrap(
 		c.db(ctx).
 			Model(&relation.ConversationModel{}).

pkg/common/db/relation/friend_model.go

@@ -50,6 +50,7 @@ func (f *FriendGorm) Delete(ctx context.Context, ownerUserID string, friendUserI
 			Error,
 		"",
 	)
+
 	return err
 }
 
@@ -84,6 +85,7 @@ func (f *FriendGorm) UpdateRemark(ctx context.Context, ownerUserID, friendUserID
 	}
 	m := make(map[string]interface{}, 1)
 	m["remark"] = ""
+
 	return utils.Wrap(f.db(ctx).Where("owner_user_id = ?", ownerUserID).Updates(m).Error, "")
 }
 
@@ -93,6 +95,7 @@ func (f *FriendGorm) Take(
 	ownerUserID, friendUserID string,
 ) (friend *relation.FriendModel, err error) {
 	friend = &relation.FriendModel{}
+
 	return friend, utils.Wrap(
 		f.db(ctx).Where("owner_user_id = ? and friend_user_id", ownerUserID, friendUserID).Take(friend).Error,
 		"",
@@ -156,6 +159,7 @@ func (f *FriendGorm) FindOwnerFriends(
 			Error,
 		"",
 	)
+
 	return
 }
 
@@ -178,6 +182,7 @@ func (f *FriendGorm) FindInWhoseFriends(
 			Error,
 		"",
 	)
+
 	return
 }
 

pkg/common/db/relation/friend_request_model.go

@@ -74,6 +74,7 @@ func (f *FriendRequestGorm) Update(ctx context.Context, friendRequest *relation.
 	fr2 := *friendRequest
 	fr2.FromUserID = ""
 	fr2.ToUserID = ""
+
 	return utils.Wrap(
 		f.db(ctx).
 			Where("from_user_id = ? AND to_user_id =?", friendRequest.FromUserID, friendRequest.ToUserID).
@@ -93,6 +94,7 @@ func (f *FriendRequestGorm) Find(
 		f.db(ctx).Where("from_user_id = ? and to_user_id = ?", fromUserID, toUserID).Find(friendRequest).Error,
 		"",
 	)
+
 	return friendRequest, err
 }
 
@@ -105,6 +107,7 @@ func (f *FriendRequestGorm) Take(
 		f.db(ctx).Where("from_user_id = ? and to_user_id = ?", fromUserID, toUserID).Take(friendRequest).Error,
 		"",
 	)
+
 	return friendRequest, err
 }
 
@@ -127,6 +130,7 @@ func (f *FriendRequestGorm) FindToUserID(
 			Error,
 		"",
 	)
+
 	return
 }
 
@@ -149,6 +153,7 @@ func (f *FriendRequestGorm) FindFromUserID(
 			Error,
 		"",
 	)
+
 	return
 }
 
@@ -160,5 +165,6 @@ func (f *FriendRequestGorm) FindBothFriendRequests(ctx context.Context, fromUser
 			Error,
 		"",
 	)
+
 	return
 }

pkg/common/db/relation/group_member_model.go

@@ -68,6 +68,7 @@ func (g *GroupMemberGorm) UpdateRoleLevel(
 	db := g.db(ctx).Where("group_id = ? and user_id = ?", groupID, userID).Updates(map[string]any{
 		"role_level": roleLevel,
 	})
+
 	return db.RowsAffected, utils.Wrap(db.Error, "")
 }
 
@@ -87,6 +88,7 @@ func (g *GroupMemberGorm) Find(
 	if len(roleLevels) > 0 {
 		db = db.Where("role_level in (?)", roleLevels)
 	}
+
 	return groupMembers, utils.Wrap(db.Find(&groupMembers).Error, "")
 }
 
@@ -96,6 +98,7 @@ func (g *GroupMemberGorm) Take(
 	userID string,
 ) (groupMember *relation.GroupMemberModel, err error) {
 	groupMember = &relation.GroupMemberModel{}
+
 	return groupMember, utils.Wrap(
 		g.db(ctx).Where("group_id = ? and user_id = ?", groupID, userID).Take(groupMember).Error,
 		"",
@@ -107,6 +110,7 @@ func (g *GroupMemberGorm) TakeOwner(
 	groupID string,
 ) (groupMember *relation.GroupMemberModel, err error) {
 	groupMember = &relation.GroupMemberModel{}
+
 	return groupMember, utils.Wrap(
 		g.db(ctx).Where("group_id = ? and role_level = ?", groupID, constant.GroupOwner).Take(groupMember).Error,
 		"",
@@ -125,6 +129,7 @@ func (g *GroupMemberGorm) SearchMember(
 	ormutil.GormIn(&db, "group_id", groupIDs)
 	ormutil.GormIn(&db, "user_id", userIDs)
 	ormutil.GormIn(&db, "role_level", roleLevels)
+
 	return ormutil.GormSearch[relation.GroupMemberModel](db, []string{"nickname"}, keyword, pageNumber, showNumber)
 }
 
@@ -152,6 +157,7 @@ func (g *GroupMemberGorm) FindJoinUserID(
 			groupUsers[item.GroupID] = append(v, item.UserID)
 		}
 	}
+
 	return groupUsers, nil
 }
 
@@ -182,6 +188,7 @@ func (g *GroupMemberGorm) FindUsersJoinedGroupID(ctx context.Context, userIDs []
 			result[groupMember.UserID] = append(v, groupMember.GroupID)
 		}
 	}
+
 	return result, nil
 }
 

pkg/common/db/relation/group_model.go

@@ -61,12 +61,14 @@ func (g *GroupGorm) Find(ctx context.Context, groupIDs []string) (groups []*rela
 
 func (g *GroupGorm) Take(ctx context.Context, groupID string) (group *relation.GroupModel, err error) {
 	group = &relation.GroupModel{}
+
 	return group, utils.Wrap(g.DB.Where("group_id = ?", groupID).Take(group).Error, "")
 }
 
 func (g *GroupGorm) Search(ctx context.Context, keyword string, pageNumber, showNumber int32) (total uint32, groups []*relation.GroupModel, err error) {
 	db := g.DB
 	db = db.WithContext(ctx).Where("status!=?", constant.GroupStatusDismissed)
+
 	return ormutil.GormSearch[relation.GroupModel](db, []string{"name"}, keyword, pageNumber, showNumber)
 }
 
@@ -82,6 +84,7 @@ func (g *GroupGorm) CountTotal(ctx context.Context, before *time.Time) (count in
 	if err := db.Count(&count).Error; err != nil {
 		return 0, err
 	}
+
 	return count, nil
 }
 
@@ -98,6 +101,7 @@ func (g *GroupGorm) CountRangeEverydayTotal(ctx context.Context, start time.Time
 	for _, r := range res {
 		v[r.Date.Format("2006-01-02")] = r.Count
 	}
+
 	return v, nil
 }
 

pkg/common/db/relation/group_request_model.go

@@ -80,6 +80,7 @@ func (g *GroupRequestGorm) Take(
 	userID string,
 ) (groupRequest *relation.GroupRequestModel, err error) {
 	groupRequest = &relation.GroupRequestModel{}
+
 	return groupRequest, utils.Wrap(
 		g.DB.WithContext(ctx).Where("group_id = ? and user_id = ? ", groupID, userID).Take(groupRequest).Error,
 		utils.GetSelfFuncName(),
@@ -114,5 +115,6 @@ func (g *GroupRequestGorm) PageGroup(
 
 func (g *GroupRequestGorm) FindGroupRequests(ctx context.Context, groupID string, userIDs []string) (total int64, groupRequests []*relation.GroupRequestModel, err error) {
 	err = g.DB.WithContext(ctx).Where("group_id = ? and user_id in ?", groupID, userIDs).Find(&groupRequests).Error
+
 	return int64(len(groupRequests)), groupRequests, utils.Wrap(err, utils.GetSelfFuncName())
 }

pkg/common/db/relation/log_model.go

@@ -25,6 +25,7 @@ func (l *LogGorm) Search(ctx context.Context, keyword string, start time.Time, e
 		db = l.db.WithContext(ctx).Where("create_time <= ?", end)
 	}
 	db = db.Order("create_time desc")
+
 	return ormutil.GormSearch[relationtb.Log](db, []string{"user_id"}, keyword, pageNumber, showNumber)
 }
 
@@ -32,6 +33,7 @@ func (l *LogGorm) Delete(ctx context.Context, logIDs []string, userID string) er
 	if userID == "" {
 		return errs.Wrap(l.db.WithContext(ctx).Where("log_id in ?", logIDs).Delete(&relationtb.Log{}).Error)
 	}
+
 	return errs.Wrap(l.db.WithContext(ctx).Where("log_id in ? and user_id=?", logIDs, userID).Delete(&relationtb.Log{}).Error)
 }
 
@@ -40,10 +42,15 @@ func (l *LogGorm) Get(ctx context.Context, logIDs []string, userID string) ([]*r
 	if userID == "" {
 		return logs, errs.Wrap(l.db.WithContext(ctx).Where("log_id in ?", logIDs).Find(&logs).Error)
 	}
+
 	return logs, errs.Wrap(l.db.WithContext(ctx).Where("log_id in ? and user_id=?", logIDs, userID).Find(&logs).Error)
 }
 
 func NewLogGorm(db *gorm.DB) relationtb.LogInterface {
-	db.AutoMigrate(&relationtb.Log{})
+	err := db.AutoMigrate(&relationtb.Log{})
+	if err != nil {
+		panic(err)
+	}
+
 	return &LogGorm{db: db}
 }

pkg/common/db/relation/meta_db.go

@@ -34,5 +34,6 @@ func NewMetaDB(db *gorm.DB, table any) *MetaDB {
 
 func (g *MetaDB) db(ctx context.Context) *gorm.DB {
 	db := g.DB.WithContext(ctx).Model(g.table)
+
 	return db
 }

pkg/common/db/relation/mysql_init.go

@@ -15,6 +15,7 @@
 package relation
 
 import (
+	"errors"
 	"fmt"
 	"time"
 
@@ -82,6 +83,7 @@ func newMysqlGormDB() (*gorm.DB, error) {
 	sqlDB.SetConnMaxLifetime(time.Second * time.Duration(config.Config.Mysql.MaxLifeTime))
 	sqlDB.SetMaxOpenConns(config.Config.Mysql.MaxOpenConn)
 	sqlDB.SetMaxIdleConns(config.Config.Mysql.MaxIdleConn)
+
 	return db, nil
 }
 
@@ -94,11 +96,13 @@ func connectToDatabase(dsn string, maxRetry int) (*gorm.DB, error) {
 		if err == nil {
 			return db, nil
 		}
-		if mysqlErr, ok := err.(*mysqldriver.MySQLError); ok && mysqlErr.Number == 1045 {
+		var mysqlErr *mysqldriver.MySQLError
+		if errors.As(err, &mysqlErr) && mysqlErr.Number == 1045 {
 			return nil, err
 		}
 		time.Sleep(time.Duration(1) * time.Second)
 	}
+
 	return nil, err
 }
 
@@ -106,6 +110,7 @@ func connectToDatabase(dsn string, maxRetry int) (*gorm.DB, error) {
 func NewGormDB() (*gorm.DB, error) {
 	specialerror.AddReplace(gorm.ErrRecordNotFound, errs.ErrRecordNotFound)
 	specialerror.AddErrHandler(replaceDuplicateKey)
+
 	return newMysqlGormDB()
 }
 
@@ -113,12 +118,15 @@ func replaceDuplicateKey(err error) errs.CodeError {
 	if IsMysqlDuplicateKey(err) {
 		return errs.ErrDuplicateKey
 	}
+
 	return nil
 }
 
 func IsMysqlDuplicateKey(err error) bool {
-	if mysqlErr, ok := err.(*mysqldriver.MySQLError); ok {
+	var mysqlErr *mysqldriver.MySQLError
+	if errors.As(err, &mysqlErr) {
 		return mysqlErr.Number == 1062
 	}
+
 	return false
 }

pkg/common/db/relation/object_model.go

@@ -44,10 +44,12 @@ func (o *ObjectInfoGorm) SetObject(ctx context.Context, obj *relation.ObjectMode
 	if err := o.DB.WithContext(ctx).Where("name = ?", obj.Name).FirstOrCreate(obj).Error; err != nil {
 		return errs.Wrap(err)
 	}
+
 	return nil
 }
 
 func (o *ObjectInfoGorm) Take(ctx context.Context, name string) (info *relation.ObjectModel, err error) {
 	info = &relation.ObjectModel{}
+
 	return info, errs.Wrap(o.DB.WithContext(ctx).Where("name = ?", name).Take(info).Error)
 }

pkg/common/db/relation/user_model.go

@@ -53,6 +53,7 @@ func (u *UserGorm) Update(ctx context.Context, user *relation.UserModel) (err er
 // 获取指定用户信息  不存在，也不返回错误.
 func (u *UserGorm) Find(ctx context.Context, userIDs []string) (users []*relation.UserModel, err error) {
 	err = utils.Wrap(u.db(ctx).Where("user_id in (?)", userIDs).Find(&users).Error, "")
+
 	return users, err
 }
 
@@ -60,6 +61,7 @@ func (u *UserGorm) Find(ctx context.Context, userIDs []string) (users []*relatio
 func (u *UserGorm) Take(ctx context.Context, userID string) (user *relation.UserModel, err error) {
 	user = &relation.UserModel{}
 	err = utils.Wrap(u.db(ctx).Where("user_id = ?", userID).Take(&user).Error, "")
+
 	return user, err
 }
 
@@ -81,6 +83,7 @@ func (u *UserGorm) Page(
 			Error,
 		"",
 	)
+
 	return
 }
 
@@ -88,13 +91,14 @@ func (u *UserGorm) Page(
 func (u *UserGorm) GetAllUserID(ctx context.Context, pageNumber, showNumber int32) (userIDs []string, err error) {
 	if pageNumber == 0 || showNumber == 0 {
 		return userIDs, errs.Wrap(u.db(ctx).Pluck("user_id", &userIDs).Error)
-	} else {
-		return userIDs, errs.Wrap(u.db(ctx).Limit(int(showNumber)).Offset(int((pageNumber-1)*showNumber)).Pluck("user_id", &userIDs).Error)
 	}
+
+	return userIDs, errs.Wrap(u.db(ctx).Limit(int(showNumber)).Offset(int((pageNumber-1)*showNumber)).Pluck("user_id", &userIDs).Error)
 }
 
 func (u *UserGorm) GetUserGlobalRecvMsgOpt(ctx context.Context, userID string) (opt int, err error) {
 	err = u.db(ctx).Model(&relation.UserModel{}).Where("user_id = ?", userID).Pluck("global_recv_msg_opt", &opt).Error
+
 	return opt, err
 }
 
@@ -106,6 +110,7 @@ func (u *UserGorm) CountTotal(ctx context.Context, before *time.Time) (count int
 	if err := db.Count(&count).Error; err != nil {
 		return 0, err
 	}
+
 	return count, nil
 }
 
@@ -132,5 +137,6 @@ func (u *UserGorm) CountRangeEverydayTotal(
 	for _, r := range res {
 		v[r.Date.Format("2006-01-02")] = r.Count
 	}
+
 	return v, nil
 }

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

@@ -46,6 +46,7 @@ func (c *Controller) HashPath(md5 string) string {
 
 func (c *Controller) NowPath() string {
 	now := time.Now()
+
 	return path.Join(
 		fmt.Sprintf("%04d", now.Year()),
 		fmt.Sprintf("%02d", now.Month()),
@@ -58,6 +59,7 @@ func (c *Controller) NowPath() string {
 
 func (c *Controller) UUID() string {
 	id := uuid.New()
+
 	return hex.EncodeToString(id[:])
 }
 
@@ -92,20 +94,24 @@ func (c *Controller) InitiateUpload(ctx context.Context, hash string, size int64
 		partNumber++
 	}
 	if maxParts > 0 && partNumber > 0 && partNumber < maxParts {
-		return nil, errors.New(fmt.Sprintf("too many parts: %d", partNumber))
+		return nil, fmt.Errorf("too few parts: %d", partNumber)
 	}
-	if info, err := c.impl.StatObject(ctx, c.HashPath(hash)); err == nil {
+	info, err := c.impl.StatObject(ctx, c.HashPath(hash))
+	if err == nil {
 		return nil, &HashAlreadyExistsError{Object: info}
-	} else if !c.impl.IsNotFound(err) {
+	}
+	if !c.impl.IsNotFound(err) {
 		return nil, err
 	}
+
 	if size <= partSize {
 		// 预签名上传
 		key := path.Join(tempPath, c.NowPath(), fmt.Sprintf("%s_%d_%s.presigned", hash, size, c.UUID()))
-		rawURL, err := c.impl.PresignedPutObject(ctx, key, expire)
-		if err != nil {
-			return nil, err
+		rawURL, err2 := c.impl.PresignedPutObject(ctx, key, expire)
+		if err2 != nil {
+			return nil, err2
 		}
+
 		return &InitiateUploadResult{
 			UploadID: newMultipartUploadID(multipartUploadID{
 				Type: UploadTypePresigned,
@@ -124,7 +130,8 @@ func (c *Controller) InitiateUpload(ctx context.Context, hash string, size int64
 				},
 			},
 		}, nil
-	} else {
+	}
+
 	// 分片上传
 	upload, err := c.impl.InitiateMultipartUpload(ctx, c.HashPath(hash))
 	if err != nil {
@@ -144,6 +151,7 @@ func (c *Controller) InitiateUpload(ctx context.Context, hash string, size int64
 			return nil, err
 		}
 	}
+
 	return &InitiateUploadResult{
 		UploadID: newMultipartUploadID(multipartUploadID{
 			Type: UploadTypeMultipart,
@@ -155,7 +163,6 @@ func (c *Controller) InitiateUpload(ctx context.Context, hash string, size int64
 		PartSize: partSize,
 		Sign:     authSign,
 	}, nil
-	}
 }
 
 func (c *Controller) CompleteUpload(ctx context.Context, uploadID string, partHashs []string) (*UploadResult, error) {
@@ -164,8 +171,10 @@ func (c *Controller) CompleteUpload(ctx context.Context, uploadID string, partHa
 	if err != nil {
 		return nil, err
 	}
+	//nolint:gosec 	//tofix G401: Use of weak cryptographic primitive
 	if md5Sum := md5.Sum([]byte(strings.Join(partHashs, partSeparator))); hex.EncodeToString(md5Sum[:]) != upload.Hash {
 		fmt.Println("CompleteUpload sum:", hex.EncodeToString(md5Sum[:]), "upload hash:", upload.Hash)
+
 		return nil, errors.New("md5 mismatching")
 	}
 	if info, err := c.impl.StatObject(ctx, c.HashPath(upload.Hash)); err == nil {
@@ -193,7 +202,7 @@ func (c *Controller) CompleteUpload(ctx context.Context, uploadID string, partHa
 				ETag:       part,
 			}
 		}
-		// todo: 验证大小
+		// todo: verify size
 		result, err := c.impl.CompleteMultipartUpload(ctx, upload.ID, upload.Key, parts)
 		if err != nil {
 			return nil, err
@@ -208,11 +217,12 @@ func (c *Controller) CompleteUpload(ctx context.Context, uploadID string, partHa
 		if uploadInfo.Size != upload.Size {
 			return nil, errors.New("upload size mismatching")
 		}
+		//nolint:gosec 	//G401: Use of weak cryptographic primitive
 		md5Sum := md5.Sum([]byte(strings.Join([]string{uploadInfo.ETag}, partSeparator)))
 		if md5val := hex.EncodeToString(md5Sum[:]); md5val != upload.Hash {
 			return nil, errs.ErrArgs.Wrap(fmt.Sprintf("md5 mismatching %s != %s", md5val, upload.Hash))
 		}
-		// 防止在这个时候，并发操作，导致文件被覆盖
+		// Prevent concurrent operations at this time to avoid file overwrite
 		copyInfo, err := c.impl.CopyObject(ctx, uploadInfo.Key, upload.Key+"."+c.UUID())
 		if err != nil {
 			return nil, err
@@ -230,6 +240,7 @@ func (c *Controller) CompleteUpload(ctx context.Context, uploadID string, partHa
 	default:
 		return nil, errors.New("invalid upload id type")
 	}
+
 	return &UploadResult{
 		Key:  targetKey,
 		Size: upload.Size,
@@ -261,5 +272,6 @@ func (c *Controller) AccessURL(ctx context.Context, name string, expire time.Dur
 		opt.Filename = ""
 		opt.ContentType = ""
 	}
+
 	return c.impl.AccessURL(ctx, name, expire, opt)
 }

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

@@ -33,6 +33,7 @@ func newMultipartUploadID(id multipartUploadID) string {
 	if err != nil {
 		panic(err)
 	}
+
 	return base64.StdEncoding.EncodeToString(data)
 }
 
@@ -45,5 +46,6 @@ func parseMultipartUploadID(id string) (*multipartUploadID, error) {
 	if err := json.Unmarshal(data, &upload); err != nil {
 		return nil, fmt.Errorf("invalid multipart upload id: %w", err)
 	}
+
 	return &upload, nil
 }

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

@@ -44,11 +44,6 @@ const (
 	imageWebp = "webp"
 )
 
-const (
-	videoSnapshotImagePng = "png"
-	videoSnapshotImageJpg = "jpg"
-)
-
 func NewCos() (s3.Interface, error) {
 	conf := config.Config.Object.Cos
 	u, err := url.Parse(conf.BucketURL)
@@ -62,6 +57,7 @@ func NewCos() (s3.Interface, error) {
 			SessionToken: conf.SessionToken,
 		},
 	})
+
 	return &Cos{
 		copyURL:    u.Host + "/",
 		client:     client,
@@ -92,6 +88,7 @@ func (c *Cos) InitiateMultipartUpload(ctx context.Context, name string) (*s3.Ini
 	if err != nil {
 		return nil, err
 	}
+
 	return &s3.InitiateMultipartUploadResult{
 		UploadID: result.UploadID,
 		Bucket:   result.Bucket,
@@ -113,6 +110,7 @@ func (c *Cos) CompleteMultipartUpload(ctx context.Context, uploadID string, name
 	if err != nil {
 		return nil, err
 	}
+
 	return &s3.CompleteMultipartUploadResult{
 		Location: result.Location,
 		Bucket:   result.Bucket,
@@ -135,6 +133,7 @@ func (c *Cos) PartSize(ctx context.Context, size int64) (int64, error) {
 	if size%maxNumSize != 0 {
 		partSize++
 	}
+
 	return partSize, nil
 }
 
@@ -157,6 +156,7 @@ func (c *Cos) AuthSign(ctx context.Context, uploadID string, name string, expire
 			Query:      url.Values{"partNumber": {strconv.Itoa(partNumber)}},
 		}
 	}
+
 	return &result, nil
 }
 
@@ -165,11 +165,13 @@ func (c *Cos) PresignedPutObject(ctx context.Context, name string, expire time.D
 	if err != nil {
 		return "", err
 	}
+
 	return rawURL.String(), nil
 }
 
 func (c *Cos) DeleteObject(ctx context.Context, name string) error {
 	_, err := c.client.Object.Delete(ctx, name)
+
 	return err
 }
 
@@ -185,9 +187,10 @@ func (c *Cos) StatObject(ctx context.Context, name string) (*s3.ObjectInfo, erro
 	if res.ETag = strings.ToLower(strings.ReplaceAll(info.Header.Get("ETag"), `"`, "")); res.ETag == "" {
 		return nil, errors.New("StatObject etag not found")
 	}
-	if contentLengthStr := info.Header.Get("Content-Length"); contentLengthStr == "" {
+	contentLengthStr := info.Header.Get("Content-Length")
+	if contentLengthStr == "" {
 		return nil, errors.New("StatObject content-length not found")
-	} else {
+	}
 	res.Size, err = strconv.ParseInt(contentLengthStr, 10, 64)
 	if err != nil {
 		return nil, fmt.Errorf("StatObject content-length parse error: %w", err)
@@ -195,15 +198,15 @@ func (c *Cos) StatObject(ctx context.Context, name string) (*s3.ObjectInfo, erro
 	if res.Size < 0 {
 		return nil, errors.New("StatObject content-length must be greater than 0")
 	}
-	}
-	if lastModified := info.Header.Get("Last-Modified"); lastModified == "" {
+	lastModified := info.Header.Get("Last-Modified")
+	if lastModified == "" {
 		return nil, errors.New("StatObject last-modified not found")
-	} else {
+	}
 	res.LastModified, err = time.Parse(http.TimeFormat, lastModified)
 	if err != nil {
 		return nil, fmt.Errorf("StatObject last-modified parse error: %w", err)
 	}
-	}
+
 	return res, nil
 }
 
@@ -213,6 +216,7 @@ func (c *Cos) CopyObject(ctx context.Context, src string, dst string) (*s3.CopyO
 	if err != nil {
 		return nil, err
 	}
+
 	return &s3.CopyObjectInfo{
 		Key:  dst,
 		ETag: strings.ReplaceAll(result.ETag, `"`, ``),
@@ -220,16 +224,17 @@ func (c *Cos) CopyObject(ctx context.Context, src string, dst string) (*s3.CopyO
 }
 
 func (c *Cos) IsNotFound(err error) bool {
-	switch e := err.(type) {
-	case *cos.ErrorResponse:
-		return e.Response.StatusCode == http.StatusNotFound || e.Code == "NoSuchKey"
-	default:
-		return false
+	var cosErr *cos.ErrorResponse
+	if errors.As(err, &cosErr) {
+		return cosErr.Response.StatusCode == http.StatusNotFound || cosErr.Code == "NoSuchKey"
 	}
+
+	return false
 }
 
 func (c *Cos) AbortMultipartUpload(ctx context.Context, uploadID string, name string) error {
 	_, err := c.client.Object.AbortMultipartUpload(ctx, name, uploadID)
+
 	return err
 }
 
@@ -257,15 +262,17 @@ func (c *Cos) ListUploadedParts(ctx context.Context, uploadID string, name strin
 			Size:         part.Size,
 		}
 	}
+
 	return res, nil
 }
 
 func (c *Cos) AccessURL(ctx context.Context, name string, expire time.Duration, opt *s3.AccessURLOption) (string, error) {
 	var imageMogr string
 	var option cos.PresignedURLOptions
-	if opt != nil {
-		query := make(url.Values)
-		if opt.Image != nil {
+	getImageMogr := func(opt *s3.AccessURLOption) (imageMogr string) {
+		if opt.Image == nil {
+			return imageMogr
+		}
 		// https://cloud.tencent.com/document/product/436/44880
 		style := make([]string, 0, 2)
 		wh := make([]string, 2)
@@ -290,13 +297,24 @@ func (c *Cos) AccessURL(ctx context.Context, name string, expire time.Duration,
 		if len(style) > 0 {
 			imageMogr = "imageMogr2/thumbnail/" + strings.Join(style, "/") + "/ignore-error/1"
 		}
+
+		return imageMogr
 	}
+	getQuery := func(opt *s3.AccessURLOption) (query url.Values) {
+		query = make(url.Values)
 		if opt.ContentType != "" {
 			query.Set("response-content-type", opt.ContentType)
 		}
 		if opt.Filename != "" {
 			query.Set("response-content-disposition", `attachment; filename=`+strconv.Quote(opt.Filename))
 		}
+
+		return query
+	}
+
+	if opt != nil {
+		imageMogr = getImageMogr(opt)
+		query := getQuery(opt)
 		if len(query) > 0 {
 			option.Query = &query
 		}
@@ -317,6 +335,7 @@ func (c *Cos) AccessURL(ctx context.Context, name string, expire time.Duration,
 			rawURL.RawQuery = rawURL.RawQuery + "&" + imageMogr
 		}
 	}
+
 	return rawURL.String(), nil
 }
 
@@ -324,5 +343,6 @@ func (c *Cos) getPresignedURL(ctx context.Context, name string, expire time.Dura
 	if !config.Config.Object.Cos.PublicRead {
 		return c.client.Object.GetPresignedURL(ctx, http.MethodGet, name, c.credential.SecretID, c.credential.SecretKey, expire, opt)
 	}
+
 	return c.client.Object.GetObjectURL(name), nil
 }

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

@@ -39,6 +39,7 @@ func ImageStat(reader io.Reader) (image.Image, string, error) {
 
 func ImageWidthHeight(img image.Image) (int, int) {
 	bounds := img.Bounds().Max
+
 	return bounds.X, bounds.Y
 }
 
@@ -47,27 +48,27 @@ func resizeImage(img image.Image, maxWidth, maxHeight int) image.Image {
 	imgWidth := bounds.Max.X
 	imgHeight := bounds.Max.Y
 
-	// 计算缩放比例
+	// Calculate scaling ratio
 	scaleWidth := float64(maxWidth) / float64(imgWidth)
 	scaleHeight := float64(maxHeight) / float64(imgHeight)
 
-	// 如果都为0，则不缩放，返回原始图片
+	// If both maxWidth and maxHeight are 0, return the original image
 	if maxWidth == 0 && maxHeight == 0 {
 		return img
 	}
 
-	// 如果宽度和高度都大于0，则选择较小的缩放比例，以保持宽高比
+	// If both maxWidth and maxHeight are greater than 0, choose the smaller scaling ratio to maintain aspect ratio
 	if maxWidth > 0 && maxHeight > 0 {
 		scale := scaleWidth
 		if scaleHeight < scaleWidth {
 			scale = scaleHeight
 		}
 
-		// 计算缩略图尺寸
+		// Calculate thumbnail size
 		thumbnailWidth := int(float64(imgWidth) * scale)
 		thumbnailHeight := int(float64(imgHeight) * scale)
 
-		// 使用"image"库的Resample方法生成缩略图
+		// Generate thumbnail using the Resample method of the "image" library
 		thumbnail := image.NewRGBA(image.Rect(0, 0, thumbnailWidth, thumbnailHeight))
 		for y := 0; y < thumbnailHeight; y++ {
 			for x := 0; x < thumbnailWidth; x++ {
@@ -80,12 +81,12 @@ func resizeImage(img image.Image, maxWidth, maxHeight int) image.Image {
 		return thumbnail
 	}
 
-	// 如果只指定了宽度或高度，则根据最大不超过的规则生成缩略图
+	// If only maxWidth or maxHeight is specified, generate thumbnail according to the "max not exceed" rule
 	if maxWidth > 0 {
 		thumbnailWidth := maxWidth
 		thumbnailHeight := int(float64(imgHeight) * scaleWidth)
 
-		// 使用"image"库的Resample方法生成缩略图
+		// Generate thumbnail using the Resample method of the "image" library
 		thumbnail := image.NewRGBA(image.Rect(0, 0, thumbnailWidth, thumbnailHeight))
 		for y := 0; y < thumbnailHeight; y++ {
 			for x := 0; x < thumbnailWidth; x++ {
@@ -102,7 +103,7 @@ func resizeImage(img image.Image, maxWidth, maxHeight int) image.Image {
 		thumbnailWidth := int(float64(imgWidth) * scaleHeight)
 		thumbnailHeight := maxHeight
 
-		// 使用"image"库的Resample方法生成缩略图
+		// Generate thumbnail using the Resample method of the "image" library
 		thumbnail := image.NewRGBA(image.Rect(0, 0, thumbnailWidth, thumbnailHeight))
 		for y := 0; y < thumbnailHeight; y++ {
 			for x := 0; x < thumbnailWidth; x++ {
@@ -115,6 +116,6 @@ func resizeImage(img image.Image, maxWidth, maxHeight int) image.Image {
 		return thumbnail
 	}
 
-	// 默认情况下，返回原始图片
+	// By default, return the original image
 	return img
 }

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

@@ -111,6 +111,7 @@ func NewMinio() (s3.Interface, error) {
 	if err := m.initMinio(ctx); err != nil {
 		fmt.Println("init minio error:", err)
 	}
+
 	return m, nil
 }
 
@@ -141,8 +142,9 @@ func (m *Minio) initMinio(ctx context.Context) error {
 		return fmt.Errorf("check bucket exists error: %w", err)
 	}
 	if !exists {
-		if err := m.core.Client.MakeBucket(ctx, conf.Bucket, minio.MakeBucketOptions{}); err != nil {
-			return fmt.Errorf("make bucket error: %w", err)
+		err2 := m.core.Client.MakeBucket(ctx, conf.Bucket, minio.MakeBucketOptions{})
+		if err2 != nil {
+			return fmt.Errorf("make bucket error: %w", err2)
 		}
 	}
 	if conf.PublicRead {
@@ -150,8 +152,9 @@ func (m *Minio) initMinio(ctx context.Context) error {
 			`{"Version": "2012-10-17","Statement": [{"Action": ["s3:GetObject","s3:PutObject"],"Effect": "Allow","Principal": {"AWS": ["*"]},"Resource": ["arn:aws:s3:::%s/*"],"Sid": ""}]}`,
 			conf.Bucket,
 		)
-		if err := m.core.Client.SetBucketPolicy(ctx, conf.Bucket, policy); err != nil {
-			return err
+		err2 := m.core.Client.SetBucketPolicy(ctx, conf.Bucket, policy)
+		if err2 != nil {
+			return err2
 		}
 	}
 	m.location, err = m.core.Client.GetBucketLocation(ctx, conf.Bucket)
@@ -182,6 +185,7 @@ func (m *Minio) initMinio(ctx context.Context) error {
 		vblc.Elem().Elem().Interface().(interface{ Set(string, string) }).Set(conf.Bucket, m.location)
 	}()
 	m.init = true
+
 	return nil
 }
 
@@ -205,6 +209,7 @@ func (m *Minio) InitiateMultipartUpload(ctx context.Context, name string) (*s3.I
 	if err != nil {
 		return nil, err
 	}
+
 	return &s3.InitiateMultipartUploadResult{
 		Bucket:   m.bucket,
 		Key:      name,
@@ -227,6 +232,7 @@ func (m *Minio) CompleteMultipartUpload(ctx context.Context, uploadID string, na
 	if err != nil {
 		return nil, err
 	}
+
 	return &s3.CompleteMultipartUploadResult{
 		Location: upload.Location,
 		Bucket:   upload.Bucket,
@@ -249,6 +255,7 @@ func (m *Minio) PartSize(ctx context.Context, size int64) (int64, error) {
 	if size%maxNumSize != 0 {
 		partSize++
 	}
+
 	return partSize, nil
 }
 
@@ -282,6 +289,7 @@ func (m *Minio) AuthSign(ctx context.Context, uploadID string, name string, expi
 	if m.prefix != "" {
 		result.URL = m.signEndpoint + m.prefix + "/" + m.bucket + "/" + name
 	}
+
 	return &result, nil
 }
 
@@ -296,6 +304,7 @@ func (m *Minio) PresignedPutObject(ctx context.Context, name string, expire time
 	if m.prefix != "" {
 		rawURL.Path = path.Join(m.prefix, rawURL.Path)
 	}
+
 	return rawURL.String(), nil
 }
 
@@ -303,6 +312,7 @@ func (m *Minio) DeleteObject(ctx context.Context, name string) error {
 	if err := m.initMinio(ctx); err != nil {
 		return err
 	}
+
 	return m.core.Client.RemoveObject(ctx, m.bucket, name, minio.RemoveObjectOptions{})
 }
 
@@ -314,6 +324,7 @@ func (m *Minio) StatObject(ctx context.Context, name string) (*s3.ObjectInfo, er
 	if err != nil {
 		return nil, err
 	}
+
 	return &s3.ObjectInfo{
 		ETag:         strings.ToLower(info.ETag),
 		Key:          info.Key,
@@ -336,6 +347,7 @@ func (m *Minio) CopyObject(ctx context.Context, src string, dst string) (*s3.Cop
 	if err != nil {
 		return nil, err
 	}
+
 	return &s3.CopyObjectInfo{
 		Key:  dst,
 		ETag: strings.ToLower(result.ETag),
@@ -346,20 +358,23 @@ func (m *Minio) IsNotFound(err error) bool {
 	if err == nil {
 		return false
 	}
-	switch e := err.(type) {
-	case minio.ErrorResponse:
-		return e.StatusCode == http.StatusNotFound || e.Code == "NoSuchKey"
-	case *minio.ErrorResponse:
-		return e.StatusCode == http.StatusNotFound || e.Code == "NoSuchKey"
-	default:
-		return false
+	var minioErr minio.ErrorResponse
+	if errors.As(err, &minio.ErrorResponse{}) {
+		return minioErr.StatusCode == http.StatusNotFound || minioErr.Code == "NoSuchKey"
 	}
+	var minioErr2 *minio.ErrorResponse
+	if errors.As(err, &minioErr2) {
+		return minioErr2.StatusCode == http.StatusNotFound || minioErr2.Code == "NoSuchKey"
+	}
+
+	return false
 }
 
 func (m *Minio) AbortMultipartUpload(ctx context.Context, uploadID string, name string) error {
 	if err := m.initMinio(ctx); err != nil {
 		return err
 	}
+
 	return m.core.AbortMultipartUpload(ctx, m.bucket, name, uploadID)
 }
 
@@ -386,6 +401,7 @@ func (m *Minio) ListUploadedParts(ctx context.Context, uploadID string, name str
 			Size:         part.Size,
 		}
 	}
+
 	return res, nil
 }
 
@@ -410,14 +426,11 @@ func (m *Minio) presignedGetObject(ctx context.Context, name string, expire time
 	if m.prefix != "" {
 		rawURL.Path = path.Join(m.prefix, rawURL.Path)
 	}
+
 	return rawURL.String(), nil
 }
 
-func (m *Minio) AccessURL(ctx context.Context, name string, expire time.Duration, opt *s3.AccessURLOption) (string, error) {
-	if err := m.initMinio(ctx); err != nil {
-		return "", err
-	}
-	reqParams := make(url.Values)
+func (m *Minio) getImageInfoForAccessURL(ctx context.Context, name string, expire time.Duration, opt *s3.AccessURLOption, reqParams url.Values) (fileInfo *s3.ObjectInfo, objectInfoPath, msg string, err error) {
 	if opt != nil {
 		if opt.ContentType != "" {
 			reqParams.Set("response-content-type", opt.ContentType)
@@ -427,35 +440,47 @@ func (m *Minio) AccessURL(ctx context.Context, name string, expire time.Duration
 		}
 	}
 	if opt.Image == nil || (opt.Image.Width < 0 && opt.Image.Height < 0 && opt.Image.Format == "") || (opt.Image.Width > maxImageWidth || opt.Image.Height > maxImageHeight) {
-		return m.presignedGetObject(ctx, name, expire, reqParams)
+		msg, err = m.presignedGetObject(ctx, name, expire, reqParams)
+
+		return nil, "", msg, err
 	}
-	fileInfo, err := m.StatObject(ctx, name)
+	fileInfo, err = m.StatObject(ctx, name)
+	objectInfoPath = path.Join(pathInfo, fileInfo.ETag, "image.json")
 	if err != nil {
-		return "", err
+		return nil, "", msg, err
 	}
 	if fileInfo.Size > maxImageSize {
-		return "", errors.New("file size too large")
+		return nil, "", "", errors.New("file size too large")
 	}
-	objectInfoPath := path.Join(pathInfo, fileInfo.ETag, "image.json")
-	var (
-		img  image.Image
-		info minioImageInfo
-	)
-	data, err := m.getObjectData(ctx, objectInfoPath, 1024)
+
+	return fileInfo, objectInfoPath, "", nil
+}
+
+func (m *Minio) loadImgDataForAccessURL(objectInfoPath string, ctx context.Context, name string, info *minioImageInfo) (img image.Image, msg string, err error) {
+	var data []byte
+	data, err = m.getObjectData(ctx, objectInfoPath, 1024)
+
+	//nolint:nestif 	//easy enough to understand
 	if err == nil {
-		if err := json.Unmarshal(data, &info); err != nil {
-			return "", fmt.Errorf("unmarshal minio image info.json error: %w", err)
+		err = json.Unmarshal(data, &info)
+		if err != nil {
+			return nil, "", fmt.Errorf("unmarshal minio image info.json error: %w", err)
 		}
 		if info.NotImage {
-			return "", errors.New("not image")
+			return nil, "", errors.New("not image")
 		}
 	} else if m.IsNotFound(err) {
-		reader, err := m.core.Client.GetObject(ctx, m.bucket, name, minio.GetObjectOptions{})
+		var reader *minio.Object
+		reader, err = m.core.Client.GetObject(ctx, m.bucket, name, minio.GetObjectOptions{})
 		if err != nil {
-			return "", err
+			return img, msg, err
 		}
 		defer reader.Close()
-		imageInfo, format, err := ImageStat(reader)
+		var (
+			imageInfo image.Image
+			format    string
+		)
+		imageInfo, format, err = ImageStat(reader)
 		if err == nil {
 			info.NotImage = false
 			info.Format = format
@@ -464,16 +489,22 @@ func (m *Minio) AccessURL(ctx context.Context, name string, expire time.Duration
 		} else {
 			info.NotImage = true
 		}
-		data, err := json.Marshal(&info)
+
+		data, err = json.Marshal(&info)
 		if err != nil {
-			return "", err
+			return img, msg, err
 		}
-		if _, err := m.core.Client.PutObject(ctx, m.bucket, objectInfoPath, bytes.NewReader(data), int64(len(data)), minio.PutObjectOptions{}); err != nil {
-			return "", err
+
+		_, err = m.core.Client.PutObject(ctx, m.bucket, objectInfoPath, bytes.NewReader(data), int64(len(data)), minio.PutObjectOptions{})
+		if err != nil {
+			return img, msg, err
 		}
-	} else {
-		return "", err
 	}
+
+	return img, msg, err
+}
+
+func (m *Minio) formatImgInfoForAccessURL(opt *s3.AccessURLOption, info *minioImageInfo, reqParams url.Values) {
 	if opt.Image.Width > info.Width || opt.Image.Width <= 0 {
 		opt.Image.Width = info.Width
 	}
@@ -496,24 +527,24 @@ func (m *Minio) AccessURL(ctx context.Context, name string, expire time.Duration
 		}
 	}
 	reqParams.Set("response-content-type", "image/"+opt.Image.Format)
-	if opt.Image.Width == info.Width && opt.Image.Height == info.Height && opt.Image.Format == info.Format {
-		return m.presignedGetObject(ctx, name, expire, reqParams)
-	}
-	cacheKey := filepath.Join(pathInfo, fileInfo.ETag, fmt.Sprintf("image_w%d_h%d.%s", opt.Image.Width, opt.Image.Height, opt.Image.Format))
-	if _, err := m.core.Client.StatObject(ctx, m.bucket, cacheKey, minio.StatObjectOptions{}); err == nil {
+}
+
+func (m *Minio) cacheImgInfoForAccessURL(ctx context.Context, name, cacheKey string, img image.Image, expire time.Duration, opt *s3.AccessURLOption, reqParams url.Values) (string, error) {
+	_, err := m.core.Client.StatObject(ctx, m.bucket, cacheKey, minio.StatObjectOptions{})
+	if err == nil {
 		return m.presignedGetObject(ctx, cacheKey, expire, reqParams)
 	} else if !m.IsNotFound(err) {
 		return "", err
 	}
 	if img == nil {
-		reader, err := m.core.Client.GetObject(ctx, m.bucket, name, minio.GetObjectOptions{})
-		if err != nil {
-			return "", err
+		reader, err2 := m.core.Client.GetObject(ctx, m.bucket, name, minio.GetObjectOptions{})
+		if err2 != nil {
+			return "", err2
 		}
 		defer reader.Close()
-		img, _, err = ImageStat(reader)
-		if err != nil {
-			return "", err
+		img, _, err2 = ImageStat(reader)
+		if err2 != nil {
+			return "", err2
 		}
 	}
 	thumbnail := resizeImage(img, opt.Image.Width, opt.Image.Height)
@@ -526,9 +557,48 @@ func (m *Minio) AccessURL(ctx context.Context, name string, expire time.Duration
 	case formatGif:
 		err = gif.Encode(buf, thumbnail, nil)
 	}
+	if err != nil {
+		return "", err
+	}
 	if _, err := m.core.Client.PutObject(ctx, m.bucket, cacheKey, buf, int64(buf.Len()), minio.PutObjectOptions{}); err != nil {
 		return "", err
 	}
+
+	return "", nil
+}
+
+func (m *Minio) AccessURL(ctx context.Context, name string, expire time.Duration, opt *s3.AccessURLOption) (string, error) {
+	errInit := m.initMinio(ctx)
+	if errInit != nil {
+		return "", errInit
+	}
+	reqParams := make(url.Values)
+	fileInfo, objectInfoPath, msg, err := m.getImageInfoForAccessURL(ctx, name, expire, opt, reqParams)
+	if err != nil {
+		return msg, err
+	}
+	// load-cache img data
+	var (
+		img  image.Image
+		info minioImageInfo
+	)
+	img, msg, err = m.loadImgDataForAccessURL(objectInfoPath, ctx, name, &info)
+	if err != nil {
+		return msg, err
+	}
+	// format img info
+	m.formatImgInfoForAccessURL(opt, &info, reqParams)
+	// no need resize
+	if opt.Image.Width == info.Width && opt.Image.Height == info.Height && opt.Image.Format == info.Format {
+		return m.presignedGetObject(ctx, name, expire, reqParams)
+	}
+	// cache img
+	cacheKey := filepath.Join(pathInfo, fileInfo.ETag, fmt.Sprintf("image_w%d_h%d.%s", opt.Image.Width, opt.Image.Height, opt.Image.Format))
+	msg, err = m.cacheImgInfoForAccessURL(ctx, name, cacheKey, img, expire, opt, reqParams)
+	if err != nil {
+		return msg, err
+	}
+	// return cache img
 	return m.presignedGetObject(ctx, cacheKey, expire, reqParams)
 }
 
@@ -541,5 +611,6 @@ func (m *Minio) getObjectData(ctx context.Context, name string, limit int64) ([]
 	if limit < 0 {
 		return io.ReadAll(object)
 	}
+
 	return io.ReadAll(io.LimitReader(object, 1024))
 }