feat: fix openim ci and deployment

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

.dockerignore

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

.github/workflows/create_branch_on_tag.yml

@@ -48,7 +48,7 @@ jobs:
         fi
 
     - name: Push Changes
-      uses: stefanzweifel/git-auto-commit-action@v4
+      uses: stefanzweifel/git-auto-commit-action@v5
       with:
         commit_message: "Auto Commit CHANGELOG"
         branch: release-v${VERSION_PARTS[0]}.${VERSION_PARTS[1]}
@@ -68,7 +68,7 @@ jobs:
         fi
 
     - name: Push Changes
-      uses: stefanzweifel/git-auto-commit-action@v4
+      uses: stefanzweifel/git-auto-commit-action@v5
       with:
         commit_message: "Auto Commit CHANGELOG"
         branch: main

.github/workflows/openimci.yml

@@ -48,7 +48,7 @@ jobs:
 
     strategy:
       matrix:
-        go_version: ["1.18","1.19","1.20","1.21"]
+        go_version: ["1.19","1.20","1.21"]
         os: [ubuntu-latest]
 
     steps:
@@ -86,7 +86,7 @@ jobs:
       run: sudo make clean
 
     - name: Push Changes to Main
-      uses: stefanzweifel/git-auto-commit-action@v4
+      uses: stefanzweifel/git-auto-commit-action@v5
       with:
         commit_message: "cicd: robot automated Change"
         branch: main

README-zh_CN.md

@@ -29,330 +29,106 @@
 
 </p>
 
-## ✨ 关于 OpenIM
+## Ⓜ️ 关于 OpenIM
 
-Open-IM-Server 是使用纯 Golang 精心制作的强大的即时消息服务器。其通过 JSON over WebSocket 进行通信的独特方法将每次交互都视为消息。这简化了定制并消除了修改服务器代码的需求。通过利用微服务架构，服务器可以通过集群部署，保证出色的性能和可伸缩性。
+OpenIM 不仅仅是一个开源的即时消息组件，它是你的应用程序生态系统的一个不可或缺的部分。查看下面的图表，了解 AppServer、AppClient、OpenIMServer 和 OpenIMSDK 是如何交互的。
 
-Open-IM-Server 不仅仅是一个即时消息服务器；它是将实时网络集成到您的应用程序中的强大工具，定位为您集成的首选选择！🚀
+![App-OpenIM 关系](./docs/images/oepnim-design.png)
 
