docs: add all openim helm chart deployment

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

.github/workflows/docker-buildx.yml

@@ -104,8 +104,8 @@ jobs:
         with:
           images: |
             ghcr.io/openimsdk/openim-api
-            openim/openim-api
+            docker.io/openimsdk/openim-api
-            registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-api
+            registry.cn-shanghai.aliyuncs.com/openimsdk/openim-api
 
       - name: Build and push Docker image for openim-api
         uses: docker/build-push-action@v5
@@ -125,8 +125,8 @@ jobs:
         with:
           images: |
             ghcr.io/openimsdk/openim-cmdutils
-            openim/openim-cmdutils
+            docker.io/openimsdk/openim-cmdutils
-            registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-cmdutils
+            registry.cn-shanghai.aliyuncs.com/openimsdk/openim-cmdutils
 
       - name: Build and push Docker image for openim-cmdutils
         uses: docker/build-push-action@v5
@@ -146,8 +146,8 @@ jobs:
         with:
           images: |
             ghcr.io/openimsdk/openim-crontask
-            openim/openim-crontask
+            docker.io/openimsdk/openim-crontask
-            registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-crontask
+            registry.cn-shanghai.aliyuncs.com/openimsdk/openim-crontask
 
       - name: Build and push Docker image for openim-crontask
         uses: docker/build-push-action@v5
@@ -167,8 +167,8 @@ jobs:
         with:
           images: |
             ghcr.io/openimsdk/openim-msggateway
-            openim/openim-msggateway
+            docker.io/openimsdk/openim-msggateway
-            registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-msggateway
+            registry.cn-shanghai.aliyuncs.com/openimsdk/openim-msggateway
 
       - name: Build and push Docker image for openim-msggateway
         uses: docker/build-push-action@v5
@@ -188,8 +188,8 @@ jobs:
         with:
           images: |
             ghcr.io/openimsdk/openim-msgtransfer
-            openim/openim-msgtransfer
+            docker.io/openimsdk/openim-msgtransfer
-            registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-msgtransfer
+            registry.cn-shanghai.aliyuncs.com/openimsdk/openim-msgtransfer
 
       - name: Build and push Docker image for openim-msgtransfer
         uses: docker/build-push-action@v5
@@ -209,8 +209,8 @@ jobs:
         with:
           images: |
             ghcr.io/openimsdk/openim-push
-            openim/openim-push
+            docker.io/openimsdk/openim-push
-            registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-push
+            registry.cn-shanghai.aliyuncs.com/openimsdk/openim-push
 
       - name: Build and push Docker image for openim-push
         uses: docker/build-push-action@v5
@@ -230,8 +230,8 @@ jobs:
         with:
           images: |
             ghcr.io/openimsdk/openim-rpc-auth
-            openim/openim-rpc-auth
+            docker.io/openimsdk/openim-rpc-auth
-            registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-rpc-auth
+            registry.cn-shanghai.aliyuncs.com/openimsdk/openim-rpc-auth
 
       - name: Build and push Docker image for openim-rpc-auth
         uses: docker/build-push-action@v5
@@ -251,8 +251,8 @@ jobs:
         with:
           images: |
             ghcr.io/openimsdk/openim-rpc-conversation
-            openim/openim-rpc-conversation
+            docker.io/openimsdk/openim-rpc-conversation
-            registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-rpc-conversation
+            registry.cn-shanghai.aliyuncs.com/openimsdk/openim-rpc-conversation
 
       - name: Build and push Docker image for openim-rpc-conversation
         uses: docker/build-push-action@v5
@@ -272,8 +272,8 @@ jobs:
         with:
           images: |
             ghcr.io/openimsdk/openim-rpc-friend
-            openim/openim-rpc-friend
+            docker.io/openimsdk/openim-rpc-friend
-            registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-rpc-friend
+            registry.cn-shanghai.aliyuncs.com/openimsdk/openim-rpc-friend
 
       - name: Build and push Docker image for openim-rpc-friend
         uses: docker/build-push-action@v5
@@ -293,8 +293,8 @@ jobs:
         with:
           images: |
             ghcr.io/openimsdk/openim-rpc-group
-            openim/openim-rpc-group
+            docker.io/openimsdk/openim-rpc-group
-            registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-rpc-group
+            registry.cn-shanghai.aliyuncs.com/openimsdk/openim-rpc-group
 
       - name: Build and push Docker image for openim-rpc-group
         uses: docker/build-push-action@v5
@@ -314,8 +314,8 @@ jobs:
         with:
           images: |
             ghcr.io/openimsdk/openim-rpc-msg
-            openim/openim-rpc-msg
+            docker.io/openimsdk/openim-rpc-msg
-            registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-rpc-msg
+            registry.cn-shanghai.aliyuncs.com/openimsdk/openim-rpc-msg
 
       - name: Build and push Docker image for openim-rpc-msg
         uses: docker/build-push-action@v5
@@ -335,8 +335,8 @@ jobs:
         with:
           images: |
             ghcr.io/openimsdk/openim-rpc-third
-            openim/openim-rpc-third
+            docker.io/openimsdk/openim-rpc-third
-            registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-rpc-third
+            registry.cn-shanghai.aliyuncs.com/openimsdk/openim-rpc-third
 
       - name: Build and push Docker image for openim-rpc-third
         uses: docker/build-push-action@v5
@@ -356,8 +356,8 @@ jobs:
         with:
           images: |
             ghcr.io/openimsdk/openim-rpc-user
-            openim/openim-rpc-user
+            docker.io/openimsdk/openim-rpc-user
-            registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-rpc-user
+            registry.cn-shanghai.aliyuncs.com/openimsdk/openim-rpc-user
 
       - name: Build and push Docker image for openim-rpc-user
         uses: docker/build-push-action@v5

.gitignore

@@ -29,7 +29,6 @@ tmp/
 bin/
 output/
 _output/
-deployments/charts/generated-configs/
 
 ### OpenIM Config ###
 config/config.yaml

.golangci.yml

@@ -171,7 +171,7 @@ linters-settings:
   #   exclude_godoc_examples: false
   funlen:
     lines: 150
-    statements: 80
+    statements: 50
   gci:
     # put imports beginning with prefix after 3rd-party packages;
     # only support one prefix

build/goreleaser.yaml

@@ -255,6 +255,131 @@ builds:
       - "6"
       - "7"
 
+  - binary: infra
+    id: infra
+    main: ./tools/infra/infra.go
+    goos:
+      - darwin
+      - windows
+      - linux
+    goarch:
+      - s390x
+      - mips64
+      - mips64le
+      - amd64
+      - ppc64le
+      - arm64
+    goarm:
+      - "6"
+      - "7"
+
+  - binary: ncpu
+    id: ncpu
+    main: ./tools/ncpu/ncpu.go
+    goos:
+      - darwin
+      - windows
+      - linux
+    goarch:
+      - s390x
+      - mips64
+      - mips64le
+      - amd64
+      - ppc64le
+      - arm64
+    goarm:
+      - "6"
+      - "7"
+
+  - binary: openim-web
+    id: openim-web
+    main: ./tools/openim-web/openim-web.go
+    goos:
+      - darwin
+      - windows
+      - linux
+    goarch:
+      - s390x
+      - mips64
+      - mips64le
+      - amd64
+      - ppc64le
+      - arm64
+    goarm:
+      - "6"
+      - "7"
+
+  - binary: component
+    id: component
+    main: ./tools/component/component.go
+    goos:
+      - darwin
+      - windows
+      - linux
+    goarch:
+      - s390x
+      - mips64
+      - mips64le
+      - amd64
+      - ppc64le
+      - arm64
+    goarm:
+      - "6"
+      - "7"
+    
+  - binary: versionchecker
+    id: versionchecker
+    main: ./tools/versionchecker/versionchecker.go
+    goos:
+      - darwin
+      - windows
+      - linux
+    goarch:
+      - s390x
+      - mips64
+      - mips64le
+      - amd64
+      - ppc64le
+      - arm64
+    goarm:
+      - "6"
+      - "7"
+
+  - binary: changelog
+    id: changelog
+    main: ./tools/changelog/changelog.go
+    goos:
+      - darwin
+      - windows
+      - linux
+    goarch:
+      - s390x
+      - mips64
+      - mips64le
+      - amd64
+      - ppc64le
+      - arm64
+    goarm:
+      - "6"
+      - "7"
+
+  - binary: yamlfmt
+    id: yamlfmt
+    main: ./tools/yamlfmt/yamlfmt.go
+    goos:
+      - darwin
+      - windows
+      - linux
+    goarch:
+      - s390x
+      - mips64
+      - mips64le
+      - amd64
+      - ppc64le
+      - arm64
+    goarm:
+      - "6"
+      - "7"
 
 # TODO：Need a script, such as the init - release to help binary to find the right directory
 # ,which can be compiled binary

build/images/Dockerfile

@@ -5,6 +5,6 @@ WORKDIR ${SERVER_WORKDIR}
 # Set HTTP proxy
 ARG BINARY_NAME
 
-COPY BINARY_NAME ./BINARY_NAME
+COPY BINARY_NAME ./bin/BINARY_NAME
 
-ENTRYPOINT ["./BINARY_NAME"]
+ENTRYPOINT ["./bin/BINARY_NAME"]

build/images/openim-api/Dockerfile

@@ -21,7 +21,7 @@ FROM golang:1.20 AS builder
 ARG GO111MODULE=on
 ARG GOPROXY=https://goproxy.cn,direct
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
 ENV GO111MODULE=$GO111MODULE
 ENV GOPROXY=$GOPROXY
@@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC
 # FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
-COPY --from=builder /usr/bin/openim-api ./openim-api
+COPY --from=builder /usr/bin/openim-api ./bin/openim-api
 
-ENTRYPOINT ["./openim-api"]
+ENTRYPOINT ["./bin/openim-api"]

build/images/openim-cmdutils/Dockerfile

@@ -21,7 +21,7 @@ FROM golang:1.20 AS builder
 ARG GO111MODULE=on
 ARG GOPROXY=https://goproxy.cn,direct
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
 ENV GO111MODULE=$GO111MODULE
 ENV GOPROXY=$GOPROXY
@@ -36,10 +36,10 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC
 
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
-COPY --from=builder /usr/bin/openim-cmdutils ./openim-cmdutils
+COPY --from=builder /usr/bin/openim-cmdutils ./bin/openim-cmdutils
 
-ENTRYPOINT ["./openim-cmdutils"]
+ENTRYPOINT ["./bin/openim-cmdutils"]
 
 CMD ["--help"]

build/images/openim-crontask/Dockerfile

@@ -21,7 +21,7 @@ FROM golang:1.20 AS builder
 ARG GO111MODULE=on
 ARG GOPROXY=https://goproxy.cn,direct
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
 ENV GO111MODULE=$GO111MODULE
 ENV GOPROXY=$GOPROXY
@@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC
 # FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
-COPY --from=builder /usr/bin/openim-crontask ./openim-crontask
+COPY --from=builder /usr/bin/openim-crontask ./bin/openim-crontask
 
-ENTRYPOINT ["./openim-crontask"]
+ENTRYPOINT ["./bin/openim-crontask"]

build/images/openim-msggateway/Dockerfile

@@ -21,7 +21,7 @@ FROM golang:1.20 AS builder
 ARG GO111MODULE=on
 ARG GOPROXY=https://goproxy.cn,direct
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
 ENV GO111MODULE=$GO111MODULE
 ENV GOPROXY=$GOPROXY
@@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC
 # FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
-COPY --from=builder /usr/bin/openim-msggateway ./openim-msggateway
+COPY --from=builder /usr/bin/openim-msggateway ./bin/openim-msggateway
 
-ENTRYPOINT ["./openim-msggateway"]
+ENTRYPOINT ["./bin/openim-msggateway"]

build/images/openim-msgtransfer/Dockerfile

@@ -21,7 +21,7 @@ FROM golang:1.20 AS builder
 ARG GO111MODULE=on
 ARG GOPROXY=https://goproxy.cn,direct
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
 ENV GO111MODULE=$GO111MODULE
 ENV GOPROXY=$GOPROXY
@@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC
 # FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
-COPY --from=builder /usr/bin/openim-msgtransfer ./openim-msgtransfer
+COPY --from=builder /usr/bin/openim-msgtransfer ./bin/openim-msgtransfer
 
-ENTRYPOINT ["./openim-msgtransfer"]
+ENTRYPOINT ["./bin/openim-msgtransfer"]

build/images/openim-push/Dockerfile

@@ -21,7 +21,7 @@ FROM golang:1.20 AS builder
 ARG GO111MODULE=on
 ARG GOPROXY=https://goproxy.cn,direct
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
 ENV GO111MODULE=$GO111MODULE
 ENV GOPROXY=$GOPROXY
@@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC
 # FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
-COPY --from=builder /usr/bin/openim-push ./openim-push
+COPY --from=builder /usr/bin/openim-push ./bin/openim-push
 
-ENTRYPOINT ["./openim-push"]
+ENTRYPOINT ["./bin/openim-push"]

build/images/openim-rpc-auth/Dockerfile

@@ -21,7 +21,7 @@ FROM golang:1.20 AS builder
 ARG GO111MODULE=on
 ARG GOPROXY=https://goproxy.cn,direct
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
 ENV GO111MODULE=$GO111MODULE
 ENV GOPROXY=$GOPROXY
@@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC
 # FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
-COPY --from=builder /usr/bin/openim-rpc-auth ./openim-rpc-auth
+COPY --from=builder /usr/bin/openim-rpc-auth ./bin/openim-rpc-auth
 
-ENTRYPOINT ["./openim-rpc-auth"]
+ENTRYPOINT ["./bin/openim-rpc-auth"]

build/images/openim-rpc-conversation/Dockerfile

@@ -21,7 +21,7 @@ FROM golang:1.20 AS builder
 ARG GO111MODULE=on
 ARG GOPROXY=https://goproxy.cn,direct
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
 ENV GO111MODULE=$GO111MODULE
 ENV GOPROXY=$GOPROXY
@@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC
 # FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
-COPY --from=builder /usr/bin/openim-rpc-conversation ./openim-rpc-conversation
+COPY --from=builder /usr/bin/openim-rpc-conversation ./bin/openim-rpc-conversation
 
-ENTRYPOINT ["./openim-rpc-conversation"]
+ENTRYPOINT ["./bin/openim-rpc-conversation"]

build/images/openim-rpc-friend/Dockerfile

@@ -21,7 +21,7 @@ FROM golang:1.20 AS builder
 ARG GO111MODULE=on
 ARG GOPROXY=https://goproxy.cn,direct
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
 ENV GO111MODULE=$GO111MODULE
 ENV GOPROXY=$GOPROXY
@@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC
 # FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
-COPY --from=builder /usr/bin/openim-rpc-friend ./openim-rpc-friend
+COPY --from=builder /usr/bin/openim-rpc-friend ./bin/openim-rpc-friend
 
-ENTRYPOINT ["./openim-rpc-friend"]
+ENTRYPOINT ["./bin/openim-rpc-friend"]

build/images/openim-rpc-group/Dockerfile

@@ -21,7 +21,7 @@ FROM golang:1.20 AS builder
 ARG GO111MODULE=on
 ARG GOPROXY=https://goproxy.cn,direct
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
 ENV GO111MODULE=$GO111MODULE
 ENV GOPROXY=$GOPROXY
@@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC
 # FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
-COPY --from=builder /usr/bin/openim-rpc-group ./openim-rpc-group
+COPY --from=builder /usr/bin/openim-rpc-group ./bin/openim-rpc-group
 
-ENTRYPOINT ["./openim-rpc-group"]
+ENTRYPOINT ["./bin/openim-rpc-group"]

build/images/openim-rpc-msg/Dockerfile

@@ -21,7 +21,7 @@ FROM golang:1.20 AS builder
 ARG GO111MODULE=on
 ARG GOPROXY=https://goproxy.cn,direct
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
 ENV GO111MODULE=$GO111MODULE
 ENV GOPROXY=$GOPROXY
@@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC
 # FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
-COPY --from=builder /usr/bin/openim-rpc-msg ./openim-rpc-msg
+COPY --from=builder /usr/bin/openim-rpc-msg ./bin/openim-rpc-msg
 
-ENTRYPOINT ["./openim-rpc-msg"]
+ENTRYPOINT ["./bin/openim-rpc-msg"]

build/images/openim-rpc-third/Dockerfile

@@ -21,7 +21,7 @@ FROM golang:1.20 AS builder
 ARG GO111MODULE=on
 ARG GOPROXY=https://goproxy.cn,direct
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
 ENV GO111MODULE=$GO111MODULE
 ENV GOPROXY=$GOPROXY
@@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC
 # FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
-COPY --from=builder /usr/bin/openim-rpc-third ./openim-rpc-third
+COPY --from=builder /usr/bin/openim-rpc-third ./bin/openim-rpc-third
 
-ENTRYPOINT ["./openim-rpc-third"]
+ENTRYPOINT ["./bin/openim-rpc-third"]

build/images/openim-rpc-user/Dockerfile

@@ -21,7 +21,7 @@ FROM golang:1.20 AS builder
 ARG GO111MODULE=on
 ARG GOPROXY=https://goproxy.cn,direct
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
 ENV GO111MODULE=$GO111MODULE
 ENV GOPROXY=$GOPROXY
@@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC
 # FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
-COPY --from=builder /usr/bin/openim-rpc-user ./openim-rpc-user
+COPY --from=builder /usr/bin/openim-rpc-user ./bin/openim-rpc-user
 
-ENTRYPOINT ["./openim-rpc-user"]
+ENTRYPOINT ["./bin/openim-rpc-user"]

build/images/openim-tools/component/Dockerfile

@@ -21,7 +21,7 @@ FROM golang:1.20 AS builder
 ARG GO111MODULE=on
 ARG GOPROXY=https://goproxy.cn,direct
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
 ENV GO111MODULE=$GO111MODULE
 ENV GOPROXY=$GOPROXY
@@ -37,7 +37,7 @@ RUN make build BINS=component
 # FROM ghcr.io/openim-sigs/openim-bash-image:latest
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
 COPY --from=builder /openim/openim-server/_output/bin/tools /openim/openim-server/_output/bin/tools/
 COPY --from=builder /openim/openim-server/config /openim/openim-server/config

build/images/openim-tools/openim-web/Dockerfile

@@ -21,7 +21,7 @@ FROM golang:1.20 AS builder
 ARG GO111MODULE=on
 ARG GOPROXY=https://goproxy.cn,direct
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
 ENV GO111MODULE=$GO111MODULE
 ENV GOPROXY=$GOPROXY
@@ -42,7 +42,7 @@ RUN make build BINS=openim-web
 
 FROM ghcr.io/openim-sigs/openim-ubuntu-image:latest
 
-WORKDIR /openim/openim-server/bin
+WORKDIR /openim/openim-server
 
 COPY --from=builder /openim/openim-server/_output/bin/tools /openim/openim-server/_output/bin/tools/
 COPY --from=builder /openim/openim-server/dist /openim/openim-server/dist

cmd/openim-api/main.go

@@ -32,6 +32,7 @@ import (
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/cache"
 )
 