-请注意，Open-IM-Server 不作为独立产品运行，也不提供内置的帐户注册或登录服务。为了简化您的实施过程，我们已开源了 [chat repository](https://github.com/OpenIMSDK/chat)，其中包括这些功能。与 Open-IM-Server 一起部署此聊天业务服务器可加快全面的聊天产品的设置。👥
+## 🚀 关于 OpenIMSDK
 
-为了进一步增强您的体验，我们还提供了 SDK 客户端，在其中实现了大多数复杂逻辑。可以在 [此链接](https://github.com/OpenIMSDK/openim-sdk-core) 找到 [SDK repository](https://github.com/OpenIMSDK/openim-sdk-core)。[chat repository](https://github.com/OpenIMSDK/chat) 是我们的业务服务器，而 'core' 代表 SDK 的高级封装，它们协同工作以提供卓越的结果。✨
+**OpenIMSDK** 无缝集成到您的应用中，提供丰富、实时的消息体验，无需复杂的 UI 集成。它提供：
 
-## :star2: 为什么选择 OpenIM
++ **本地存储**：用于快速数据检索和消息同步。
++ **监听器回调**：确保实时消息交互性。
++ **API 封装**：简化开发流程。
++ **连接管理**：保证可靠的消息传递。
 
-**🔍 功能截图显示**
+它使用 Golang 构建，并支持跨平台部署，确保在所有平台上提供一致的消息体验。
 
-<div align="center">
+👉 **[探索 GO SDK](https://github.com/openimsdk/openim-sdk-core)**
 
-|                      💻🔄📱 多终端同步 🔄🖥️                       |                        📅⚡ 高效会议 🚀💼                        |
-| :----------------------------------------------------------: | :----------------------------------------------------------: |
-| ![multiple-message](./assets/demo/multi-terminal-synchronization.png) | ![efficient-meetings](./assets/demo/efficient-meetings.png) |
-|                    📲🔄 **一对一和群聊** 👥🗣️                    |               🎁💻 **特殊功能 - 自定义消息** ✉️🎨                |
-| ![group-chat](./assets/demo/group-chat.png) | ![special-function](./assets/demo/special-function.png) |
+## 🌐 关于 OpenIMServer
 
-</div>
+精心用 Golang 开发的 **OpenIMServer** 通过多重方式确保了卓越的即时消息服务器能力：
 
-1. **全面的消息类型支持 :speech_balloon:**
++ **模块组成**：它由多个模块组成，例如网关和多个 RPC 服务，提供一个多功能的消息环境。
++ **微服务架构**：支持集群模式，确保出色的性能和可伸缩性，以有效管理各个实例间的通信。
++ **多样的部署选项**：适应你的操作偏好，通过源代码、Kubernetes 或 Docker 提供部署选项。
 
-   ✅ 支持几乎所有类型的消息，包括文本、图片、表情符号、语音、视频、地理位置、文件、报价、名片、系统通知、自定义消息等
+### 增强的业务功能：
 
-   ✅ 支持一对一和多人音视频通话
++ **REST API**：OpenIMServer 为业务系统提供 REST API，旨在通过后端接口为您的操作提供附加功能，如群组创建和消息推送。
++ **回调**：为了扩展其在各种业务形式中的实用性，OpenIMServer 提供了回调能力。即，在事件发生之前或之后，它向业务服务器发送请求，比如发送消息，丰富通信过程中的交互和数据交换流。
 
-   ✅ 为 iOS、Android、Flutter、uni-app、ReactNative、Electron、Web、H5 等多个平台提供终端支持
-
-2. **随时随地的高效会议 :earth_americas:**
-
-   ✅ 基于具有 100% 可靠强制信令功能的 IM (Instant Messaging)，为与聊天应用程序深度集成的 IM 系统铺平了道路
-
-   ✅ 支持单次会议中的数百人，订阅人数达到数千，以及服务器端音视频录制
-
-3. **适用于各种社交场景的一对一和群聊 :busts_in_silhouette:**
-
-   ✅ OpenIM 有四种角色：应用程序管理员、群主、群管理员和普通成员
-
-   ✅ 强大的群特性，如静音、群公告、群验证、无限群成员和根据需要加载群消息
-
-4. **独特的功能 :star2:**
-
-   ✅ 支持读取并烧毁私人聊天，可自定义时长
-
-   ✅ 消息编辑功能扩大了社交场景，使即时通讯变得更加多样化和有趣
-
-5. **开源 :open_hands:**
-
-   ✅ OpenIM 的代码是开源的，数据自控，旨在构建一个全球领先的 IM 开源社区，包括客户端 SDK 和服务器
-
-   ✅ 基于开源服务器，已经开发了许多出色的开源项目，例如 [OpenKF](https://github.com/OpenIMSDK/OpenKF) (开源 AI 客户服务系统)
-
-6. **易于扩展 :wrench:**
-
-   ✅ OpenIM 服务器是用 Golang 实现的，引入了创新的 "一切都是消息" 通信模型，简化了自定义消息和扩展功能的实现
-
-7. **高性能 :racing_car:**
-
-   ✅ OpenIM 支持集群中的分层治理架构，经过大量用户的测试，并抽象了在线消息、离线消息和历史消息的存储模型
-
-8. **全平台支持 :tv:**
-
-   ✅ 支持原生 iOS、Android；跨平台 Flutter、uni-app、ReactNative；主要的 Web 前端框架如 React、Vue；小程序和 Electron 支持的 PC 平台
-
-9. **终极部署体验 🤖**
-
-   ✅ 支持 [集群部署](https://github.com/openimsdk/open-im-server/edit/main/deployments/README.md)
-
-   ✅ 支持多架构镜像，我们的 Docker 镜像不仅托管在 GitHub 上，而且还在阿里云和 Docker Hub 上支持多个架构。请访问 [我们的 GitHub packages](https://github.com/orgs/OpenIMSDK/packages?repo_name=Open-IM-Server) 并阅读我们的 [版本管理文档](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/version.md) 以获取更多信息。
-
-10. **开源社区的大生态系统 🤲**
-
-    ✅ 我们有数万用户和许多解决方案来解决问题。 
-
-    ✅  我们有一个大型的开源社区叫 [OpenIMSDK](https://github.com/OpenIMSDK)，它运行核心模块，我们还有一个开源社区叫 [openim-sigs](https://github.com/openim-sigs) 以探索更多基于 IM 的基础设施产品。
+👉 **[了解更多](https://doc.rentsoft.cn/guides/introduction/product)**
 
 ## :rocket: 快速开始
 
-<details>   <summary>使用 Docker Compose 部署</summary>
-
-1. 克隆项目
+你只需要一个简单的命令，就可以快速学习 OpenIM 的工程解决方案：
 
 ```
-# 选择您需要的
-BRANCH=release-v3.1
-git clone -b $BRANCH https://github.com/openimsdk/open-im-server openim && export openim=$(pwd)/openim && cd $openim && make build
+bashCopy code
+$ make demo
 ```
 
-> **注意** 阅读我们的发布策略：https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/version.md
+🤲 为了方便用户体验，我们提供了多种部署解决方案，您可以根据下面的列表选择自己的部署方法：
 
-1. 修改 `.env`
-
-```
-USER=root #无需修改
-PASSWORD=openIM123  #8位或更多数字和字母的组合，此密码适用于redis、mysql、mongo，以及config/config.yaml中的accessSecret
-ENDPOINT=http://127.0.0.1:10005 #minio的外部服务IP和端口，或使用域名storage.xx.xx，应用程序必须能够访问此IP和端口或域名，
-API_URL=http://127.0.0.1:10002/object/ #应用程序必须能够访问此IP和端口或域名，
-DATA_DIR=./  #指定大磁盘目录
-```
-
-1. 部署并启动
-
-> **注意** 此命令只能执行一次。它会基于 `.env` 中的 `PASSWORD` 变量修改 docker-compose 中的组件密码，并修改 `config/config.yaml` 中的组件密码。如果 `.env` 中的密码发生变化，您需要首先执行 `docker-compose down`；`rm components -rf` 然后执行此命令。
-
-```
-
-make install
-```
-
-1. 检查服务
-
-```
-
-make check
-```
-
-![https://github.com/openimsdk/open-im-server/blob/main/docs/images/docker_build.png](https://github.com/openimsdk/open-im-server/blob/main/docs/images/docker_build.png)
-
-</details>  <details>  <summary>从源码编译</summary>
-
-您需要 `Go 1.18` 或更高版本，以及 `make`。
-
-版本详情：https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/version.md
-
-```
-# 选择您需要的
-BRANCH=release-v3.1
-git clone -b $BRANCH https://github.com/openimsdk/open-im-server openim && export openim=$(pwd)/openim && cd $openim && make build
-```
-
-阅读关于 [OpenIM 版本策略](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/version.md)
-
-使用 `make help` 来查看 OpenIM 支持的指令。
-
-如图所示，所有服务已成功构建
-
-![成功编译](https://github.com/openimsdk/open-im-server/blob/main/docs/images/build.png)
-
-</details> <details>  <summary>组件配置说明</summary>
-
-config/config.yaml 文件为存储组件提供了详细的配置说明。
-
-- Zookeeper
-
-  - 用于 RPC 服务发现和注册，支持集群。
-
-    ```
-    zookeeper:
-      schema: openim                          #不建议修改
-      address: [ 127.0.0.1:2181 ]             #地址
-      username:                               #用户名
-      password:                               #密码
-    ```
-
-- MySQL
-
-  - 用于存储用户、关系和群组，支持主从数据库。
-
-    ```
-    mysql:
-      address: [ 127.0.0.1:13306 ]            #地址
-      username: root                          #用户名
-      password: openIM123                     #密码
-      database: openIM_v2                     #不建议修改
-      maxOpenConn: 1000                       #最大连接
-      maxIdleConn: 100                        #最大空闲连接
-      maxLifeTime: 60                         #连接可重用的最大时间(秒)
-      logLevel: 4                             #日志级别 1=静音 2=错误 3=警告 4=信息
-      slowThreshold: 500                      #慢语句阈值(毫秒)
-    ```
-
-- Mongo
-
-  - 用于存储离线消息，支持 mongo 分片集群。
-
-    ```
-    mongo:
-      uri:                                    #如果不为空，则直接使用此值
-      address: [ 127.0.0.1:37017 ]            #地址
-      database: openIM                        #默认 mongo 数据库
-      username: root                          #用户名
-      password: openIM123                     #密码
-      maxPoolSize: 100                        #最大连接数
-    ```
-
-- Redis
-
-  - 用于存储消息序列号、最新消息、用户令牌和 mysql 缓存，支持集群部署。
-
-    ```
-    redis:
-      clusterMode: false                      #是否为 redis cluster 模式
-      address: [ 127.0.0.1:16379 ]            #地址
-      username:                               #用户名
-      password: openIM123                     #密码
-    ```
-
-- Kafka
-
-  - 用于消息队列，用于消息解耦，支持集群部署。
-
-    ```
-    kafka:
-      username:                               #用户名
-      password:                               #密码
-      addr: [ 127.0.0.1:9092 ]                #地址
-      latestMsgToRedis:
-        topic: "latestMsgToRedis"
-      offlineMsgToMongo:
-        topic: "offlineMsgToMongoMysql"
-      msgToPush:
-        topic: "msqToPush"
-      msgToModify:
-        topic: "msgToModify"
-      consumerGroupID:
-        msgToRedis: redis
-        msgToMongo: mongo
-        msgToMySql: mysql
-        msgToPush: push
-        msgToModify: modify
-    ```
-
-</details> <details>  <summary>启动和停止服务</summary>
-
-启动服务
-
-```
-
-./scripts/start-all.sh;
-```
-
-检查服务
-
-```
-
-./scripts/check-all.sh
-```
-
-停止服务
-
-```
-
-./scripts/stop-all.sh
-```
-
-</details>
-
-<details>  <summary>开放 IM 端口</summary>
-
-| TCP 端口  | 描述                                                | 操作                                    |
-| --------- | --------------------------------------------------- | --------------------------------------- |
-| TCP:10001 | ws 协议，消息端口如消息发送、推送等，用于客户端 SDK | 端口释放或 nginx 反向代理，并关闭防火墙 |
-| TCP:10002 | api 端口，如用户、朋友、组、消息接口。              | 端口释放或 nginx 反向代理，并关闭防火墙 |
-| TCP:10005 | 选择 minio 存储时所需 (openIM 默认使用 minio 存储)  | 端口释放或 nginx 反向代理，并关闭防火墙 |
-
-</details>  <details>  <summary>开放聊天端口</summary>
-
-- 聊天仓库: https://github.com/OpenIMSDK/chat
-
-| TCP 端口  | 描述                     | 操作                                    |
-| --------- | ------------------------ | --------------------------------------- |
-| TCP:10008 | 业务系统，如注册、登录等 | 端口释放或 nginx 反向代理，并关闭防火墙 |
-| TCP:10009 | 管理后台，如统计、封禁等 | 端口释放或 nginx 反向代理，并关闭防火墙 |
-
-</details>
-
-## :link: APP 和 OpenIM 之间的关系
-
-OpenIM 不仅仅是一个开源的即时消息组件，它是您的应用程序生态系统的一个不可分割的部分。查看此图表以了解 AppServer、AppClient、Open-IM-Server 和 Open-IM-SDK 如何互动。
-
-![App-OpenIM 关系](https://github.com/openimsdk/open-im-server/blob/main/docs/images/open-im-server.png)
-
-## :building_construction: 总体架构
-
-深入了解 Open-IM-Server 的功能与我们的架构图。
-
-![总体架构](https://github.com/openimsdk/open-im-server/blob/main/docs/images/Architecture.jpg)
++ **[源代码部署指南](https://doc.rentsoft.cn/guides/gettingStarted/imSourceCodeDeployment)**
++ **[Docker 部署指南](https://doc.rentsoft.cn/guides/gettingStarted/dockerCompose)**
++ **[Kubernetes 部署指南](https://github.com/openimsdk/open-im-server/tree/main/deployments)**
 
 ## :hammer_and_wrench: 开始开发 OpenIM
 
-OpenIM 我们的目标是建立一个顶级的开源社区。我们有一套标准，在 [Community repository](https://github.com/OpenIMSDK/community) 中。
+OpenIM 我们的目标是建立一个顶级的开源社区。我们有一套标准，在[社区仓库](https://github.com/OpenIMSDK/community)中。
 
-如果您想为这个 Open-IM-Server 仓库做贡献，请阅读我们的 [贡献者文档](https://github.com/openimsdk/open-im-server/blob/main/CONTRIBUTING.md)。
+如果你想为这个 Open-IM-Server 仓库做贡献，请阅读我们的[贡献者文档](https://github.com/openimsdk/open-im-server/blob/main/CONTRIBUTING.md)。
 
-在您开始之前，请确保您的更改是需要的。最好的方法是创建一个 [新的讨论](https://github.com/openimsdk/open-im-server/discussions/new/choose) 或 [Slack 通讯](https://join.slack.com/t/openimsdk/shared_invite/zt-22720d66b-o_FvKxMTGXtcnnnHiMqe9Q)，或者如果您发现一个问题，首先 [报告它](https://github.com/openimsdk/open-im-server/issues/new/choose)。
+在开始之前，请确保你的更改是有需求的。最好的方法是创建一个[新的讨论](https://github.com/openimsdk/open-im-server/discussions/new/choose) 或 [Slack 通信](https://join.slack.com/t/openimsdk/shared_invite/zt-22720d66b-o_FvKxMTGXtcnnnHiMqe9Q)，或者如果你发现一个问题，首先[报告它](https://github.com/openimsdk/open-im-server/issues/new/choose)。
 
-- [代码标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/go_code.md)
-- [Docker 图像标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/images.md)
-- [目录标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/directory.md)
-- [提交标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/commit.md)
-- [版本控制标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/version.md)
-- [接口标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/api.md)
-- [日志标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/)
-- [错误代码标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/error_code.md)
++ [代码标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/go_code.md)
 
-## :busts_in_silhouette: 社区
++ [Docker 镜像标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/images.md)
 
-- 📚 [OpenIM 社区](https://github.com/OpenIMSDK/community)
-- 💕 [OpenIM 兴趣小组](https://github.com/Openim-sigs)
-- 🚀 [加入我们的 Slack 社区](https://join.slack.com/t/openimsdk/shared_invite/zt-22720d66b-o_FvKxMTGXtcnnnHiMqe9Q)
-- :eyes: [加入我们的微信群 (微信群)](https://openim-1253691595.cos.ap-nanjing.myqcloud.com/WechatIMG20.jpeg)
++ [目录标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/directory.md)
 
-## :calendar: 社区会议
++ [提交标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/commit.md)
 
-我们希望任何人都可以参与我们的社区并贡献代码，我们提供礼物和奖励，欢迎您每周四晚上加入我们。
++ [版本控制标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/version.md)
 
-我们的会议在 [OpenIM Slack](https://join.slack.com/t/openimsdk/shared_invite/zt-22720d66b-o_FvKxMTGXtcnnnHiMqe9Q) 🎯，然后您可以搜索 Open-IM-Server 管道加入。
++ [接口标准](https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/interface.md)
 
-我们在 [GitHub 讨论](https://github.com/openimsdk/open-im-server/discussions/categories/meeting) 中记下每次 [双周会议](https://github.com/orgs/OpenIMSDK/discussions/categories/meeting) 的笔记，我们的历史会议记录以及会议回放都可在 [Google Docs :bookmark_tabs:](https://docs.google.com/document/d/1nx8MDpuG74NASx081JcCpxPgDITNTpIIos0DS6Vr9GU/edit?usp=sharing) 中找到。
+## :link: 链接
 
-## :eyes: 谁在使用 OpenIM
+  + **[完整文档](https://doc.rentsoft.cn/)**
+  + **[更新日志](https://github.com/openimsdk/open-im-server/blob/main/CHANGELOG.md)**
+  + **[FAQ](https://github.com/openimsdk/open-im-server/blob/main/FAQ.md)**
+  + **[代码示例](https://github.com/openimsdk/open-im-server/blob/main/examples)**
 
-查看我们的 [用户案例研究](https://github.com/OpenIMSDK/community/blob/main/ADOPTERS.md) 页面以获取项目用户列表。不要犹豫，留下一个 [📝评论](https://github.com/openimsdk/open-im-server/issues/379) 并分享您的使用案例。
+## :handshake: 社区
 
-## :page_facing_up: 许可证
+  + **[GitHub Discussions](https://github.com/openimsdk/open-im-server/discussions)**
+  + **[Slack 通信](https://join.slack.com/t/openimsdk/shared_invite/zt-22720d66b-o_FvKxMTGXtcnnnHiMqe9Q)**
+  + **[GitHub Issues](https://github.com/openimsdk/open-im-server/issues)**
 
-OpenIM 根据 Apache 2.0 许可证授权。请查看 [LICENSE](https://github.com/openimsdk/open-im-server/tree/main/LICENSE) 以获取完整的许可证文本。
+  您可以加入这些平台，讨论问题，提出建议，或分享您的成功故事！
 
-OpenIM logo，包括其变体和动画版本，在此存储库 [OpenIM](https://github.com/openimsdk/open-im-server) 下的 [assets/logo](./assets/logo) 和 [assets/logo-gif](./assets/logo-gif) 目录中显示，受版权法保护。
+## :writing_hand: 贡献
 
-## 🔮 感谢我们的贡献者！
+  我们欢迎任何形式的贡献！请确保在提交 Pull Request 之前阅读我们的[贡献者文档](https://github.com/openimsdk/open-im-server/blob/main/CONTRIBUTING.md)。
 
-<a href="https://github.com/openimsdk/open-im-server/graphs/contributors">   <img src="https://contrib.rocks/image?repo=openimsdk/open-im-server" /> </a>
+  + **[报告 Bug](https://github.com/openimsdk/open-im-server/issues/new?assignees=&labels=bug&template=bug_report.md&title=)**
+  + **[提出新特性](https://github.com/openimsdk/open-im-server/issues/new?assignees=&labels=enhancement&template=feature_request.md&title=)**
+  + **[提交 Pull Request](https://github.com/openimsdk/open-im-server/pulls)**
+
+  感谢您的贡献，我们一起打造一个强大的即时通信解决方案！
+
+## :closed_book: 许可证
+
+  OpenIMSDK 在 Apache License 2.0 许可下可用。查看[LICENSE 文件](https://github.com/openimsdk/open-im-server/blob/main/LICENSE)了解更多信息。
+
+## 🔮 Thanks to our contributors!
+
+<a href="https://github.com/openimsdk/open-im-server/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=openimsdk/open-im-server" />
+</a>

build/images/openim-api/Dockerfile

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

build/images/openim-api/Dockerfile.release

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

build/images/openim-cmdutils/Dockerfile

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

build/images/openim-crontask/Dockerfile

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

build/images/openim-msggateway/Dockerfile

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

build/images/openim-msgtransfer/Dockerfile

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

build/images/openim-push/Dockerfile

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

build/images/openim-rpc-auth/Dockerfile

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

build/images/openim-rpc-conversation/Dockerfile

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

build/images/openim-rpc-friend/Dockerfile

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

build/images/openim-rpc-group/Dockerfile

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

build/images/openim-rpc-msg/Dockerfile

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

build/images/openim-rpc-third/Dockerfile

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

build/images/openim-rpc-user/Dockerfile

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

cmd/openim-api/main.go

@@ -18,71 +18,76 @@ import (
 	"context"
 	"fmt"
 	"net"
-	"strconv"
-	"time"
-
 	_ "net/http/pprof"
+	"strconv"
+
+	"github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register"
 
 	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
-	openkeeper "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper"
 	"github.com/OpenIMSDK/tools/log"
-
 	"github.com/openimsdk/open-im-server/v3/internal/api"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/cache"
 )
 
+var logger log.Logger // Assuming Logger is globally accessible and properly initialized
+
 func main() {
 	apiCmd := cmd.NewApiCmd()
 	apiCmd.AddPortFlag()
 	apiCmd.AddApi(run)
 	if err := apiCmd.Execute(); err != nil {
+		logger.Error(context.Background(), "API command execution failed", err)
 		panic(err.Error())
 	}
 }
 
 func run(port int) error {
+	logger.Info(context.Background(), "Openim api port:", "port", port)
+
 	if port == 0 {
-		return fmt.Errorf("port is empty")
+		err := "port is empty"
+		logger.Error(context.Background(), err, nil)
+		return fmt.Errorf(err)
 	}
 	rdb, err := cache.NewRedis()
 	if err != nil {
+		logger.Error(context.Background(), "Failed to initialize Redis", err)
 		return err
 	}
-	fmt.Println("api start init discov client")
+	logger.Info(context.Background(), "api start init discov client")
+
 	var client discoveryregistry.SvcDiscoveryRegistry
-	client, err = openkeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema,
-		openkeeper.WithFreq(time.Hour), openkeeper.WithUserNameAndPassword(
-			config.Config.Zookeeper.Username,
-			config.Config.Zookeeper.Password,
-		), openkeeper.WithRoundRobin(), openkeeper.WithTimeout(10), openkeeper.WithLogger(log.NewZkLogger()))
+	client, err = discovery_register.NewDiscoveryRegister(config.Config.Envs.Discovery)
 	if err != nil {
+		logger.Error(context.Background(), "Failed to initialize discovery register", err)
 		return err
 	}
 	if err = client.CreateRpcRootNodes(config.Config.GetServiceNames()); err != nil {
+		logger.Error(context.Background(), "Failed to create RPC root nodes", err)
 		return err
 	}
-	fmt.Println("api register public config to discov")
+	logger.Info(context.Background(), "api register public config to discov")
 	if err = client.RegisterConf2Registry(constant.OpenIMCommonConfigKey, config.Config.EncodeConfig()); err != nil {
+		logger.Error(context.Background(), "Failed to register public config to discov", err)
 		return err
 	}
-	fmt.Println("api register public config to discov success")
+	logger.Info(context.Background(), "api register public config to discov success")
 	router := api.NewGinRouter(client, rdb)
-	fmt.Println("api init router success")
+	logger.Info(context.Background(), "api init router success")
 	var address string
 	if config.Config.Api.ListenIP != "" {
 		address = net.JoinHostPort(config.Config.Api.ListenIP, strconv.Itoa(port))
 	} else {
 		address = net.JoinHostPort("0.0.0.0", strconv.Itoa(port))
 	}
-	fmt.Println("start api server, address: ", address, ", OpenIM version: ", config.Version)
-	log.ZInfo(context.Background(), "start server success", "address", address, "version", config.Version)
+	logger.Info(context.Background(), "start api server", "address", address, "OpenIM version", config.Version)
+
 	err = router.Run(address)
 	if err != nil {
-		log.ZError(context.Background(), "api run failed ", err, "address", address)
-
+		logger.Error(context.Background(), "api run failed", err, "address", address)
 		return err
 	}
 

cmd/openim-push/main.go

@@ -21,7 +21,7 @@ import (
 )
 
 func main() {
-	pushCmd := cmd.NewRpcCmd("push")
+	pushCmd := cmd.NewRpcCmd(cmd.RpcPushServer)
 	pushCmd.AddPortFlag()
 	pushCmd.AddPrometheusPortFlag()
 	if err := pushCmd.Exec(); err != nil {

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

@@ -21,7 +21,7 @@ import (
 )
 
 func main() {
-	authCmd := cmd.NewRpcCmd("auth")
+	authCmd := cmd.NewRpcCmd(cmd.RpcAuthServer)
 	authCmd.AddPortFlag()
 	authCmd.AddPrometheusPortFlag()
 	if err := authCmd.Exec(); err != nil {

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

@@ -21,7 +21,7 @@ import (
 )
 
 func main() {
-	rpcCmd := cmd.NewRpcCmd("conversation")
+	rpcCmd := cmd.NewRpcCmd(cmd.RpcConversationServer)
 	rpcCmd.AddPortFlag()
 	rpcCmd.AddPrometheusPortFlag()
 	if err := rpcCmd.Exec(); err != nil {

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

@@ -21,7 +21,7 @@ import (
 )
 
 func main() {
-	rpcCmd := cmd.NewRpcCmd("friend")
+	rpcCmd := cmd.NewRpcCmd(cmd.RpcFriendServer)
 	rpcCmd.AddPortFlag()
 	rpcCmd.AddPrometheusPortFlag()
 	if err := rpcCmd.Exec(); err != nil {

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

@@ -21,7 +21,7 @@ import (
 )
 
 func main() {
-	rpcCmd := cmd.NewRpcCmd("group")
+	rpcCmd := cmd.NewRpcCmd(cmd.RpcGroupServer)
 	rpcCmd.AddPortFlag()
 	rpcCmd.AddPrometheusPortFlag()
 	if err := rpcCmd.Exec(); err != nil {

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

@@ -21,7 +21,7 @@ import (
 )
 
 func main() {
-	rpcCmd := cmd.NewRpcCmd("msg")
+	rpcCmd := cmd.NewRpcCmd(cmd.RpcMsgServer)
 	rpcCmd.AddPortFlag()
 	rpcCmd.AddPrometheusPortFlag()
 	if err := rpcCmd.Exec(); err != nil {

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

@@ -21,7 +21,7 @@ import (
 )
 
 func main() {
-	rpcCmd := cmd.NewRpcCmd("third")
+	rpcCmd := cmd.NewRpcCmd(cmd.RpcThirdServer)
 	rpcCmd.AddPortFlag()
 	rpcCmd.AddPrometheusPortFlag()
 	if err := rpcCmd.Exec(); err != nil {

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

@@ -21,7 +21,7 @@ import (
 )
 
 func main() {
-	rpcCmd := cmd.NewRpcCmd("user")
+	rpcCmd := cmd.NewRpcCmd(cmd.RpcUserServer)
 	rpcCmd.AddPortFlag()
 	rpcCmd.AddPrometheusPortFlag()
 	if err := rpcCmd.Exec(); err != nil {

config/config.yaml

@@ -26,6 +26,9 @@
 # Zookeeper address
 # Zookeeper username
 # Zookeeper password
+envs:
+  discovery: zookeeper
+
 zookeeper:
   schema: openim
   address: [ 172.28.0.1:12181 ]
@@ -213,6 +216,7 @@ log:
 # Websocket connection handshake timeout
 longConnSvr:
   openImWsPort: [ 10001 ]
+  openImMessageGatewayPort: [ 10140 ]
   websocketMaxConnNum: 100000
   websocketMaxMsgLen: 4096
   websocketTimeout: 10

deployments/README.md

@@ -80,6 +80,12 @@ $ sudo sealos run labring/kubernetes:v1.25.0 labring/helm:v3.8.2 labring/calico:
     -p "$CLUSTER_PASSWORD"
 ```
 
+> **Node**
+> 卸载的方式：使用 `kubeadm` 卸载并不会清除 `etcd` 和 `cni` 相关，所以需要手动清除，或者使用 `sealos` 卸载。
+> ```bash
+> sealos reset
+> ```
+
 ### 安装 helm
 
 helm通过打包的方式，支持发布的版本管理和控制，很大程度上简化了Kubernetes应用的部署和管理。
@@ -101,7 +107,3 @@ $ helm repo add brigade https://openimsdk.github.io/openim-charts
 ### 容器化安装
 
 具体安装步骤如下：
-
-
-
-### Helm安装

deployments/openim-chat/.helmignore

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

deployments/openim-chat/Chart.yaml

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

deployments/openim-chat/LICENSE

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

deployments/openim-chat/templates/NOTES.txt

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

deployments/openim-chat/templates/_helpers.tpl

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

deployments/openim-chat/templates/deployment.yaml

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

deployments/openim-chat/templates/hpa.yaml

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

deployments/openim-chat/templates/ingress.yaml

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

deployments/openim-chat/templates/service.yaml

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

deployments/openim-chat/templates/serviceaccount.yaml

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

deployments/openim-chat/values.yaml

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

deployments/templates/openim.yaml

@@ -19,6 +19,9 @@
 # --| target: config/config.yaml
 # -----------------------------------------------------------------
 
+envs:
+  discovery: ${ENVS_DISCOVERY}
+
 ###################### Zookeeper ######################
 # Zookeeper configuration
 # It's not recommended to modify the schema

docs/contrib/environment.md

@@ -1,20 +1,19 @@
-# OpenIM enviroment
+# OpenIM ENVIRONMENT CONFIGURATION
 
 <!-- vscode-markdown-toc -->
-
 * 1. [OpenIM Deployment Guide](#OpenIMDeploymentGuide)
 	* 1.1. [Deployment Strategies](#DeploymentStrategies)
 	* 1.2. [Source Code Deployment](#SourceCodeDeployment)
 	* 1.3. [Docker Compose Deployment](#DockerComposeDeployment)
 	* 1.4. [Environment Variable Configuration](#EnvironmentVariableConfiguration)
-		* 1.4.1. [[1. Recommended using environment variables:](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#1-recommended-using-environment-variables)](#1.Recommendedusingenvironmentvariables:https:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.md1-recommended-using-environment-variables)
-		* 1.4.2. [[Additional Configuration](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#additional-configuration)](#AdditionalConfigurationhttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdadditional-configuration)
-		* 1.4.3. [[Security Considerations](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#security-considerations)](#SecurityConsiderationshttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdsecurity-considerations)
-		* 1.4.4. [[Data Management](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#data-management)](#DataManagementhttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mddata-management)
-		* 1.4.5. [[Monitoring and Logging](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#monitoring-and-logging)](#MonitoringandLogginghttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdmonitoring-and-logging)
-		* 1.4.6. [[Troubleshooting](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#troubleshooting)](#Troubleshootinghttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdtroubleshooting)
-		* 1.4.7. [[Conclusion](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#conclusion)](#Conclusionhttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdconclusion)
-		* 1.4.8. [[Additional Resources](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#additional-resources)](#AdditionalResourceshttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdadditional-resources)
+		* 1.4.1. [Recommended using environment variables](#Recommendedusingenvironmentvariables)
+		* 1.4.2. [Additional Configuration](#AdditionalConfiguration)
+		* 1.4.3. [Security Considerations](#SecurityConsiderations)
+		* 1.4.4. [Data Management](#DataManagement)
+		* 1.4.5. [Monitoring and Logging](#MonitoringandLogging)
+		* 1.4.6. [Troubleshooting](#Troubleshooting)
+		* 1.4.7. [Conclusion](#Conclusion)
+		* 1.4.8. [Additional Resources](#AdditionalResources)
 * 2. [Further Configuration](#FurtherConfiguration)
 	* 2.1. [Image Registry Configuration](#ImageRegistryConfiguration)
 	* 2.2. [OpenIM Docker Network Configuration](#OpenIMDockerNetworkConfiguration)
@@ -39,11 +38,6 @@
 		* 2.20.1. [General Configuration](#GeneralConfiguration)
 		* 2.20.2. [Service-Specific Prometheus Ports](#Service-SpecificPrometheusPorts)
 
-<!-- vscode-markdown-toc-config
-	numbering=true
-	autoSave=true
-	/vscode-markdown-toc-config -->
-<!-- /vscode-markdown-toc -->
 
 
 ##  1. <a name='OpenIMDeploymentGuide'></a>OpenIM Deployment Guide
@@ -96,7 +90,7 @@ Setting a variable, e.g., `export CHAT_BRANCH="release-v1.3"`, will prioritize `
 
 For convenience, configuration through modifying environment variables is recommended:
 
-####  1.4.1. <a name='1.Recommendedusingenvironmentvariables:https:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.md1-recommended-using-environment-variables'></a>[1. Recommended using environment variables:](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#1-recommended-using-environment-variables)
+####  1.4.1. <a name='Recommendedusingenvironmentvariables'></a>Recommended using environment variables
 
 + PASSWORD
 
@@ -137,9 +131,9 @@ For convenience, configuration through modifying environment variables is recomm
   export DATA_DIR="/data/openim"
   ```
 
-####  1.4.2. <a name='AdditionalConfigurationhttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdadditional-configuration'></a>[Additional Configuration](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#additional-configuration)
+####  1.4.2. <a name='AdditionalConfiguration'></a>Additional Configuration
 
-##### [MinIO Access and Secret Key](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#minio-access-and-secret-key)
+##### MinIO Access and Secret Key
 
 To secure your MinIO server, you should set up an access key and secret key. These credentials are used to authenticate requests to your MinIO server.
 
@@ -148,7 +142,7 @@ export MINIO_ACCESS_KEY="YourAccessKey"
 export MINIO_SECRET_KEY="YourSecretKey"
 ```
 
-##### [MinIO Browser](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#minio-browser)
+##### MinIO Browser
 
 MinIO comes with an embedded web-based object browser. You can control the availability of the MinIO browser by setting the `MINIO_BROWSER` environment variable.
 
@@ -156,9 +150,9 @@ MinIO comes with an embedded web-based object browser. You can control the avail
 export MINIO_BROWSER="on"
 ```
 
-####  1.4.3. <a name='SecurityConsiderationshttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdsecurity-considerations'></a>[Security Considerations](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#security-considerations)
+####  1.4.3. <a name='SecurityConsiderations'></a>Security Considerations
 
-##### [TLS/SSL Configuration](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#tls-ssl-configuration)
+##### TLS/SSL Configuration
 
 For secure communication, it's recommended to enable TLS/SSL for your MinIO server. You can do this by providing the path to the SSL certificate and key files.
 
@@ -166,9 +160,9 @@ For secure communication, it's recommended to enable TLS/SSL for your MinIO serv
 export MINIO_CERTS_DIR="/path/to/certs/directory"
 ```
 
-####  1.4.4. <a name='DataManagementhttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mddata-management'></a>[Data Management](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#data-management)
+####  1.4.4. <a name='DataManagement'></a>Data Management
 
-##### [Data Retention Policy](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#data-retention-policy)
+##### Data Retention Policy
 
 You may want to set up a data retention policy to automatically delete objects after a specified period.
 
@@ -176,7 +170,7 @@ You may want to set up a data retention policy to automatically delete objects a
 export MINIO_RETENTION_DAYS="30"
 ```
 
-####  1.4.5. <a name='MonitoringandLogginghttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdmonitoring-and-logging'></a>[Monitoring and Logging](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#monitoring-and-logging)
+####  1.4.5. <a name='MonitoringandLogging'></a>Monitoring and Logging
 
 ##### [Audit Logging](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#audit-logging)
 
@@ -186,9 +180,9 @@ Enable audit logging to keep track of access and changes to your data.
 export MINIO_AUDIT="on"
 ```
 
-####  1.4.6. <a name='Troubleshootinghttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdtroubleshooting'></a>[Troubleshooting](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#troubleshooting)
+####  1.4.6. <a name='Troubleshooting'></a>Troubleshooting
 
-##### [Debug Mode](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#debug-mode)
+##### Debug Mode
 
 In case of issues, you may enable debug mode to get more detailed logs to assist in troubleshooting.
 
@@ -196,11 +190,11 @@ In case of issues, you may enable debug mode to get more detailed logs to assist
 export MINIO_DEBUG="on"
 ```
 
-####  1.4.7. <a name='Conclusionhttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdconclusion'></a>[Conclusion](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#conclusion)
+####  1.4.7. <a name='Conclusion'></a>Conclusion
 
 With the environment variables configured as per your requirements, your MinIO server should be ready to securely store and manage your object data. Ensure to verify the setup and monitor the logs for any unusual activities or errors. Regularly update the MinIO server and review your configuration to adapt to any changes or improvements in the MinIO system.
 
-####  1.4.8. <a name='AdditionalResourceshttps:github.comopenimsdkopen-im-serverblobmaindocscontribenvironment.mdadditional-resources'></a>[Additional Resources](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md#additional-resources)
+####  1.4.8. <a name='AdditionalResources'></a>Additional Resources
 
 + [MinIO Client Quickstart Guide](https://docs.min.io/docs/minio-client-quickstart-guide)
 + [MinIO Admin Complete Guide](https://docs.min.io/docs/minio-admin-complete-guide)

go.mod

@@ -1,6 +1,6 @@
 module github.com/openimsdk/open-im-server/v3
 
-go 1.18
+go 1.19
 
 require (
 	firebase.google.com/go v3.13.0+incompatible
@@ -24,34 +24,34 @@ require (
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/stretchr/testify v1.8.4
 	go.mongodb.org/mongo-driver v1.12.1
-	golang.org/x/image v0.12.0
-	google.golang.org/api v0.143.0
-	google.golang.org/grpc v1.58.2
+	golang.org/x/image v0.13.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
-	gorm.io/driver/mysql v1.5.1
+	gorm.io/driver/mysql v1.5.2
 	gorm.io/gorm v1.25.5
 )
 
 require github.com/google/uuid v1.3.1
 
 require (
-	github.com/IBM/sarama v1.41.2
-	github.com/OpenIMSDK/protocol v0.0.24
+	github.com/IBM/sarama v1.41.3
+	github.com/OpenIMSDK/protocol v0.0.27
 	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.44
+	github.com/tencentyun/cos-go-sdk-v5 v0.7.45
 )
 
 require (
-	cloud.google.com/go v0.110.7 // indirect
+	cloud.google.com/go v0.110.8 // indirect
 	cloud.google.com/go/compute v1.23.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	cloud.google.com/go/firestore v1.12.0 // indirect
-	cloud.google.com/go/iam v1.1.1 // indirect
+	cloud.google.com/go/firestore v1.13.0 // indirect
+	cloud.google.com/go/iam v1.1.2 // indirect
 	cloud.google.com/go/longrunning v0.5.1 // indirect
 	cloud.google.com/go/storage v1.30.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
@@ -71,7 +71,6 @@ require (
 	github.com/go-zookeeper/zk v1.0.3 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/s2a-go v0.1.7 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect
@@ -120,16 +119,16 @@ require (
 	go.uber.org/multierr v1.6.0 // indirect
 	golang.org/x/arch v0.3.0 // indirect
 	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/oauth2 v0.12.0 // indirect
-	golang.org/x/sync v0.3.0 // indirect
+	golang.org/x/oauth2 v0.13.0 // indirect
+	golang.org/x/sync v0.4.0 // indirect
 	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
+	google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c // indirect
 )
 
 require (

go.sum

@@ -1,14 +1,14 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.110.7 h1:rJyC7nWRg2jWGZ4wSJ5nY65GTdYJkg0cd/uXb+ACI6o=
-cloud.google.com/go v0.110.7/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI=
+cloud.google.com/go v0.110.8 h1:tyNdfIxjzaWctIiLYOTalaLKZ17SI44SKFW26QbOhME=
+cloud.google.com/go v0.110.8/go.mod h1:Iz8AkXJf1qmxC3Oxoep8R1T36w8B92yU29PcBhHO5fk=
 cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY=
 cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=
 cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
 cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
-cloud.google.com/go/firestore v1.12.0 h1:aeEA/N7DW7+l2u5jtkO8I0qv0D95YwjggD8kUHrTHO4=
-cloud.google.com/go/firestore v1.12.0/go.mod h1:b38dKhgzlmNNGTNZZwe7ZRFEuRab1Hay3/DBsIGKKy4=
-cloud.google.com/go/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y=
-cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU=
+cloud.google.com/go/firestore v1.13.0 h1:/3S4RssUV4GO/kvgJZB+tayjhOfyAHs+KcpJgRVu/Qk=
+cloud.google.com/go/firestore v1.13.0/go.mod h1:QojqqOh8IntInDUSTAh0c8ZsPYAr68Ma8c5DWOy8xb8=
+cloud.google.com/go/iam v1.1.2 h1:gacbrBdWcoVmGLozRuStX45YKvJtzIjJdAolzUs1sm4=
+cloud.google.com/go/iam v1.1.2/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU=
 cloud.google.com/go/longrunning v0.5.1 h1:Fr7TXftcqTudoyRJa113hyaqlGdiBQkp0Gq7tErFDWI=
 cloud.google.com/go/longrunning v0.5.1/go.mod h1:spvimkwdz6SPWKEt/XBij79E9fiTkHSQl/fRUUQJYJc=
 cloud.google.com/go/storage v1.30.1 h1:uOdMxAs8HExqBlnLtnQyP0YkvbiDpdGShGKtx6U/oNM=
@@ -16,10 +16,10 @@ cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7Biccwk
 firebase.google.com/go v3.13.0+incompatible h1:3TdYC3DDi6aHn20qoRkxwGqNgdjtblwVAyRLQwGn/+4=
 firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIwjt8toICdV5Wh9ptHs=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/IBM/sarama v1.41.2 h1:ZDBZfGPHAD4uuAtSv4U22fRZBgst0eEwGFzLj0fb85c=
-github.com/IBM/sarama v1.41.2/go.mod h1:xdpu7sd6OE1uxNdjYTSKUfY8FaKkJES9/+EyjSgiGQk=
-github.com/OpenIMSDK/protocol v0.0.24 h1:wk/S0GOGVh8mBbpmjKxSsyYMhyBazdn/ZcS9VqXfT24=
-github.com/OpenIMSDK/protocol v0.0.24/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y=
+github.com/IBM/sarama v1.41.3 h1:MWBEJ12vHC8coMjdEXFq/6ftO6DUZnQlFYcxtOJFa7c=
+github.com/IBM/sarama v1.41.3/go.mod h1:Xxho9HkHd4K/MDUo/T/sOqwtX/17D33++E9Wib6hUdQ=
+github.com/OpenIMSDK/protocol v0.0.27 h1:ee1Y6idLahgJrTHkgWPboKIvCT9zvf7jitavVpffpPw=
+github.com/OpenIMSDK/protocol v0.0.27/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y=
 github.com/OpenIMSDK/tools v0.0.14 h1:WLof/+WxyPyRST+QkoTKubYCiV73uCLiL8pgnpH/yKQ=
 github.com/OpenIMSDK/tools v0.0.14/go.mod h1:eg+q4A34Qmu73xkY0mt37FHGMCMfC6CtmOnm0kFEGFI=
 github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM=
@@ -52,6 +52,7 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t
 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/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=
 github.com/dtm-labs/rockscache v0.1.1 h1:6S1vgaHvGqrLd8Ka4hRTKeKPV7v+tT0MSkTIX81LRyA=
@@ -131,7 +132,6 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
@@ -295,8 +295,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.563/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.563/go.mod h1:uom4Nvi9W+Qkom0exYiJ9VWJjXwyxtPYTkKkaLMlfE0=
-github.com/tencentyun/cos-go-sdk-v5 v0.7.44 h1:Vvz28KVdmSUrwTH2MWgAMlhzUAh+lQBSSAW1J7qJDW8=
-github.com/tencentyun/cos-go-sdk-v5 v0.7.44/go.mod h1:LUFnaqRmGk6pEHOaRmdn2dCZR2j0cSsM5xowWFPTPao=
+github.com/tencentyun/cos-go-sdk-v5 v0.7.45 h1:5/ZGOv846tP6+2X7w//8QjLgH2KcUK+HciFbfjWquFU=
+github.com/tencentyun/cos-go-sdk-v5 v0.7.45/go.mod h1:DH9US8nB+AJXqwu/AMOrCFN1COv3dpytXuJWHgdg7kE=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
@@ -335,15 +335,14 @@ 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/image v0.12.0 h1:w13vZbU4o5rKOFFR8y7M+c4A5jXDC0uXTdHYRP8X2DQ=
-golang.org/x/image v0.12.0/go.mod h1:Lu90jvHG7GfemOIcldsh9A2hS01ocl6oNO7ype5mEnk=
+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=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -366,8 +365,8 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=
-golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=
+golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY=
+golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -375,9 +374,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
+golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -424,15 +422,14 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 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.143.0 h1:o8cekTkqhywkbZT6p1UHJPZ9+9uuCAJs/KYomxZB8fA=
-google.golang.org/api v0.143.0/go.mod h1:FoX9DO9hT7DLNn97OuoZAGSDuNAXdJRuGK98rSUgurk=
+google.golang.org/api v0.147.0 h1:Can3FaQo9LlVqxJCodNmeZW/ib3/qKAY3rFeXiHo5gc=
+google.golang.org/api v0.147.0/go.mod h1:pQ/9j83DcmPd/5C9e2nFOdjjNkDZ1G+zkbK2uvdkJMs=
 google.golang.org/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=
@@ -440,19 +437,19 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb h1:XFBgcDwm7irdHTbz4Zk2h7Mh+eis4nfJEFQFYzJzuIA=
-google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4=
-google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb h1:lK0oleSc7IQsUxO3U5TjL9DWlsxpEBemh+zpB7IqhWI=
-google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 h1:N3bU/SQDCDyD6R528GJ/PwW9KjYcJA3dgyH+MovAkIM=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:KSqppvjFjtoCI+KGd4PELB0qLNxdJHRGqRI09mB6pQA=
+google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 h1:SeZZZx0cP0fqUyA+oRzP9k7cSwJlvDFiROO72uwD6i0=
+google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97/go.mod h1:t1VqOqqvce95G3hIDCT5FeO3YUc6Q4Oe24L/+rNMxRk=
+google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 h1:W18sezcAYs+3tDZX4F80yctqa12jcP1PUS2gQu1zTPU=
+google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c h1:jHkCUWkseRf+W+edG5hMzr/Uh1xkDREY4caybAq4dpY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c/go.mod h1:4cYg8o5yUbm77w8ZX00LhMVNl/YVBFJRYWDc0uYWMs0=
 google.golang.org/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=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I=
-google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
+google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
+google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -481,9 +478,9 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/mysql v1.5.1 h1:WUEH5VF9obL/lTtzjmML/5e6VfFR/788coz2uaVCAZw=
-gorm.io/driver/mysql v1.5.1/go.mod h1:Jo3Xu7mMhCyj8dlrb3WoCaRd1FhsVh+yMXb1jUInf5o=
-gorm.io/gorm v1.25.1/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
+gorm.io/driver/mysql v1.5.2 h1:QC2HRskSE75wBuOxe0+iCkyJZ+RqpudsQtqkp+IMuXs=
+gorm.io/driver/mysql v1.5.2/go.mod h1:pQLhh1Ut/WUAySdTHwBpBv6+JKcj+ua4ZFx1QQTBzb8=
+gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
 gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls=
 gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

go.work

@@ -1,4 +1,4 @@
-go 1.18
+go 1.19
 
 use (
 	.

internal/msggateway/client.go

@@ -207,8 +207,8 @@ func (c *Client) handleMessage(message []byte) error {
 			binaryReq.ReqIdentifier,
 		)
 	}
-	c.replyMessage(ctx, &binaryReq, messageErr, resp)
-	return nil
+
+	return c.replyMessage(ctx, &binaryReq, messageErr, resp)
 }
 
 func (c *Client) setAppBackgroundStatus(ctx context.Context, req Req) ([]byte, error) {
@@ -229,7 +229,7 @@ func (c *Client) close() {
 	c.longConnServer.UnRegister(c)
 }
 
-func (c *Client) replyMessage(ctx context.Context, binaryReq *Req, err error, resp []byte) {
+func (c *Client) replyMessage(ctx context.Context, binaryReq *Req, err error, resp []byte) error {
 	errResp := apiresp.ParseError(err)
 	mReply := Resp{
 		ReqIdentifier: binaryReq.ReqIdentifier,
@@ -244,6 +244,10 @@ func (c *Client) replyMessage(ctx context.Context, binaryReq *Req, err error, re
 	if err != nil {
 		log.ZWarn(ctx, "wireBinaryMsg replyMessage", err, "resp", mReply.String())
 	}
+	if binaryReq.ReqIdentifier == WsLogoutMsg {
+		return errors.New("user logout")
+	}
+	return nil
 }
 
 func (c *Client) PushMessage(ctx context.Context, msgData *sdkws.MsgData) error {

internal/msggateway/n_ws_server.go

@@ -143,9 +143,6 @@ func NewWsServer(opts ...Option) (*WsServer, error) {
 	for _, o := range opts {
 		o(&config)
 	}
-	if config.port < 1024 {
-		return nil, errors.New("port not allow to listen")
-	}
 	v := validator.New()
 	return &WsServer{
 		port:             config.port,

internal/msgtransfer/init.go

@@ -16,14 +16,11 @@ package msgtransfer
 
 import (
 	"fmt"
-	"sync"
-	"time"
-
+	"github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
+	"sync"
 
-	openkeeper "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper"
-	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/mw"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
@@ -62,9 +59,11 @@ func StartTransfer(prometheusPort int) error {
 	if err := mongo.CreateMsgIndex(); err != nil {
 		return err
 	}
-	client, err := openkeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema,
-		openkeeper.WithFreq(time.Hour), openkeeper.WithRoundRobin(), openkeeper.WithUserNameAndPassword(config.Config.Zookeeper.Username,
-			config.Config.Zookeeper.Password), openkeeper.WithTimeout(10), openkeeper.WithLogger(log.NewZkLogger()))
+	client, err := discovery_register.NewDiscoveryRegister(config.Config.Envs.Discovery)
+	/*
+		client, err := openkeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema,
+			openkeeper.WithFreq(time.Hour), openkeeper.WithRoundRobin(), openkeeper.WithUserNameAndPassword(config.Config.Zookeeper.Username,
+				config.Config.Zookeeper.Password), openkeeper.WithTimeout(10), openkeeper.WithLogger(log.NewZkLogger()))*/
 	if err != nil {
 		return err
 	}

internal/rpc/group/callback.go

@@ -51,7 +51,7 @@ func CallbackBeforeCreateGroup(ctx context.Context, req *group.CreateGroupReq) (
 			RoleLevel: constant.GroupAdmin,
 		})
 	}
-	for _, userID := range req.AdminUserIDs {
+	for _, userID := range req.MemberUserIDs {
 		cbReq.InitMemberList = append(cbReq.InitMemberList, &apistruct.GroupAddMemberInfo{
 			UserID:    userID,
 			RoleLevel: constant.GroupOrdinaryUsers,

internal/rpc/group/group.go

@@ -121,14 +121,23 @@ func (s *groupServer) NotificationUserInfoUpdate(ctx context.Context, req *pbgro
 	if err != nil {
 		return nil, err
 	}
+	groupIDs := make([]string, 0, len(members))
 	for _, member := range members {
 		if member.Nickname != "" && member.FaceURL != "" {
 			continue
 		}
-		if err := s.Notification.GroupMemberInfoSetNotification(ctx, member.GroupID, member.UserID); err != nil {
-			log.ZError(ctx, "setGroupMemberInfo notification failed", err, "member", member.UserID, "groupID", member.GroupID)
+		groupIDs = append(groupIDs, member.GroupID)
+	}
+	log.ZInfo(ctx, "NotificationUserInfoUpdate", "joinGroupNum", len(members), "updateNum", len(groupIDs), "updateGroupIDs", groupIDs)
+	for _, groupID := range groupIDs {
+		if err := s.Notification.GroupMemberInfoSetNotification(ctx, groupID, req.UserID); err != nil {
+			log.ZError(ctx, "NotificationUserInfoUpdate setGroupMemberInfo notification failed", err, "groupID", groupID)
 		}
 	}
+	if err := s.GroupDatabase.DeleteGroupMemberHash(ctx, groupIDs); err != nil {
+		log.ZError(ctx, "NotificationUserInfoUpdate DeleteGroupMemberHash", err, "groupID", groupIDs)
+	}
+
 	return &pbgroup.NotificationUserInfoUpdateResp{}, nil
 }
 

internal/rpc/msg/as_read.go

@@ -81,7 +81,8 @@ func (m *msgServer) SetConversationHasReadSeq(
 	if err := m.MsgDatabase.SetHasReadSeq(ctx, req.UserID, req.ConversationID, req.HasReadSeq); err != nil {
 		return nil, err
 	}
-	if err = m.sendMarkAsReadNotification(ctx, req.ConversationID, constant.SingleChatType, req.UserID, req.UserID, nil, req.HasReadSeq); err != nil {
+	if err = m.sendMarkAsReadNotification(ctx, req.ConversationID, constant.SingleChatType, req.UserID,
+		req.UserID, nil, req.HasReadSeq); err != nil {
 		return
 	}
 	return &msg.SetConversationHasReadSeqResp{}, nil
@@ -119,7 +120,8 @@ func (m *msgServer) MarkMsgsAsRead(
 			return
 		}
 	}
-	if err = m.sendMarkAsReadNotification(ctx, req.ConversationID, conversation.ConversationType, req.UserID, m.conversationAndGetRecvID(conversation, req.UserID), req.Seqs, hasReadSeq); err != nil {
+	if err = m.sendMarkAsReadNotification(ctx, req.ConversationID, conversation.ConversationType, req.UserID,
+		m.conversationAndGetRecvID(conversation, req.UserID), req.Seqs, hasReadSeq); err != nil {
 		return
 	}
 	return &msg.MarkMsgsAsReadResp{}, nil
@@ -131,44 +133,61 @@ func (m *msgServer) MarkConversationAsRead(
 ) (resp *msg.MarkConversationAsReadResp, err error) {
 	conversation, err := m.Conversation.GetConversation(ctx, req.UserID, req.ConversationID)
 	if err != nil {
-		return
+		return nil, err
 	}
 	hasReadSeq, err := m.MsgDatabase.GetHasReadSeq(ctx, req.UserID, req.ConversationID)
 	if err != nil && errs.Unwrap(err) != redis.Nil {
-		return
+		return nil, err
 	}
-	log.ZDebug(ctx, "MarkConversationAsRead", "hasReadSeq", hasReadSeq, "req.HasReadSeq", req.HasReadSeq)
 	var seqs []int64
-	if len(req.Seqs) == 0 {
+
+	log.ZDebug(ctx, "MarkConversationAsRead", "hasReadSeq", hasReadSeq,
+		"req.HasReadSeq", req.HasReadSeq)
+	if conversation.ConversationType == constant.SingleChatType {
 		for i := hasReadSeq + 1; i <= req.HasReadSeq; i++ {
 			seqs = append(seqs, i)
 		}
-	} else {
-		seqs = req.Seqs
-	}
-	if len(seqs) > 0 {
-		log.ZDebug(ctx, "MarkConversationAsRead", "seqs", seqs, "conversationID", req.ConversationID)
-		if err = m.MsgDatabase.MarkSingleChatMsgsAsRead(ctx, req.UserID, req.ConversationID, seqs); err != nil {
-			return
+
+		if len(seqs) > 0 {
+			log.ZDebug(ctx, "MarkConversationAsRead", "seqs", seqs, "conversationID", req.ConversationID)
+			if err = m.MsgDatabase.MarkSingleChatMsgsAsRead(ctx, req.UserID, req.ConversationID, seqs); err != nil {
+				return nil, err
+			}
 		}
-	}
-	if req.HasReadSeq > hasReadSeq {
-		err = m.MsgDatabase.SetHasReadSeq(ctx, req.UserID, req.ConversationID, req.HasReadSeq)
-		if err != nil {
-			return
+		if req.HasReadSeq > hasReadSeq {
+			err = m.MsgDatabase.SetHasReadSeq(ctx, req.UserID, req.ConversationID, req.HasReadSeq)
+			if err != nil {
+				return nil, err
+			}
+			hasReadSeq = req.HasReadSeq
 		}
-		hasReadSeq = req.HasReadSeq
-	}
-	if err = m.sendMarkAsReadNotification(ctx, req.ConversationID, conversation.ConversationType, req.UserID, m.conversationAndGetRecvID(conversation, req.UserID), seqs, hasReadSeq); err != nil {
-		return
+		if err = m.sendMarkAsReadNotification(ctx, req.ConversationID, conversation.ConversationType, req.UserID,
+			m.conversationAndGetRecvID(conversation, req.UserID), seqs, hasReadSeq); err != nil {
+			return nil, err
+		}
+
+	} else if conversation.ConversationType == constant.SuperGroupChatType {
+		if req.HasReadSeq > hasReadSeq {
+			err = m.MsgDatabase.SetHasReadSeq(ctx, req.UserID, req.ConversationID, req.HasReadSeq)
+			if err != nil {
+				return nil, err
+			}
+			hasReadSeq = req.HasReadSeq
+		}
+		if err = m.sendMarkAsReadNotification(ctx, req.ConversationID, constant.SingleChatType, req.UserID,
+			req.UserID, seqs, hasReadSeq); err != nil {
+			return nil, err
+		}
+
 	}
+
 	return &msg.MarkConversationAsReadResp{}, nil
 }
 
 func (m *msgServer) sendMarkAsReadNotification(
 	ctx context.Context,
 	conversationID string,
-	sesstionType int32,
+	sessionType int32,
 	sendID, recvID string,
 	seqs []int64,
 	hasReadSeq int64,
@@ -179,6 +198,9 @@ func (m *msgServer) sendMarkAsReadNotification(
 		Seqs:             seqs,
 		HasReadSeq:       hasReadSeq,
 	}
-	m.notificationSender.NotificationWithSesstionType(ctx, sendID, recvID, constant.HasReadReceipt, sesstionType, tips)
+	err := m.notificationSender.NotificationWithSesstionType(ctx, sendID, recvID, constant.HasReadReceipt, sessionType, tips)
+	if err != nil {
+		log.ZWarn(ctx, "send has read Receipt err", err)
+	}
 	return nil
 }

internal/rpc/user/user.go

@@ -289,7 +289,8 @@ func (s *userServer) SubscribeOrCancelUsersStatus(ctx context.Context, req *pbus
 }
 
 // GetUserStatus Get the online status of the user.
-func (s *userServer) GetUserStatus(ctx context.Context, req *pbuser.GetUserStatusReq) (resp *pbuser.GetUserStatusResp, err error) {
+func (s *userServer) GetUserStatus(ctx context.Context, req *pbuser.GetUserStatusReq) (resp *pbuser.GetUserStatusResp,
+	err error) {
 	onlineStatusList, err := s.UserDatabase.GetUserStatus(ctx, req.UserIDs)
 	if err != nil {
 		return nil, err
@@ -298,31 +299,32 @@ func (s *userServer) GetUserStatus(ctx context.Context, req *pbuser.GetUserStatu
 }
 
 // SetUserStatus Synchronize user's online status.
-func (s *userServer) SetUserStatus(ctx context.Context, req *pbuser.SetUserStatusReq) (resp *pbuser.SetUserStatusResp, err error) {
-	err = s.UserDatabase.SetUserStatus(ctx, req.StatusList)
+func (s *userServer) SetUserStatus(ctx context.Context, req *pbuser.SetUserStatusReq) (resp *pbuser.SetUserStatusResp,
+	err error) {
+	err = s.UserDatabase.SetUserStatus(ctx, req.UserID, req.Status, req.PlatformID)
 	if err != nil {
 		return nil, err
 	}
-	for _, value := range req.StatusList {
-		list, err := s.UserDatabase.GetSubscribedList(ctx, value.UserID)
-		if err != nil {
-			return nil, err
-		}
-		for _, userID := range list {
-			tips := &sdkws.UserStatusChangeTips{
-				FromUserID: value.UserID,
-				ToUserID:   userID,
-				Status:     value.Status,
-				PlatformID: value.PlatformIDs[0],
-			}
-			s.userNotificationSender.UserStatusChangeNotification(ctx, tips)
-		}
+	list, err := s.UserDatabase.GetSubscribedList(ctx, req.UserID)
+	if err != nil {
+		return nil, err
 	}
+	for _, userID := range list {
+		tips := &sdkws.UserStatusChangeTips{
+			FromUserID: req.UserID,
+			ToUserID:   userID,
+			Status:     req.Status,
+			PlatformID: req.PlatformID,
+		}
+		s.userNotificationSender.UserStatusChangeNotification(ctx, tips)
+	}
+
 	return &pbuser.SetUserStatusResp{}, nil
 }
 
 // GetSubscribeUsersStatus Get the online status of subscribers.
-func (s *userServer) GetSubscribeUsersStatus(ctx context.Context, req *pbuser.GetSubscribeUsersStatusReq) (*pbuser.GetSubscribeUsersStatusResp, error) {
+func (s *userServer) GetSubscribeUsersStatus(ctx context.Context,
+	req *pbuser.GetSubscribeUsersStatusReq) (*pbuser.GetSubscribeUsersStatusResp, error) {
 	userList, err := s.UserDatabase.GetAllSubscribeList(ctx, req.UserID)
 	if err != nil {
 		return nil, err

internal/tools/msg.go

@@ -17,14 +17,12 @@ package tools
 import (
 	"context"
 	"fmt"
-	"math"
-	"time"
-
+	"github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register"
 	"github.com/redis/go-redis/v9"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
+	"math"
 
-	"github.com/OpenIMSDK/tools/discoveryregistry/zookeeper"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/mcontext"
@@ -74,9 +72,11 @@ func InitMsgTool() (*MsgTool, error) {
 	if err != nil {
 		return nil, err
 	}
-	discov, err := zookeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema,
-		zookeeper.WithFreq(time.Hour), zookeeper.WithRoundRobin(), zookeeper.WithUserNameAndPassword(config.Config.Zookeeper.Username,
-			config.Config.Zookeeper.Password), zookeeper.WithTimeout(10), zookeeper.WithLogger(log.NewZkLogger()))
+	discov, err := discovery_register.NewDiscoveryRegister(config.Config.Envs.Discovery)
+	/*
+		discov, err := zookeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema,
+			zookeeper.WithFreq(time.Hour), zookeeper.WithRoundRobin(), zookeeper.WithUserNameAndPassword(config.Config.Zookeeper.Username,
+				config.Config.Zookeeper.Password), zookeeper.WithTimeout(10), zookeeper.WithLogger(log.NewZkLogger()))*/
 	if err != nil {
 		return nil, err
 	}

manifest/build-docker.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+IMAGEHUB="registry.cn-shenzhen.aliyuncs.com/huanglin_hub"
+PROJECT=$1
+ALLPRO="all"
+servers=(openim-api openim-crontask openim-msggateway openim-msgtransfer openim-push openim-rpc-auth openim-rpc-conversation openim-rpc-friend openim-rpc-group openim-rpc-msg openim-rpc-third openim-rpc-user)
+
+
+if [ "$1" != "" ]
+then
+    if [[ "${servers[@]}"  =~ "${1}" ]]
+    then
+        echo "building ${PROJECT}"
+        DOCKER_PUSHIMG=${IMAGEHUB}/${PROJECT}:dev
+        docker rmi  ${DOCKER_PUSHIMG}
+        docker build -f manifest/dockerfiles/${PROJECT}/Dockerfile -t ${DOCKER_PUSHIMG} .
+        docker push ${DOCKER_PUSHIMG}
+    elif [[ ! "${servers[@]}"  =~ "${1}" ]]
+    then
+        if [ ${PROJECT} == ${ALLPRO} ]
+        then
+            echo "building allproject"
+            for element in ${servers[@]}
+            do
+                SUB_IMG=${element}
+                SUB_PUSHIMG=${IMAGEHUB}/${element}:dev
+                docker rmi  ${SUB_PUSHIMG}
+                docker build -f manifest/dockerfiles/${SUB_IMG}/Dockerfile -t ${SUB_PUSHIMG} .
+                docker push ${SUB_PUSHIMG}
+            done
+        else
+          echo "输入的项目名称不正确"
+        fi
+    fi
+else
+    echo "请传入一个参数"
+fi

manifest/dockerfiles/openim-api/Dockerfile

@@ -0,0 +1,27 @@
+
+# build container
+FROM golang:1.20-alpine3.18 AS builder
+ENV GOPROXY https://goproxy.cn,direct
+ENV GOSUMDB=sum.golang.google.cn
+ENV GO111MODULE=on
+
+WORKDIR /app
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add git pkgconfig build-base
+ADD go.mod .
+ADD go.sum .
+RUN go mod download
+ADD . .
+RUN go build -o cmd/openim-api/openim-api cmd/openim-api/main.go
+
+# archive container
+FROM alpine:3.18
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add ca-certificates libdrm
+RUN apk add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && echo "Asia/Shanghai" > /etc/timezone \
+    && apk del tzdata
+
+WORKDIR /app/bin
+COPY --from=builder /app/cmd/openim-api/openim-api /app/bin/
+ENTRYPOINT ["/app/bin/openim-api"]

manifest/dockerfiles/openim-crontask/Dockerfile

@@ -0,0 +1,27 @@
+
+# build container
+FROM golang:1.20-alpine3.18 AS builder
+ENV GOPROXY https://goproxy.cn,direct
+ENV GOSUMDB=sum.golang.google.cn
+ENV GO111MODULE=on
+
+WORKDIR /app
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add git pkgconfig build-base
+ADD go.mod .
+ADD go.sum .
+RUN go mod download
+ADD . .
+RUN go build -o cmd/openim-crontask/openim-crontask cmd/openim-crontask/main.go
+
+# archive container
+FROM alpine:3.18
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add ca-certificates libdrm
+RUN apk add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && echo "Asia/Shanghai" > /etc/timezone \
+    && apk del tzdata
+
+WORKDIR /app/bin
+COPY --from=builder /app/cmd/openim-crontask/openim-crontask /app/bin/
+ENTRYPOINT ["/app/bin/openim-crontask"]

manifest/dockerfiles/openim-msggateway/Dockerfile

@@ -0,0 +1,27 @@
+
+# build container
+FROM golang:1.20-alpine3.18 AS builder
+ENV GOPROXY https://goproxy.cn,direct
+ENV GOSUMDB=sum.golang.google.cn
+ENV GO111MODULE=on
+
+WORKDIR /app
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add git pkgconfig build-base
+ADD go.mod .
+ADD go.sum .
+RUN go mod download
+ADD . .
+RUN go build -o cmd/openim-msggateway/openim-msggateway cmd/openim-msggateway/main.go
+
+# archive container
+FROM alpine:3.18
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add ca-certificates libdrm
+RUN apk add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && echo "Asia/Shanghai" > /etc/timezone \
+    && apk del tzdata
+
+WORKDIR /app/bin
+COPY --from=builder /app/cmd/openim-msggateway/openim-msggateway /app/bin/
+ENTRYPOINT ["/app/bin/openim-msggateway"]

manifest/dockerfiles/openim-msgtransfer/Dockerfile

@@ -0,0 +1,27 @@
+
+# build container
+FROM golang:1.20-alpine3.18 AS builder
+ENV GOPROXY https://goproxy.cn,direct
+ENV GOSUMDB=sum.golang.google.cn
+ENV GO111MODULE=on
+
+WORKDIR /app
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add git pkgconfig build-base
+ADD go.mod .
+ADD go.sum .
+RUN go mod download
+ADD . .
+RUN go build -o cmd/openim-msgtransfer/openim-msgtransfer cmd/openim-msgtransfer/main.go
+
+# archive container
+FROM alpine:3.18
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add ca-certificates libdrm
+RUN apk add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && echo "Asia/Shanghai" > /etc/timezone \
+    && apk del tzdata
+
+WORKDIR /app/bin
+COPY --from=builder /app/cmd/openim-msgtransfer/openim-msgtransfer /app/bin/
+ENTRYPOINT ["/app/bin/openim-msgtransfer"]

manifest/dockerfiles/openim-push/Dockerfile

@@ -0,0 +1,27 @@
+
+# build container
+FROM golang:1.20-alpine3.18 AS builder
+ENV GOPROXY https://goproxy.cn,direct
+ENV GOSUMDB=sum.golang.google.cn
+ENV GO111MODULE=on
+
+WORKDIR /app
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add git pkgconfig build-base
+ADD go.mod .
+ADD go.sum .
+RUN go mod download
+ADD . .
+RUN go build -o cmd/openim-push/openim-push cmd/openim-push/main.go
+
+# archive container
+FROM alpine:3.18
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add ca-certificates libdrm
+RUN apk add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && echo "Asia/Shanghai" > /etc/timezone \
+    && apk del tzdata
+
+WORKDIR /app/bin
+COPY --from=builder /app/cmd/openim-push/openim-push /app/bin/
+ENTRYPOINT ["/app/bin/openim-push"]

manifest/dockerfiles/openim-rpc-auth/Dockerfile

@@ -0,0 +1,27 @@
+
+# build container
+FROM golang:1.20-alpine3.18 AS builder
+ENV GOPROXY https://goproxy.cn,direct
+ENV GOSUMDB=sum.golang.google.cn
+ENV GO111MODULE=on
+
+WORKDIR /app
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add git pkgconfig build-base
+ADD go.mod .
+ADD go.sum .
+RUN go mod download
+ADD . .
+RUN go build -o cmd/openim-rpc/openim-rpc-auth/openim-rpc-auth cmd/openim-rpc/openim-rpc-auth/main.go
+
+# archive container
+FROM alpine:3.18
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add ca-certificates libdrm
+RUN apk add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && echo "Asia/Shanghai" > /etc/timezone \
+    && apk del tzdata
+
+WORKDIR /app/bin
+COPY --from=builder /app/cmd/openim-rpc/openim-rpc-auth/openim-rpc-auth /app/bin/
+ENTRYPOINT ["/app/bin/openim-rpc-auth"]

manifest/dockerfiles/openim-rpc-conversation/Dockerfile

@@ -0,0 +1,27 @@
+
+# build container
+FROM golang:1.20-alpine3.18 AS builder
+ENV GOPROXY https://goproxy.cn,direct
+ENV GOSUMDB=sum.golang.google.cn
+ENV GO111MODULE=on
+
+WORKDIR /app
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add git pkgconfig build-base
+ADD go.mod .
+ADD go.sum .
+RUN go mod download
+ADD . .
+RUN go build -o cmd/openim-rpc/openim-rpc-conversation/openim-rpc-conversation cmd/openim-rpc/openim-rpc-conversation/main.go
+
+# archive container
+FROM alpine:3.18
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add ca-certificates libdrm
+RUN apk add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && echo "Asia/Shanghai" > /etc/timezone \
+    && apk del tzdata
+
+WORKDIR /app/bin
+COPY --from=builder /app/cmd/openim-rpc/openim-rpc-conversation/openim-rpc-conversation /app/bin/
+ENTRYPOINT ["/app/bin/openim-rpc-conversation"]

manifest/dockerfiles/openim-rpc-friend/Dockerfile

@@ -0,0 +1,27 @@
+
+# build container
+FROM golang:1.20-alpine3.18 AS builder
+ENV GOPROXY https://goproxy.cn,direct
+ENV GOSUMDB=sum.golang.google.cn
+ENV GO111MODULE=on
+
+WORKDIR /app
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add git pkgconfig build-base
+ADD go.mod .
+ADD go.sum .
+RUN go mod download
+ADD . .
+RUN go build -o cmd/openim-rpc/openim-rpc-friend/openim-rpc-friend cmd/openim-rpc/openim-rpc-friend/main.go
+
+# archive container
+FROM alpine:3.18
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add ca-certificates libdrm
+RUN apk add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && echo "Asia/Shanghai" > /etc/timezone \
+    && apk del tzdata
+
+WORKDIR /app/bin
+COPY --from=builder /app/cmd/openim-rpc/openim-rpc-friend/openim-rpc-friend /app/bin/
+ENTRYPOINT ["/app/bin/openim-rpc-friend"]

manifest/dockerfiles/openim-rpc-group/Dockerfile

@@ -0,0 +1,27 @@
+
+# build container
+FROM golang:1.20-alpine3.18 AS builder
+ENV GOPROXY https://goproxy.cn,direct
+ENV GOSUMDB=sum.golang.google.cn
+ENV GO111MODULE=on
+
+WORKDIR /app
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add git pkgconfig build-base
+ADD go.mod .
+ADD go.sum .
+RUN go mod download
+ADD . .
+RUN go build -o cmd/openim-rpc/openim-rpc-group/openim-rpc-group cmd/openim-rpc/openim-rpc-group/main.go
+
+# archive container
+FROM alpine:3.18
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add ca-certificates libdrm
+RUN apk add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && echo "Asia/Shanghai" > /etc/timezone \
+    && apk del tzdata
+
+WORKDIR /app/bin
+COPY --from=builder /app/cmd/openim-rpc/openim-rpc-group/openim-rpc-group /app/bin/
+ENTRYPOINT ["/app/bin/openim-rpc-group"]

manifest/dockerfiles/openim-rpc-msg/Dockerfile

@@ -0,0 +1,27 @@
+
+# build container
+FROM golang:1.20-alpine3.18 AS builder
+ENV GOPROXY https://goproxy.cn,direct
+ENV GOSUMDB=sum.golang.google.cn
+ENV GO111MODULE=on
+
+WORKDIR /app
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add git pkgconfig build-base
+ADD go.mod .
+ADD go.sum .
+RUN go mod download
+ADD . .
+RUN go build -o cmd/openim-rpc/openim-rpc-msg/openim-rpc-msg cmd/openim-rpc/openim-rpc-msg/main.go
+
+# archive container
+FROM alpine:3.18
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add ca-certificates libdrm
+RUN apk add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && echo "Asia/Shanghai" > /etc/timezone \
+    && apk del tzdata
+
+WORKDIR /app/bin
+COPY --from=builder /app/cmd/openim-rpc/openim-rpc-msg/openim-rpc-msg /app/bin/
+ENTRYPOINT ["/app/bin/openim-rpc-msg"]

manifest/dockerfiles/openim-rpc-third/Dockerfile

@@ -0,0 +1,27 @@
+
+# build container
+FROM golang:1.20-alpine3.18 AS builder
+ENV GOPROXY https://goproxy.cn,direct
+ENV GOSUMDB=sum.golang.google.cn
+ENV GO111MODULE=on
+
+WORKDIR /app
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add git pkgconfig build-base
+ADD go.mod .
+ADD go.sum .
+RUN go mod download
+ADD . .
+RUN go build -o cmd/openim-rpc/openim-rpc-third/openim-rpc-third cmd/openim-rpc/openim-rpc-third/main.go
+
+# archive container
+FROM alpine:3.18
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add ca-certificates libdrm
+RUN apk add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && echo "Asia/Shanghai" > /etc/timezone \
+    && apk del tzdata
+
+WORKDIR /app/bin
+COPY --from=builder /app/cmd/openim-rpc/openim-rpc-third/openim-rpc-third /app/bin/
+ENTRYPOINT ["/app/bin/openim-rpc-third"]

manifest/dockerfiles/openim-rpc-user/Dockerfile

@@ -0,0 +1,27 @@
+
+# build container
+FROM golang:1.20-alpine3.18 AS builder
+ENV GOPROXY https://goproxy.cn,direct
+ENV GOSUMDB=sum.golang.google.cn
+ENV GO111MODULE=on
+
+WORKDIR /app
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add git pkgconfig build-base
+ADD go.mod .
+ADD go.sum .
+RUN go mod download
+ADD . .
+RUN go build -o cmd/openim-rpc/openim-rpc-user/openim-rpc-user cmd/openim-rpc/openim-rpc-user/main.go
+
+# archive container
+FROM alpine:3.18
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk --no-cache add ca-certificates libdrm
+RUN apk add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && echo "Asia/Shanghai" > /etc/timezone \
+    && apk del tzdata
+
+WORKDIR /app/bin
+COPY --from=builder /app/cmd/openim-rpc/openim-rpc-user/openim-rpc-user /app/bin/
+ENTRYPOINT ["/app/bin/openim-rpc-user"]

pkg/common/cmd/api.go

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

pkg/common/cmd/constant.go

@@ -0,0 +1,12 @@
+package cmd
+
+const (
+	RpcPushServer         = "push"
+	RpcAuthServer         = "auth"
+	RpcConversationServer = "conversation"
+	RpcFriendServer       = "friend"
+	RpcGroupServer        = "group"
+	RpcMsgServer          = "msg"
+	RpcThirdServer        = "third"
+	RpcUserServer         = "user"
+)

pkg/common/cmd/cron_task.go

@@ -21,7 +21,9 @@ type CronTaskCmd struct {
 }
 
 func NewCronTaskCmd() *CronTaskCmd {
-	return &CronTaskCmd{NewRootCmd("cronTask", WithCronTaskLogName())}
+	ret := &CronTaskCmd{NewRootCmd("cronTask", WithCronTaskLogName())}
+	ret.SetRootCmdPt(ret)
+	return ret
 }
 
 func (c *CronTaskCmd) addRunE(f func() error) {

pkg/common/cmd/msg_gateway.go

@@ -16,6 +16,8 @@ package cmd
 
 import (
 	"github.com/openimsdk/open-im-server/v3/internal/msggateway"
+	config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config"
+
 	//"github.com/openimsdk/open-im-server/internal/msggateway".
 	"github.com/spf13/cobra"
 
@@ -26,8 +28,10 @@ type MsgGatewayCmd struct {
 	*RootCmd
 }
 
-func NewMsgGatewayCmd() MsgGatewayCmd {
-	return MsgGatewayCmd{NewRootCmd("msgGateway")}
+func NewMsgGatewayCmd() *MsgGatewayCmd {
+	ret := &MsgGatewayCmd{NewRootCmd("msgGateway")}
+	ret.SetRootCmdPt(ret)
+	return ret
 }
 
 func (m *MsgGatewayCmd) AddWsPortFlag() {
@@ -36,6 +40,9 @@ func (m *MsgGatewayCmd) AddWsPortFlag() {
 
 func (m *MsgGatewayCmd) getWsPortFlag(cmd *cobra.Command) int {
 	port, _ := cmd.Flags().GetInt(constant.FlagWsPort)
+	if port == 0 {
+		port = m.PortFromConfig(constant.FlagWsPort)
+	}
 	return port
 }
 
@@ -49,3 +56,14 @@ func (m *MsgGatewayCmd) Exec() error {
 	m.addRunE()
 	return m.Execute()
 }
+func (m *MsgGatewayCmd) GetPortFromConfig(portType string) int {
+	if portType == constant.FlagWsPort {
+		return config2.Config.LongConnSvr.OpenImWsPort[0]
+	} else if portType == constant.FlagPort {
+		return config2.Config.LongConnSvr.OpenImMessageGatewayPort[0]
+	} else if portType == constant.FlagPrometheusPort {
+		return 0
+	} else {
+		return 0
+	}
+}

pkg/common/cmd/msg_transfer.go

@@ -24,8 +24,10 @@ type MsgTransferCmd struct {
 	*RootCmd
 }
 
-func NewMsgTransferCmd() MsgTransferCmd {
-	return MsgTransferCmd{NewRootCmd("msgTransfer")}
+func NewMsgTransferCmd() *MsgTransferCmd {
+	ret := &MsgTransferCmd{NewRootCmd("msgTransfer")}
+	ret.SetRootCmdPt(ret)
+	return ret
 }
 
 func (m *MsgTransferCmd) addRunE() {

pkg/common/cmd/root.go

@@ -26,11 +26,15 @@ import (
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 )
 
+type RootCmdPt interface {
+	GetPortFromConfig(portType string) int
+}
 type RootCmd struct {
 	Command        cobra.Command
 	Name           string
 	port           int
 	prometheusPort int
+	cmdItf         RootCmdPt
 }
 
 type CmdOpts struct {
@@ -76,7 +80,9 @@ func NewRootCmd(name string, opts ...func(*CmdOpts)) (rootCmd *RootCmd) {
 	rootCmd.addConfFlag()
 	return rootCmd
 }
-
+func (r *RootCmd) SetRootCmdPt(cmdItf RootCmdPt) {
+	r.cmdItf = cmdItf
+}
 func (r *RootCmd) addConfFlag() {
 	r.Command.Flags().StringP(constant.FlagConf, "c", "", "Path to config file folder")
 }
@@ -87,6 +93,9 @@ func (r *RootCmd) AddPortFlag() {
 
 func (r *RootCmd) getPortFlag(cmd *cobra.Command) int {
 	port, _ := cmd.Flags().GetInt(constant.FlagPort)
+	if port == 0 {
+		port = r.PortFromConfig(constant.FlagPort)
+	}
 	return port
 }
 
@@ -100,6 +109,9 @@ func (r *RootCmd) AddPrometheusPortFlag() {
 
 func (r *RootCmd) getPrometheusPortFlag(cmd *cobra.Command) int {
 	port, _ := cmd.Flags().GetInt(constant.FlagPrometheusPort)
+	if port == 0 {
+		port = r.PortFromConfig(constant.FlagPrometheusPort)
+	}
 	return port
 }
 
@@ -120,3 +132,12 @@ func (r *RootCmd) Execute() error {
 func (r *RootCmd) AddCommand(cmds ...*cobra.Command) {
 	r.Command.AddCommand(cmds...)
 }
+
+func (r *RootCmd) GetPortFromConfig(portType string) int {
+	fmt.Println("RootCmd.GetPortFromConfig:", portType)
+	return 0
+}
+func (r *RootCmd) PortFromConfig(portType string) int {
+	fmt.Println("PortFromConfig:", portType)
+	return r.cmdItf.GetPortFromConfig(portType)
+}

pkg/common/cmd/rpc.go

@@ -16,7 +16,8 @@ package cmd
 
 import (
 	"errors"
-
+	"github.com/OpenIMSDK/protocol/constant"
+	config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
 
@@ -30,8 +31,9 @@ type RpcCmd struct {
 }
 
 func NewRpcCmd(name string) *RpcCmd {
-	authCmd := &RpcCmd{NewRootCmd(name)}
-	return authCmd
+	ret := &RpcCmd{NewRootCmd(name)}
+	ret.SetRootCmdPt(ret)
+	return ret
 }
 
 func (a *RpcCmd) Exec() error {
@@ -51,3 +53,40 @@ func (a *RpcCmd) StartSvr(
 	}
 	return startrpc.Start(a.GetPortFlag(), name, a.GetPrometheusPortFlag(), rpcFn)
 }
+func (a *RpcCmd) GetPortFromConfig(portType string) int {
+	switch a.Name {
+	case RpcPushServer:
+		if portType == constant.FlagPort {
+			return config2.Config.RpcPort.OpenImPushPort[0]
+		}
+	case RpcAuthServer:
+		if portType == constant.FlagPort {
+			return config2.Config.RpcPort.OpenImAuthPort[0]
+		}
+	case RpcConversationServer:
+		if portType == constant.FlagPort {
+			return config2.Config.RpcPort.OpenImConversationPort[0]
+		}
+	case RpcFriendServer:
+		if portType == constant.FlagPort {
+			return config2.Config.RpcPort.OpenImFriendPort[0]
+		}
+	case RpcGroupServer:
+		if portType == constant.FlagPort {
+			return config2.Config.RpcPort.OpenImGroupPort[0]
+		}
+	case RpcMsgServer:
+		if portType == constant.FlagPort {
+			return config2.Config.RpcPort.OpenImMessagePort[0]
+		}
+	case RpcThirdServer:
+		if portType == constant.FlagPort {
+			return config2.Config.RpcPort.OpenImThirdPort[0]
+		}
+	case RpcUserServer:
+		if portType == constant.FlagPort {
+			return config2.Config.RpcPort.OpenImUserPort[0]
+		}
+	}
+	return 0
+}

pkg/common/config/config.go

@@ -46,6 +46,9 @@ type POfflinePush struct {
 }
 
 type configStruct struct {
+	Envs struct {
+		Discovery string `yaml:"discovery"`
+	}
 	Zookeeper struct {
 		Schema   string   `yaml:"schema"`
 		ZkAddr   []string `yaml:"address"`
@@ -185,10 +188,11 @@ type configStruct struct {
 	} `yaml:"log"`
 
 	LongConnSvr struct {
-		OpenImWsPort        []int `yaml:"openImWsPort"`
-		WebsocketMaxConnNum int   `yaml:"websocketMaxConnNum"`
-		WebsocketMaxMsgLen  int   `yaml:"websocketMaxMsgLen"`
-		WebsocketTimeout    int   `yaml:"websocketTimeout"`
+		OpenImMessageGatewayPort []int `yaml:"openImMessageGatewayPort"`
+		OpenImWsPort             []int `yaml:"openImWsPort"`
+		WebsocketMaxConnNum      int   `yaml:"websocketMaxConnNum"`
+		WebsocketMaxMsgLen       int   `yaml:"websocketMaxMsgLen"`
+		WebsocketTimeout         int   `yaml:"websocketTimeout"`
 	} `yaml:"longConnSvr"`
 
 	Push struct {

pkg/common/config/version

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

pkg/common/db/cache/user.go

@@ -21,6 +21,8 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/OpenIMSDK/tools/log"
+
 	"github.com/OpenIMSDK/protocol/constant"
 
 	"github.com/OpenIMSDK/protocol/user"
@@ -51,7 +53,7 @@ type UserCache interface {
 	GetUserGlobalRecvMsgOpt(ctx context.Context, userID string) (opt int, err error)
 	DelUsersGlobalRecvMsgOpt(userIDs ...string) UserCache
 	GetUserStatus(ctx context.Context, userIDs []string) ([]*user.OnlineStatus, error)
-	SetUserStatus(ctx context.Context, list []*user.OnlineStatus) error
+	SetUserStatus(ctx context.Context, userID string, status, platformID int32) error
 }
 
 type UserCacheRedis struct {
@@ -198,95 +200,126 @@ func (u *UserCacheRedis) GetUserStatus(ctx context.Context, userIDs []string) ([
 			return nil, errs.Wrap(err)
 		}
 		onlineStatus.UserID = userID
+		onlineStatus.Status = constant.Online
 		res = append(res, &onlineStatus)
 	}
 	return res, nil
 }
 
 // SetUserStatus Set the user status and save it in redis.
-func (u *UserCacheRedis) SetUserStatus(ctx context.Context, list []*user.OnlineStatus) error {
-	for _, status := range list {
-		var isNewKey int64
-		UserIDNum := crc32.ChecksumIEEE([]byte(status.UserID))
-		modKey := strconv.Itoa(int(UserIDNum % statusMod))
-		key := olineStatusKey + modKey
-		jsonData, err := json.Marshal(status)
-		if err != nil {
-			return errs.Wrap(err)
-		}
-		isNewKey, err = u.rdb.Exists(ctx, key).Result()
-		if err != nil {
-			return errs.Wrap(err)
-		}
-		if isNewKey == 0 {
-			_, err = u.rdb.HSet(ctx, key, status.UserID, string(jsonData)).Result()
+func (u *UserCacheRedis) SetUserStatus(ctx context.Context, userID string, status, platformID int32) error {
+	UserIDNum := crc32.ChecksumIEEE([]byte(userID))
+	modKey := strconv.Itoa(int(UserIDNum % statusMod))
+	key := olineStatusKey + modKey
+	log.ZDebug(ctx, "SetUserStatus args", "userID", userID, "status", status,
+		"platformID", platformID, "modKey", modKey, "key", key)
+	isNewKey, err := u.rdb.Exists(ctx, key).Result()
+	if err != nil {
+		return errs.Wrap(err)
+	}
+	if isNewKey == 0 {
+		if status == constant.Online {
+			onlineStatus := user.OnlineStatus{
+				UserID:      userID,
+				Status:      constant.Online,
+				PlatformIDs: []int32{platformID},
+			}
+			jsonData, err := json.Marshal(onlineStatus)
+			if err != nil {
+				return errs.Wrap(err)
+			}
+			_, err = u.rdb.HSet(ctx, key, userID, string(jsonData)).Result()
 			if err != nil {
 				return errs.Wrap(err)
 			}
 			u.rdb.Expire(ctx, key, userOlineStatusExpireTime)
+			return nil
+		}
+	}
+
+	isNil := false
+	result, err := u.rdb.HGet(ctx, key, userID).Result()
+	if err != nil {
+		if err == redis.Nil {
+			isNil = true
 		} else {
-			result, err := u.rdb.HGet(ctx, key, status.UserID).Result()
+			return errs.Wrap(err)
+		}
+	}
+
+	if status == constant.Offline {
+		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 {
+			_, err = u.rdb.HDel(ctx, key, userID).Result()
 			if err != nil {
 				return errs.Wrap(err)
 			}
-			var onlineStatus user.OnlineStatus
+		} 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 {
+		var onlineStatus user.OnlineStatus
+		if !isNil {
 			err = json.Unmarshal([]byte(result), &onlineStatus)
 			if err != nil {
 				return errs.Wrap(err)
 			}
-			onlineStatus.UserID = status.UserID
-			if status.Status == constant.Offline {
-				var newPlatformIDs []int32
-				for _, val := range onlineStatus.PlatformIDs {
-					if val != status.PlatformIDs[0] {
-						newPlatformIDs = append(newPlatformIDs, val)
-					}
-				}
-				if newPlatformIDs == nil {
-					onlineStatus.Status = constant.Offline
-					onlineStatus.PlatformIDs = []int32{}
-					newjsonData, err := json.Marshal(&onlineStatus)
-					if err != nil {
-						return errs.Wrap(err)
-					}
-					_, err = u.rdb.HSet(ctx, key, status.UserID, string(newjsonData)).Result()
-					if err != nil {
-						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, status.UserID, string(newjsonData)).Result()
-					if err != nil {
-						return errs.Wrap(err)
-					}
-				}
-			} else {
-				onlineStatus.Status = constant.Online
-				// Judging whether to be kicked out.
-				flag := false
-				for _, val := range onlineStatus.PlatformIDs {
-					if val == status.PlatformIDs[0] {
-						flag = true
-						break
-					}
-				}
-				if !flag {
-					onlineStatus.PlatformIDs = append(onlineStatus.PlatformIDs, status.PlatformIDs[0])
-				}
-				newjsonData, err := json.Marshal(&onlineStatus)
-				if err != nil {
-					return errs.Wrap(err)
-				}
-				_, err = u.rdb.HSet(ctx, key, status.UserID, string(newjsonData)).Result()
-				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)
+		}
+		_, err = u.rdb.HSet(ctx, key, userID, string(newjsonData)).Result()
+		if err != nil {
+			return errs.Wrap(err)
+		}
+
 	}
+
 	return nil
 }
+
+type Comparable interface {
+	~int | ~string | ~float64 | ~int32
+}
+
+func RemoveRepeatedElementsInList[T Comparable](slc []T) []T {
+	var result []T
+	tempMap := map[T]struct{}{}
+	for _, e := range slc {
+		if _, found := tempMap[e]; !found {
+			tempMap[e] = struct{}{}
+			result = append(result, e)
+		}
+	}
+
+	return result
+}

pkg/common/db/controller/group.go

@@ -81,6 +81,7 @@ type GroupDatabase interface {
 	CountTotal(ctx context.Context, before *time.Time) (count int64, err error)
 	// 获取范围内群增量
 	CountRangeEverydayTotal(ctx context.Context, start time.Time, end time.Time) (map[string]int64, error)
+	DeleteGroupMemberHash(ctx context.Context, groupIDs []string) error
 }
 
 func NewGroupDatabase(
@@ -556,3 +557,15 @@ func (g *groupDatabase) FindGroupRequests(ctx context.Context, groupID string, u
 func (g *groupDatabase) FindNotDismissedGroup(ctx context.Context, groupIDs []string) (groups []*relationtb.GroupModel, err error) {
 	return g.groupDB.FindNotDismissedGroup(ctx, groupIDs)
 }
+
+func (g *groupDatabase) DeleteGroupMemberHash(ctx context.Context, groupIDs []string) error {
+	if len(groupIDs) == 0 {
+		return nil
+	}
+	c := g.cache.NewCache()
+	for _, groupID := range groupIDs {
+		c = c.DelGroupMembersHash(groupID)
+	}
+
+	return c.ExecDel(ctx)
+}

pkg/common/db/controller/user.go

@@ -64,7 +64,7 @@ type UserDatabase interface {
 	// GetUserStatus Get the online status of the user
 	GetUserStatus(ctx context.Context, userIDs []string) ([]*user.OnlineStatus, error)
 	// SetUserStatus Set the user status and store the user status in redis
-	SetUserStatus(ctx context.Context, list []*user.OnlineStatus) error
+	SetUserStatus(ctx context.Context, userID string, status, platformID int32) error
 }
 
 type userDatabase struct {
@@ -217,6 +217,6 @@ func (u *userDatabase) GetUserStatus(ctx context.Context, userIDs []string) ([]*
 }
 
 // SetUserStatus Set the user status and save it in redis.
-func (u *userDatabase) SetUserStatus(ctx context.Context, list []*user.OnlineStatus) error {
-	return u.cache.SetUserStatus(ctx, list)
+func (u *userDatabase) SetUserStatus(ctx context.Context, userID string, status, platformID int32) error {
+	return u.cache.SetUserStatus(ctx, userID, status, platformID)
 }

pkg/common/db/localcache/conversation.go

@@ -60,9 +60,11 @@ func (g *ConversationLocalCache) GetConversationIDs(ctx context.Context, userID
 	if err != nil {
 		return nil, err
 	}
+
 	g.lock.Lock()
-	defer g.lock.Unlock()
 	hash, ok := g.conversationIDs[userID]
+	g.lock.Unlock()
+
 	if !ok || hash.hash != resp.Hash {
 		conversationIDsResp, err := g.client.Client.GetConversationIDs(ctx, &conversation.GetConversationIDsReq{
 			UserID: userID,
@@ -70,11 +72,16 @@ func (g *ConversationLocalCache) GetConversationIDs(ctx context.Context, userID
 		if err != nil {
 			return nil, err
 		}
+
+		g.lock.Lock()
+		defer g.lock.Unlock()
 		g.conversationIDs[userID] = Hash{
 			hash: resp.Hash,
 			ids:  conversationIDsResp.ConversationIDs,
 		}
+
 		return conversationIDsResp.ConversationIDs, nil
 	}
+
 	return hash.ids, nil
 }

pkg/common/db/relation/log_model.go

@@ -24,6 +24,7 @@ func (l *LogGorm) Search(ctx context.Context, keyword string, start time.Time, e
 	if end.UnixMilli() != 0 {
 		db = l.db.WithContext(ctx).Where("create_time <= ?", end)
 	}
+	db = db.Order("create_time desc")
 	return ormutil.GormSearch[relationtb.Log](db, []string{"user_id"}, keyword, pageNumber, showNumber)
 }
 

pkg/common/db/unrelation/user.go

@@ -163,7 +163,11 @@ func (u *UserMongoDriver) GetAllSubscribeList(ctx context.Context, userID string
 		bson.M{"user_id": SubscriptionPrefix + userID})
 	err = cursor.Decode(&user)
 	if err != nil {
-		return nil, errs.Wrap(err)
+		if err == mongo.ErrNoDocuments {
+			return []string{}, nil
+		} else {
+			return nil, errs.Wrap(err)
+		}
 	}
 	return user.UserIDList, nil
 }
@@ -176,7 +180,11 @@ func (u *UserMongoDriver) GetSubscribedList(ctx context.Context, userID string)
 		bson.M{"user_id": SubscribedPrefix + userID})
 	err = cursor.Decode(&user)
 	if err != nil {
-		return nil, errs.Wrap(err)
+		if err == mongo.ErrNoDocuments {
+			return []string{}, nil
+		} else {
+			return nil, errs.Wrap(err)
+		}
 	}
 	return user.UserIDList, nil
 }

pkg/common/discovery_register/k8s_discovery_register.go

@@ -0,0 +1,88 @@
+package discovery_register
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"github.com/OpenIMSDK/tools/discoveryregistry"
+	openkeeper "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper"
+	"github.com/OpenIMSDK/tools/log"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
+	"google.golang.org/grpc"
+	"time"
+)
+
+func NewDiscoveryRegister(envType string) (discoveryregistry.SvcDiscoveryRegistry, error) {
+	var client discoveryregistry.SvcDiscoveryRegistry
+	var err error
+	switch envType {
+	case "zookeeper":
+		client, err = openkeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema,
+			openkeeper.WithFreq(time.Hour), openkeeper.WithUserNameAndPassword(
+				config.Config.Zookeeper.Username,
+				config.Config.Zookeeper.Password,
+			), openkeeper.WithRoundRobin(), openkeeper.WithTimeout(10), openkeeper.WithLogger(log.NewZkLogger()))
+	case "k8s":
+		client, err = NewK8sDiscoveryRegister()
+	default:
+		client = nil
+		err = errors.New("envType not correct")
+	}
+	return client, err
+}
+
+type K8sDR struct {
+	options         []grpc.DialOption
+	rpcRegisterAddr string
+}
+
+func NewK8sDiscoveryRegister() (discoveryregistry.SvcDiscoveryRegistry, error) {
+	return &K8sDR{}, nil
+}
+
+func (cli *K8sDR) Register(serviceName, host string, port int, opts ...grpc.DialOption) error {
+	cli.rpcRegisterAddr = serviceName
+	return nil
+}
+func (cli *K8sDR) UnRegister() error {
+
+	return nil
+}
+func (cli *K8sDR) CreateRpcRootNodes(serviceNames []string) error {
+
+	return nil
+}
+func (cli *K8sDR) RegisterConf2Registry(key string, conf []byte) error {
+
+	return nil
+}
+
+func (cli *K8sDR) GetConfFromRegistry(key string) ([]byte, error) {
+
+	return nil, nil
+}
+func (cli *K8sDR) GetConns(ctx context.Context, serviceName string, opts ...grpc.DialOption) ([]*grpc.ClientConn, error) {
+
+	conn, err := grpc.DialContext(ctx, serviceName, append(cli.options, opts...)...)
+	return []*grpc.ClientConn{conn}, err
+}
+func (cli *K8sDR) GetConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) {
+
+	return grpc.DialContext(ctx, serviceName, append(cli.options, opts...)...)
+}
+func (cli *K8sDR) GetSelfConnTarget() string {
+
+	return cli.rpcRegisterAddr
+}
+func (cli *K8sDR) AddOption(opts ...grpc.DialOption) {
+	cli.options = append(cli.options, opts...)
+}
+func (cli *K8sDR) CloseConn(conn *grpc.ClientConn) {
+	conn.Close()
+}
+
+// do not use this method for call rpc
+func (cli *K8sDR) GetClientLocalConns() map[string][]*grpc.ClientConn {
+	fmt.Println("should not call this function!!!!!!!!!!!!!!!!!!!!!!!!!")
+	return nil
+}

pkg/common/startrpc/start.go

@@ -16,19 +16,16 @@ package startrpc
 
 import (
 	"fmt"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register"
 	"net"
 	"strconv"
-	"time"
-
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 
 	grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/OpenIMSDK/tools/discoveryregistry"
-	"github.com/OpenIMSDK/tools/discoveryregistry/zookeeper"
-	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/mw"
 	"github.com/OpenIMSDK/tools/network"
 	"github.com/OpenIMSDK/tools/prome"
@@ -60,15 +57,17 @@ func Start(
 		return err
 	}
 	defer listener.Close()
-	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()))
+	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 zkClient.CloseZK()
+	//defer zkClient.CloseZK()
 	zkClient.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	registerIP, err := network.GetRpcRegisterIP(config.Config.Rpc.RegisterIP)
 	if err != nil {

pkg/rpcclient/user.go

@@ -173,6 +173,9 @@ func (u *UserRpcClient) GetAllUserIDs(ctx context.Context, pageNumber, showNumbe
 
 // SetUserStatus sets the status for a user based on the provided user ID, status, and platform ID.
 func (u *UserRpcClient) SetUserStatus(ctx context.Context, userID string, status int32, platformID int) error {
-	_, err := u.Client.SetUserStatus(ctx, &user.SetUserStatusReq{StatusList: []*user.OnlineStatus{{UserID: userID, Status: status, PlatformIDs: []int32{int32(platformID)}}}})
+	_, err := u.Client.SetUserStatus(ctx, &user.SetUserStatusReq{
+		UserID: userID,
+		Status: status, PlatformID: int32(platformID),
+	})
 	return err
 }

scripts/demo.sh

@@ -37,6 +37,8 @@ readonly ipv6regex='(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:
 clear
 . $(dirname ${BASH_SOURCE})/lib/util.sh
 
+openim::util::ensure-bash-version
+
 trap 'openim::util::onCtrlC' INT
 
 function openim::util::onCtrlC() {

scripts/docker-check-service.sh

@@ -19,11 +19,7 @@ source "${OPENIM_ROOT}/scripts/install/common.sh"
 
 cd "$OPENIM_ROOT"
 
-if command -v docker-compose &> /dev/null; then
-    docker-compose ps
-else
-    docker compose ps
-fi
+openim::util::check_docker_and_compose_versions
 
 progress() {
     local _main_pid="$1"

scripts/install-im-server.sh

@@ -30,13 +30,7 @@ openim::util::ensure_docker_daemon_connectivity
 
 DOCKER_COMPOSE_COMMAND=
 # Check if docker-compose command is available
-if command -v docker compose &> /dev/null
-then
-    openim::log::info "docker compose command is available"
-    DOCKER_COMPOSE_COMMAND="docker compose"
-else
-    DOCKER_COMPOSE_COMMAND="docker-compose"
-fi
+openim::util::check_docker_and_compose_versions
 
 pushd "${OPENIM_ROOT}"
 ${DOCKER_COMPOSE_COMMAND} stop

scripts/install/environment.sh

@@ -150,6 +150,8 @@ def "OPENIM_CHAT_NAME" "chat"                      # openim-chat chat用户名
 # TODO 注意： 一般的配置都可以使用 def 函数来定义，如果是包含特殊字符，比如说:
 # TODO readonly MSG_DESTRUCT_TIME=${MSG_DESTRUCT_TIME:-'0 2 * * *'}
 # TODO 使用 readonly 来定义合适，负责无法正常解析, 并且 yaml 模板需要加 "" 来包裹
+###################### Env 配置信息 ######################
+def "ENVS_DISCOVERY" "zookeeper"
 
 ###################### Zookeeper 配置信息 ######################
 def "ZOOKEEPER_SCHEMA" "openim"                    # Zookeeper的模式

scripts/install_im_compose.sh

@@ -51,17 +51,7 @@ execute_scripts() {
     "${OPENIM_ROOT}"/scripts/env_check.sh
 }
 
-# Start docker compose
-start_docker_compose() {
-    openim::log::info "Checking if docker-compose command is available"
-    if command -v docker-compose &> /dev/null; then
-        docker-compose up -d
-    else
-        docker compose up -d
-    fi
-
-    "${OPENIM_ROOT}"/scripts/docker-check-service.sh
-}
+openim::util::check_docker_and_compose_versions
 
 main() {
     load_env

scripts/lib/util.sh

@@ -250,6 +250,39 @@ openim::util::host_arch() {
   echo "${host_arch}"
 }
 
+# Define a bash function to check the versions of Docker and Docker Compose
+openim::util::check_docker_and_compose_versions() {
+    # Define the required versions of Docker and Docker Compose
+    required_docker_version="20.10.0"
+    required_compose_version="2.0"
+
+    # Get the currently installed Docker version
+    installed_docker_version=$(docker --version | awk '{print $3}' | sed 's/,//')
+
+    # Check if the installed Docker version matches the required version
+    if [[ "$installed_docker_version" < "$required_docker_version" ]]; then
+        echo "Docker version mismatch. Installed: $installed_docker_version, Required: $required_docker_version"
+        return 1
+    fi
+
+    # Check if the docker compose sub-command is available
+    if ! docker compose version &> /dev/null; then
+        echo "Docker does not support the docker compose sub-command"
+        return 1
+    fi
+
+    # Get the currently installed Docker Compose version
+    installed_compose_version=$(docker compose version --short)
+
+    # Check if the installed Docker Compose version matches the required version
+    if [[ "$installed_compose_version" < "$required_compose_version" ]]; then
+        echo "Docker Compose version mismatch. Installed: $installed_compose_version, Required: $required_compose_version"
+        return 1
+    fi
+
+}
+
+
 # The `openim::util::check_ports` function analyzes the state of processes based on given ports.
 # It accepts multiple ports as arguments and prints:
 # 1. The state of the process (whether it's running or not).
@@ -1321,3 +1354,7 @@ function openim::util::gen_os_arch() {
         exit 1
     fi
 }
+
+if [[ "$*" =~ openim::util:: ]];then
+  eval $*
+fi

scripts/make-rules/golang.mk

@@ -17,7 +17,7 @@
 #
 
 GO := go
-GO_SUPPORTED_VERSIONS ?= 1.18|1.19|1.20|1.21|1.22
+GO_SUPPORTED_VERSIONS ?= 1.19|1.20|1.21|1.22
 
 GO_LDFLAGS += -X $(VERSION_PACKAGE).gitVersion=$(GIT_TAG) \
 	-X $(VERSION_PACKAGE).gitCommit=$(GIT_COMMIT) \

scripts/make-rules/image.mk

@@ -21,7 +21,6 @@
 #
 
 DOCKER := docker
-DOCKER_SUPPORTED_API_VERSION ?= 1.32|1.40|1.41|1.42
 
 # read: https://github.com/openimsdk/open-im-server/blob/main/docs/conversions/images.md
 REGISTRY_PREFIX ?= ghcr.io/openimsdk
@@ -75,22 +74,13 @@ image.docker-buildx:
 ## image.verify: Verify docker version
 .PHONY: image.verify
 image.verify:
-	$(eval API_VERSION := $(shell $(DOCKER) version | grep -E 'API version: {1,6}[0-9]' | head -n1 | awk '{print $$3} END { if (NR==0) print 0}' ))
-	$(eval PASS := $(shell echo "$(API_VERSION) > $(DOCKER_SUPPORTED_API_VERSION)" | bc))
-	@if [ $(PASS) -ne 1 ]; then \
-		$(DOCKER) -v ;\
-		echo "Unsupported docker version. Docker API version should be greater than $(DOCKER_SUPPORTED_API_VERSION)"; \
-		exit 1; \
-	fi
+	@$(ROOT_DIR)/scripts/lib/util.sh openim::util::check_docker_and_compose_versions
 
 ## image.daemon.verify: Verify docker daemon experimental features
 .PHONY: image.daemon.verify
 image.daemon.verify:
-	$(eval PASS := $(shell $(DOCKER) version | grep -q -E 'Experimental: {1,5}true' && echo 1 || echo 0))
-	@if [ $(PASS) -ne 1 ]; then \
-		echo "Experimental features of Docker daemon is not enabled. Please add \"experimental\": true in '/etc/docker/daemon.json' and then restart Docker daemon."; \
-		exit 1; \
-	fi
+	@$(ROOT_DIR)/scripts/lib/util.sh openim::util::ensure_docker_daemon_connectivity
+	@$(ROOT_DIR)/scripts/lib/util.sh openim::util::ensure-docker-buildx
 
 # If you wish built the manager image targeting other platforms you can use the --platform flag.
 # (i.e. docker build --platform linux/arm64 ). However, you must enable docker buildKit for it.
@@ -124,7 +114,6 @@ image.build.%: go.build.%
 	fi
 	@rm -rf $(TMP_DIR)/$(IMAGE)
 
-
 # https://docs.docker.com/build/building/multi-platform/
 # busybox image supports amd64, arm32v5, arm32v6, arm32v7, arm64v8, i386, ppc64le, and s390x
 ## image.buildx.%: Build docker images with buildx

test/typecheck/go.mod

@@ -1,6 +1,6 @@
 module github.com/openimsdk/open-im-server/test/typecheck
 
-go 1.18
+go 1.19
 
 require golang.org/x/tools v0.12.0
 

tools/changelog/go.mod

@@ -1,3 +1,3 @@
 module 	github.com/openimsdk/open-im-server/v3/tools/changelog
 
-go 1.18
+go 1.19

tools/component/component.go

@@ -129,11 +129,10 @@ func exactIP(urll string) string {
 	if strings.HasSuffix(host, ":") {
 		host = host[0 : len(host)-1]
 	}
-	
+
 	return host
 }
 
-
 func checkMysql() error {
 	var sqlDB *sql.DB
 	defer func() {

tools/component/go.mod

@@ -1,3 +1,3 @@
 module 	github.com/openimsdk/open-im-server/v3/tools/component
 
-go 1.18
+go 1.19

tools/data-conversion/chat/chat.go

@@ -2,12 +2,14 @@ package main
 
 import (
 	"fmt"
-	"github.com/openimsdk/open-im-server/v3/tools/data-conversion/chat/conversion"
-	"github.com/openimsdk/open-im-server/v3/tools/data-conversion/utils"
+	"log"
+
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
-	"log"
+
+	"github.com/openimsdk/open-im-server/v3/tools/data-conversion/chat/conversion"
+	"github.com/openimsdk/open-im-server/v3/tools/data-conversion/utils"
 )
 
 func main() {

tools/data-conversion/chat/v2/admin.go

@@ -6,45 +6,45 @@ import (
 
 // AppVersion pc端版本管理
 type AppVersion struct {
-	Version     string `gorm:"column:version;size:64" json:"version"`
+	Version     string `gorm:"column:version;size:64"  json:"version"`
 	Type        int    `gorm:"column:type;primary_key" json:"type"`
-	UpdateTime  int    `gorm:"column:update_time" json:"update_time"`
-	ForceUpdate bool   `gorm:"column:force_update" json:"force_update"`
-	FileName    string `gorm:"column:file_name" json:"file_name"`
-	YamlName    string `gorm:"column:yaml_name" json:"yaml_name"`
-	UpdateLog   string `gorm:"column:update_log" json:"update_log"`
+	UpdateTime  int    `gorm:"column:update_time"      json:"update_time"`
+	ForceUpdate bool   `gorm:"column:force_update"     json:"force_update"`
+	FileName    string `gorm:"column:file_name"        json:"file_name"`
+	YamlName    string `gorm:"column:yaml_name"        json:"yaml_name"`
+	UpdateLog   string `gorm:"column:update_log"       json:"update_log"`
 }
 
 // Admin 后台管理员
 type Admin struct {
 	Account    string    `gorm:"column:account;primary_key;type:char(64)" json:"account"`
-	Password   string    `gorm:"column:Password;type:char(64)" json:"password"`
-	FaceURL    string    `gorm:"column:FaceURL;type:char(64)" json:"faceURL"`
-	Nickname   string    `gorm:"column:Nickname;type:char(64)" json:"nickname"`
-	UserID     string    `gorm:"column:UserID;type:char(64)" json:"userID"` //openIM userID
-	Level      int32     `gorm:"column:level;default:1"   json:"level"`
-	CreateTime time.Time `gorm:"column:create_time" json:"createTime"`
+	Password   string    `gorm:"column:Password;type:char(64)"            json:"password"`
+	FaceURL    string    `gorm:"column:FaceURL;type:char(64)"             json:"faceURL"`
+	Nickname   string    `gorm:"column:Nickname;type:char(64)"            json:"nickname"`
+	UserID     string    `gorm:"column:UserID;type:char(64)"              json:"userID"` //openIM userID
+	Level      int32     `gorm:"column:level;default:1"                   json:"level"`
+	CreateTime time.Time `gorm:"column:create_time"                       json:"createTime"`
 }
 
 // RegisterAddFriend 注册时默认好友
 type RegisterAddFriend struct {
 	UserID     string    `gorm:"column:user_id;primary_key;type:char(64)" json:"userID"`
-	CreateTime time.Time `gorm:"column:create_time" json:"createTime"`
+	CreateTime time.Time `gorm:"column:create_time"                       json:"createTime"`
 }
 
 // RegisterAddGroup 注册时默认群组
 type RegisterAddGroup struct {
 	GroupID    string    `gorm:"column:group_id;primary_key;type:char(64)" json:"userID"`
-	CreateTime time.Time `gorm:"column:create_time" json:"createTime"`
+	CreateTime time.Time `gorm:"column:create_time"                        json:"createTime"`
 }
 
 // ClientInitConfig 系统相关配置项
 type ClientInitConfig struct {
-	DiscoverPageURL            string `gorm:"column:discover_page_url;size:128" json:"discoverPageURL"`
-	OrdinaryUserAddFriend      int32  `gorm:"column:ordinary_user_add_friend; default:1"   json:"ordinaryUserAddFriend"`
-	BossUserID                 string `gorm:"column:boss_user_id;type:char(64)" json:"bossUserID"`
-	AdminURL                   string `gorm:"column:admin_url;type:char(128)" json:"adminURL"`
-	AllowSendMsgNotFriend      int32  `gorm:"column:allow_send_msg_not_friend;default:1" json:"allowSendMsgNotFriend"`
+	DiscoverPageURL            string `gorm:"column:discover_page_url;size:128"              json:"discoverPageURL"`
+	OrdinaryUserAddFriend      int32  `gorm:"column:ordinary_user_add_friend; default:1"     json:"ordinaryUserAddFriend"`
+	BossUserID                 string `gorm:"column:boss_user_id;type:char(64)"              json:"bossUserID"`
+	AdminURL                   string `gorm:"column:admin_url;type:char(128)"                json:"adminURL"`
+	AllowSendMsgNotFriend      int32  `gorm:"column:allow_send_msg_not_friend;default:1"     json:"allowSendMsgNotFriend"`
 	NeedInvitationCodeRegister int32  `gorm:"column:need_invitation_code_register;default:0" json:"needInvitationCodeRegister"`
 }
 

tools/data-conversion/chat/v2/chat.go

@@ -7,89 +7,89 @@ import (
 // Register 注册信息表
 type Register struct {
 	UserID      string    `gorm:"column:user_id;primary_key;type:char(64)" json:"userID"`
-	DeviceID    string    `gorm:"column:device_id;type:varchar(255)" json:"deviceID"`
-	IP          string    `gorm:"column:ip;type:varchar(32)" json:"ip"`
-	Platform    string    `gorm:"column:platform;type:varchar(32)" json:"platform"`
-	AccountType string    `gorm:"column:account_type;type:varchar(32)" json:"accountType"` //email phone account
-	Mode        string    `gorm:"column:mode;type:varchar(32)"`                            //user admin
-	CreateTime  time.Time `gorm:"column:create_time" json:"createTime"`
+	DeviceID    string    `gorm:"column:device_id;type:varchar(255)"       json:"deviceID"`
+	IP          string    `gorm:"column:ip;type:varchar(32)"               json:"ip"`
+	Platform    string    `gorm:"column:platform;type:varchar(32)"         json:"platform"`
+	AccountType string    `gorm:"column:account_type;type:varchar(32)"     json:"accountType"` //email phone account
+	Mode        string    `gorm:"column:mode;type:varchar(32)"`                                //user admin
+	CreateTime  time.Time `gorm:"column:create_time"                       json:"createTime"`
 }
 
 // Account 账号密码表
 type Account struct {
 	UserID         string    `gorm:"column:user_id;primary_key;type:char(64)" json:"userID"`
-	Password       string    `gorm:"column:password;type:varchar(255)" json:"password"`
-	CreateTime     time.Time `gorm:"column:create_time" json:"createTime"`
-	ChangeTime     time.Time `gorm:"column:change_time" json:"changeTime"`
+	Password       string    `gorm:"column:password;type:varchar(255)"        json:"password"`
+	CreateTime     time.Time `gorm:"column:create_time"                       json:"createTime"`
+	ChangeTime     time.Time `gorm:"column:change_time"                       json:"changeTime"`
 	OperatorUserID string    `gorm:"column:operator_user_id;type:varchar(64)" json:"operatorUserID"`
 }
 
 // Attribute 用户属性表
 type Attribute struct {
 	UserID         string    `gorm:"column:user_id;primary_key;type:char(64)" json:"userID"`
-	Account        string    `gorm:"column:account;type:char(64)" json:"account"`
-	PhoneNumber    string    `gorm:"column:phone_number;type:varchar(32)" json:"phoneNumber"`
-	AreaCode       string    `gorm:"column:area_code;type:varchar(8)" json:"areaCode"`
-	Email          string    `gorm:"column:email;type:varchar(64)"  json:"email"`
-	Nickname       string    `gorm:"column:nickname;type:varchar(64)"  json:"nickname"`
-	FaceURL        string    `gorm:"column:face_url;type:varchar(255)"  json:"faceURL"`
-	Gender         int32     `gorm:"column:gender" json:"gender"`
-	Birth          uint32    `gorm:"column:birth" json:"birth"`
-	CreateTime     time.Time `gorm:"column:create_time" json:"createTime"`
-	ChangeTime     time.Time `gorm:"column:change_time" json:"changeTime"`
-	BirthTime      time.Time `gorm:"column:birth_time" json:"birthTime"`
-	Level          int32     `gorm:"column:level;default:1"   json:"level"`
-	AllowVibration int32     `gorm:"column:allow_vibration;default:1" json:"allowVibration"`
-	AllowBeep      int32     `gorm:"column:allow_beep;default:1" json:"allowBeep"`
-	AllowAddFriend int32     `gorm:"column:allow_add_friend;default:1" json:"allowAddFriend"`
+	Account        string    `gorm:"column:account;type:char(64)"             json:"account"`
+	PhoneNumber    string    `gorm:"column:phone_number;type:varchar(32)"     json:"phoneNumber"`
+	AreaCode       string    `gorm:"column:area_code;type:varchar(8)"         json:"areaCode"`
+	Email          string    `gorm:"column:email;type:varchar(64)"            json:"email"`
+	Nickname       string    `gorm:"column:nickname;type:varchar(64)"         json:"nickname"`
+	FaceURL        string    `gorm:"column:face_url;type:varchar(255)"        json:"faceURL"`
+	Gender         int32     `gorm:"column:gender"                            json:"gender"`
+	Birth          uint32    `gorm:"column:birth"                             json:"birth"`
+	CreateTime     time.Time `gorm:"column:create_time"                       json:"createTime"`
+	ChangeTime     time.Time `gorm:"column:change_time"                       json:"changeTime"`
+	BirthTime      time.Time `gorm:"column:birth_time"                        json:"birthTime"`
+	Level          int32     `gorm:"column:level;default:1"                   json:"level"`
+	AllowVibration int32     `gorm:"column:allow_vibration;default:1"         json:"allowVibration"`
+	AllowBeep      int32     `gorm:"column:allow_beep;default:1"              json:"allowBeep"`
+	AllowAddFriend int32     `gorm:"column:allow_add_friend;default:1"        json:"allowAddFriend"`
 }
 
 // 封号表
 type ForbiddenAccount struct {
 	UserID         string    `gorm:"column:user_id;index:userID;primary_key;type:char(64)" json:"userID"`
-	CreateTime     time.Time `gorm:"column:create_time"  json:"createTime"`
-	Reason         string    `gorm:"column:reason;type:varchar(255)"  json:"reason"`
-	OperatorUserID string    `gorm:"column:operator_user_id;type:varchar(255)" json:"operatorUserID"`
+	CreateTime     time.Time `gorm:"column:create_time"                                    json:"createTime"`
+	Reason         string    `gorm:"column:reason;type:varchar(255)"                       json:"reason"`
+	OperatorUserID string    `gorm:"column:operator_user_id;type:varchar(255)"             json:"operatorUserID"`
 }
 
 // 用户登录信息表
 type UserLoginRecord struct {
-	UserID    string    `gorm:"column:user_id;size:64" json:"userID"`
-	LoginTime time.Time `gorm:"column:login_time" json:"loginTime"`
-	IP        string    `gorm:"column:ip;type:varchar(32)" json:"ip"`
+	UserID    string    `gorm:"column:user_id;size:64"             json:"userID"`
+	LoginTime time.Time `gorm:"column:login_time"                  json:"loginTime"`
+	IP        string    `gorm:"column:ip;type:varchar(32)"         json:"ip"`
 	DeviceID  string    `gorm:"column:device_id;type:varchar(255)" json:"deviceID"`
-	Platform  string    `gorm:"column:platform;type:varchar(32)" json:"platform"`
+	Platform  string    `gorm:"column:platform;type:varchar(32)"   json:"platform"`
 }
 
 // 禁止ip登录 注册
 type IPForbidden struct {
 	IP            string    `gorm:"column:ip;primary_key;type:char(32)" json:"ip"`
-	LimitRegister int32     `gorm:"column:limit_register" json:"limitRegister"`
-	LimitLogin    int32     `gorm:"column:limit_login" json:"limitLogin"`
-	CreateTime    time.Time `gorm:"column:create_time" json:"createTime"`
+	LimitRegister int32     `gorm:"column:limit_register"               json:"limitRegister"`
+	LimitLogin    int32     `gorm:"column:limit_login"                  json:"limitLogin"`
+	CreateTime    time.Time `gorm:"column:create_time"                  json:"createTime"`
 }
 
 // 限制userID只能在某些ip登录
 type LimitUserLoginIP struct {
 	UserID     string    `gorm:"column:user_id;primary_key;type:char(64)" json:"userID"`
-	IP         string    `gorm:"column:ip;primary_key;type:char(32)" json:"ip"`
-	CreateTime time.Time `gorm:"column:create_time"  json:"createTime"`
+	IP         string    `gorm:"column:ip;primary_key;type:char(32)"      json:"ip"`
+	CreateTime time.Time `gorm:"column:create_time"                       json:"createTime"`
 }
 
 // 邀请码被注册使用
 type InvitationRegister struct {
 	InvitationCode string    `gorm:"column:invitation_code;primary_key;type:char(32)" json:"invitationCode"`
-	CreateTime     time.Time `gorm:"column:create_time" json:"createTime"`
-	UsedByUserID   string    `gorm:"column:user_id;index:userID;type:char(64)" json:"usedByUserID"`
+	CreateTime     time.Time `gorm:"column:create_time"                               json:"createTime"`
+	UsedByUserID   string    `gorm:"column:user_id;index:userID;type:char(64)"        json:"usedByUserID"`
 }
 
 type SignalRecord struct {
-	FileName    string    `gorm:"column:file_name;primary_key;type:char(128)" json:"fileName"`
+	FileName    string    `gorm:"column:file_name;primary_key;type:char(128)"            json:"fileName"`
 	MediaType   string    `gorm:"column:media_type;type:char(64);index:media_type_index" json:"mediaType"`
-	RoomType    string    `gorm:"column:room_type;type:char(20)" json:"roomType"`
-	SenderID    string    `gorm:"column:sender_id;type:char(64);index:sender_id_index" json:"senderID"`
-	RecvID      string    `gorm:"column:recv_id;type:char(64);index:recv_id_index" json:"recvID"`
-	GroupID     string    `gorm:"column:group_id;type:char(64)" json:"groupID"`
-	DownloadURL string    `gorm:"column:download_url;type:text" json:"downloadURL"`
-	CreateTime  time.Time `gorm:"create_time;index:create_time_index" json:"createTime"`
+	RoomType    string    `gorm:"column:room_type;type:char(20)"                         json:"roomType"`
+	SenderID    string    `gorm:"column:sender_id;type:char(64);index:sender_id_index"   json:"senderID"`
+	RecvID      string    `gorm:"column:recv_id;type:char(64);index:recv_id_index"       json:"recvID"`
+	GroupID     string    `gorm:"column:group_id;type:char(64)"                          json:"groupID"`
+	DownloadURL string    `gorm:"column:download_url;type:text"                          json:"downloadURL"`
+	CreateTime  time.Time `gorm:"create_time;index:create_time_index"                    json:"createTime"`
 }

tools/data-conversion/go.mod

@@ -1,6 +1,6 @@
 module github.com/openimsdk/open-im-server/v3/tools/data-conversion
 
-go 1.18
+go 1.19
 
 require (
 	github.com/IBM/sarama v1.41.2