+
 func main() {
 	apiCmd := cmd.NewApiCmd()
 	apiCmd.AddPortFlag()

deployments/README.md

@@ -81,13 +81,6 @@ $ sudo sealos run labring/kubernetes:v1.25.0 labring/helm:v3.8.2 labring/calico:
 > $ sealos reset
 > ```
 
-If you are local, you can also use Kind and Minikube to test, for example, using Kind:
-
-```bash
-$ sGO111MODULE="on" go get sigs.k8s.io/kind@v0.11.1
-$ skind create cluster
-```
-
 ### Installing helm
 
 Helm simplifies the deployment and management of Kubernetes applications to a large extent by offering version control and release management through packaging.
@@ -119,23 +112,3 @@ $ make image
 ## Installation
 
 Explore our Helm-Charts repository and read through: [Helm-Charts Repository](https://github.com/openimsdk/helm-charts)
-
-
-**Use Helmfile:**
-
-```bash
-GO111MODULE=on go get github.com/roboll/helmfile@latest
-```
-
-**Install OpenIM:**
-
-```bash
-mkdir ./charts/generated-configs
-../scripts/genconfig.sh ../scripts/install/environment.sh ./templates/openim.yaml > ./charts/generated-configs/config.yaml
-cp ../config/notification.yaml ./charts/generated-configs/notification.yaml
-../scripts/genconfig.sh ../scripts/install/environment.sh ./templates/helm-image.yaml > ./charts/generated-configs/helm-image.yaml
-```
-
-```bash
-helmfile apply
-```

deployments/charts/Chart.yaml

@@ -0,0 +1,74 @@
+# 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-api
+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"
+
+icon: https://raw.githubusercontent.com/openimsdk/open-im-server/main/assets/openim-logo-gradient.svg
+
+maintainers:
+  - name: "OpenIM"
+    url: "https://github.com/openimsdk"
+
+keywords:
+  - openim
+  - im
+  - chat
+
+sources:
+  - "https://github.com/openimsdk/open-im-server"
+  - "https://github.com/openimsdk/openim-sdk-core"
+  - "https://github.com/openimsdk/openim-docker"
+
+dependencies:
+  - name: mysql
+    version: 8.0.25
+    repository: https://charts.bitnami.com/bitnami
+  - name: redis
+    version: 14.6.1
+    repository: https://charts.bitnami.com/bitnami
+  - name: mongodb
+    version: 10.1.0
+    repository: https://charts.bitnami.com/bitnami
+  - name: kafka
+    version: 14.1.0
+    repository: https://charts.bitnami.com/bitnami
+  - name: minio
+    version: 8.1.2
+    repository: https://charts.bitnami.com/bitnami
+  - name: zookeeper
+    version: 5.17.0
+    repository: https://charts.bitnami.com/bitnami

deployments/charts/helmfile.yaml

@@ -1,94 +0,0 @@
-repositories:
-  - name: stable
-    url: https://charts.helm.sh/stable
-
-releases:
-  - name: openim-api
-    namespace: openim
-    chart: ./openim-api
-    values:
-      - openim-api/values.yaml
-      - generated-configs/helm-image.yaml
-      - generated-configs/config.yaml
-      - generated-configs/notification.yaml
-  - name: openim-msggateway
-    namespace: openim
-    chart: ./openim-msggateway
-    values:
-      - openim-msggateway/values.yaml
-      - generated-configs/helm-image.yaml
-      - generated-configs/config.yaml
-      - generated-configs/notification.yaml
-  - name: openim-msgtransfer
-    namespace: openim
-    chart: ./openim-msgtransfer
-    values:
-      - openim-msgtransfer/values.yaml
-      - generated-configs/helm-image.yaml
-      - generated-configs/config.yaml
-      - generated-configs/notification.yaml
-  - name: openim-push
-    namespace: openim
-    chart: ./openim-push
-    values:
-      - openim-push/values.yaml
-      - generated-configs/helm-image.yaml
-      - generated-configs/config.yaml
-      - generated-configs/notification.yaml
-
-  - name: openim-rpc-auth
-    namespace: openim
-    chart: ./openim-rpc-auth
-    values:
-      - openim-rpc-auth/values.yaml
-      - generated-configs/helm-image.yaml
-      - generated-configs/config.yaml
-      - generated-configs/notification.yaml
-  - name: openim-rpc-conversation
-    namespace: openim
-    chart: ./openim-rpc-conversation
-    values:
-      - openim-rpc-conversation/values.yaml
-      - generated-configs/helm-image.yaml
-      - generated-configs/config.yaml
-      - generated-configs/notification.yaml
-  - name: openim-rpc-friend
-    namespace: openim
-    chart: ./openim-rpc-friend
-    values:
-      - openim-rpc-friend/values.yaml
-      - generated-configs/helm-image.yaml
-      - generated-configs/config.yaml
-      - generated-configs/notification.yaml
-  - name: openim-rpc-group
-    namespace: openim
-    chart: ./openim-rpc-group
-    values:
-      - openim-rpc-group/values.yaml
-      - generated-configs/helm-image.yaml
-      - generated-configs/config.yaml
-      - generated-configs/notification.yaml
-  - name: openim-rpc-msg
-    namespace: openim
-    chart: ./openim-rpc-msg
-    values:
-      - openim-rpc-msg/values.yaml
-      - generated-configs/helm-image.yaml
-      - generated-configs/config.yaml
-      - generated-configs/notification.yaml
-  - name: openim-rpc-third
-    namespace: openim
-    chart: ./openim-rpc-third
-    values:
-      - openim-rpc-third/values.yaml
-      - generated-configs/helm-image.yaml
-      - generated-configs/config.yaml
-      - generated-configs/notification.yaml
-  - name: openim-rpc-user
-    namespace: openim
-    chart: ./openim-rpc-user
-    values:
-      - openim-rpc-user/values.yaml
-      - generated-configs/helm-image.yaml
-      - generated-configs/config.yaml
-      - generated-configs/notification.yaml

deployments/charts/openim-api/Chart.yaml

@@ -22,18 +22,3 @@ version: 0.1.0
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "1.16.0"
-
-icon: https://raw.githubusercontent.com/openimsdk/open-im-server/main/assets/openim-logo-gradient.svg
-
-maintainers:
-  - name: "OpenIM"
-    url: "https://github.com/openimsdk"
-
-keywords:
-  - openim
-  - im
-  - chat
-
-sources:
-  - "https://github.com/openimsdk/open-im-server"
-  - "https://github.com/openimsdk/helm-charts"

deployments/charts/openim-msggateway/Chart.yaml

@@ -22,18 +22,3 @@ version: 0.1.0
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "1.16.0"
-
-icon: https://raw.githubusercontent.com/openimsdk/open-im-server/main/assets/openim-logo-gradient.svg
-
-maintainers:
-  - name: "OpenIM"
-    url: "https://github.com/openimsdk"
-
-keywords:
-  - openim
-  - im
-  - chat
-
-sources:
-  - "https://github.com/openimsdk/open-im-server"
-  - "https://github.com/openimsdk/helm-charts"

deployments/charts/openim-msgtransfer/Chart.yaml

@@ -22,18 +22,3 @@ version: 0.1.0
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "1.16.0"
-
-icon: https://raw.githubusercontent.com/openimsdk/open-im-server/main/assets/openim-logo-gradient.svg
-
-maintainers:
-  - name: "OpenIM"
-    url: "https://github.com/openimsdk"
-
-keywords:
-  - openim
-  - im
-  - chat
-
-sources:
-  - "https://github.com/openimsdk/open-im-server"
-  - "https://github.com/openimsdk/helm-charts"

deployments/charts/openim-push/Chart.yaml

@@ -22,18 +22,3 @@ version: 0.1.0
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "1.16.0"
-
-icon: https://raw.githubusercontent.com/openimsdk/open-im-server/main/assets/openim-logo-gradient.svg
-
-maintainers:
-  - name: "OpenIM"
-    url: "https://github.com/openimsdk"
-
-keywords:
-  - openim
-  - im
-  - chat
-
-sources:
-  - "https://github.com/openimsdk/open-im-server"
-  - "https://github.com/openimsdk/helm-charts"

deployments/charts/openim-rpc-auth/Chart.yaml

@@ -22,18 +22,3 @@ version: 0.1.0
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "1.16.0"
-
-icon: https://raw.githubusercontent.com/openimsdk/open-im-server/main/assets/openim-logo-gradient.svg
-
-maintainers:
-  - name: "OpenIM"
-    url: "https://github.com/openimsdk"
-
-keywords:
-  - openim
-  - im
-  - chat
-
-sources:
-  - "https://github.com/openimsdk/open-im-server"
-  - "https://github.com/openimsdk/helm-charts"

deployments/charts/openim-rpc-conversation/Chart.yaml

@@ -22,18 +22,3 @@ version: 0.1.0
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "1.16.0"
-
-icon: https://raw.githubusercontent.com/openimsdk/open-im-server/main/assets/openim-logo-gradient.svg
-
-maintainers:
-  - name: "OpenIM"
-    url: "https://github.com/openimsdk"
-
-keywords:
-  - openim
-  - im
-  - chat
-
-sources:
-  - "https://github.com/openimsdk/open-im-server"
-  - "https://github.com/openimsdk/helm-charts"

deployments/charts/openim-rpc-friend/Chart.yaml

@@ -22,18 +22,3 @@ version: 0.1.0
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "1.16.0"
-
-icon: https://raw.githubusercontent.com/openimsdk/open-im-server/main/assets/openim-logo-gradient.svg
-
-maintainers:
-  - name: "OpenIM"
-    url: "https://github.com/openimsdk"
-
-keywords:
-  - openim
-  - im
-  - chat
-
-sources:
-  - "https://github.com/openimsdk/open-im-server"
-  - "https://github.com/openimsdk/helm-charts"

deployments/charts/openim-rpc-group/Chart.yaml

@@ -22,18 +22,3 @@ version: 0.1.0
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "1.16.0"
-
-icon: https://raw.githubusercontent.com/openimsdk/open-im-server/main/assets/openim-logo-gradient.svg
-
-maintainers:
-  - name: "OpenIM"
-    url: "https://github.com/openimsdk"
-
-keywords:
-  - openim
-  - im
-  - chat
-
-sources:
-  - "https://github.com/openimsdk/open-im-server"
-  - "https://github.com/openimsdk/helm-charts"

deployments/charts/openim-rpc-msg/Chart.yaml

@@ -22,18 +22,3 @@ version: 0.1.0
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "1.16.0"
-
-icon: https://raw.githubusercontent.com/openimsdk/open-im-server/main/assets/openim-logo-gradient.svg
-
-maintainers:
-  - name: "OpenIM"
-    url: "https://github.com/openimsdk"
-
-keywords:
-  - openim
-  - im
-  - chat
-
-sources:
-  - "https://github.com/openimsdk/open-im-server"
-  - "https://github.com/openimsdk/helm-charts"

deployments/charts/openim-rpc-third/Chart.yaml

@@ -22,18 +22,3 @@ version: 0.1.0
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "1.16.0"
-
-icon: https://raw.githubusercontent.com/openimsdk/open-im-server/main/assets/openim-logo-gradient.svg
-
-maintainers:
-  - name: "OpenIM"
-    url: "https://github.com/openimsdk"
-
-keywords:
-  - openim
-  - im
-  - chat
-
-sources:
-  - "https://github.com/openimsdk/open-im-server"
-  - "https://github.com/openimsdk/helm-charts"

deployments/charts/openim-rpc-user/Chart.yaml

@@ -22,18 +22,3 @@ version: 0.1.0
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "1.16.0"
-
-icon: https://raw.githubusercontent.com/openimsdk/open-im-server/main/assets/openim-logo-gradient.svg
-
-maintainers:
-  - name: "OpenIM"
-    url: "https://github.com/openimsdk"
-
-keywords:
-  - openim
-  - im
-  - chat
-
-sources:
-  - "https://github.com/openimsdk/open-im-server"
-  - "https://github.com/openimsdk/helm-charts"

deployments/templates/helm-image.yaml

@@ -1,89 +0,0 @@
-#This configuration file is used to override the use of the value.yaml variable.
-#Currently, only the configuration with ingressName as nginx is provided.
-#If it is another gateway such as istio or treafik, please modify the corresponding gateway requirements
-image:
-  repository: ${IMAGE_REGISTRY}/openim-api
-  pullPolicy: Always
-  tag: "${SERVER_IMAGE_TAG}"
-ingress:
-  enabled: true
-  className: "nginx"
-  annotations:
-    nginx.ingress.kubernetes.io/use-regex: "true"
-    nginx.ingress.kubernetes.io/rewrite-target: /$2
-  hosts:
-    - host: openim.server.com # your hostname
-      paths:
-        - path: /api(/|$)(.*)
-          pathType: ImplementationSpecific
-  tls:
-    - secretName: webapitls  #your hostname tls
-      hosts:
-        - openim.server.com
-
-openim-msggateway:
-  image:
-    repository: ${IMAGE_REGISTRY}/openim-msggateway
-    tag: "${SERVER_IMAGE_TAG}"
-    pullPolicy: Always
-  ingress:
-    enabled: true
-    className: "nginx"
-    annotations:
-      nginx.ingress.kubernetes.io/use-regex: "true"
-      nginx.ingress.kubernetes.io/rewrite-target: /$2
-    hosts:
-      - host: openim.server.com # your hostname
-        paths:
-          - path: /msg_gateway(/|$)(.*)
-            pathType: ImplementationSpecific
-    tls:
-      - secretName: webapitls  #your hostname tls
-        hosts:
-          - openim.server.com
-
-openim-msgtransfer:
-  image:
-    repository: ${IMAGE_REGISTRY}/openim-msgtransfer
-    tag: "${SERVER_IMAGE_TAG}"
-    pullPolicy: Always
-openim-push:
-  image:
-    repository: ${IMAGE_REGISTRY}/openim-push
-    tag: "${SERVER_IMAGE_TAG}"
-    pullPolicy: Always
-openim-rpc-auth:
-  image:
-    repository: ${IMAGE_REGISTRY}/openim-rpc-auth
-    tag: "${SERVER_IMAGE_TAG}"
-    pullPolicy: Always
-openim-rpc-conversation:
-  image:
-    repository: ${IMAGE_REGISTRY}/openim-rpc-conversation
-    tag: "${SERVER_IMAGE_TAG}"
-    pullPolicy: Always
-openim-rpc-friend:
-  image:
-    repository: ${IMAGE_REGISTRY}/openim-rpc-friend
-    tag: "${SERVER_IMAGE_TAG}"
-    pullPolicy: Always
-openim-rpc-group:
-  image:
-    repository: ${IMAGE_REGISTRY}/openim-rpc-group
-    tag: "${SERVER_IMAGE_TAG}"
-    pullPolicy: Always
-openim-rpc-msg:
-  image:
-    repository: ${IMAGE_REGISTRY}/openim-rpc-msg
-    tag: "${SERVER_IMAGE_TAG}"
-    pullPolicy: Always
-openim-rpc-third:
-  image:
-    repository: ${IMAGE_REGISTRY}/openim-rpc-third
-    tag: "${SERVER_IMAGE_TAG}"
-    pullPolicy: Always
-openim-rpc-user:
-  image:
-    repository: ${IMAGE_REGISTRY}/openim-rpc-user
-    tag: "${SERVER_IMAGE_TAG}"
-    pullPolicy: Always

deployments/templates/openim.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=${SERVER_NAME} for OpenIM
-Documentation=https://github.com/openimsdk/open-im-server/blob/main/deployment/README.md
+Documentation=https://github.com/openimsdk/open-im-server/blob/main/deployment/init/README.md
 
 [Service]
 WorkingDirectory=${OPENIM_DATA_DIR}

deployments/templates/openim.target

@@ -1,7 +0,0 @@
-[Unit]
-Description=Unified target for OpenIM servers
-Requires=openim-api.service openim-push.service openim-rpc-group.service openim-crontask.service openim-rpc-auth.service openim-rpc-msg.service openim-msggateway.service openim-rpc-conversation.service openim-rpc-third.service openim-msgtransfer.service openim-rpc-friend.service openim-rpc-user.service
-After=openim-api.service openim-push.service openim-rpc-group.service openim-crontask.service openim-rpc-auth.service openim-rpc-msg.service openim-msggateway.service openim-rpc-conversation.service openim-rpc-third.service openim-msgtransfer.service openim-rpc-friend.service openim-rpc-user.service
-
-[Install]
-WantedBy=multi-user.target

docs/contrib/install-openim-linux-system.md

@@ -1,353 +0,0 @@
-# OpenIM System: Setup and Usage Guide
-
-<!-- vscode-markdown-toc -->
-* 1. [1. Introduction](#Introduction)
-* 2. [2. Prerequisites (Requires root permissions)](#PrerequisitesRequiresrootpermissions)
-* 3. [3. Create `openim-api` systemd unit template file](#Createopenim-apisystemdunittemplatefile)
-* 4. [4. Copy systemd unit template file to systemd config directory (Requires root permissions)](#CopysystemdunittemplatefiletosystemdconfigdirectoryRequiresrootpermissions)
-* 5. [5. Start systemd service](#Startsystemdservice)
-
-
-##  0. <a name='Introduction'></a>0. Introduction
-
-Systemd is the default service management form for the latest Linux distributions, replacing the original init.
-
-The OpenIM system is a comprehensive suite of services tailored to address a wide variety of messaging needs. This guide will walk you through the steps of setting up the OpenIM system services and provide insights into its usage.
-
-**Prerequisites:**
-
-+ A Linux server with necessary privileges.
-+ Ensure you have `systemctl` installed and running.
-
-
-##  1. <a name='Deployment'></a>1. Deployment
-
-1. **Retrieve the Installation Script**:
-
-   Begin by obtaining the OpenIM installation script which will be utilized to deploy the entire OpenIM system.
-
-2. **Install OpenIM**:
-
-   To install all the components of OpenIM, run:
-
-   ```bash
-   ./scripts/install/install.sh -i  
-   ```
-
-   or
-
-   ```bash
-   ./scripts/install/install.sh --install  
-   ```
-
-   This will initiate the installation process for all OpenIM components.
-
-3. **Check the Status**:
-
-   Post installation, it is good practice to verify if all the services are running as expected:
-
-   ```bash
-   systemctl status openim.target
-   ```
-
-   This will list the status of all related services of OpenIM.
-
-**Maintenance & Management:**
-
-1. **Checking Individual Service Status**:
-
-   You can monitor the status of individual services with the following command:
-
-   ```bash
-   systemctl status <service-name>
-   ```
-
-   For instance:
-
-   ```bash
-   systemctl status openim-api.service
-   ``
-
-2. **Starting and Stopping Services**:
-
-   If you wish to start or stop any specific service, you can do so with `systemctl start` or `systemctl stop` followed by the service name:
-
-   ```bash
-   systemctl start openim-api.service
-   systemctl stop openim-api.service
-   ```
-
-3. **Uninstalling OpenIM**:
-
-   In case you wish to remove the OpenIM components from your server, utilize:
-
-   ```bash
-   ./scripts/install/install.sh -u
-   ```
-
-   or
-
-   ```bash
-   ./scripts/install/install.sh --uninstall
-   ```
-
-   Ensure you take a backup of any important data before executing the uninstall command.
-
-4. **Logs & Troubleshooting**:
-
-   Logs play a pivotal role in understanding the system's operation and troubleshooting any issues. OpenIM logs can typically be found in the directory specified during installation, usually `${OPENIM_LOG_DIR}`.
-
-   Always refer to the logs when troubleshooting. Look for any error messages or warnings that might give insights into the issue at hand.
-
-
-**Note:**
-
-+ `openim-api.service`: Manages the main API gateways for OpenIM communication.
-+ `openim-crontask.service`: Manages scheduled tasks and jobs.
-+ `openim-msggateway.service`: Takes care of message gateway operations.
-+ `openim-msgtransfer.service`: Handles message transfer functionalities.
-+ `openim-push.service`: Responsible for push notification services.
-+ `openim-rpc-auth.service`: Manages RPC (Remote Procedure Call) for authentication.
-+ `openim-rpc-conversation.service`: Manages RPC for conversations.
-+ `openim-rpc-friend.service`: Handles RPC for friend-related operations.
-+ `openim-rpc-group.service`: Manages group-related RPC operations.
-+ `openim-rpc-msg.service`: Takes care of message RPCs.
-+ `openim-rpc-third.service`: Deals with third-party integrations using RPC.
-+ `openim-rpc-user.service`: Manages user-related RPC operations.
-+ `openim.target`: A target that bundles all the above services for collective operations.
-
-
-**Viewing Logs with `journalctl`:**
-
-`systemctl` services usually log their output to the systemd journal, which you can access using the `journalctl` command.
-
-1. **View Logs for a Specific Service**:
-
-   To view the logs for a particular service, you can use:
-
-   ```bash
-   journalctl -u <service-name>
-   ```
-
-   For example, to see the logs for the `openim-api.service`, you would use:
-
-   ```bash
-   journalctl -u openim-api.service
-   ```
-
-2. **Filtering Logs**:
-
-   + By Time
-
-     : If you wish to see logs since a specific time:
-
-     ```bash
-     journalctl -u openim-api.service --since "2023-10-28 12:00:00"
-     ```
-
-   + Most Recent Logs
-
-     : To view the most recent logs, you can combine 
-`tail` functionality with `journalctl`:
-
-     ```bash
-     journalctl -u openim-api.service -n 100
-     ```
-
-3. **Continuous Monitoring of Logs**:
-
-   To see new log messages in real-time, you can use the `-f` flag, which mimics the behavior of `tail -f`:
-
-   ```bash
-   journalctl -u openim-api.service -f
-   ```
-
-### Continued Maintenance:
-
-1. **Regularly Check Service Status**:
-
-   It's good practice to routinely verify that all services are active and running. This can be done with:
-
-   ```bash
-   systemctl status openim-api.service openim-push.service openim-rpc-group.service openim-crontask.service openim-rpc-auth.service openim-rpc-msg.service openim-msggateway.service openim-rpc-conversation.service openim-rpc-third.service openim-msgtransfer.service openim-rpc-friend.service openim-rpc-user.service
-   ```
-
-2. **Update Services**:
-
-   Periodically, there might be updates or patches to the OpenIM system or its components. Make sure you keep the system updated. After updating any service, always reload the daemon and restart the service:
-
-   ```bash
-   systemctl daemon-reload
-   systemctl restart openim-api.service
-   ```
-
-3. **Backup Important Data**:
-
-   Regularly backup any configuration files, user data, and other essential data. This ensures that you can restore the system to a working state in case of failures.
-
-### Important `systemctl` and Logging Commands to Learn:
-
-1. **Start/Stop/Restart Services**:
-
-   ```bash
-   systemctl start <service-name>
-   systemctl stop <service-name>
-   systemctl restart <service-name>
-   ```
-
-2. **Enable/Disable Services**:
-
-   If you want a service to start automatically at boot:
-
-   ```bash
-   systemctl enable <service-name>
-   ```
-
-   To prevent it from starting at boot:
-
-   ```bash
-   systemctl disable <service-name>
-   ```
-
-3. **Check Failed Services**:
-
-   To quickly check if any service has failed:
-
-   ```bash
-   systemctl --failed
-   ```
-
-4. **Log Rotation**:
-
-   `journalctl` logs can grow large. To clear all archived journal entries, use:
-
-   ```bash
-   journalctl --vacuum-time=1d
-   ```
-
-
-**Advanced requirements:**
-
-- Convenient service runtime log recording for problem analysis
-- Service management logs
-- Option to restart upon abnormal exit
-
-The daemon does not meet these advanced requirements.
-
-`nohup` only logs the service's runtime outputs and errors.
-
-Only systemd can fulfill all of the above requirements.
-
-> The default logs are enhanced with timestamps, usernames, service names, PIDs, etc., making them user-friendly. You can view logs of abnormal service exits. Advanced customization is possible through the configuration files in `/lib/systemd/system/`.
-
-In short, systemd is the current mainstream way to manage backend services on Linux, so I've abandoned `nohup` in my new versions of bash scripts, opting instead for systemd.
-
-##  2. <a name='PrerequisitesRequiresrootpermissions'></a>Prerequisites (Requires root permissions)
-
-1. Configure `environment.sh` based on the comments.
-2. Create a data directory:
-
-```bash
-mkdir -p ${OPENIM_DATA_DIR}/{openim-api,openim-crontask}
-```
-
-3. Create a bin directory and copy `openim-api` and `openim-crontask` executable files:
-
-```bash
-source ./environment.sh
-mkdir -p ${OPENIM_INSTALL_DIR}/bin
-cp openim-api openim-crontask ${OPENIM_INSTALL_DIR}/bin
-```
-
-4. Copy the configuration files of `openim-api` and `openim-crontask` to the `${OPENIM_CONFIG_DIR}` directory:
-
-```bash
-mkdir -p ${OPENIM_CONFIG_DIR}
-cp openim-api.yaml openim-crontask.yaml ${OPENIM_CONFIG_DIR}
-```
-
-##  3. <a name='Createopenim-apisystemdunittemplatefile'></a> Create `openim-api` systemd unit template file
-
-For each OpenIM service, we will create a systemd unit template. Follow the steps below for each service:
-
-Run the following shell script to generate the `openim-api.service.template`:
-
-```bash
-source ./environment.sh
-cat > openim-api.service.template <<EOF
-[Unit]
-Description=OpenIM Server API
-Documentation=https://github.com/oepnimsdk/open-im-server/blob/master/init/README.md
-
-[Service]
-WorkingDirectory=${OPENIM_DATA_DIR}/openim-api
-ExecStart=${OPENIM_INSTALL_DIR}/bin/openim-api --config=${OPENIM_CONFIG_DIR}/openim-api.yaml
-Restart=always
-RestartSec=5
-StartLimitInterval=0
-
-[Install]
-WantedBy=multi-user.target
-EOF
-```
-
-Following the above style, create the respective template files or generate them in bulk:
-
-First, make sure you've sourced the environment variables:
-
-```bash
-source ./environment.sh
-```
-
-Use the shell script to generate the systemd unit template for each service:
-
-```bash
-declare -a services=(
-"openim-api"
-... [other services]
-)
-
-for service in "${services[@]}"
-do
-   cat > $service.service.template <<EOF
-[Unit]
-Description=OpenIM Server - $service
-Documentation=https://github.com/oepnimsdk/open-im-server/blob/master/init/README.md
-
-[Service]
-WorkingDirectory=${OPENIM_DATA_DIR}/$service
-ExecStart=${OPENIM_INSTALL_DIR}/bin/$service --config=${OPENIM_CONFIG_DIR}/$service.yaml
-Restart=always
-RestartSec=5
-StartLimitInterval=0
-
-[Install]
-WantedBy=multi-user.target
-EOF
-done
-```
-
-##  4. <a name='CopysystemdunittemplatefiletosystemdconfigdirectoryRequiresrootpermissions'></a>Copy systemd unit template file to systemd config directory (Requires root permissions)
-
-Ensure you have root permissions to perform this operation:
-
-```bash
-for service in "${services[@]}"
-do
-   sudo cp $service.service.template /etc/systemd/system/$service.service
-done
-...
-```
-
-##  5. <a name='Startsystemdservice'></a>Start systemd service
-
-To start the OpenIM services:
-
-```bash
-for service in "${services[@]}"
-do
-   sudo systemctl daemon-reload 
-   sudo systemctl enable $service 
-   sudo systemctl restart $service
-done
-```

go.mod

@@ -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.148.0
+	google.golang.org/api v0.147.0
 	google.golang.org/grpc v1.59.0
 	google.golang.org/protobuf v1.31.0
 	gopkg.in/yaml.v3 v3.0.1
@@ -37,14 +37,13 @@ require github.com/google/uuid v1.3.1
 
 require (
 	github.com/IBM/sarama v1.41.3
-	github.com/OpenIMSDK/protocol v0.0.30
+	github.com/OpenIMSDK/protocol v0.0.27
-	github.com/OpenIMSDK/tools v0.0.15
+	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
 	github.com/go-sql-driver/mysql v1.7.1
 	github.com/redis/go-redis/v9 v9.2.1
 	github.com/tencentyun/cos-go-sdk-v5 v0.7.45
-	gopkg.in/src-d/go-git.v4 v4.13.1
 )
 
 require (
@@ -67,6 +66,7 @@ require (
 	github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
 	github.com/eapache/queue v1.1.0 // indirect
 	github.com/emirpasic/gods v1.12.0 // indirect
+	github.com/fatih/color v1.15.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
@@ -95,6 +95,7 @@ require (
 	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/lithammer/shortuuid v3.0.0+incompatible // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/minio/sha256-simd v1.0.1 // indirect
@@ -136,8 +137,9 @@ 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-20231012201019-e917dd12ba7a // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c // indirect
 	gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
+	gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )
 

go.sum

@@ -18,18 +18,15 @@ 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.30 h1:MiHO6PyQMR9ojBHNnSFxCHLmsoE2xZqaiYj975JiZnM=
+github.com/OpenIMSDK/protocol v0.0.27 h1:ee1Y6idLahgJrTHkgWPboKIvCT9zvf7jitavVpffpPw=
-github.com/OpenIMSDK/protocol v0.0.30/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y=
+github.com/OpenIMSDK/protocol v0.0.27/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y=
-github.com/OpenIMSDK/tools v0.0.15 h1:FF3m0TQUG56pJC15a11jmBG6Y1EjXarEW4JV3CBF/Jc=
+github.com/OpenIMSDK/tools v0.0.14 h1:WLof/+WxyPyRST+QkoTKubYCiV73uCLiL8pgnpH/yKQ=
-github.com/OpenIMSDK/tools v0.0.15/go.mod h1:eg+q4A34Qmu73xkY0mt37FHGMCMfC6CtmOnm0kFEGFI=
+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=
-github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
 github.com/aliyun/aliyun-oss-go-sdk v2.2.9+incompatible h1:Sg/2xHwDrioHpxTN6WMiwbXTpUEinBpHsN7mG21Rc2k=
 github.com/aliyun/aliyun-oss-go-sdk v2.2.9+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
-github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
-github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -50,15 +47,22 @@ github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583j
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/cilium/ebpf v0.11.0 h1:V8gS/bTCCjX9uUnkUFUpPsksM8n1lXBAvHcpiFk1X2Y=
+github.com/cilium/ebpf v0.11.0/go.mod h1:WE7CZAnqOL2RouJ4f1uyNhqr2P4CCvXFIqdRDUgWsVs=
 github.com/clbanning/mxj v1.8.4 h1:HuhwZtbyvyOw+3Z1AowPkU87JkJUSv751ELWaiTpj8I=
 github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cosiner/argv v0.1.0 h1:BVDiEL32lwHukgJKP87btEPenzrrHUjajs/8yzaqcXg=
+github.com/cosiner/argv v0.1.0/go.mod h1:EusR6TucWKX+zFgtdUsKT2Cvg45K5rtpCcWz4hK06d8=
+github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/derekparker/trie v0.0.0-20221213183930-4c74548207f4 h1:atN94qKNhLpy+9BwbE5nxvFj4rScJi6W3x/NfFmMDg4=
+github.com/derekparker/trie v0.0.0-20221213183930-4c74548207f4/go.mod h1:C7Es+DLenIpPc9J6IYw4jrK0h7S9bKj4DNl8+KxGEXU=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
@@ -78,6 +82,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
+github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@@ -89,8 +95,11 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
 github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
-github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
 github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
+github.com/go-delve/delve v1.21.1 h1:oDpED8gvXPLS1VKSYzaMH/ihZtyk04H9jqQ9xpyFXl0=
+github.com/go-delve/delve v1.21.1/go.mod h1:FgTAiRUe43RS5EexL06RPyMtP8AMZVL/t9Qqgy3qUe4=
+github.com/go-delve/liner v1.2.3-0.20220127212407-d32d89dd2a5d h1:pxjSLshkZJGLVm0wv20f/H0oTWiq/egkoJQ2ja6LEvo=
+github.com/go-delve/liner v1.2.3-0.20220127212407-d32d89dd2a5d/go.mod h1:biJCRbqp51wS+I92HMqn5H8/A0PAhxn2vyOT+JqhiGI=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
@@ -140,10 +149,13 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-dap v0.9.1 h1:d8dETjgHMR9/xs+Xza+NrZmB7jxIS5OtM2uRsyJVA/c=
+github.com/google/go-dap v0.9.1/go.mod h1:HAeyoSd2WIfTfg+0GRXcFrb+RnojAtGNh+k+XTIxJDE=
 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=
@@ -173,6 +185,8 @@ github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9
 github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
 github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
+github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
@@ -228,8 +242,16 @@ github.com/lestrrat-go/strftime v1.0.6 h1:CFGsDEt1pOpFNU+TJB0nhz9jl+K0hZSLE205Ah
 github.com/lestrrat-go/strftime v1.0.6/go.mod h1:f7jQKgV5nnJpYgdEasS+/y7EsTb8ykN2z68n3TtcTaw=
 github.com/lithammer/shortuuid v3.0.0+incompatible h1:NcD0xWW/MZYXEHa6ITy6kaXN5nwm/V115vj2YXfhS0w=
 github.com/lithammer/shortuuid v3.0.0+incompatible/go.mod h1:FR74pbAuElzOUuenUHTK2Tciko1/vKuIKS9dSkDrA4w=
+github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
+github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
@@ -292,11 +314,14 @@ github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5X
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/redis/go-redis/v9 v9.2.1 h1:WlYJg71ODF0dVspZZCpYmoF1+U1Jjk9Rwd7pq6QmlCg=
 github.com/redis/go-redis/v9 v9.2.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
+github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
@@ -348,6 +373,8 @@ go.mongodb.org/mongo-driver v1.12.1 h1:nLkghSU8fQNaK7oUmDhQFsnrtcoNy7Z6LVFKsEecq
 go.mongodb.org/mongo-driver v1.12.1/go.mod h1:/rGBTebI3XYboVmgz+Wv3Bcbl3aD0QF9zl6kDDw18rQ=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
+go.starlark.net v0.0.0-20220816155156-cfacd8902214 h1:MqijAN3S61c7KWasOk+zIqIjHQPN6WUra/X3+YAkQxQ=
+go.starlark.net v0.0.0-20220816155156-cfacd8902214/go.mod h1:VZcBMdr3cT3PnBoWunTabuSEXwVAH+ZJ5zxfs3AdASk=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
@@ -369,6 +396,8 @@ golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58
 golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
 golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 h1:Jvc7gsqn21cJHCmAWx0LiimpP18LZmUxkT5Mp7EZ1mI=
+golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/image v0.13.0 h1:3cge/F/QTkNLauhf2QoE9zp+7sr+ZcL4HnoZmdwg9sg=
 golang.org/x/image v0.13.0/go.mod h1:6mmbMOeV28HuMTgA6OSRkdXKYw/t5W9Uwn2Yv1r3Yxk=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -427,10 +456,12 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
@@ -438,7 +469,6 @@ golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -467,8 +497,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.148.0 h1:HBq4TZlN4/1pNcu0geJZ/Q50vIwIXT532UIMYoo0vOs=
+google.golang.org/api v0.147.0 h1:Can3FaQo9LlVqxJCodNmeZW/ib3/qKAY3rFeXiHo5gc=
-google.golang.org/api v0.148.0/go.mod h1:8/TBgwaKjfqTdacOJrOv2+2Q6fBDU1uHKK06oGSkxzU=
+google.golang.org/api v0.147.0/go.mod h1:pQ/9j83DcmPd/5C9e2nFOdjjNkDZ1G+zkbK2uvdkJMs=
 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=
@@ -480,8 +510,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-20231012201019-e917dd12ba7a h1:a2MQQVoTo96JC9PMGtGBymLp7+/RzpFc2yX/9WfFg1c=
+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-20231012201019-e917dd12ba7a/go.mod h1:4cYg8o5yUbm77w8ZX00LhMVNl/YVBFJRYWDc0uYWMs0=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c/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=
@@ -510,7 +540,6 @@ gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg=
 gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98=
-gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOAJK+LsJg=
 gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g=
 gopkg.in/src-d/go-git.v4 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE=
 gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8=

internal/api/msg.go

@@ -57,10 +57,6 @@ func (m MessageApi) newUserSendMsgReq(c *gin.Context, params *apistruct.SendMsg)
 	var newContent string
 	options := make(map[string]bool, 5)
 	switch params.ContentType {
-	case constant.OANotification:
-		notification := sdkws.NotificationElem{}
-		notification.Detail = utils.StructToJsonString(params.Content)
-		newContent = utils.StructToJsonString(&notification)
 	case constant.Text:
 		fallthrough
 	case constant.Picture:
@@ -73,6 +69,10 @@ func (m MessageApi) newUserSendMsgReq(c *gin.Context, params *apistruct.SendMsg)
 		fallthrough
 	case constant.File:
 		fallthrough
+	case constant.CustomNotTriggerConversation:
+		fallthrough
+	case constant.CustomOnlineOnly:
+		fallthrough
 	default:
 		newContent = utils.StructToJsonString(params.Content)
 	}
@@ -82,6 +82,11 @@ func (m MessageApi) newUserSendMsgReq(c *gin.Context, params *apistruct.SendMsg)
 	if params.NotOfflinePush {
 		utils.SetSwitchFromOptions(options, constant.IsOfflinePush, false)
 	}
+	if params.ContentType == constant.CustomOnlineOnly {
+		m.SetOptions(options, false)
+	} else if params.ContentType == constant.CustomNotTriggerConversation {
+		utils.SetSwitchFromOptions(options, constant.IsConversationUpdate, false)
+	}
 	pbData := msg.SendMsgReq{
 		MsgData: &sdkws.MsgData{
 			SendID:           params.SendID,
@@ -100,6 +105,14 @@ func (m MessageApi) newUserSendMsgReq(c *gin.Context, params *apistruct.SendMsg)
 			OfflinePushInfo:  params.OfflinePushInfo,
 		},
 	}
+	//if params.ContentType == constant.OANotification {
+	//	var tips sdkws.TipsComm
+	//	tips.JsonDetail = utils.StructToJsonString(params.Content)
+	//	pbData.MsgData.Content, err = proto.Marshal(&tips)
+	//	if err != nil {
+	//		log.ZError(c, "Marshal failed ", err, "tips", tips.String())
+	//	}
+	//}
 	return &pbData
 }
 
@@ -167,13 +180,15 @@ func (m *MessageApi) getSendMsgReq(c *gin.Context, req apistruct.SendMsg) (sendM
 		data = apistruct.FileElem{}
 	case constant.Custom:
 		data = apistruct.CustomElem{}
+	case constant.Revoke:
+		data = apistruct.RevokeElem{}
 	case constant.OANotification:
 		data = apistruct.OANotificationElem{}
 		req.SessionType = constant.NotificationChatType
-		if !authverify.IsManagerUserID(req.SendID) {
+	case constant.CustomNotTriggerConversation:
-			return nil, errs.ErrNoPermission.
+		data = apistruct.CustomElem{}
-				Wrap("only app manager can as sender send OANotificationElem")
+	case constant.CustomOnlineOnly:
-		}
+		data = apistruct.CustomElem{}
 	default:
 		return nil, errs.ErrArgs.WithDetail("not support err contentType")
 	}
@@ -197,6 +212,7 @@ func (m *MessageApi) SendMessage(c *gin.Context) {
 		apiresp.GinError(c, errs.ErrNoPermission.Wrap("only app manager can send message"))
 		return
 	}
+
 	sendMsgReq, err := m.getSendMsgReq(c, req.SendMsg)
 	if err != nil {
 		log.ZError(c, "decodeData failed", err)

internal/api/route.go

@@ -83,6 +83,7 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 		userRouterGroup.POST("/get_users_online_status", ParseToken, u.GetUsersOnlineStatus)
 		userRouterGroup.POST("/get_users_online_token_detail", ParseToken, u.GetUsersOnlineTokenDetail)
 		userRouterGroup.POST("/subscribe_users_status", ParseToken, u.SubscriberStatus)
+		userRouterGroup.POST("/unsubscribe_users_status", ParseToken, u.UnSubscriberStatus)
 		userRouterGroup.POST("/get_users_status", ParseToken, u.GetUserStatus)
 		userRouterGroup.POST("/get_subscribe_users_status", ParseToken, u.GetSubscribeUsersStatus)
 	}

internal/api/user.go

@@ -190,6 +190,11 @@ func (u *UserApi) SubscriberStatus(c *gin.Context) {
 	a2r.Call(user.UserClient.SubscribeOrCancelUsersStatus, u.Client, c)
 }
 
+// UnSubscriberStatus Unsubscribe a user's presence.
+func (u *UserApi) UnSubscriberStatus(c *gin.Context) {
+	a2r.Call(user.UserClient.SubscribeOrCancelUsersStatus, u.Client, c)
+}
+
 // GetUserStatus Get the online status of the user.
 func (u *UserApi) GetUserStatus(c *gin.Context) {
 	a2r.Call(user.UserClient.GetUserStatus, u.Client, c)

internal/msggateway/init.go

@@ -18,12 +18,9 @@ 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: ",
@@ -45,7 +42,7 @@ func RunWsAndServer(rpcPort, wsPort, prometheusPort int) error {
 	go func() {
 		err := hubServer.Start()
 		if err != nil {
-			panic(utils.Wrap1(err))
+			panic(err.Error())
 		}
 	}()
 	return hubServer.LongConnServer.Run()

internal/msgtransfer/online_history_msg_handler.go

@@ -283,30 +283,20 @@ func (och *OnlineHistoryRedisConsumerHandler) handleMsg(
 			return
 		}
 		if isNewConversation {
-			switch storageList[0].SessionType {
+			if storageList[0].SessionType == constant.SuperGroupChatType {
-			case constant.SuperGroupChatType:
+				log.ZInfo(ctx, "group chat first create conversation", "conversationID", conversationID)
-				log.ZInfo(ctx, "group chat first create conversation", "conversationID",
-					conversationID)
 				userIDs, err := och.groupRpcClient.GetGroupMemberIDs(ctx, storageList[0].GroupID)
 				if err != nil {
-					log.ZWarn(ctx, "get group member ids error", err, "conversationID",
+					log.ZWarn(ctx, "get group member ids error", err, "conversationID", conversationID)
-						conversationID)
 				} else {
-					if err := och.conversationRpcClient.GroupChatFirstCreateConversation(ctx,
+					if err := och.conversationRpcClient.GroupChatFirstCreateConversation(ctx, storageList[0].GroupID, userIDs); err != nil {
-						storageList[0].GroupID, userIDs); err != nil {
+						log.ZWarn(ctx, "single chat first create conversation error", err, "conversationID", conversationID)
-						log.ZWarn(ctx, "single chat first create conversation error", err,
-							"conversationID", conversationID)
 					}
 				}
-			case constant.SingleChatType, constant.NotificationChatType:
+			} else {
-				if err := och.conversationRpcClient.SingleChatFirstCreateConversation(ctx, storageList[0].RecvID,
+				if err := och.conversationRpcClient.SingleChatFirstCreateConversation(ctx, storageList[0].RecvID, storageList[0].SendID); err != nil {
-					storageList[0].SendID, conversationID, storageList[0].SessionType); err != nil {
+					log.ZWarn(ctx, "single chat first create conversation error", err, "conversationID", conversationID)
-					log.ZWarn(ctx, "single chat or notification first create conversation error", err,
-						"conversationID", conversationID, "sessionType", storageList[0].SessionType)
 				}
-			default:
-				log.ZWarn(ctx, "unknown session type", nil, "sessionType",
-					storageList[0].SessionType)
 			}
 		}
 

internal/msgtransfer/online_msg_to_mongo_handler.go

@@ -62,7 +62,7 @@ func (mc *OnlineHistoryMongoConsumerHandler) handleChatWs2Mongo(
 		log.ZError(ctx, "msgFromMQ.MsgData is empty", nil, "cMsg", cMsg)
 		return
 	}
-	log.ZInfo(ctx, "mongo consumer recv msg", "msgs", msgFromMQ.String())
+	log.ZInfo(ctx, "mongo consumer recv msg", "msgs", msgFromMQ.MsgData)
 	err = mc.msgDatabase.BatchInsertChat2DB(ctx, msgFromMQ.ConversationID, msgFromMQ.MsgData, msgFromMQ.LastSeq)
 	if err != nil {
 		log.ZError(

internal/push/push_handler.go

@@ -58,7 +58,6 @@ func (c *ConsumerHandler) handleMs2PsChat(ctx context.Context, msg []byte) {
 	}
 	sec := msgFromMQ.MsgData.SendTime / 1000
 	nowSec := utils.GetCurrentTimestampBySecond()
-	log.ZDebug(ctx, "push msg", "msg", pbData.String(), "sec", sec, "nowSec", nowSec)
 	if nowSec-sec > 10 {
 		return
 	}

internal/push/push_to_client.go

@@ -126,12 +126,13 @@ func (p *Pusher) Push2User(ctx context.Context, userIDs []string, msg *sdkws.Msg
 }
 
 func (p *Pusher) UnmarshalNotificationElem(bytes []byte, t interface{}) error {
-	var notification sdkws.NotificationElem
+	var notificationElem struct {
-	if err := json.Unmarshal(bytes, &notification); err != nil {
+		Detail string `json:"detail,omitempty"`
+	}
+	if err := json.Unmarshal(bytes, &notificationElem); err != nil {
 		return err
 	}
-
+	return json.Unmarshal([]byte(notificationElem.Detail), t)
-	return json.Unmarshal([]byte(notification.Detail), t)
 }
 
 func (p *Pusher) Push2SuperGroup(ctx context.Context, groupID string, msg *sdkws.MsgData) (err error) {

internal/rpc/conversation/conversaion.go

@@ -17,6 +17,8 @@ package conversation
 import (
 	"context"
 
+	"github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"
+
 	"google.golang.org/grpc"
 
 	"github.com/OpenIMSDK/protocol/constant"
@@ -112,10 +114,7 @@ func (c *conversationServer) SetConversation(ctx context.Context, req *pbconvers
 	return resp, nil
 }
 
-//nolint
+func (c *conversationServer) SetConversations(ctx context.Context, req *pbconversation.SetConversationsReq) (*pbconversation.SetConversationsResp, error) {
-func (c *conversationServer) SetConversations(ctx context.Context,
-	req *pbconversation.SetConversationsReq,
-) (*pbconversation.SetConversationsResp, error) {
 	if req.Conversation == nil {
 		return nil, errs.ErrArgs.Wrap("conversation must not be nil")
 	}
@@ -125,8 +124,14 @@ func (c *conversationServer) SetConversations(ctx context.Context,
 			return nil, err
 		}
 		if groupInfo.Status == constant.GroupStatusDismissed {
-			return nil, errs.ErrDismissedAlready.Wrap("group dismissed")
+			return nil, err
 		}
+		// for _, userID := range req.UserIDs {
+		// 	if _, err := c.groupRpcClient.GetGroupMemberCache(ctx, req.Conversation.GroupID, userID); err != nil {
+		// 		log.ZError(ctx, "user not in group", err, "userID", userID, "groupID", req.Conversation.GroupID)
+		// 		return nil, err
+		// 	}
+		// }
 	}
 	var unequal int
 	var conv tablerelation.ConversationModel
@@ -200,14 +205,7 @@ func (c *conversationServer) SetConversations(ctx context.Context,
 			return nil, err
 		}
 		for _, userID := range req.UserIDs {
-			err := c.conversationNotificationSender.ConversationSetPrivateNotification(ctx, userID, req.Conversation.UserID,
+			c.conversationNotificationSender.ConversationSetPrivateNotification(ctx, userID, req.Conversation.UserID, req.Conversation.IsPrivateChat.Value, req.Conversation.ConversationID)
-				req.Conversation.IsPrivateChat.Value, req.Conversation.ConversationID)
-			if err != nil {
-				log.ZWarn(ctx, "send conversation set private notification failed", err,
-					"userID", userID, "conversationID", req.Conversation.ConversationID)
-
-				continue
-			}
 		}
 	}
 	if req.Conversation.BurnDuration != nil {
@@ -237,40 +235,24 @@ func (c *conversationServer) GetRecvMsgNotNotifyUserIDs(ctx context.Context, req
 }
 
 // create conversation without notification for msg redis transfer.
-func (c *conversationServer) CreateSingleChatConversations(ctx context.Context,
+func (c *conversationServer) CreateSingleChatConversations(ctx context.Context, req *pbconversation.CreateSingleChatConversationsReq) (*pbconversation.CreateSingleChatConversationsResp, error) {
-	req *pbconversation.CreateSingleChatConversationsReq,
+	var conversation tablerelation.ConversationModel
-) (*pbconversation.CreateSingleChatConversationsResp, error) {
+	conversation.ConversationID = msgprocessor.GetConversationIDBySessionType(constant.SingleChatType, req.RecvID, req.SendID)
-	switch req.ConversationType {
+	conversation.ConversationType = constant.SingleChatType
-	case constant.SingleChatType:
+	conversation.OwnerUserID = req.SendID
-		var conversation tablerelation.ConversationModel
+	conversation.UserID = req.RecvID
-		conversation.ConversationID = req.ConversationID
+	err := c.conversationDatabase.CreateConversation(ctx, []*tablerelation.ConversationModel{&conversation})
-		conversation.ConversationType = req.ConversationType
+	if err != nil {
-		conversation.OwnerUserID = req.SendID
+		log.ZWarn(ctx, "create conversation failed", err, "conversation", conversation)
-		conversation.UserID = req.RecvID
-		err := c.conversationDatabase.CreateConversation(ctx, []*tablerelation.ConversationModel{&conversation})
-		if err != nil {
-			log.ZWarn(ctx, "create conversation failed", err, "conversation", conversation)
-		}
-
-		conversation2 := conversation
-		conversation2.OwnerUserID = req.RecvID
-		conversation2.UserID = req.SendID
-		err = c.conversationDatabase.CreateConversation(ctx, []*tablerelation.ConversationModel{&conversation2})
-		if err != nil {
-			log.ZWarn(ctx, "create conversation failed", err, "conversation2", conversation)
-		}
-	case constant.NotificationChatType:
-		var conversation tablerelation.ConversationModel
-		conversation.ConversationID = req.ConversationID
-		conversation.ConversationType = req.ConversationType
-		conversation.OwnerUserID = req.RecvID
-		conversation.UserID = req.SendID
-		err := c.conversationDatabase.CreateConversation(ctx, []*tablerelation.ConversationModel{&conversation})
-		if err != nil {
-			log.ZWarn(ctx, "create conversation failed", err, "conversation2", conversation)
-		}
 	}
 
+	conversation2 := conversation
+	conversation2.OwnerUserID = req.RecvID
+	conversation2.UserID = req.SendID
+	err = c.conversationDatabase.CreateConversation(ctx, []*tablerelation.ConversationModel{&conversation2})
+	if err != nil {
+		log.ZWarn(ctx, "create conversation failed", err, "conversation2", conversation)
+	}
 	return &pbconversation.CreateSingleChatConversationsResp{}, nil
 }
 

internal/rpc/friend/friend.go

@@ -252,8 +252,7 @@ func (s *friendServer) GetDesignatedFriends(
 	return resp, nil
 }
 
-func (s *friendServer) GetDesignatedFriendsApply(ctx context.Context,
+func (s *friendServer) GetDesignatedFriendsApply(ctx context.Context, req *pbfriend.GetDesignatedFriendsApplyReq) (resp *pbfriend.GetDesignatedFriendsApplyResp, err error) {
-	req *pbfriend.GetDesignatedFriendsApplyReq) (resp *pbfriend.GetDesignatedFriendsApplyResp, err error) {
 	friendRequests, err := s.friendDatabase.FindBothFriendRequests(ctx, req.FromUserID, req.ToUserID)
 	if err != nil {
 		return nil, err

internal/rpc/group/group.go

@@ -154,16 +154,16 @@ func (s *groupServer) CheckGroupAdmin(ctx context.Context, groupID string) error
 	return nil
 }
 
-func (s *groupServer) GetPublicUserInfoMap(ctx context.Context, userIDs []string, complete bool) (map[string]*sdkws.PublicUserInfo, error) {
+func (s *groupServer) GetUsernameMap(ctx context.Context, userIDs []string, complete bool) (map[string]string, error) {
 	if len(userIDs) == 0 {
-		return map[string]*sdkws.PublicUserInfo{}, nil
+		return map[string]string{}, nil
 	}
 	users, err := s.User.GetPublicUserInfos(ctx, userIDs, complete)
 	if err != nil {
 		return nil, err
 	}
-	return utils.SliceToMapAny(users, func(e *sdkws.PublicUserInfo) (string, *sdkws.PublicUserInfo) {
+	return utils.SliceToMapAny(users, func(e *sdkws.PublicUserInfo) (string, string) {
-		return e.UserID, e
+		return e.UserID, e.Nickname
 	}), nil
 }
 
@@ -468,18 +468,15 @@ func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbgroup.GetGro
 	if err != nil {
 		return nil, err
 	}
-	publicUserInfoMap, err := s.GetPublicUserInfoMap(ctx, utils.Filter(members, func(e *relationtb.GroupMemberModel) (string, bool) {
+	nameMap, err := s.GetUsernameMap(ctx, utils.Filter(members, func(e *relationtb.GroupMemberModel) (string, bool) {
-		return e.UserID, e.Nickname == "" || e.FaceURL == ""
+		return e.UserID, e.Nickname == ""
 	}), true)
 	if err != nil {
 		return nil, err
 	}
 	resp.Members = utils.Slice(members, func(e *relationtb.GroupMemberModel) *sdkws.GroupMemberFullInfo {
 		if e.Nickname == "" {
-			e.Nickname = publicUserInfoMap[e.UserID].Nickname
+			e.Nickname = nameMap[e.UserID]
-		}
-		if e.FaceURL == "" {
-			e.FaceURL = publicUserInfoMap[e.UserID].FaceURL
 		}
 		return convert.Db2PbGroupMember(e)
 	})
@@ -619,18 +616,15 @@ func (s *groupServer) GetGroupMembersInfo(ctx context.Context, req *pbgroup.GetG
 	if err != nil {
 		return nil, err
 	}
-	publicUserInfoMap, err := s.GetPublicUserInfoMap(ctx, utils.Filter(members, func(e *relationtb.GroupMemberModel) (string, bool) {
+	nameMap, err := s.GetUsernameMap(ctx, utils.Filter(members, func(e *relationtb.GroupMemberModel) (string, bool) {
-		return e.UserID, e.Nickname == "" || e.FaceURL == ""
+		return e.UserID, e.Nickname == ""
 	}), true)
 	if err != nil {
 		return nil, err
 	}
 	resp.Members = utils.Slice(members, func(e *relationtb.GroupMemberModel) *sdkws.GroupMemberFullInfo {
 		if e.Nickname == "" {
-			e.Nickname = publicUserInfoMap[e.UserID].Nickname
+			e.Nickname = nameMap[e.UserID]
-		}
-		if e.FaceURL == "" {
-			e.FaceURL = publicUserInfoMap[e.UserID].FaceURL
 		}
 		return convert.Db2PbGroupMember(e)
 	})
@@ -1073,18 +1067,15 @@ func (s *groupServer) GetGroupMembersCMS(ctx context.Context, req *pbgroup.GetGr
 		return nil, err
 	}
 	resp.Total = total
-	nameMap, err := s.GetPublicUserInfoMap(ctx, utils.Filter(members, func(e *relationtb.GroupMemberModel) (string, bool) {
+	nameMap, err := s.GetUsernameMap(ctx, utils.Filter(members, func(e *relationtb.GroupMemberModel) (string, bool) {
-		return e.UserID, e.Nickname == "" || e.FaceURL == ""
+		return e.UserID, e.Nickname == ""
 	}), true)
 	if err != nil {
 		return nil, err
 	}
 	resp.Members = utils.Slice(members, func(e *relationtb.GroupMemberModel) *sdkws.GroupMemberFullInfo {
 		if e.Nickname == "" {
-			e.Nickname = nameMap[e.UserID].Nickname
+			e.Nickname = nameMap[e.UserID]
-		}
-		if e.FaceURL == "" {
-			e.FaceURL = nameMap[e.UserID].FaceURL
 		}
 		return convert.Db2PbGroupMember(e)
 	})
@@ -1470,7 +1461,7 @@ func (s *groupServer) GetUserInGroupMembers(ctx context.Context, req *pbgroup.Ge
 	if err != nil {
 		return nil, err
 	}
-	publicUserInfoMap, err := s.GetPublicUserInfoMap(ctx, utils.Filter(members, func(e *relationtb.GroupMemberModel) (string, bool) {
+	nameMap, err := s.GetUsernameMap(ctx, utils.Filter(members, func(e *relationtb.GroupMemberModel) (string, bool) {
 		return e.UserID, e.Nickname == ""
 	}), true)
 	if err != nil {
@@ -1478,10 +1469,7 @@ func (s *groupServer) GetUserInGroupMembers(ctx context.Context, req *pbgroup.Ge
 	}
 	resp.Members = utils.Slice(members, func(e *relationtb.GroupMemberModel) *sdkws.GroupMemberFullInfo {
 		if e.Nickname == "" {
-			e.Nickname = publicUserInfoMap[e.UserID].Nickname
+			e.Nickname = nameMap[e.UserID]
-		}
-		if e.FaceURL == "" {
-			e.FaceURL = publicUserInfoMap[e.UserID].FaceURL
 		}
 		return convert.Db2PbGroupMember(e)
 	})
@@ -1506,18 +1494,15 @@ func (s *groupServer) GetGroupMemberRoleLevel(ctx context.Context, req *pbgroup.
 	if err != nil {
 		return nil, err
 	}
-	publicUserInfoMap, err := s.GetPublicUserInfoMap(ctx, utils.Filter(members, func(e *relationtb.GroupMemberModel) (string, bool) {
+	nameMap, err := s.GetUsernameMap(ctx, utils.Filter(members, func(e *relationtb.GroupMemberModel) (string, bool) {
-		return e.UserID, e.Nickname == "" || e.FaceURL == ""
+		return e.UserID, e.Nickname == ""
 	}), true)
 	if err != nil {
 		return nil, err
 	}
 	resp.Members = utils.Slice(members, func(e *relationtb.GroupMemberModel) *sdkws.GroupMemberFullInfo {
 		if e.Nickname == "" {
-			e.Nickname = publicUserInfoMap[e.UserID].Nickname
+			e.Nickname = nameMap[e.UserID]
-		}
-		if e.FaceURL == "" {
-			e.FaceURL = publicUserInfoMap[e.UserID].FaceURL
 		}
 		return convert.Db2PbGroupMember(e)
 	})

internal/rpc/msg/as_read.go

@@ -165,8 +165,8 @@ func (m *msgServer) MarkConversationAsRead(
 			m.conversationAndGetRecvID(conversation, req.UserID), seqs, hasReadSeq); err != nil {
 			return nil, err
 		}
-	} else if conversation.ConversationType == constant.SuperGroupChatType ||
+
-		conversation.ConversationType == constant.NotificationChatType {
+	} else if conversation.ConversationType == constant.SuperGroupChatType {
 		if req.HasReadSeq > hasReadSeq {
 			err = m.MsgDatabase.SetHasReadSeq(ctx, req.UserID, req.ConversationID, req.HasReadSeq)
 			if err != nil {

internal/rpc/msg/sync_msg.go

@@ -62,11 +62,6 @@ func (m *msgServer) PullMessageBySeqs(
 			case sdkws.PullOrder_PullOrderDesc:
 				isEnd = seq.Begin <= minSeq
 			}
-			if len(msgs) == 0 {
-				log.ZWarn(ctx, "not have msgs", nil, "conversationID", seq.ConversationID, "seq", seq)
-
-				continue
-			}
 			resp.Msgs[seq.ConversationID] = &sdkws.PullMsgs{Msgs: msgs, IsEnd: isEnd}
 		} else {
 			var seqs []int64
@@ -76,7 +71,6 @@ func (m *msgServer) PullMessageBySeqs(
 			minSeq, maxSeq, notificationMsgs, err := m.MsgDatabase.GetMsgBySeqs(ctx, req.UserID, seq.ConversationID, seqs)
 			if err != nil {
 				log.ZWarn(ctx, "GetMsgBySeqs error", err, "conversationID", seq.ConversationID, "seq", seq)
-
 				continue
 			}
 			var isEnd bool
@@ -86,11 +80,6 @@ func (m *msgServer) PullMessageBySeqs(
 			case sdkws.PullOrder_PullOrderDesc:
 				isEnd = seq.Begin <= minSeq
 			}
-			if len(notificationMsgs) == 0 {
-				log.ZWarn(ctx, "not have notificationMsgs", nil, "conversationID", seq.ConversationID, "seq", seq)
-
-				continue
-			}
 			resp.NotificationMsgs[seq.ConversationID] = &sdkws.PullMsgs{Msgs: notificationMsgs, IsEnd: isEnd}
 		}
 	}

pkg/apistruct/manage.go

@@ -41,7 +41,7 @@ type SendMsgReq struct {
 type BatchSendMsgReq struct {
 	SendMsg
 	IsSendAll bool     `json:"isSendAll"`
-	RecvIDs   []string `json:"recvIDs" binding:"required"`
+	RecvIDs   []string `json:"recvIDs"`
 }
 
 type BatchSendMsgResp struct {

pkg/common/cmd/root.go

@@ -23,7 +23,6 @@ import (
 
 	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/log"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 )
 

pkg/common/config/parse.go

@@ -92,6 +92,6 @@ func InitConfig(configFolderPath string) error {
 	if err := initConfig(&Config, FileName, configFolderPath); err != nil {
 		return err
 	}
-
+	
 	return initConfig(&Config.Notification, NotificationFileName, configFolderPath)
 }

pkg/common/db/cache/black.go

@@ -52,7 +52,6 @@ func NewBlackCacheRedis(
 	options rockscache.Options,
 ) BlackCache {
 	rcClient := rockscache.NewClient(rdb, options)
-
 	return &BlackCacheRedis{
 		expireTime: blackExpireTime,
 		rcClient:   rcClient,
@@ -89,6 +88,5 @@ 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

@@ -73,7 +73,7 @@ type ConversationCache interface {
 	GetSuperGroupRecvMsgNotNotifyUserIDsHash(ctx context.Context, groupID string) (hash uint64, err error)
 	DelSuperGroupRecvMsgNotNotifyUserIDsHash(groupID string) ConversationCache
 
-	//GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (map[string]int64, error)
+	GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (map[string]int64, error)
 	DelUserAllHasReadSeqs(ownerUserID string, conversationIDs ...string) ConversationCache
 
 	GetConversationsByConversationID(ctx context.Context,
@@ -83,9 +83,12 @@ type ConversationCache interface {
 	DelConversationNotReceiveMessageUserIDs(conversationIDs ...string) ConversationCache
 }
 
-func NewConversationRedis(rdb redis.UniversalClient, opts rockscache.Options, db relationtb.ConversationModelInterface) ConversationCache {
+func NewConversationRedis(
+	rdb redis.UniversalClient,
+	opts rockscache.Options,
+	db relationtb.ConversationModelInterface,
+) ConversationCache {
 	rcClient := rockscache.NewClient(rdb, opts)
-
 	return &ConversationRedisCache{
 		rcClient:       rcClient,
 		metaCache:      NewMetaCacheRedis(rcClient),
@@ -107,7 +110,6 @@ func NewNewConversationRedis(
 	options rockscache.Options,
 ) ConversationCache {
 	rcClient := rockscache.NewClient(rdb, options)
-
 	return &ConversationRedisCache{
 		rcClient:       rcClient,
 		metaCache:      NewMetaCacheRedis(rcClient),
@@ -154,19 +156,24 @@ func (c *ConversationRedisCache) getConversationNotReceiveMessageUserIDsKey(conv
 }
 
 func (c *ConversationRedisCache) GetUserConversationIDs(ctx context.Context, ownerUserID string) ([]string, error) {
-	return getCache(ctx, c.rcClient, c.getConversationIDsKey(ownerUserID), c.expireTime, func(ctx context.Context) ([]string, error) {
+	return getCache(
-		return c.conversationDB.FindUserIDAllConversationID(ctx, ownerUserID)
+		ctx,
-	})
+		c.rcClient,
+		c.getConversationIDsKey(ownerUserID),
+		c.expireTime,
+		func(ctx context.Context) ([]string, error) {
+			return c.conversationDB.FindUserIDAllConversationID(ctx, ownerUserID)
+		},
+	)
 }
 
 func (c *ConversationRedisCache) DelConversationIDs(userIDs ...string) ConversationCache {
-	keys := make([]string, 0, len(userIDs))
+	var keys []string
 	for _, userID := range userIDs {
 		keys = append(keys, c.getConversationIDsKey(userID))
 	}
 	cache := c.NewCache()
 	cache.AddKeys(keys...)
-
 	return cache
 }
 
@@ -174,7 +181,10 @@ func (c *ConversationRedisCache) getUserConversationIDsHashKey(ownerUserID strin
 	return conversationIDsHashKey + ownerUserID
 }
 
-func (c *ConversationRedisCache) GetUserConversationIDsHash(ctx context.Context, ownerUserID string) (hash uint64, err error) {
+func (c *ConversationRedisCache) GetUserConversationIDsHash(
+	ctx context.Context,
+	ownerUserID string,
+) (hash uint64, err error) {
 	return getCache(
 		ctx,
 		c.rcClient,
@@ -194,180 +204,229 @@ func (c *ConversationRedisCache) GetUserConversationIDsHash(ctx context.Context,
 }
 
 func (c *ConversationRedisCache) DelUserConversationIDsHash(ownerUserIDs ...string) ConversationCache {
-	keys := make([]string, 0, len(ownerUserIDs))
+	var keys []string
 	for _, ownerUserID := range ownerUserIDs {
 		keys = append(keys, c.getUserConversationIDsHashKey(ownerUserID))
 	}
 	cache := c.NewCache()
 	cache.AddKeys(keys...)
-
 	return cache
 }
 
-func (c *ConversationRedisCache) GetConversation(ctx context.Context, ownerUserID, conversationID string) (*relationtb.ConversationModel, error) {
+func (c *ConversationRedisCache) GetConversation(
-	return getCache(ctx, c.rcClient, c.getConversationKey(ownerUserID, conversationID), c.expireTime, func(ctx context.Context) (*relationtb.ConversationModel, error) {
+	ctx context.Context,
-		return c.conversationDB.Take(ctx, ownerUserID, conversationID)
+	ownerUserID, conversationID string,
-	})
+) (*relationtb.ConversationModel, error) {
+	return getCache(
+		ctx,
+		c.rcClient,
+		c.getConversationKey(ownerUserID, conversationID),
+		c.expireTime,
+		func(ctx context.Context) (*relationtb.ConversationModel, error) {
+			return c.conversationDB.Take(ctx, ownerUserID, conversationID)
+		},
+	)
 }
 
 func (c *ConversationRedisCache) DelConversations(ownerUserID string, conversationIDs ...string) ConversationCache {
-	keys := make([]string, 0, len(conversationIDs))
+	var keys []string
 	for _, conversationID := range conversationIDs {
 		keys = append(keys, c.getConversationKey(ownerUserID, conversationID))
 	}
 	cache := c.NewCache()
 	cache.AddKeys(keys...)
-
 	return cache
 }
 
-func (c *ConversationRedisCache) getConversationIndex(convsation *relationtb.ConversationModel, keys []string) (int, error) {
+func (c *ConversationRedisCache) getConversationIndex(
+	convsation *relationtb.ConversationModel,
+	keys []string,
+) (int, error) {
 	key := c.getConversationKey(convsation.OwnerUserID, convsation.ConversationID)
 	for _i, _key := range keys {
 		if _key == key {
 			return _i, nil
 		}
 	}
-
 	return 0, errors.New("not found key:" + key + " in keys")
 }
 
-func (c *ConversationRedisCache) GetConversations(ctx context.Context, ownerUserID string, conversationIDs []string) ([]*relationtb.ConversationModel, error) {
+func (c *ConversationRedisCache) GetConversations(
-	//var keys []string
+	ctx context.Context,
-	//for _, conversarionID := range conversationIDs {
+	ownerUserID string,
-	//	keys = append(keys, c.getConversationKey(ownerUserID, conversarionID))
+	conversationIDs []string,
-	//}
+) ([]*relationtb.ConversationModel, error) {
-	//return batchGetCache(
+	var keys []string
-	//	ctx,
+	for _, conversarionID := range conversationIDs {
-	//	c.rcClient,
+		keys = append(keys, c.getConversationKey(ownerUserID, conversarionID))
-	//	keys,
+	}
-	//	c.expireTime,
+	return batchGetCache(
-	//	c.getConversationIndex,
+		ctx,
-	//	func(ctx context.Context) ([]*relationtb.ConversationModel, error) {
+		c.rcClient,
-	//		return c.conversationDB.Find(ctx, ownerUserID, conversationIDs)
+		keys,
-	//	},
+		c.expireTime,
-	//)
+		c.getConversationIndex,
-	return batchGetCache2(ctx, c.rcClient, c.expireTime, conversationIDs, func(conversationID string) string {
+		func(ctx context.Context) ([]*relationtb.ConversationModel, error) {
-		return c.getConversationKey(ownerUserID, conversationID)
+			return c.conversationDB.Find(ctx, ownerUserID, conversationIDs)
-	}, func(ctx context.Context, conversationID string) (*relationtb.ConversationModel, error) {
+		},
-		return c.conversationDB.Take(ctx, ownerUserID, conversationID)
+	)
-	})
 }
 
-func (c *ConversationRedisCache) GetUserAllConversations(ctx context.Context, ownerUserID string) ([]*relationtb.ConversationModel, error) {
+func (c *ConversationRedisCache) GetUserAllConversations(
+	ctx context.Context,
+	ownerUserID string,
+) ([]*relationtb.ConversationModel, error) {
 	conversationIDs, err := c.GetUserConversationIDs(ctx, ownerUserID)
 	if err != nil {
 		return nil, err
 	}
-	//var keys []string
+	var keys []string
-	//for _, conversarionID := range conversationIDs {
+	for _, conversarionID := range conversationIDs {
-	//	keys = append(keys, c.getConversationKey(ownerUserID, conversarionID))
+		keys = append(keys, c.getConversationKey(ownerUserID, conversarionID))
-	//}
+	}
-	//return batchGetCache(
+	return batchGetCache(
-	//	ctx,
+		ctx,
-	//	c.rcClient,
+		c.rcClient,
-	//	keys,
+		keys,
-	//	c.expireTime,
+		c.expireTime,
-	//	c.getConversationIndex,
+		c.getConversationIndex,
-	//	func(ctx context.Context) ([]*relationtb.ConversationModel, error) {
+		func(ctx context.Context) ([]*relationtb.ConversationModel, error) {
-	//		return c.conversationDB.FindUserIDAllConversations(ctx, ownerUserID)
+			return c.conversationDB.FindUserIDAllConversations(ctx, ownerUserID)
-	//	},
+		},
-	//)
+	)
-	return c.GetConversations(ctx, ownerUserID, conversationIDs)
 }
 
-func (c *ConversationRedisCache) GetUserRecvMsgOpt(ctx context.Context, ownerUserID, conversationID string) (opt int, err error) {
+func (c *ConversationRedisCache) GetUserRecvMsgOpt(
-	return getCache(ctx, c.rcClient, c.getRecvMsgOptKey(ownerUserID, conversationID), c.expireTime, func(ctx context.Context) (opt int, err error) {
+	ctx context.Context,
-		return c.conversationDB.GetUserRecvMsgOpt(ctx, ownerUserID, conversationID)
+	ownerUserID, conversationID string,
-	})
+) (opt int, err error) {
+	return getCache(
+		ctx,
+		c.rcClient,
+		c.getRecvMsgOptKey(ownerUserID, conversationID),
+		c.expireTime,
+		func(ctx context.Context) (opt int, err error) {
+			return c.conversationDB.GetUserRecvMsgOpt(ctx, ownerUserID, conversationID)
+		},
+	)
 }
 
-func (c *ConversationRedisCache) GetSuperGroupRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) (userIDs []string, err error) {
+func (c *ConversationRedisCache) GetSuperGroupRecvMsgNotNotifyUserIDs(
-	return getCache(ctx, c.rcClient, c.getSuperGroupRecvNotNotifyUserIDsKey(groupID), c.expireTime, func(ctx context.Context) (userIDs []string, err error) {
+	ctx context.Context,
-		return c.conversationDB.FindSuperGroupRecvMsgNotNotifyUserIDs(ctx, groupID)
+	groupID string,
-	})
+) (userIDs []string, err error) {
+	return getCache(
+		ctx,
+		c.rcClient,
+		c.getSuperGroupRecvNotNotifyUserIDsKey(groupID),
+		c.expireTime,
+		func(ctx context.Context) (userIDs []string, err error) {
+			return c.conversationDB.FindSuperGroupRecvMsgNotNotifyUserIDs(ctx, groupID)
+		},
+	)
 }
 
 func (c *ConversationRedisCache) DelUsersConversation(conversationID string, ownerUserIDs ...string) ConversationCache {
-	keys := make([]string, 0, len(ownerUserIDs))
+	var keys []string
 	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
 }
 
-func (c *ConversationRedisCache) GetSuperGroupRecvMsgNotNotifyUserIDsHash(ctx context.Context, groupID string) (hash uint64, err error) {
+func (c *ConversationRedisCache) GetSuperGroupRecvMsgNotNotifyUserIDsHash(
-	return getCache(ctx, c.rcClient, c.getSuperGroupRecvNotNotifyUserIDsHashKey(groupID), c.expireTime, func(ctx context.Context) (hash uint64, err error) {
+	ctx context.Context,
-		userIDs, err := c.GetSuperGroupRecvMsgNotNotifyUserIDs(ctx, groupID)
+	groupID string,
-		if err != nil {
+) (hash uint64, err error) {
-			return 0, err
+	return getCache(
-		}
+		ctx,
-		utils.Sort(userIDs, true)
+		c.rcClient,
-		bi := big.NewInt(0)
+		c.getSuperGroupRecvNotNotifyUserIDsHashKey(groupID),
-		bi.SetString(utils.Md5(strings.Join(userIDs, ";"))[0:8], 16)
+		c.expireTime,
-		return bi.Uint64(), nil
+		func(ctx context.Context) (hash uint64, err error) {
-	},
+			userIDs, err := c.GetSuperGroupRecvMsgNotNotifyUserIDs(ctx, groupID)
+			if err != nil {
+				return 0, err
+			}
+			utils.Sort(userIDs, true)
+			bi := big.NewInt(0)
+			bi.SetString(utils.Md5(strings.Join(userIDs, ";"))[0:8], 16)
+			return bi.Uint64(), nil
+		},
 	)
 }
 
 func (c *ConversationRedisCache) DelSuperGroupRecvMsgNotNotifyUserIDsHash(groupID string) ConversationCache {
 	cache := c.NewCache()
 	cache.AddKeys(c.getSuperGroupRecvNotNotifyUserIDsHashKey(groupID))
-
 	return cache
 }
 
-func (c *ConversationRedisCache) getUserAllHasReadSeqsIndex(conversationID string, conversationIDs []string) (int, error) {
+func (c *ConversationRedisCache) getUserAllHasReadSeqsIndex(
+	conversationID string,
+	conversationIDs []string,
+) (int, error) {
 	for _i, _conversationID := range conversationIDs {
 		if _conversationID == conversationID {
 			return _i, nil
 		}
 	}
-
 	return 0, errors.New("not found key:" + conversationID + " in keys")
 }
 
-//func (c *ConversationRedisCache) GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (map[string]int64, error) {
+func (c *ConversationRedisCache) GetUserAllHasReadSeqs(
-//	conversationIDs, err := c.GetUserConversationIDs(ctx, ownerUserID)
+	ctx context.Context,
-//	if err != nil {
+	ownerUserID string,
-//		return nil, err
+) (map[string]int64, error) {
-//	}
+	conversationIDs, err := c.GetUserConversationIDs(ctx, ownerUserID)
-//	var keys []string
+	if err != nil {
-//	for _, conversarionID := range conversationIDs {
+		return nil, err
-//		keys = append(keys, c.getConversationHasReadSeqKey(ownerUserID, conversarionID))
+	}
-//	}
+	var keys []string
-//	return batchGetCacheMap(ctx, c.rcClient, keys, conversationIDs, c.expireTime, c.getUserAllHasReadSeqsIndex, func(ctx context.Context) (map[string]int64, error) {
+	for _, conversarionID := range conversationIDs {
-//		return c.conversationDB.GetUserAllHasReadSeqs(ctx, ownerUserID)
+		keys = append(keys, c.getConversationHasReadSeqKey(ownerUserID, conversarionID))
-//	})
+	}
-//}
+	return batchGetCacheMap(
+		ctx,
+		c.rcClient,
+		keys,
+		conversationIDs,
+		c.expireTime,
+		c.getUserAllHasReadSeqsIndex,
+		func(ctx context.Context) (map[string]int64, error) {
+			return c.conversationDB.GetUserAllHasReadSeqs(ctx, ownerUserID)
+		},
+	)
+}
 
-func (c *ConversationRedisCache) DelUserAllHasReadSeqs(ownerUserID string, conversationIDs ...string) ConversationCache {
+func (c *ConversationRedisCache) DelUserAllHasReadSeqs(ownerUserID string,
+	conversationIDs ...string,
+) ConversationCache {
 	cache := c.NewCache()
 	for _, conversationID := range conversationIDs {
 		cache.AddKeys(c.getConversationHasReadSeqKey(ownerUserID, conversationID))
 	}
-
 	return cache
 }
 
-func (c *ConversationRedisCache) GetConversationsByConversationID(ctx context.Context, conversationIDs []string) ([]*relationtb.ConversationModel, error) {
+func (c *ConversationRedisCache) GetConversationsByConversationID(
+	ctx context.Context,
+	conversationIDs []string,
+) ([]*relationtb.ConversationModel, error) {
 	panic("implement me")
 }
 
@@ -376,9 +435,15 @@ func (c *ConversationRedisCache) DelConversationByConversationID(conversationIDs
 }
 
 func (c *ConversationRedisCache) GetConversationNotReceiveMessageUserIDs(ctx context.Context, conversationID string) ([]string, error) {
-	return getCache(ctx, c.rcClient, c.getConversationNotReceiveMessageUserIDsKey(conversationID), c.expireTime, func(ctx context.Context) ([]string, error) {
+	return getCache(
-		return c.conversationDB.GetConversationNotReceiveMessageUserIDs(ctx, conversationID)
+		ctx,
-	})
+		c.rcClient,
+		c.getConversationNotReceiveMessageUserIDsKey(conversationID),
+		c.expireTime,
+		func(ctx context.Context) ([]string, error) {
+			return c.conversationDB.GetConversationNotReceiveMessageUserIDs(ctx, conversationID)
+		},
+	)
 }
 
 func (c *ConversationRedisCache) DelConversationNotReceiveMessageUserIDs(conversationIDs ...string) ConversationCache {
@@ -386,6 +451,5 @@ func (c *ConversationRedisCache) DelConversationNotReceiveMessageUserIDs(convers
 	for _, conversationID := range conversationIDs {
 		cache.AddKeys(c.getConversationNotReceiveMessageUserIDsKey(conversationID))
 	}
-
 	return cache
 }

pkg/common/db/cache/friend.go

@@ -53,8 +53,11 @@ type FriendCacheRedis struct {
 	rcClient   *rockscache.Client
 }
 
-func NewFriendCacheRedis(rdb redis.UniversalClient, friendDB relationtb.FriendModelInterface,
+func NewFriendCacheRedis(
-	options rockscache.Options) FriendCache {
+	rdb redis.UniversalClient,
+	friendDB relationtb.FriendModelInterface,
+	options rockscache.Options,
+) FriendCache {
 	rcClient := rockscache.NewClient(rdb, options)
 	return &FriendCacheRedis{
 		metaCache:  NewMetaCacheRedis(rcClient),
@@ -64,12 +67,12 @@ func NewFriendCacheRedis(rdb redis.UniversalClient, friendDB relationtb.FriendMo
 	}
 }
 
-func (f *FriendCacheRedis) NewCache() FriendCache {
+func (c *FriendCacheRedis) NewCache() FriendCache {
 	return &FriendCacheRedis{
-		rcClient:   f.rcClient,
+		rcClient:   c.rcClient,
-		metaCache:  NewMetaCacheRedis(f.rcClient, f.metaCache.GetPreDelKeys()...),
+		metaCache:  NewMetaCacheRedis(c.rcClient, c.metaCache.GetPreDelKeys()...),
-		friendDB:   f.friendDB,
+		friendDB:   c.friendDB,
-		expireTime: f.expireTime,
+		expireTime: c.expireTime,
 	}
 }
 
@@ -86,24 +89,32 @@ func (f *FriendCacheRedis) getFriendKey(ownerUserID, friendUserID string) string
 }
 
 func (f *FriendCacheRedis) GetFriendIDs(ctx context.Context, ownerUserID string) (friendIDs []string, err error) {
-	return getCache(ctx, f.rcClient, f.getFriendIDsKey(ownerUserID), f.expireTime, func(ctx context.Context) ([]string, error) {
+	return getCache(
-		return f.friendDB.FindFriendUserIDs(ctx, ownerUserID)
+		ctx,
-	})
+		f.rcClient,
+		f.getFriendIDsKey(ownerUserID),
+		f.expireTime,
+		func(ctx context.Context) ([]string, error) {
+			return f.friendDB.FindFriendUserIDs(ctx, ownerUserID)
+		},
+	)
 }
 
-func (f *FriendCacheRedis) DelFriendIDs(ownerUserIDs ...string) FriendCache {
+func (f *FriendCacheRedis) DelFriendIDs(ownerUserID ...string) FriendCache {
-	newGroupCache := f.NewCache()
+	new := f.NewCache()
-	keys := make([]string, 0, len(ownerUserIDs))
+	var keys []string
-	for _, userID := range ownerUserIDs {
+	for _, userID := range ownerUserID {
 		keys = append(keys, f.getFriendIDsKey(userID))
 	}
-	newGroupCache.AddKeys(keys...)
+	new.AddKeys(keys...)
-
+	return new
-	return newGroupCache
 }
 
 // todo.
-func (f *FriendCacheRedis) GetTwoWayFriendIDs(ctx context.Context, ownerUserID string) (twoWayFriendIDs []string, err error) {
+func (f *FriendCacheRedis) GetTwoWayFriendIDs(
+	ctx context.Context,
+	ownerUserID string,
+) (twoWayFriendIDs []string, err error) {
 	friendIDs, err := f.GetFriendIDs(ctx, ownerUserID)
 	if err != nil {
 		return nil, err
@@ -117,28 +128,32 @@ 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 {
-	newFriendCache := f.NewCache()
+	new := f.NewCache()
-	newFriendCache.AddKeys(f.getTwoWayFriendsIDsKey(ownerUserID))
+	new.AddKeys(f.getTwoWayFriendsIDsKey(ownerUserID))
-
+	return new
-	return newFriendCache
 }
 
-func (f *FriendCacheRedis) GetFriend(ctx context.Context, ownerUserID,
+func (f *FriendCacheRedis) GetFriend(
-	friendUserID string) (friend *relationtb.FriendModel, err error) {
+	ctx context.Context,
-	return getCache(ctx, f.rcClient, f.getFriendKey(ownerUserID,
+	ownerUserID, friendUserID string,
-		friendUserID), f.expireTime, func(ctx context.Context) (*relationtb.FriendModel, error) {
+) (friend *relationtb.FriendModel, err error) {
-		return f.friendDB.Take(ctx, ownerUserID, friendUserID)
+	return getCache(
-	})
+		ctx,
+		f.rcClient,
+		f.getFriendKey(ownerUserID, friendUserID),
+		f.expireTime,
+		func(ctx context.Context) (*relationtb.FriendModel, error) {
+			return f.friendDB.Take(ctx, ownerUserID, friendUserID)
+		},
+	)
 }
 
 func (f *FriendCacheRedis) DelFriend(ownerUserID, friendUserID string) FriendCache {
-	newFriendCache := f.NewCache()
+	new := f.NewCache()
-	newFriendCache.AddKeys(f.getFriendKey(ownerUserID, friendUserID))
+	new.AddKeys(f.getFriendKey(ownerUserID, friendUserID))
-
+	return new
-	return newFriendCache
 }

pkg/common/db/cache/group.go

@@ -65,10 +65,22 @@ type GroupCache interface {
 	GetJoinedGroupIDs(ctx context.Context, userID string) (joinedGroupIDs []string, err error)
 	DelJoinedGroupID(userID ...string) GroupCache
 
-	GetGroupMemberInfo(ctx context.Context, groupID, userID string) (groupMember *relationtb.GroupMemberModel, err error)
+	GetGroupMemberInfo(
-	GetGroupMembersInfo(ctx context.Context, groupID string, userID []string) (groupMembers []*relationtb.GroupMemberModel, err error)
+		ctx context.Context,
+		groupID, userID string,
+	) (groupMember *relationtb.GroupMemberModel, err error)
+	GetGroupMembersInfo(
+		ctx context.Context,
+		groupID string,
+		userID []string,
+	) (groupMembers []*relationtb.GroupMemberModel, err error)
 	GetAllGroupMembersInfo(ctx context.Context, groupID string) (groupMembers []*relationtb.GroupMemberModel, err error)
-	GetGroupMembersPage(ctx context.Context, groupID string, userID []string, showNumber, pageNumber int32) (total uint32, groupMembers []*relationtb.GroupMemberModel, err error)
+	GetGroupMembersPage(
+		ctx context.Context,
+		groupID string,
+		userID []string,
+		showNumber, pageNumber int32,
+	) (total uint32, groupMembers []*relationtb.GroupMemberModel, err error)
 
 	DelGroupMembersInfo(groupID string, userID ...string) GroupCache
 
@@ -97,7 +109,6 @@ func NewGroupCacheRedis(
 	opts rockscache.Options,
 ) GroupCache {
 	rcClient := rockscache.NewClient(rdb, opts)
-
 	return &GroupCacheRedis{
 		rcClient: rcClient, expireTime: groupExpireTime,
 		groupDB: groupDB, groupMemberDB: groupMemberDB, groupRequestDB: groupRequestDB,
@@ -158,7 +169,6 @@ func (g *GroupCacheRedis) GetGroupIndex(group *relationtb.GroupModel, keys []str
 			return i, nil
 		}
 	}
-
 	return 0, errIndex
 }
 
@@ -169,98 +179,117 @@ func (g *GroupCacheRedis) GetGroupMemberIndex(groupMember *relationtb.GroupMembe
 			return i, nil
 		}
 	}
-
 	return 0, errIndex
 }
 
 // / groupInfo.
-func (g *GroupCacheRedis) GetGroupsInfo(ctx context.Context, groupIDs []string) (groups []*relationtb.GroupModel, err error) {
+func (g *GroupCacheRedis) GetGroupsInfo(
-	//var keys []string
+	ctx context.Context,
-	//for _, group := range groupIDs {
+	groupIDs []string,
-	//	keys = append(keys, g.getGroupInfoKey(group))
+) (groups []*relationtb.GroupModel, err error) {
-	//}
+	var keys []string
-	//return batchGetCache(ctx, g.rcClient, keys, g.expireTime, g.GetGroupIndex, func(ctx context.Context) ([]*relationtb.GroupModel, error) {
+	for _, group := range groupIDs {
-	//	return g.groupDB.Find(ctx, groupIDs)
+		keys = append(keys, g.getGroupInfoKey(group))
-	//})
-	return batchGetCache2(ctx, g.rcClient, g.expireTime, groupIDs, func(groupID string) string {
-		return g.getGroupInfoKey(groupID)
-	}, func(ctx context.Context, groupID string) (*relationtb.GroupModel, error) {
-		return g.groupDB.Take(ctx, groupID)
-	})
-}
-
-func (g *GroupCacheRedis) GetGroupInfo(ctx context.Context, groupID string) (group *relationtb.GroupModel, err error) {
-	return getCache(ctx, g.rcClient, g.getGroupInfoKey(groupID), g.expireTime, func(ctx context.Context) (*relationtb.GroupModel, error) {
-		return g.groupDB.Take(ctx, groupID)
-	})
-}
-
-func (g *GroupCacheRedis) DelGroupsInfo(groupIDs ...string) GroupCache {
-	newGroupCache := g.NewCache()
-	keys := make([]string, 0, len(groupIDs))
-	for _, groupID := range groupIDs {
-		keys = append(keys, g.getGroupInfoKey(groupID))
 	}
-	newGroupCache.AddKeys(keys...)
+	return batchGetCache(
-
+		ctx,
-	return newGroupCache
+		g.rcClient,
-}
+		keys,
-
+		g.expireTime,
-func (g *GroupCacheRedis) GetJoinedSuperGroupIDs(ctx context.Context, userID string) (joinedSuperGroupIDs []string, err error) {
+		g.GetGroupIndex,
-	return getCache(ctx, g.rcClient, g.getJoinedSuperGroupsIDKey(userID), g.expireTime, func(ctx context.Context) ([]string, error) {
+		func(ctx context.Context) ([]*relationtb.GroupModel, error) {
-		userGroup, err := g.mongoDB.GetSuperGroupByUserID(ctx, userID)
+			return g.groupDB.Find(ctx, groupIDs)
-		if err != nil {
+		},
-			return nil, err
-		}
-		return userGroup.GroupIDs, nil
-	},
 	)
 }
 
-func (g *GroupCacheRedis) GetSuperGroupMemberIDs(ctx context.Context, groupIDs ...string) (models []*unrelationtb.SuperGroupModel, err error) {
+func (g *GroupCacheRedis) GetGroupInfo(ctx context.Context, groupID string) (group *relationtb.GroupModel, err error) {
-	//var keys []string
+	return getCache(
-	//for _, group := range groupIDs {
+		ctx,
-	//	keys = append(keys, g.getSuperGroupMemberIDsKey(group))
+		g.rcClient,
-	//}
+		g.getGroupInfoKey(groupID),
-	//return batchGetCache(ctx, g.rcClient, keys, g.expireTime, func(model *unrelationtb.SuperGroupModel, keys []string) (int, error) {
+		g.expireTime,
-	//	for i, key := range keys {
+		func(ctx context.Context) (*relationtb.GroupModel, error) {
-	//		if g.getSuperGroupMemberIDsKey(model.GroupID) == key {
+			return g.groupDB.Take(ctx, groupID)
-	//			return i, nil
+		},
-	//		}
+	)
-	//	}
+}
-	//	return 0, errIndex
+
-	//},
+func (g *GroupCacheRedis) DelGroupsInfo(groupIDs ...string) GroupCache {
-	//	func(ctx context.Context) ([]*unrelationtb.SuperGroupModel, error) {
+	new := g.NewCache()
-	//		return g.mongoDB.FindSuperGroup(ctx, groupIDs)
+	var keys []string
-	//	})
+	for _, groupID := range groupIDs {
-	return batchGetCache2(ctx, g.rcClient, g.expireTime, groupIDs, func(groupID string) string {
+		keys = append(keys, g.getGroupInfoKey(groupID))
-		return g.getSuperGroupMemberIDsKey(groupID)
+	}
-	}, func(ctx context.Context, groupID string) (*unrelationtb.SuperGroupModel, error) {
+	new.AddKeys(keys...)
-		return g.mongoDB.TakeSuperGroup(ctx, groupID)
+	return new
-	})
+}
+
+func (g *GroupCacheRedis) GetJoinedSuperGroupIDs(
+	ctx context.Context,
+	userID string,
+) (joinedSuperGroupIDs []string, err error) {
+	return getCache(
+		ctx,
+		g.rcClient,
+		g.getJoinedSuperGroupsIDKey(userID),
+		g.expireTime,
+		func(ctx context.Context) ([]string, error) {
+			userGroup, err := g.mongoDB.GetSuperGroupByUserID(ctx, userID)
+			if err != nil {
+				return nil, err
+			}
+			return userGroup.GroupIDs, nil
+		},
+	)
+}
+
+func (g *GroupCacheRedis) GetSuperGroupMemberIDs(
+	ctx context.Context,
+	groupIDs ...string,
+) (models []*unrelationtb.SuperGroupModel, err error) {
+	var keys []string
+	for _, group := range groupIDs {
+		keys = append(keys, g.getSuperGroupMemberIDsKey(group))
+	}
+	return batchGetCache(
+		ctx,
+		g.rcClient,
+		keys,
+		g.expireTime,
+		func(model *unrelationtb.SuperGroupModel, keys []string) (int, error) {
+			for i, key := range keys {
+				if g.getSuperGroupMemberIDsKey(model.GroupID) == key {
+					return i, nil
+				}
+			}
+			return 0, errIndex
+		},
+		func(ctx context.Context) ([]*unrelationtb.SuperGroupModel, error) {
+			return g.mongoDB.FindSuperGroup(ctx, groupIDs)
+		},
+	)
 }
 
 // userJoinSuperGroup.
 func (g *GroupCacheRedis) DelJoinedSuperGroupIDs(userIDs ...string) GroupCache {
-	newGroupCache := g.NewCache()
+	new := g.NewCache()
-	keys := make([]string, 0, len(userIDs))
+	var keys []string
 	for _, userID := range userIDs {
 		keys = append(keys, g.getJoinedSuperGroupsIDKey(userID))
 	}
-	newGroupCache.AddKeys(keys...)
+	new.AddKeys(keys...)
-
+	return new
-	return newGroupCache
 }
 
 func (g *GroupCacheRedis) DelSuperGroupMemberIDs(groupIDs ...string) GroupCache {
-	newGroupCache := g.NewCache()
+	new := g.NewCache()
-	keys := make([]string, 0, len(groupIDs))
+	var keys []string
 	for _, groupID := range groupIDs {
 		keys = append(keys, g.getSuperGroupMemberIDsKey(groupID))
 	}
-	newGroupCache.AddKeys(keys...)
+	new.AddKeys(keys...)
-
+	return new
-	return newGroupCache
 }
 
 // groupMembersHash.
@@ -322,7 +351,10 @@ func (g *GroupCacheRedis) GetGroupMembersHash(ctx context.Context, groupID strin
 	//)
 }
 
-func (g *GroupCacheRedis) GetGroupMemberHashMap(ctx context.Context, groupIDs []string) (map[string]*relationtb.GroupSimpleUserID, error) {
+func (g *GroupCacheRedis) GetGroupMemberHashMap(
+	ctx context.Context,
+	groupIDs []string,
+) (map[string]*relationtb.GroupSimpleUserID, error) {
 	res := make(map[string]*relationtb.GroupSimpleUserID)
 	for _, groupID := range groupIDs {
 		hash, err := g.GetGroupMembersHash(ctx, groupID)
@@ -336,22 +368,26 @@ 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
 }
 
 // groupMemberIDs.
 func (g *GroupCacheRedis) GetGroupMemberIDs(ctx context.Context, groupID string) (groupMemberIDs []string, err error) {
-	return getCache(ctx, g.rcClient, g.getGroupMemberIDsKey(groupID), g.expireTime, func(ctx context.Context) ([]string, error) {
+	return getCache(
-		return g.groupMemberDB.FindMemberUserID(ctx, groupID)
+		ctx,
-	})
+		g.rcClient,
+		g.getGroupMemberIDsKey(groupID),
+		g.expireTime,
+		func(ctx context.Context) ([]string, error) {
+			return g.groupMemberDB.FindMemberUserID(ctx, groupID)
+		},
+	)
 }
 
 func (g *GroupCacheRedis) GetGroupsMemberIDs(ctx context.Context, groupIDs []string) (map[string][]string, error) {
@@ -363,53 +399,71 @@ 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
 }
 
 func (g *GroupCacheRedis) GetJoinedGroupIDs(ctx context.Context, userID string) (joinedGroupIDs []string, err error) {
-	return getCache(ctx, g.rcClient, g.getJoinedGroupsKey(userID), g.expireTime, func(ctx context.Context) ([]string, error) {
+	return getCache(
-		return g.groupMemberDB.FindUserJoinedGroupID(ctx, userID)
+		ctx,
-	})
+		g.rcClient,
+		g.getJoinedGroupsKey(userID),
+		g.expireTime,
+		func(ctx context.Context) ([]string, error) {
+			return g.groupMemberDB.FindUserJoinedGroupID(ctx, userID)
+		},
+	)
 }
 
 func (g *GroupCacheRedis) DelJoinedGroupID(userIDs ...string) GroupCache {
-	keys := make([]string, 0, len(userIDs))
+	var keys []string
 	for _, userID := range userIDs {
 		keys = append(keys, g.getJoinedGroupsKey(userID))
 	}
 	cache := g.NewCache()
 	cache.AddKeys(keys...)
-
 	return cache
 }
 
-func (g *GroupCacheRedis) GetGroupMemberInfo(ctx context.Context, groupID, userID string) (groupMember *relationtb.GroupMemberModel, err error) {
+func (g *GroupCacheRedis) GetGroupMemberInfo(
-	return getCache(ctx, g.rcClient, g.getGroupMemberInfoKey(groupID, userID), g.expireTime, func(ctx context.Context) (*relationtb.GroupMemberModel, error) {
+	ctx context.Context,
-		return g.groupMemberDB.Take(ctx, groupID, userID)
+	groupID, userID string,
-	})
+) (groupMember *relationtb.GroupMemberModel, err error) {
+	return getCache(
+		ctx,
+		g.rcClient,
+		g.getGroupMemberInfoKey(groupID, userID),
+		g.expireTime,
+		func(ctx context.Context) (*relationtb.GroupMemberModel, error) {
+			return g.groupMemberDB.Take(ctx, groupID, userID)
+		},
+	)
 }
 
-func (g *GroupCacheRedis) GetGroupMembersInfo(ctx context.Context, groupID string, userIDs []string) ([]*relationtb.GroupMemberModel, error) {
+func (g *GroupCacheRedis) GetGroupMembersInfo(
-	//var keys []string
+	ctx context.Context,
-	//for _, userID := range userIDs {
+	groupID string,
-	//	keys = append(keys, g.getGroupMemberInfoKey(groupID, userID))
+	userIDs []string,
-	//}
+) ([]*relationtb.GroupMemberModel, error) {
-	//return batchGetCache(ctx, g.rcClient, keys, g.expireTime, g.GetGroupMemberIndex, func(ctx context.Context) ([]*relationtb.GroupMemberModel, error) {
+	var keys []string
-	//	return g.groupMemberDB.Find(ctx, []string{groupID}, userIDs, nil)
+	for _, userID := range userIDs {
-	//})
+		keys = append(keys, g.getGroupMemberInfoKey(groupID, userID))
-	return batchGetCache2(ctx, g.rcClient, g.expireTime, userIDs, func(userID string) string {
+	}
-		return g.getGroupMemberInfoKey(groupID, userID)
+	return batchGetCache(
-	}, func(ctx context.Context, userID string) (*relationtb.GroupMemberModel, error) {
+		ctx,
-		return g.groupMemberDB.Take(ctx, groupID, userID)
+		g.rcClient,
-	})
+		keys,
+		g.expireTime,
+		g.GetGroupMemberIndex,
+		func(ctx context.Context) ([]*relationtb.GroupMemberModel, error) {
+			return g.groupMemberDB.Find(ctx, []string{groupID}, userIDs, nil)
+		},
+	)
 }
 
 func (g *GroupCacheRedis) GetGroupMembersPage(
@@ -428,58 +482,72 @@ func (g *GroupCacheRedis) GetGroupMembersPage(
 		userIDs = groupMemberIDs
 	}
 	groupMembers, err = g.GetGroupMembersInfo(ctx, groupID, utils.Paginate(userIDs, int(showNumber), int(showNumber)))
-
 	return uint32(len(userIDs)), groupMembers, err
 }
 
-func (g *GroupCacheRedis) GetAllGroupMembersInfo(ctx context.Context, groupID string) (groupMembers []*relationtb.GroupMemberModel, err error) {
+func (g *GroupCacheRedis) GetAllGroupMembersInfo(
+	ctx context.Context,
+	groupID string,
+) (groupMembers []*relationtb.GroupMemberModel, err error) {
 	groupMemberIDs, err := g.GetGroupMemberIDs(ctx, groupID)
 	if err != nil {
 		return nil, err
 	}
-
 	return g.GetGroupMembersInfo(ctx, groupID, groupMemberIDs)
 }
 
-func (g *GroupCacheRedis) GetAllGroupMemberInfo(ctx context.Context, groupID string) ([]*relationtb.GroupMemberModel, error) {
+func (g *GroupCacheRedis) GetAllGroupMemberInfo(
+	ctx context.Context,
+	groupID string,
+) ([]*relationtb.GroupMemberModel, error) {
 	groupMemberIDs, err := g.GetGroupMemberIDs(ctx, groupID)
 	if err != nil {
 		return nil, err
 	}
-	//var keys []string
+	var keys []string
-	//for _, groupMemberID := range groupMemberIDs {
+	for _, groupMemberID := range groupMemberIDs {
-	//	keys = append(keys, g.getGroupMemberInfoKey(groupID, groupMemberID))
+		keys = append(keys, g.getGroupMemberInfoKey(groupID, groupMemberID))
-	//}
+	}
-	//return batchGetCache(ctx, g.rcClient, keys, g.expireTime, g.GetGroupMemberIndex, func(ctx context.Context) ([]*relationtb.GroupMemberModel, error) {
+	return batchGetCache(
-	//	return g.groupMemberDB.Find(ctx, []string{groupID}, groupMemberIDs, nil)
+		ctx,
-	//})
+		g.rcClient,
-	return g.GetGroupMembersInfo(ctx, groupID, groupMemberIDs)
+		keys,
+		g.expireTime,
+		g.GetGroupMemberIndex,
+		func(ctx context.Context) ([]*relationtb.GroupMemberModel, error) {
+			return g.groupMemberDB.Find(ctx, []string{groupID}, groupMemberIDs, nil)
+		},
+	)
 }
 
 func (g *GroupCacheRedis) DelGroupMembersInfo(groupID string, userIDs ...string) GroupCache {
-	keys := make([]string, 0, len(userIDs))
+	var keys []string
 	for _, userID := range userIDs {
 		keys = append(keys, g.getGroupMemberInfoKey(groupID, userID))
 	}
 	cache := g.NewCache()
 	cache.AddKeys(keys...)
-
 	return cache
 }
 
 func (g *GroupCacheRedis) GetGroupMemberNum(ctx context.Context, groupID string) (memberNum int64, err error) {
-	return getCache(ctx, g.rcClient, g.getGroupMemberNumKey(groupID), g.expireTime, func(ctx context.Context) (int64, error) {
+	return getCache(
-		return g.groupMemberDB.TakeGroupMemberNum(ctx, groupID)
+		ctx,
-	})
+		g.rcClient,
+		g.getGroupMemberNumKey(groupID),
+		g.expireTime,
+		func(ctx context.Context) (int64, error) {
+			return g.groupMemberDB.TakeGroupMemberNum(ctx, groupID)
+		},
+	)
 }
 
 func (g *GroupCacheRedis) DelGroupsMemberNum(groupID ...string) GroupCache {
-	keys := make([]string, 0, len(groupID))
+	var keys []string
 	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

@@ -18,6 +18,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"time"
 
 	"github.com/dtm-labs/rockscache"
@@ -58,40 +59,27 @@ type metaCacheRedis struct {
 func (m *metaCacheRedis) ExecDel(ctx context.Context) error {
 	if len(m.keys) > 0 {
 		log.ZDebug(ctx, "delete cache", "keys", m.keys)
-		for _, key := range m.keys {
+		retryTimes := 0
-			for i := 0; i < m.maxRetryTimes; i++ {
+		for {
-				if err := m.rcClient.TagAsDeleted(key); err != nil {
+			if err := m.rcClient.TagAsDeletedBatch2(ctx, m.keys); err != nil {
-					log.ZError(ctx, "delete cache failed", err, "key", key)
+				if retryTimes >= m.maxRetryTimes {
-					time.Sleep(m.retryInterval)
+					err = errs.ErrInternalServer.Wrap(
-					continue
+						fmt.Sprintf(
+							"delete cache error: %v, keys: %v, retry times %d, please check redis server",
+							err,
+							m.keys,
+							retryTimes,
+						),
+					)
+					log.ZWarn(ctx, "delete cache failed, please handle keys", err, "keys", m.keys)
+					return err
 				}
+				retryTimes++
+			} else {
 				break
 			}
-
-			//retryTimes := 0
-			//for {
-			//	m.rcClient.TagAsDeleted()
-			//	if err := m.rcClient.TagAsDeletedBatch2(ctx, []string{key}); err != nil {
-			//		if retryTimes >= m.maxRetryTimes {
-			//			err = errs.ErrInternalServer.Wrap(
-			//				fmt.Sprintf(
-			//					"delete cache error: %v, keys: %v, retry times %d, please check redis server",
-			//					err,
-			//					key,
-			//					retryTimes,
-			//				),
-			//			)
-			//			log.ZWarn(ctx, "delete cache failed, please handle keys", err, "keys", key)
-			//			return err
-			//		}
-			//		retryTimes++
-			//	} else {
-			//		break
-			//	}
-			//}
 		}
 	}
-
 	return nil
 }
 
@@ -115,11 +103,16 @@ func GetDefaultOpt() rockscache.Options {
 	opts := rockscache.NewDefaultOptions()
 	opts.StrongConsistency = true
 	opts.RandomExpireAdjustment = 0.2
-
 	return opts
 }
 
-func getCache[T any](ctx context.Context, rcClient *rockscache.Client, key string, expire time.Duration, fn func(ctx context.Context) (T, error)) (T, error) {
+func getCache[T any](
+	ctx context.Context,
+	rcClient *rockscache.Client,
+	key string,
+	expire time.Duration,
+	fn func(ctx context.Context) (T, error),
+) (T, error) {
 	var t T
 	var write bool
 	v, err := rcClient.Fetch2(ctx, key, expire, func() (s string, err error) {
@@ -132,7 +125,6 @@ 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 {
@@ -147,116 +139,95 @@ 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
 }
 
-// func batchGetCache[T any](ctx context.Context, rcClient *rockscache.Client, keys []string, expire time.Duration, keyIndexFn func(t T, keys []string) (int, error), fn func(ctx context.Context) ([]T,
+func batchGetCache[T any](
-// error)) ([]T, error) {
-//	batchMap, err := rcClient.FetchBatch2(ctx, keys, expire, func(idxs []int) (m map[int]string, err error) {
-//		values := make(map[int]string)
-//		tArrays, err := fn(ctx)
-//		if err != nil {
-//			return nil, err
-//		}
-//		for _, v := range tArrays {
-//			index, err := keyIndexFn(v, keys)
-//			if err != nil {
-//				continue
-//			}
-//			bs, err := json.Marshal(v)
-//			if err != nil {
-//				return nil, utils.Wrap(err, "marshal failed")
-//			}
-//			values[index] = string(bs)
-//		}
-//		return values, nil
-//	})
-//	if err != nil {
-//		return nil, err
-//	}
-//	var tArrays []T
-//	for _, v := range batchMap {
-//		if v != "" {
-//			var t T
-//			err = json.Unmarshal([]byte(v), &t)
-//			if err != nil {
-//				return nil, utils.Wrap(err, "unmarshal failed")
-//			}
-//			tArrays = append(tArrays, t)
-//		}
-//	}
-//	return tArrays, nil
-//}
-
-func batchGetCache2[T any, K comparable](
 	ctx context.Context,
 	rcClient *rockscache.Client,
+	keys []string,
 	expire time.Duration,
-	keys []K,
+	keyIndexFn func(t T, keys []string) (int, error),
-	keyFn func(key K) string,
+	fn func(ctx context.Context) ([]T, error),
-	fns func(ctx context.Context, key K) (T, error),
 ) ([]T, error) {
-	if len(keys) == 0 {
+	batchMap, err := rcClient.FetchBatch2(ctx, keys, expire, func(idxs []int) (m map[int]string, err error) {
-		return nil, nil
+		values := make(map[int]string)
-	}
+		tArrays, err := fn(ctx)
-	res := make([]T, 0, len(keys))
-	for _, key := range keys {
-		val, err := getCache(ctx, rcClient, keyFn(key), expire, func(ctx context.Context) (T, error) {
-			return fns(ctx, key)
-		})
 		if err != nil {
 			return nil, err
 		}
-		res = append(res, val)
+		for _, v := range tArrays {
+			index, err := keyIndexFn(v, keys)
+			if err != nil {
+				continue
+			}
+			bs, err := json.Marshal(v)
+			if err != nil {
+				return nil, utils.Wrap(err, "marshal failed")
+			}
+			values[index] = string(bs)
+		}
+		return values, nil
+	})
+	if err != nil {
+		return nil, err
 	}
-
+	var tArrays []T
-	return res, nil
+	for _, v := range batchMap {
+		if v != "" {
+			var t T
+			err = json.Unmarshal([]byte(v), &t)
+			if err != nil {
+				return nil, utils.Wrap(err, "unmarshal failed")
+			}
+			tArrays = append(tArrays, t)
+		}
+	}
+	return tArrays, nil
 }
 
-//func batchGetCacheMap[T any](
+func batchGetCacheMap[T any](
-//	ctx context.Context,
+	ctx context.Context,
-//	rcClient *rockscache.Client,
+	rcClient *rockscache.Client,
-//	keys, originKeys []string,
+	keys, originKeys []string,
-//	expire time.Duration,
+	expire time.Duration,
-//	keyIndexFn func(s string, keys []string) (int, error),
+	keyIndexFn func(s string, keys []string) (int, error),
-//	fn func(ctx context.Context) (map[string]T, error),
+	fn func(ctx context.Context) (map[string]T, error),
-//) (map[string]T, error) {
+) (map[string]T, error) {
-//	batchMap, err := rcClient.FetchBatch2(ctx, keys, expire, func(idxs []int) (m map[int]string, err error) {
+	batchMap, err := rcClient.FetchBatch2(ctx, keys, expire, func(idxs []int) (m map[int]string, err error) {
-//		tArrays, err := fn(ctx)
+		tArrays, err := fn(ctx)
-//		if err != nil {
+		if err != nil {
-//			return nil, err
+			return nil, err
-//		}
+		}
-//		values := make(map[int]string)
+		values := make(map[int]string)
-//		for k, v := range tArrays {
+		for k, v := range tArrays {
-//			index, err := keyIndexFn(k, originKeys)
+			index, err := keyIndexFn(k, originKeys)
-//			if err != nil {
+			if err != nil {
-//				continue
+				continue
-//			}
+			}
-//			bs, err := json.Marshal(v)
+			bs, err := json.Marshal(v)
-//			if err != nil {
+			if err != nil {
-//				return nil, utils.Wrap(err, "marshal failed")
+				return nil, utils.Wrap(err, "marshal failed")
-//			}
+			}
-//			values[index] = string(bs)
+			values[index] = string(bs)
-//		}
+		}
-//		return values, nil
+		return values, nil
-//	})
+	})
-//	if err != nil {
+	if err != nil {
-//		return nil, err
+		return nil, err
-//	}
+	}
-//	tMap := make(map[string]T)
+	tMap := make(map[string]T)
-//	for i, v := range batchMap {
+	for i, v := range batchMap {
-//		if v != "" {
+		if v != "" {
-//			var t T
+			var t T
-//			err = json.Unmarshal([]byte(v), &t)
+			err = json.Unmarshal([]byte(v), &t)
-//			if err != nil {
+			if err != nil {
-//				return nil, utils.Wrap(err, "unmarshal failed")
+				return nil, utils.Wrap(err, "unmarshal failed")
-//			}
+			}
-//			tMap[originKeys[i]] = t
+			tMap[originKeys[i]] = t
-//		}
+		}
-//	}
+	}
-//	return tMap, nil
+	return tMap, nil
-//}
+}

pkg/common/db/cache/msg.go

@@ -16,16 +16,13 @@ package cache
 
 import (
 	"context"
-	"errors"
 	"strconv"
 	"time"
 
-	"github.com/dtm-labs/rockscache"
-
-	unrelationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"
 
+	"github.com/dtm-labs/rockscache"
+
 	"github.com/OpenIMSDK/tools/errs"
 
 	"github.com/gogo/protobuf/jsonpb"
@@ -36,6 +33,7 @@ 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"
 )
@@ -107,7 +105,11 @@ type MsgModel interface {
 	GetTokensWithoutError(ctx context.Context, userID string, platformID int) (map[string]int, error)
 	SetTokenMapByUidPid(ctx context.Context, userID string, platformID int, m map[string]int) error
 	DeleteTokenByUidPid(ctx context.Context, userID string, platformID int, fields []string) error
-	GetMessagesBySeq(ctx context.Context, conversationID string, seqs []int64) (seqMsg []*sdkws.MsgData, failedSeqList []int64, err error)
+	GetMessagesBySeq(
+		ctx context.Context,
+		conversationID string,
+		seqs []int64,
+	) (seqMsg []*sdkws.MsgData, failedSeqList []int64, err error)
 	SetMessageToCache(ctx context.Context, conversationID string, msgs []*sdkws.MsgData) (int, error)
 	UserDeleteMsgs(ctx context.Context, conversationID string, seqs []int64, userID string) error
 	DelUserDeleteMsgsList(ctx context.Context, conversationID string, seqs []int64)
@@ -120,7 +122,12 @@ type MsgModel interface {
 	JudgeMessageReactionExist(ctx context.Context, clientMsgID string, sessionType int32) (bool, error)
 	GetOneMessageAllReactionList(ctx context.Context, clientMsgID string, sessionType int32) (map[string]string, error)
 	DeleteOneMessageKey(ctx context.Context, clientMsgID string, sessionType int32, subKey string) error
-	SetMessageReactionExpire(ctx context.Context, clientMsgID string, sessionType int32, expiration time.Duration) (bool, error)
+	SetMessageReactionExpire(
+		ctx context.Context,
+		clientMsgID string,
+		sessionType int32,
+		expiration time.Duration,
+	) (bool, error)
 	GetMessageTypeKeyValue(ctx context.Context, clientMsgID string, sessionType int32, typeKey string) (string, error)
 	SetMessageTypeKeyValue(ctx context.Context, clientMsgID string, sessionType int32, typeKey, value string) error
 	LockMessageTypeKey(ctx context.Context, clientMsgID string, TypeKey string) error
@@ -151,51 +158,50 @@ func (c *msgCache) getHasReadSeqKey(conversationID string, userID string) string
 	return hasReadSeq + userID + ":" + conversationID
 }
 
-func (c *msgCache) setSeq(ctx context.Context, conversationID string, seq int64, getkey func(conversationID string) string) error {
+func (c *msgCache) setSeq(
+	ctx context.Context,
+	conversationID string,
+	seq int64,
+	getkey func(conversationID string) string,
+) error {
 	return utils.Wrap1(c.rdb.Set(ctx, getkey(conversationID), seq, 0).Err())
 }
 
-func (c *msgCache) getSeq(ctx context.Context, conversationID string, getkey func(conversationID string) string) (int64, error) {
+func (c *msgCache) getSeq(
+	ctx context.Context,
+	conversationID string,
+	getkey func(conversationID string) string,
+) (int64, error) {
 	return utils.Wrap2(c.rdb.Get(ctx, getkey(conversationID)).Int64())
 }
 
-func (c *msgCache) getSeqs(ctx context.Context, items []string, getkey func(s string) string) (m map[string]int64, err error) {
+func (c *msgCache) getSeqs(
-	m = make(map[string]int64, len(items))
+	ctx context.Context,
-	for i, v := range items {
+	items []string,
-		res, err := c.rdb.Get(ctx, getkey(v)).Result()
+	getkey func(s string) string,
-		if err != nil && err != redis.Nil {
+) (m map[string]int64, err error) {
+	pipe := c.rdb.Pipeline()
+	for _, v := range items {
+		if err := pipe.Get(ctx, getkey(v)).Err(); err != nil && err != redis.Nil {
 			return nil, errs.Wrap(err)
 		}
-		val := utils.StringToInt64(res)
+	}
+	result, err := pipe.Exec(ctx)
+	if err != nil && err != redis.Nil {
+		return nil, errs.Wrap(err)
+	}
+	m = make(map[string]int64, len(items))
+	for i, v := range result {
+		seq := v.(*redis.StringCmd)
+		if seq.Err() != nil && seq.Err() != redis.Nil {
+			return nil, errs.Wrap(v.Err())
+		}
+		val := utils.StringToInt64(seq.Val())
 		if val != 0 {
 			m[items[i]] = val
 		}
 	}
-
 	return m, nil
-
-	//pipe := c.rdb.Pipeline()
-	//for _, v := range items {
-	//	if err := pipe.Get(ctx, getkey(v)).Err(); err != nil && err != redis.Nil {
-	//		return nil, errs.Wrap(err)
-	//	}
-	//}
-	//result, err := pipe.Exec(ctx)
-	//if err != nil && err != redis.Nil {
-	//	return nil, errs.Wrap(err)
-	//}
-	//m = make(map[string]int64, len(items))
-	//for i, v := range result {
-	//	seq := v.(*redis.StringCmd)
-	//	if seq.Err() != nil && seq.Err() != redis.Nil {
-	//		return nil, errs.Wrap(v.Err())
-	//	}
-	//	val := utils.StringToInt64(seq.Val())
-	//	if val != 0 {
-	//		m[items[i]] = val
-	//	}
-	//}
-	//return m, nil
 }
 
 func (c *msgCache) SetMaxSeq(ctx context.Context, conversationID string, maxSeq int64) error {
@@ -215,21 +221,15 @@ func (c *msgCache) SetMinSeq(ctx context.Context, conversationID string, minSeq
 }
 
 func (c *msgCache) setSeqs(ctx context.Context, seqs map[string]int64, getkey func(key string) string) error {
-	for conversationID, seq := range seqs {
+	pipe := c.rdb.Pipeline()
-		if err := c.rdb.Set(ctx, getkey(conversationID), seq, 0).Err(); err != nil {
+	for k, seq := range seqs {
+		err := pipe.Set(ctx, getkey(k), seq, 0).Err()
+		if err != nil {
 			return errs.Wrap(err)
 		}
 	}
-	return nil
+	_, err := pipe.Exec(ctx)
-	//pipe := c.rdb.Pipeline()
+	return err
-	//for k, seq := range seqs {
-	//	err := pipe.Set(ctx, getkey(k), seq, 0).Err()
-	//	if err != nil {
-	//		return errs.Wrap(err)
-	//	}
-	//}
-	//_, err := pipe.Exec(ctx)
-	//return err
 }
 
 func (c *msgCache) SetMinSeqs(ctx context.Context, seqs map[string]int64) error {
@@ -252,17 +252,30 @@ func (c *msgCache) GetConversationUserMinSeq(ctx context.Context, conversationID
 	return utils.Wrap2(c.rdb.Get(ctx, c.getConversationUserMinSeqKey(conversationID, userID)).Int64())
 }
 
-func (c *msgCache) GetConversationUserMinSeqs(ctx context.Context, conversationID string, userIDs []string) (m map[string]int64, err error) {
+func (c *msgCache) GetConversationUserMinSeqs(
+	ctx context.Context,
+	conversationID string,
+	userIDs []string,
+) (m map[string]int64, err error) {
 	return c.getSeqs(ctx, userIDs, func(userID string) string {
 		return c.getConversationUserMinSeqKey(conversationID, userID)
 	})
 }
 
-func (c *msgCache) SetConversationUserMinSeq(ctx context.Context, conversationID string, userID string, minSeq int64) error {
+func (c *msgCache) SetConversationUserMinSeq(
+	ctx context.Context,
+	conversationID string,
+	userID string,
+	minSeq int64,
+) error {
 	return utils.Wrap1(c.rdb.Set(ctx, c.getConversationUserMinSeqKey(conversationID, userID), minSeq, 0).Err())
 }
 
-func (c *msgCache) SetConversationUserMinSeqs(ctx context.Context, conversationID string, seqs map[string]int64) (err error) {
+func (c *msgCache) SetConversationUserMinSeqs(
+	ctx context.Context,
+	conversationID string,
+	seqs map[string]int64,
+) (err error) {
 	return c.setSeqs(ctx, seqs, func(userID string) string {
 		return c.getConversationUserMinSeqKey(conversationID, userID)
 	})
@@ -290,7 +303,11 @@ func (c *msgCache) UserSetHasReadSeqs(ctx context.Context, userID string, hasRea
 	})
 }
 
-func (c *msgCache) GetHasReadSeqs(ctx context.Context, userID string, conversationIDs []string) (map[string]int64, error) {
+func (c *msgCache) GetHasReadSeqs(
+	ctx context.Context,
+	userID string,
+	conversationIDs []string,
+) (map[string]int64, error) {
 	return c.getSeqs(ctx, conversationIDs, func(conversationID string) string {
 		return c.getHasReadSeqKey(conversationID, userID)
 	})
@@ -302,7 +319,6 @@ 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())
 }
 
@@ -316,7 +332,6 @@ func (c *msgCache) GetTokensWithoutError(ctx context.Context, userID string, pla
 	for k, v := range m {
 		mm[k] = utils.StringToInt(v)
 	}
-
 	return mm, nil
 }
 
@@ -326,13 +341,11 @@ 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())
 }
 
@@ -344,86 +357,58 @@ func (c *msgCache) allMessageCacheKey(conversationID string) string {
 	return messageCache + conversationID + "_*"
 }
 
-func (c *msgCache) GetMessagesBySeq(ctx context.Context, conversationID string, seqs []int64) (seqMsgs []*sdkws.MsgData, failedSeqs []int64, err error) {
+func (c *msgCache) GetMessagesBySeq(
-	for _, seq := range seqs {
+	ctx context.Context,
-		res, err := c.rdb.Get(ctx, c.getMessageCacheKey(conversationID, seq)).Result()
+	conversationID string,
-		if err != nil {
+	seqs []int64,
-			log.ZError(ctx, "GetMessagesBySeq failed", err, "conversationID", conversationID, "seq", seq)
+) (seqMsgs []*sdkws.MsgData, failedSeqs []int64, err error) {
-			failedSeqs = append(failedSeqs, seq)
+	pipe := c.rdb.Pipeline()
-			continue
+	for _, v := range seqs {
+		// MESSAGE_CACHE:169.254.225.224_reliability1653387820_0_1
+		key := c.getMessageCacheKey(conversationID, v)
+		if err := pipe.Get(ctx, key).Err(); err != nil && err != redis.Nil {
+			return nil, nil, err
 		}
-		msg := sdkws.MsgData{}
-		if err = msgprocessor.String2Pb(res, &msg); err != nil {
-			log.ZError(ctx, "GetMessagesBySeq Unmarshal failed", err, "res", res, "conversationID", conversationID, "seq", seq)
-			failedSeqs = append(failedSeqs, seq)
-			continue
-		}
-		if msg.Status == constant.MsgDeleted {
-			failedSeqs = append(failedSeqs, seq)
-			continue
-		}
-		seqMsgs = append(seqMsgs, &msg)
 	}
-
+	result, err := pipe.Exec(ctx)
-	return
+	for i, v := range result {
-	//pipe := c.rdb.Pipeline()
+		cmd := v.(*redis.StringCmd)
-	//for _, v := range seqs {
+		if cmd.Err() != nil {
-	//	// MESSAGE_CACHE:169.254.225.224_reliability1653387820_0_1
+			failedSeqs = append(failedSeqs, seqs[i])
-	//	key := c.getMessageCacheKey(conversationID, v)
+		} else {
-	//	if err := pipe.Get(ctx, key).Err(); err != nil && err != redis.Nil {
+			msg := sdkws.MsgData{}
-	//		return nil, nil, err
+			err = msgprocessor.String2Pb(cmd.Val(), &msg)
-	//	}
+			if err == nil {
-	//}
+				if msg.Status != constant.MsgDeleted {
-	//result, err := pipe.Exec(ctx)
+					seqMsgs = append(seqMsgs, &msg)
-	//for i, v := range result {
+					continue
-	//	cmd := v.(*redis.StringCmd)
+				}
-	//	if cmd.Err() != nil {
+			} else {
-	//		failedSeqs = append(failedSeqs, seqs[i])
+				log.ZWarn(ctx, "UnmarshalString failed", err, "conversationID", conversationID, "seq", seqs[i], "msg", cmd.Val())
-	//	} else {
+			}
-	//		msg := sdkws.MsgData{}
+			failedSeqs = append(failedSeqs, seqs[i])
-	//		err = msgprocessor.String2Pb(cmd.Val(), &msg)
+		}
-	//		if err == nil {
+	}
-	//			if msg.Status != constant.MsgDeleted {
+	return seqMsgs, failedSeqs, err
-	//				seqMsgs = append(seqMsgs, &msg)
-	//				continue
-	//			}
-	//		} else {
-	//			log.ZWarn(ctx, "UnmarshalString failed", err, "conversationID", conversationID, "seq", seqs[i], "msg", cmd.Val())
-	//		}
-	//		failedSeqs = append(failedSeqs, seqs[i])
-	//	}
-	//}
-	//return seqMsgs, failedSeqs, err
 }
 
 func (c *msgCache) SetMessageToCache(ctx context.Context, conversationID string, msgs []*sdkws.MsgData) (int, error) {
+	pipe := c.rdb.Pipeline()
+	var failedMsgs []*sdkws.MsgData
 	for _, msg := range msgs {
+		key := c.getMessageCacheKey(conversationID, msg.Seq)
 		s, err := msgprocessor.Pb2String(msg)
 		if err != nil {
 			return 0, errs.Wrap(err)
 		}
-		key := c.getMessageCacheKey(conversationID, msg.Seq)
+		err = pipe.Set(ctx, key, s, time.Duration(config.Config.MsgCacheTimeout)*time.Second).Err()
-		if err := c.rdb.Set(ctx, key, s, time.Duration(config.Config.MsgCacheTimeout)*time.Second).Err(); err != nil {
+		if err != nil {
-			return 0, errs.Wrap(err)
+			failedMsgs = append(failedMsgs, msg)
+			log.ZWarn(ctx, "set msg 2 cache failed", err, "msg", failedMsgs)
 		}
 	}
-	return len(msgs), nil
+	_, err := pipe.Exec(ctx)
-	//pipe := c.rdb.Pipeline()
+	return len(failedMsgs), err
-	//var failedMsgs []*sdkws.MsgData
-	//for _, msg := range msgs {
-	//	key := c.getMessageCacheKey(conversationID, msg.Seq)
-	//	s, err := msgprocessor.Pb2String(msg)
-	//	if err != nil {
-	//		return 0, errs.Wrap(err)
-	//	}
-	//	err = pipe.Set(ctx, key, s, time.Duration(config.Config.MsgCacheTimeout)*time.Second).Err()
-	//	if err != nil {
-	//		failedMsgs = append(failedMsgs, msg)
-	//		log.ZWarn(ctx, "set msg 2 cache failed", err, "msg", failedMsgs)
-	//	}
-	//}
-	//_, err := pipe.Exec(ctx)
-	//return len(failedMsgs), err
 }
 
 func (c *msgCache) getMessageDelUserListKey(conversationID string, seq int64) string {
@@ -435,47 +420,27 @@ func (c *msgCache) getUserDelList(conversationID, userID string) string {
 }
 
 func (c *msgCache) UserDeleteMsgs(ctx context.Context, conversationID string, seqs []int64, userID string) error {
+	pipe := c.rdb.Pipeline()
 	for _, seq := range seqs {
 		delUserListKey := c.getMessageDelUserListKey(conversationID, seq)
 		userDelListKey := c.getUserDelList(conversationID, userID)
-		err := c.rdb.SAdd(ctx, delUserListKey, userID).Err()
+		err := pipe.SAdd(ctx, delUserListKey, userID).Err()
 		if err != nil {
 			return errs.Wrap(err)
 		}
-		err = c.rdb.SAdd(ctx, userDelListKey, seq).Err()
+		err = pipe.SAdd(ctx, userDelListKey, seq).Err()
 		if err != nil {
 			return errs.Wrap(err)
 		}
-		if err := c.rdb.Expire(ctx, delUserListKey, time.Duration(config.Config.MsgCacheTimeout)*time.Second).Err(); err != nil {
+		if err := pipe.Expire(ctx, delUserListKey, time.Duration(config.Config.MsgCacheTimeout)*time.Second).Err(); err != nil {
 			return errs.Wrap(err)
 		}
-		if err := c.rdb.Expire(ctx, userDelListKey, time.Duration(config.Config.MsgCacheTimeout)*time.Second).Err(); err != nil {
+		if err := pipe.Expire(ctx, userDelListKey, time.Duration(config.Config.MsgCacheTimeout)*time.Second).Err(); err != nil {
 			return errs.Wrap(err)
 		}
 	}
-
+	_, err := pipe.Exec(ctx)
-	return nil
+	return errs.Wrap(err)
-	//pipe := c.rdb.Pipeline()
-	//for _, seq := range seqs {
-	//	delUserListKey := c.getMessageDelUserListKey(conversationID, seq)
-	//	userDelListKey := c.getUserDelList(conversationID, userID)
-	//	err := pipe.SAdd(ctx, delUserListKey, userID).Err()
-	//	if err != nil {
-	//		return errs.Wrap(err)
-	//	}
-	//	err = pipe.SAdd(ctx, userDelListKey, seq).Err()
-	//	if err != nil {
-	//		return errs.Wrap(err)
-	//	}
-	//	if err := pipe.Expire(ctx, delUserListKey, time.Duration(config.Config.MsgCacheTimeout)*time.Second).Err(); err != nil {
-	//		return errs.Wrap(err)
-	//	}
-	//	if err := pipe.Expire(ctx, userDelListKey, time.Duration(config.Config.MsgCacheTimeout)*time.Second).Err(); err != nil {
-	//		return errs.Wrap(err)
-	//	}
-	//}
-	//_, err := pipe.Exec(ctx)
-	//return errs.Wrap(err)
 }
 
 func (c *msgCache) GetUserDelList(ctx context.Context, userID, conversationID string) (seqs []int64, err error) {
@@ -487,7 +452,6 @@ func (c *msgCache) GetUserDelList(ctx context.Context, userID, conversationID st
 	for i, v := range result {
 		seqs[i] = utils.StringToInt64(v)
 	}
-
 	return seqs, nil
 }
 
@@ -496,102 +460,67 @@ 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 {
+			pipe := c.rdb.Pipeline()
 			var failedFlag bool
 			for _, userID := range delUsers {
-				err = c.rdb.SRem(ctx, c.getUserDelList(conversationID, userID), seq).Err()
+				err = pipe.SRem(ctx, c.getUserDelList(conversationID, userID), seq).Err()
 				if err != nil {
 					failedFlag = true
-					log.ZWarn(ctx, "DelUserDeleteMsgsList failed", err, "conversationID", conversationID, "seq", seq, "userID", userID)
+					log.ZWarn(
+						ctx,
+						"DelUserDeleteMsgsList failed",
+						err,
+						"conversationID",
+						conversationID,
+						"seq",
+						seq,
+						"userID",
+						userID,
+					)
 				}
 			}
 			if !failedFlag {
-				if err := c.rdb.Del(ctx, c.getMessageDelUserListKey(conversationID, seq)).Err(); err != nil {
+				if err := pipe.Del(ctx, c.getMessageDelUserListKey(conversationID, seq)).Err(); err != nil {
 					log.ZWarn(ctx, "DelUserDeleteMsgsList failed", err, "conversationID", conversationID, "seq", seq)
 				}
 			}
+			if _, err := pipe.Exec(ctx); err != nil {
+				log.ZError(ctx, "pipe exec failed", err, "conversationID", conversationID, "seq", seq)
+			}
 		}
 	}
-	//for _, seq := range seqs {
-	//	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 {
-	//		pipe := c.rdb.Pipeline()
-	//		var failedFlag bool
-	//		for _, userID := range delUsers {
-	//			err = pipe.SRem(ctx, c.getUserDelList(conversationID, userID), seq).Err()
-	//			if err != nil {
-	//				failedFlag = true
-	//				log.ZWarn(
-	//					ctx,
-	//					"DelUserDeleteMsgsList failed",
-	//					err,
-	//					"conversationID",
-	//					conversationID,
-	//					"seq",
-	//					seq,
-	//					"userID",
-	//					userID,
-	//				)
-	//			}
-	//		}
-	//		if !failedFlag {
-	//			if err := pipe.Del(ctx, c.getMessageDelUserListKey(conversationID, seq)).Err(); err != nil {
-	//				log.ZWarn(ctx, "DelUserDeleteMsgsList failed", err, "conversationID", conversationID, "seq", seq)
-	//			}
-	//		}
-	//		if _, err := pipe.Exec(ctx); err != nil {
-	//			log.ZError(ctx, "pipe exec failed", err, "conversationID", conversationID, "seq", seq)
-	//		}
-	//	}
-	//}
 }
 
 func (c *msgCache) DeleteMessages(ctx context.Context, conversationID string, seqs []int64) error {
+	pipe := c.rdb.Pipeline()
 	for _, seq := range seqs {
-		if err := c.rdb.Del(ctx, c.getMessageCacheKey(conversationID, seq)).Err(); err != nil {
+		if err := pipe.Del(ctx, c.getMessageCacheKey(conversationID, seq)).Err(); err != nil {
 			return errs.Wrap(err)
 		}
 	}
-	return nil
+	_, err := pipe.Exec(ctx)
-	//pipe := c.rdb.Pipeline()
+	return errs.Wrap(err)
-	//for _, seq := range seqs {
-	//	if err := pipe.Del(ctx, c.getMessageCacheKey(conversationID, seq)).Err(); err != nil {
-	//		return errs.Wrap(err)
-	//	}
-	//}
-	//_, err := pipe.Exec(ctx)
-	//return errs.Wrap(err)
 }
 
 func (c *msgCache) CleanUpOneConversationAllMsg(ctx context.Context, conversationID string) error {
 	vals, err := c.rdb.Keys(ctx, c.allMessageCacheKey(conversationID)).Result()
-	if errors.Is(err, redis.Nil) {
+	if err == redis.Nil {
 		return nil
 	}
 	if err != nil {
 		return errs.Wrap(err)
 	}
+	pipe := c.rdb.Pipeline()
 	for _, v := range vals {
-		if err := c.rdb.Del(ctx, v).Err(); err != nil {
+		if err := pipe.Del(ctx, v).Err(); err != nil {
 			return errs.Wrap(err)
 		}
 	}
-	return nil
+	_, err = pipe.Exec(ctx)
-	//pipe := c.rdb.Pipeline()
+	return errs.Wrap(err)
-	//for _, v := range vals {
-	//	if err := pipe.Del(ctx, v).Err(); err != nil {
-	//		return errs.Wrap(err)
-	//	}
-	//}
-	//_, err = pipe.Exec(ctx)
-	//return errs.Wrap(err)
 }
 
 func (c *msgCache) DelMsgFromCache(ctx context.Context, userID string, seqs []int64) error {
@@ -599,15 +528,13 @@ 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 errors.Is(err, redis.Nil) {
+			if err == redis.Nil {
 				continue
 			}
-
 			return errs.Wrap(err)
 		}
 		var msg sdkws.MsgData
-		err = jsonpb.UnmarshalString(result, &msg)
+		if err := jsonpb.UnmarshalString(result, &msg); err != nil {
-		if err != nil {
 			return err
 		}
 		msg.Status = constant.MsgDeleted
@@ -619,7 +546,6 @@ func (c *msgCache) DelMsgFromCache(ctx context.Context, userID string, seqs []in
 			return errs.Wrap(err)
 		}
 	}
-
 	return nil
 }
 
@@ -645,12 +571,20 @@ 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)
 }
 
-func (c *msgCache) SetFcmToken(ctx context.Context, account string, platformID int, fcmToken string, expireTime int64) (err error) {
+func (c *msgCache) SetFcmToken(
-	return errs.Wrap(c.rdb.Set(ctx, fcmToken+account+":"+strconv.Itoa(platformID), fcmToken, time.Duration(expireTime)*time.Second).Err())
+	ctx context.Context,
+	account string,
+	platformID int,
+	fcmToken string,
+	expireTime int64,
+) (err error) {
+	return errs.Wrap(
+		c.rdb.Set(ctx, fcmToken+account+":"+strconv.Itoa(platformID), fcmToken, time.Duration(expireTime)*time.Second).
+			Err(),
+	)
 }
 
 func (c *msgCache) GetFcmToken(ctx context.Context, account string, platformID int) (string, error) {
@@ -663,7 +597,6 @@ 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)
 }
 
@@ -677,13 +610,11 @@ 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())
 }
 
@@ -698,7 +629,6 @@ func (c *msgCache) getMessageReactionExPrefix(clientMsgID string, sessionType in
 	case constant.NotificationChatType:
 		return "EX_NOTIFICATION" + clientMsgID
 	}
-
 	return ""
 }
 
@@ -707,7 +637,6 @@ func (c *msgCache) JudgeMessageReactionExist(ctx context.Context, clientMsgID st
 	if err != nil {
 		return false, utils.Wrap(err, "")
 	}
-
 	return n > 0, nil
 }
 
@@ -720,11 +649,21 @@ func (c *msgCache) SetMessageTypeKeyValue(
 	return errs.Wrap(c.rdb.HSet(ctx, c.getMessageReactionExPrefix(clientMsgID, sessionType), typeKey, value).Err())
 }
 
-func (c *msgCache) SetMessageReactionExpire(ctx context.Context, clientMsgID string, sessionType int32, expiration time.Duration) (bool, error) {
+func (c *msgCache) SetMessageReactionExpire(
+	ctx context.Context,
+	clientMsgID string,
+	sessionType int32,
+	expiration time.Duration,
+) (bool, error) {
 	return utils.Wrap2(c.rdb.Expire(ctx, c.getMessageReactionExPrefix(clientMsgID, sessionType), expiration).Result())
 }
 
-func (c *msgCache) GetMessageTypeKeyValue(ctx context.Context, clientMsgID string, sessionType int32, typeKey string) (string, error) {
+func (c *msgCache) GetMessageTypeKeyValue(
+	ctx context.Context,
+	clientMsgID string,
+	sessionType int32,
+	typeKey string,
+) (string, error) {
 	return utils.Wrap2(c.rdb.HGet(ctx, c.getMessageReactionExPrefix(clientMsgID, sessionType), typeKey).Result())
 }
 

pkg/common/db/cache/user.go

@@ -17,7 +17,6 @@ package cache
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"hash/crc32"
 	"strconv"
 	"time"
@@ -71,7 +70,6 @@ func NewUserCacheRedis(
 	options rockscache.Options,
 ) UserCache {
 	rcClient := rockscache.NewClient(rdb, options)
-
 	return &UserCacheRedis{
 		rdb:        rdb,
 		metaCache:  NewMetaCacheRedis(rcClient),
@@ -99,6 +97,10 @@ 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,
@@ -112,42 +114,36 @@ func (u *UserCacheRedis) GetUserInfo(ctx context.Context, userID string) (userIn
 }
 
 func (u *UserCacheRedis) GetUsersInfo(ctx context.Context, userIDs []string) ([]*relationtb.UserModel, error) {
-	//var keys []string
+	var keys []string
-	//for _, userID := range userIDs {
+	for _, userID := range userIDs {
-	//	keys = append(keys, u.getUserInfoKey(userID))
+		keys = append(keys, u.getUserInfoKey(userID))
-	//}
+	}
-	//return batchGetCache(
+	return batchGetCache(
-	//	ctx,
+		ctx,
-	//	u.rcClient,
+		u.rcClient,
-	//	keys,
+		keys,
-	//	u.expireTime,
+		u.expireTime,
-	//	func(user *relationtb.UserModel, keys []string) (int, error) {
+		func(user *relationtb.UserModel, keys []string) (int, error) {
-	//		for i, key := range keys {
+			for i, key := range keys {
-	//			if key == u.getUserInfoKey(user.UserID) {
+				if key == u.getUserInfoKey(user.UserID) {
-	//				return i, nil
+					return i, nil
-	//			}
+				}
-	//		}
+			}
-	//		return 0, errIndex
+			return 0, errIndex
-	//	},
+		},
-	//	func(ctx context.Context) ([]*relationtb.UserModel, error) {
+		func(ctx context.Context) ([]*relationtb.UserModel, error) {
-	//		return u.userDB.Find(ctx, userIDs)
+			return u.userDB.Find(ctx, userIDs)
-	//	},
+		},
-	//)
+	)
-	return batchGetCache2(ctx, u.rcClient, u.expireTime, userIDs, func(userID string) string {
-		return u.getUserInfoKey(userID)
-	}, func(ctx context.Context, userID string) (*relationtb.UserModel, error) {
-		return u.userDB.Take(ctx, userID)
-	})
 }
 
 func (u *UserCacheRedis) DelUsersInfo(userIDs ...string) UserCache {
-	keys := make([]string, 0, len(userIDs))
+	var keys []string
 	for _, userID := range userIDs {
 		keys = append(keys, u.getUserInfoKey(userID))
 	}
 	cache := u.NewCache()
 	cache.AddKeys(keys...)
-
 	return cache
 }
 
@@ -164,19 +160,22 @@ func (u *UserCacheRedis) GetUserGlobalRecvMsgOpt(ctx context.Context, userID str
 }
 
 func (u *UserCacheRedis) DelUsersGlobalRecvMsgOpt(userIDs ...string) UserCache {
-	keys := make([]string, 0, len(userIDs))
+	var keys []string
 	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
+}
+
 // GetUserStatus get user status.
 func (u *UserCacheRedis) GetUserStatus(ctx context.Context, userIDs []string) ([]*user.OnlineStatus, error) {
-	userStatus := make([]*user.OnlineStatus, 0, len(userIDs))
+	var res []*user.OnlineStatus
 	for _, userID := range userIDs {
 		UserIDNum := crc32.ChecksumIEEE([]byte(userID))
 		modKey := strconv.Itoa(int(UserIDNum % statusMod))
@@ -184,14 +183,13 @@ 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 errors.Is(err, redis.Nil) {
+			if err == redis.Nil {
 				// key or field does not exist
-				userStatus = append(userStatus, &user.OnlineStatus{
+				res = append(res, &user.OnlineStatus{
 					UserID:      userID,
 					Status:      constant.Offline,
 					PlatformIDs: nil,
 				})
-
 				continue
 			} else {
 				return nil, errs.Wrap(err)
@@ -203,10 +201,9 @@ func (u *UserCacheRedis) GetUserStatus(ctx context.Context, userIDs []string) ([
 		}
 		onlineStatus.UserID = userID
 		onlineStatus.Status = constant.Online
-		userStatus = append(userStatus, &onlineStatus)
+		res = append(res, &onlineStatus)
 	}
-
+	return res, nil
-	return userStatus, nil
 }
 
 // SetUserStatus Set the user status and save it in redis.
@@ -227,16 +224,15 @@ func (u *UserCacheRedis) SetUserStatus(ctx context.Context, userID string, statu
 				Status:      constant.Online,
 				PlatformIDs: []int32{platformID},
 			}
-			jsonData, err2 := json.Marshal(&onlineStatus)
+			jsonData, err := json.Marshal(onlineStatus)
-			if err2 != nil {
+			if err != nil {
-				return errs.Wrap(err2)
+				return errs.Wrap(err)
 			}
-			_, err2 = u.rdb.HSet(ctx, key, userID, string(jsonData)).Result()
+			_, err = u.rdb.HSet(ctx, key, userID, string(jsonData)).Result()
-			if err2 != nil {
+			if err != nil {
-				return errs.Wrap(err2)
+				return errs.Wrap(err)
 			}
 			u.rdb.Expire(ctx, key, userOlineStatusExpireTime)
-
 			return nil
 		}
 	}
@@ -244,7 +240,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 errors.Is(err, redis.Nil) {
+		if err == redis.Nil {
 			isNil = true
 		} else {
 			return errs.Wrap(err)
@@ -252,45 +248,51 @@ 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 isNil {
-		if err != nil {
+			log.ZWarn(ctx, "this user not online,maybe trigger order not right",
-			return err
+				err, "userStatus", status)
+			return nil
 		}
-	} else {
+		var onlineStatus user.OnlineStatus
-		err = u.refreshStatusOnline(ctx, userID, platformID, isNil, err, result, key)
+		err = json.Unmarshal([]byte(result), &onlineStatus)
 		if err != nil {
 			return errs.Wrap(err)
 		}
-	}
+		var newPlatformIDs []int32
-
+		for _, val := range onlineStatus.PlatformIDs {
-	return nil
+			if val != platformID {
-}
+				newPlatformIDs = append(newPlatformIDs, val)
-
+			}
-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
-	err = json.Unmarshal([]byte(result), &onlineStatus)
-	if err != nil {
-		return errs.Wrap(err)
-	}
-	var newPlatformIDs []int32
-	for _, val := range onlineStatus.PlatformIDs {
-		if val != platformID {
-			newPlatformIDs = append(newPlatformIDs, val)
 		}
-	}
+		if newPlatformIDs == nil {
-	if newPlatformIDs == nil {
+			_, err = u.rdb.HDel(ctx, key, userID).Result()
-		_, err = u.rdb.HDel(ctx, key, userID).Result()
+			if err != nil {
-		if err != nil {
+				return errs.Wrap(err)
-			return errs.Wrap(err)
+			}
+		} else {
+			onlineStatus.PlatformIDs = newPlatformIDs
+			newjsonData, err := json.Marshal(&onlineStatus)
+			if err != nil {
+				return errs.Wrap(err)
+			}
+			_, err = u.rdb.HSet(ctx, key, userID, string(newjsonData)).Result()
+			if err != nil {
+				return errs.Wrap(err)
+			}
 		}
 	} else {
-		onlineStatus.PlatformIDs = newPlatformIDs
+		var onlineStatus user.OnlineStatus
+		if !isNil {
+			err = json.Unmarshal([]byte(result), &onlineStatus)
+			if err != nil {
+				return errs.Wrap(err)
+			}
+			onlineStatus.PlatformIDs = RemoveRepeatedElementsInList(append(onlineStatus.PlatformIDs, platformID))
+		} else {
+			onlineStatus.PlatformIDs = append(onlineStatus.PlatformIDs, platformID)
+		}
+		onlineStatus.Status = constant.Online
+		onlineStatus.UserID = userID
 		newjsonData, err := json.Marshal(&onlineStatus)
 		if err != nil {
 			return errs.Wrap(err)
@@ -299,31 +301,7 @@ func (u *UserCacheRedis) refreshStatusOffline(ctx context.Context, userID string
 		if err != nil {
 			return errs.Wrap(err)
 		}
-	}
 
-	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 {
-		err2 := json.Unmarshal([]byte(result), &onlineStatus)
-		if err != nil {
-			return errs.Wrap(err2)
-		}
-		onlineStatus.PlatformIDs = RemoveRepeatedElementsInList(append(onlineStatus.PlatformIDs, platformID))
-	} else {
-		onlineStatus.PlatformIDs = append(onlineStatus.PlatformIDs, platformID)
-	}
-	onlineStatus.Status = constant.Online
-	onlineStatus.UserID = userID
-	newjsonData, err := json.Marshal(&onlineStatus)
-	if err != nil {
-		return errs.Wrap(err)
-	}
-	_, err = u.rdb.HSet(ctx, key, userID, string(newjsonData)).Result()
-	if err != nil {
-		return errs.Wrap(err)
 	}
 
 	return nil

pkg/common/db/controller/conversation.go

@@ -50,7 +50,7 @@ type ConversationDatabase interface {
 	GetConversationIDs(ctx context.Context, userID string) ([]string, error)
 	GetUserConversationIDsHash(ctx context.Context, ownerUserID string) (hash uint64, err error)
 	GetAllConversationIDs(ctx context.Context) ([]string, error)
-	//GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (map[string]int64, error)
+	GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (map[string]int64, error)
 	GetConversationsByConversationID(ctx context.Context, conversationIDs []string) ([]*relationtb.ConversationModel, error)
 	GetConversationIDsNeedDestruct(ctx context.Context) ([]*relationtb.ConversationModel, error)
 	GetConversationNotReceiveMessageUserIDs(ctx context.Context, conversationID string) ([]string, error)
@@ -295,9 +295,9 @@ func (c *conversationDatabase) GetAllConversationIDs(ctx context.Context) ([]str
 	return c.conversationDB.GetAllConversationIDs(ctx)
 }
 
-//func (c *conversationDatabase) GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (map[string]int64, error) {
+func (c *conversationDatabase) GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (map[string]int64, error) {
-//	return c.cache.GetUserAllHasReadSeqs(ctx, ownerUserID)
+	return c.cache.GetUserAllHasReadSeqs(ctx, ownerUserID)
-//}
+}
 
 func (c *conversationDatabase) GetConversationsByConversationID(ctx context.Context, conversationIDs []string) ([]*relationtb.ConversationModel, error) {
 	return c.conversationDB.GetConversationsByConversationID(ctx, conversationIDs)

pkg/common/discovery_register/k8s_discovery_register.go

@@ -86,6 +86,3 @@ func (cli *K8sDR) GetClientLocalConns() map[string][]*grpc.ClientConn {
 	fmt.Println("should not call this function!!!!!!!!!!!!!!!!!!!!!!!!!")
 	return nil
 }
-func (cli *K8sDR) Close() {
-	return
-}

pkg/common/startrpc/doc.go

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

pkg/common/startrpc/start.go

@@ -16,11 +16,10 @@ package startrpc
 
 import (
 	"fmt"
-	"net"
-	"strconv"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register"
+	"net"
+	"strconv"
 
 	grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
 	"google.golang.org/grpc"
@@ -33,7 +32,6 @@ import (
 	"github.com/OpenIMSDK/tools/utils"
 )
 
-// Start rpc server.
 func Start(
 	rpcPort int,
 	rpcRegisterName string,
@@ -41,8 +39,16 @@ func Start(
 	rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error,
 	options ...grpc.ServerOption,
 ) error {
-	fmt.Printf("start %s server, port: %d, prometheusPort: %d, OpenIM version: %s",
+	fmt.Println(
-		rpcRegisterName, rpcPort, prometheusPort, config.Version)
+		"start",
+		rpcRegisterName,
+		"server, port: ",
+		rpcPort,
+		"prometheusPort:",
+		prometheusPort,
+		", OpenIM version: ",
+		config.Version,
+	)
 	listener, err := net.Listen(
 		"tcp",
 		net.JoinHostPort(network.GetListenIP(config.Config.Rpc.ListenIP), strconv.Itoa(rpcPort)),
@@ -51,12 +57,18 @@ func Start(
 		return err
 	}
 	defer listener.Close()
-	client, err := discovery_register.NewDiscoveryRegister(config.Config.Envs.Discovery)
+	zkClient, err := discovery_register.NewDiscoveryRegister(config.Config.Envs.Discovery)
+	/*
+		zkClient, err := zookeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema,
+			zookeeper.WithFreq(time.Hour), zookeeper.WithUserNameAndPassword(
+				config.Config.Zookeeper.Username,
+				config.Config.Zookeeper.Password,
+			), zookeeper.WithRoundRobin(), zookeeper.WithTimeout(10), zookeeper.WithLogger(log.NewZkLogger()))*/
 	if err != nil {
 		return utils.Wrap1(err)
 	}
-	defer client.Close()
+	//defer zkClient.CloseZK()
-	client.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()))
+	zkClient.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	registerIP, err := network.GetRpcRegisterIP(config.Config.Rpc.RegisterIP)
 	if err != nil {
 		return err
@@ -76,11 +88,11 @@ func Start(
 	}
 	srv := grpc.NewServer(options...)
 	defer srv.GracefulStop()
-	err = rpcFn(client, srv)
+	err = rpcFn(zkClient, srv)
 	if err != nil {
 		return utils.Wrap1(err)
 	}
-	err = client.Register(
+	err = zkClient.Register(
 		rpcRegisterName,
 		registerIP,
 		rpcPort,
@@ -96,6 +108,5 @@ func Start(
 			}
 		}
 	}()
-
 	return utils.Wrap1(srv.Serve(listener))
 }

pkg/rpcclient/conversation.go

@@ -59,13 +59,8 @@ func (c *ConversationRpcClient) GetSingleConversationRecvMsgOpt(ctx context.Cont
 	return conversation.GetConversation().RecvMsgOpt, err
 }
 
-func (c *ConversationRpcClient) SingleChatFirstCreateConversation(ctx context.Context, recvID, sendID,
+func (c *ConversationRpcClient) SingleChatFirstCreateConversation(ctx context.Context, recvID, sendID string) error {
-	conversationID string, conversationType int32) error {
+	_, err := c.Client.CreateSingleChatConversations(ctx, &pbconversation.CreateSingleChatConversationsReq{RecvID: recvID, SendID: sendID})
-	_, err := c.Client.CreateSingleChatConversations(ctx,
-		&pbconversation.CreateSingleChatConversationsReq{
-			RecvID: recvID, SendID: sendID, ConversationID: conversationID,
-			ConversationType: conversationType,
-		})
 	return err
 }
 

pkg/rpcclient/msg.go

@@ -228,9 +228,8 @@ func (s *NotificationSender) NotificationWithSesstionType(ctx context.Context, s
 	}
 	var req msg.SendMsgReq
 	var msg sdkws.MsgData
-	var userInfo *sdkws.UserInfo
 	if notificationOpt.WithRpcGetUsername && s.getUserInfo != nil {
-		userInfo, err = s.getUserInfo(ctx, sendID)
+		userInfo, err := s.getUserInfo(ctx, sendID)
 		if err != nil {
 			log.ZWarn(ctx, "getUserInfo failed", err, "sendID", sendID)
 		} else {
@@ -252,7 +251,7 @@ func (s *NotificationSender) NotificationWithSesstionType(ctx context.Context, s
 	msg.CreateTime = utils.GetCurrentTimestampByMill()
 	msg.ClientMsgID = utils.GetMsgID(sendID)
 	optionsConfig := s.contentTypeConf[contentType]
-	if sendID == recvID && contentType == constant.HasReadReceipt {
+	if sesstionType == constant.SuperGroupChatType && contentType == constant.HasReadReceipt {
 		optionsConfig.ReliabilityLevel = constant.UnreliableNotification
 	}
 	options := config.GetOptionsByNotification(optionsConfig)

pkg/rpcclient/notification/conevrsation.go

@@ -41,7 +41,6 @@ func (c *ConversationNotificationSender) ConversationSetPrivateNotification(ctx
 		IsPrivate:      isPrivateChat,
 		ConversationID: conversationID,
 	}
-
 	return c.Notification(ctx, sendID, recvID, constant.ConversationPrivateChatNotification, tips)
 }
 
@@ -51,7 +50,6 @@ func (c *ConversationNotificationSender) ConversationChangeNotification(ctx cont
 		UserID:             userID,
 		ConversationIDList: conversationIDs,
 	}
-
 	return c.Notification(ctx, userID, userID, constant.ConversationChangeNotification, tips)
 }
 
@@ -67,6 +65,5 @@ func (c *ConversationNotificationSender) ConversationUnreadChangeNotification(
 		HasReadSeq:      hasReadSeq,
 		UnreadCountTime: unreadCountTime,
 	}
-
 	return c.Notification(ctx, userID, userID, constant.ConversationUnreadNotification, tips)
 }

scripts/install/environment.sh

@@ -78,9 +78,6 @@ def "IMAGE_REGISTRY" "ghcr.io/openimsdk"
 # def "IMAGE_REGISTRY" "openim"
 # def "IMAGE_REGISTRY" "registry.cn-hangzhou.aliyuncs.com/openimsdk"
 
-# Choose the appropriate image tag, the default is the latest version
-def "SERVER_IMAGE_TAG" "latest"
-
 ###################### OpenIM Docker Network ######################
 # 设置 Docker 网络的网段
 readonly DOCKER_BRIDGE_SUBNET=${DOCKER_BRIDGE_SUBNET:-'172.28.0.0/16'}
@@ -118,7 +115,7 @@ LAST_OCTET=$((LAST_OCTET + 1))
 GRAFANA_NETWORK_ADDRESS=$(generate_ip)
 
 ###################### openim 配置 ######################
-# read: https://github.com/openimsdk/open-im-server/blob/main/deployment/README.md
+# read: https://github.com/openimsdk/open-im-server/blob/main/deployment/init/README.md
 def "OPENIM_DATA_DIR" "/data/openim"
 def "OPENIM_INSTALL_DIR" "/opt/openim"
 def "OPENIM_CONFIG_DIR" "/etc/openim/config"

scripts/install/install.sh

@@ -89,10 +89,6 @@ function openim::install::install_openim()
     ${OPENIM_ROOT}/scripts/install/openim-rpc.sh openim::rpc::install || return 1
     ${OPENIM_ROOT}/scripts/install/openim-api.sh openim::api::install || return 1
 
-    openim::common::sudo "cp -r ${OPENIM_ROOT}/deployments/templates/openim.target /etc/systemd/system/openim.target"
-    openim::common::sudo "systemctl daemon-reload"
-    openim::common::sudo "systemctl restart openim.target"
-    openim::common::sudo "systemctl enable openim.target"
     openim::log::success "openim install success"
 }
 
@@ -107,11 +103,6 @@ function openim::uninstall::uninstall_openim()
     ${OPENIM_ROOT}/scripts/install/openim-rpc.sh openim::rpc::uninstall || return 1
     ${OPENIM_ROOT}/scripts/install/openim-api.sh openim::api::uninstall || return 1
 
-    set +o errexit
-    openim::common::sudo "systemctl stop openim.target"
-    openim::common::sudo "systemctl disable openim.target"
-    openim::common::sudo "rm -f /etc/systemd/system/openim.target"
-    set -o errexit
     openim::log::success "openim uninstall success"
 }
 

scripts/install/openim-man.sh

@@ -48,7 +48,7 @@ OPENIM_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)
 function openim::man::info() {
 cat <<- EOF
 Usage:
-  man openim-server to see openim-server help # Display the man page for openim-server
+  man openim-server  # Display the man page for openim-server
 EOF
 }
 

scripts/update-generated-docs.sh

@@ -28,10 +28,10 @@ source "${OPENIM_ROOT}/hack/lib/init.sh"
 openim::golang::setup_env
 
 BINS=(
-	gendocs
+	cmd/gendocs
-	genopenimdocs
+	cmd/genopenimdocs
-	genman
+	cmd/genman
-	genyaml
+	cmd/genyaml
 )
 make -C "${OPENIM_ROOT}" WHAT="${BINS[*]}"
 

tools/data-conversion/README.md

@@ -1,3 +1,8 @@
+
+在更新你的数据迁移README文档时，考虑到清晰、准确和专业的表述是非常重要的。这不仅可以帮助读者更好地理解迁移过程，还可以确保在迁移过程中减少可能出现的错误。以下是对你提供的README文档的一些改进和完善建议：
+
+------
+
 # OpenIM V2 至 V3 数据迁移指南
 
 该指南提供了从 OpenIM V2 迁移至 V3 的详细步骤。请确保在开始迁移过程之前，熟悉所有步骤，并按照指南准确执行。
@@ -95,4 +100,4 @@ var (
 
 ```bash
 make build BINS="conversion-chat"
-```
+```

tools/url2im/pkg/buffer.go

@@ -15,7 +15,7 @@ func NewReader(r io.Reader, max int64, path string) (ReadSeekSizeCloser, error)
 	buf := make([]byte, max+1)
 	n, err := io.ReadFull(r, buf)
 	if err == nil {
-		f, err := os.OpenFile(path, os.O_CREATE|os.O_RDWR, 0o666)
+		f, err := os.OpenFile(path, os.O_CREATE|os.O_RDWR, 0666)
 		if err != nil {
 			return nil, err
 		}

tools/yamlfmt/yamlfmt.go

@@ -39,7 +39,7 @@ func main() {
 			fmt.Fprintf(os.Stderr, "%s: %v\n", path, err)
 			continue
 		}
-		writer, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o666)
+		writer, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "%s: %v\n", path, err)
 			continue