feat: ver3 branch

Signed-off-by: kubbot & kubecub <3293172751ysy@gmail.com>

.env

@@ -1,4 +1,4 @@
-USER=root #不用修改
+USER=root
-PASSWORD=openIM123  #8位以上的数字和字母组合密码，密码对redis mysql mongo生效，以及config/config.yaml中的accessSecret
+PASSWORD=openIM123
-ENDPOINT=http://127.0.0.1:10005 #minio对外服务的ip和端口，或用域名storage.xx.xx，app要能访问到此ip和端口或域名，
+MINIO_ENDPOINT=http://127.0.0.1:10005
-DATA_DIR=./  #指定大磁盘目录
+DATA_DIR=./

Dockerfile

@@ -9,7 +9,7 @@ WORKDIR /Open-IM-Server
 # add all files to the container
 COPY . .
 
-WORKDIR /Open-IM-Server/scripts
+WORKDIR /Open-IM-Server/script
 RUN chmod +x *.sh
 
 RUN /bin/sh -c ./build_all_service.sh
@@ -27,13 +27,13 @@ RUN apt-get install -y vim curl tzdata gawk
 RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
 
 
-#set directory to map logs,config file,scripts file.
+#set directory to map logs,config file,script file.
-VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts","/Open-IM-Server/db/sdk"]
+VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"]
 
-#Copy scriptss files and binary files to the blank image
+#Copy scripts files and binary files to the blank image
-COPY --from=build /Open-IM-Server/scripts /Open-IM-Server/scripts
+COPY --from=build /Open-IM-Server/script /Open-IM-Server/script
 COPY --from=build /Open-IM-Server/bin /Open-IM-Server/bin
 
-WORKDIR /Open-IM-Server/scripts
+WORKDIR /Open-IM-Server/script
 
 CMD ["./docker_start_all.sh"]

cmd/api/main.go

@@ -57,6 +57,9 @@ func run(port int) error {
 	if err != nil {
 		return err
 	}
+	if client.CreateRpcRootNodes(config.GetServiceNames()); err != nil {
+		return err
+	}
 	fmt.Println("api init discov client success")
 	fmt.Println("api register public config to discov")
 	if err := client.RegisterConf2Registry(constant.OpenIMCommonConfigKey, config.EncodeConfig()); err != nil {

config/config.yaml

@@ -12,7 +12,7 @@ mysql:
   address: [ 127.0.0.1:13306 ]            #目前仅支持单机
   username: root                          #用户名
   password: openIM123                     #密码
-  database: openIM_v2                     #不建议修改
+  database: openIM_v3                     #不建议修改
   maxOpenConn: 1000                       #最大连接数
   maxIdleConn: 100                        #最大空闲连接数
   maxLifeTime: 60                         #连接可以重复使用的最长时间（秒）
@@ -22,7 +22,7 @@ mysql:
 mongo:
   uri:                                    #不为空则直接使用该值
   address: [ 127.0.0.1:37017 ]            #单机时为mongo地址，使用分片集群时，为mongos地址
-  database: openIM                        #mongo db 默认即可
+  database: openIM_v3                      #mongo db 默认即可
   username: root                          #用户名
   password: openIM123                     #密码
   maxPoolSize: 100
@@ -41,10 +41,10 @@ kafka:
   offlineMsgToMongo:
     topic: "offlineMsgToMongoMysql"       #不建议修改
   msgToPush:
-    topic: "msqToPush"                    #不建议修改
+    topic: "msgToPush"                    #不建议修改
   msgToModify:
     topic: "msgToModify"                  #不建议修改
-  consumerGroupID:                        #消费者组，不建议修改
+  consumerGroupID: #消费者组，不建议修改
     msgToRedis: redis                     #
     msgToMongo: mongo                     #
     msgToMySql: mysql                     #
@@ -72,13 +72,13 @@ object:
     accessKeyID: root                     #ID
     secretAccessKey: openIM123            #秘钥
     isDistributedMod: false               #是否分布式多硬盘部署，如果是多硬盘部署，需要修改为true
-  tencent:                                #tencent cos
+  tencent: #tencent cos
     appID:
     region:
     bucket:
     secretID:
     secretKey:
-  ali:                                    #ali oss
+  ali: #ali oss
     regionID:
     accessKeyID:
     accessKeySecret:
@@ -98,7 +98,7 @@ object:
     externalId:
     roleSessionName:
 
-rpcPort:                              #rpc服务端口，不建议修改，端口由脚本读取后传入程序，如启动多个程序，只需要填入多个端口，用逗号隔开，如 openImUserPort: [10110, 10111]
+rpcPort: #rpc服务端口，不建议修改，端口由脚本读取后传入程序，如启动多个程序，只需要填入多个端口，用逗号隔开，如  [10110, 10111]
   openImUserPort: [ 10110 ]
   openImFriendPort: [ 10120 ]
   openImMessagePort: [ 10130 ]
@@ -109,7 +109,7 @@ rpcPort:                              #rpc服务端口，不建议修改，端
   openImConversationPort: [ 10180 ]
   openImThirdPort: [ 10190 ]
 
-rpcRegisterName:                      #rpc注册服务名，不建议修改
+rpcRegisterName: #rpc注册服务名，不建议修改
   openImUserName: User
   openImFriendName: Friend
   openImMsgName: Msg
@@ -136,17 +136,17 @@ longConnSvr:
   websocketTimeout: 10                #websocket连接握手超时时间
 
 push:
-  enable: getui                       #选择个推离线推送
+  enable: getui
-  geTui:                              #个推离线推送
+  geTui: #个推离线推送
     pushUrl: "https://restapi.getui.com/v2/$appId"
     masterSecret: ""
     appKey: ""
     intent: ""
     channelID: ""
     channelName: ""
-  fcm:                                #fcm离线推送
+  fcm: #fcm离线推送
     serviceAccount: "x.json"          #帐号文件，并放在 config目录下
-  jpns:                               #极光推送 在极光后台申请后，修改以下四项
+  jpns: #极光推送 在极光后台申请后，修改以下四项
     appKey:
     masterSecret:
     pushUrl:
@@ -170,11 +170,10 @@ singleMessageHasReadReceiptEnable: true                 #单聊已读是否开
 retainChatRecords: 365                                  #mongo保存离线消息时间（天）
 chatRecordsClearTime: "0 2 * * 3"                       #每周三凌晨2点清理mongo中的过期（超过retainChatRecords时间）消息
 
-
+secret: tuoyun #秘钥，获取token时校验
 
 tokenPolicy:
-  accessSecret: openIM123                              #秘钥，获取token时校验
+  expire: 90                                     #过期时间（天）
-  accessExpire: 90                                     #过期时间（天）
 
 messageVerify:
   friendVerify: false                                  #发送消息时是否验证好友关系
@@ -249,7 +248,7 @@ callback:
     failedContinue: true
 
 
-prometheus:                                                   #prometheus每个服务的端口数量需要和rpcPort保持对应
+prometheus: #prometheus每个服务的端口数量需要和rpcPort保持对应
   enable: false
   userPrometheusPort: [ 20110 ]
   friendPrometheusPort: [ 20120 ]
@@ -261,5 +260,5 @@ prometheus:                                                   #prometheus每个
   conversationPrometheusPort: [ 20230 ]
   rtcPrometheusPort: [ 21300 ]
   thirdPrometheusPort: [ 21301 ]
-  messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ] #端口数量需要和scripts/path_info.cfg中的msg_transfer_service_num保持一致
+  messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ] #端口数量需要和script/path_info.cfg中的msg_transfer_service_num保持一致
 

deploy.Dockerfile

@@ -0,0 +1,39 @@
+FROM golang as build
+
+# go mod Installation source, container environment variable addition will override the default variable value
+ENV GO111MODULE=on
+ENV GOPROXY=https://goproxy.cn,direct
+
+# Set up the working directory
+WORKDIR /Open-IM-Server
+# add all files to the container
+COPY . .
+
+WORKDIR /Open-IM-Server/script
+RUN chmod +x *.sh
+
+RUN /bin/sh -c ./build_all_service.sh
+
+#Blank image Multi-Stage Build
+FROM ubuntu
+
+RUN rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\
+&&apt-get install net-tools
+#Non-interactive operation
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get install -y vim curl tzdata gawk
+#Time zone adjusted to East eighth District
+RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
+
+
+#set directory to map logs,config file,script file.
+VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"]
+
+#Copy scripts files and binary files to the blank image
+COPY --from=build /Open-IM-Server/script /Open-IM-Server/script
+COPY --from=build /Open-IM-Server/bin /Open-IM-Server/bin
+
+WORKDIR /Open-IM-Server/script
+
+CMD ["./docker_start_all.sh"]

docker-compose-1.yaml

@@ -0,0 +1,173 @@
+#fixme  Clone openIM Server project before using docker-compose,project address：https://github.com/OpenIMSDK/Open-IM-Server.git
+version: "3"
+services:
+  mysql:
+    image: mysql:5.7
+    ports:
+      - 13306:3306
+      - 23306:33060
+    container_name: mysql
+    volumes:
+      - ${DATA_DIR}/components/mysql/data:/var/lib/mysql
+      - /etc/localtime:/etc/localtime
+    environment:
+      MYSQL_ROOT_PASSWORD: ${PASSWORD}
+    restart: always
+
+  mongodb:
+    image: mongo:6.0
+    ports:
+      - 37017:27017
+    container_name: mongo
+    command: --wiredTigerCacheSizeGB 1 --auth
+    volumes:
+      - ${DATA_DIR}/components/mongodb/data/db:/data/db
+      - ${DATA_DIR}/components/mongodb/data/logs:/data/logs
+      - ${DATA_DIR}/components/mongodb/data/conf:/etc/mongo
+      - ./scripts/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh:ro 
+    environment:
+      - TZ=Asia/Shanghai
+      # cache
+      - wiredTigerCacheSizeGB=1
+      - MONGO_INITDB_ROOT_USERNAME=${USER}
+      - MONGO_INITDB_ROOT_PASSWORD=${PASSWORD}
+      - MONGO_INITDB_DATABASE=openIM
+      - MONGO_USERNAME=${USER}
+      - MONGO_PASSWORD=${PASSWORD}
+    restart: always
+
+  redis:
+    image: redis:6.2.5
+    ports:
+      - 16379:6379
+    container_name: redis
+    volumes:
+      - ${DATA_DIR}/components/redis/data:/data
+      #redis config file
+      - ${DATA_DIR}/components/redis/config/redis.conf:/usr/local/redis/config/redis.conf
+    environment:
+      TZ: Asia/Shanghai
+    restart: always
+    sysctls:
+      net.core.somaxconn: 1024
+    command: redis-server --requirepass ${PASSWORD} --appendonly yes
+
+  zookeeper:
+    image: zookeeper
+    ports:
+      - 2181:2181
+    container_name: zookeeper
+    volumes:
+      - /etc/localtime:/etc/localtime
+    environment:
+      TZ: Asia/Shanghai
+    restart: always
+
+  kafka:
+    image: wurstmeister/kafka
+    container_name: kafka
+    restart: always
+    ports:
+      - 9092:9092
+    environment:
+      TZ: Asia/Shanghai
+      KAFKA_BROKER_ID: 0
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_CREATE_TOPICS: "latestMsgToRedis:8:1,msgToPush:8:1,offlineMsgToMongoMysql:8:1"
+      KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9092
+      KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT"
+      KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE
+    depends_on:
+      - zookeeper
+
+  minio:
+    image: minio/minio
+    ports:
+      - 10005:9000
+      - 9090:9090
+    container_name: minio
+    volumes:
+      - /mnt/data:/data
+      - /mnt/config:/root/.minio
+    environment:
+      MINIO_ROOT_USER: ${USER}
+      MINIO_ROOT_PASSWORD: ${PASSWORD}
+    restart: always
+    command: minio server /data --console-address ':9090'
+
+
+  open_im_server:
+    image: openim/open_im_server:v3.0.0
+    container_name: open_im_server
+    volumes:
+      - ./logs:/Open-IM-Server/logs
+      - ./config/config.yaml:/Open-IM-Server/config/config.yaml
+      - ./config/notification.yaml:/Open-IM-Server/config/notification.yaml
+      - ${DATA_DIR}/db/sdk:/Open-IM-Server/db/sdk
+      - ./scripts:/Open-IM-Server/scripts
+    restart: always
+    depends_on:
+      - kafka
+      - mysql
+      - mongodb
+      - redis
+      - minio
+    network_mode: "host"
+    logging:
+      driver: json-file
+      options:
+        max-size: "1g"
+        max-file: "2"
+
+  openim_chat:
+    image: openim/openim_chat:v1.0
+    container_name: openim_chat
+    volumes:
+      - ./logs:/openim-chat/logs
+      - ./openim-chat/config/config.yaml:/openim-chat/config/config.yaml
+    restart: always
+    depends_on:
+      - mysql
+      - mongodb
+      - redis
+      - minio
+      - open_im_server
+    network_mode: "host"
+    logging:
+      driver: json-file
+      options:
+        max-size: "1g"
+        max-file: "2"
+    environment:
+      CONFIG_NAME: "/openim-chat"
+
+  prometheus:
+    image: prom/prometheus
+    volumes:
+      - ./.docker-compose_cfg/prometheus-compose.yml:/etc/prometheus/prometheus.yml
+    container_name: prometheus
+    #    ports:
+    #    - 9091:9091
+    depends_on:
+    - open_im_server
+    command: --web.listen-address=:9091 --config.file="/etc/prometheus/prometheus.yml"
+    network_mode: "host" 
+
+  grafana:
+    image: grafana/grafana
+    volumes:
+    - ./.docker-compose_cfg/datasource-compose.yaml:/etc/grafana/provisioning/datasources/datasource.yaml
+    - ./.docker-compose_cfg/grafana.ini:/etc/grafana/grafana.ini
+    - ./.docker-compose_cfg/node-exporter-full_rev1.json:/var/lib/grafana/dashboards/node-exporter-full_rev1.json
+    container_name: grafana
+    depends_on:
+    - prometheus
+    network_mode: "host" 
+
+  # node-exporter:
+  #   image: quay.io/prometheus/node-exporter
+  #   container_name: node-exporter
+  #   restart: always
+  #   ports:
+  #     - "9100:9100"

docker-compose-mongos.yaml

@@ -1,139 +0,0 @@
-version: "3"
-#fixme  Clone openIM Server project before using docker-compose,project address：https://github.com/OpenIMSDK/Open-IM-Server.git
-
-services:
-  mysql:
-    image: mysql:5.7
-    ports:
-      - 13306:3306
-      - 23306:33060
-    container_name: mysql
-    volumes:
-      - ./components/mysql/data:/var/lib/mysql
-      - /etc/localtime:/etc/localtime
-    environment:
-      MYSQL_ROOT_PASSWORD: openIM
-    restart: always
-
-  mongos:
-    image: mongo:latest
-    ports:
-      - 37017:27017
-    container_name: mongos
-    command: mongos --configdb config/103.116.45.174:27019 --bind_ip_all
-    volumes:
-      - ./components/mongos_mongodb/data/db:/data/db
-      - ./components/mongos_mongodb/data/logs:/data/logs
-      - ./components/mongos_mongodb/data/conf:/etc/mongo
-      - ./components/mongos_mongodb/data/configdb:/data/configdb
-    environment:
-      - TZ=Asia/Shanghai
-      # cache
-      - wiredTigerCacheSizeGB=1
-      #    environment:
-      #      - MONGO_INITDB_ROOT_USERNAME=openIM
-      #      - MONGO_INITDB_ROOT_PASSWORD=openIM
-
-
-      #TZ: Asia/Shanghai
-    restart: always
-
-
-  redis:
-    image: redis
-    ports:
-      - 16379:6379
-    container_name: redis
-    volumes:
-      - ./components/redis/data:/data
-      #redis config file
-      - ./components/redis/config/redis.conf:/usr/local/redis/config/redis.conf
-    environment:
-      TZ: Asia/Shanghai
-    restart: always
-    sysctls:
-      net.core.somaxconn: 1024
-    command: redis-server --requirepass openIM --appendonly yes
-
-
-  zookeeper:
-    image: wurstmeister/zookeeper
-    ports:
-      - 2181:2181
-    container_name: zookeeper
-    volumes:
-      - /etc/localtime:/etc/localtime
-    environment:
-      TZ: Asia/Shanghai
-    restart: always
-
-
-  kafka:
-    image: wurstmeister/kafka
-    container_name: kafka
-    restart: always
-    ports:
-      - 9092:9092
-    environment:
-      TZ: Asia/Shanghai
-      KAFKA_BROKER_ID: 0
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_CREATE_TOPICS: "ws2ms_chat:8:1,ms2ps_chat:8:1,msg_to_mongo:8:1"
-      KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9092
-      KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT"
-      KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE
-    depends_on:
-      - zookeeper
-
-  etcd:
-    image: quay.io/coreos/etcd
-    ports:
-      - 2379:2379
-      - 2380:2380
-    container_name: etcd
-    volumes:
-      - /etc/timezone:/etc/timezone
-      - /etc/localtime:/etc/localtime
-    environment:
-      ETCDCTL_API: 3
-    restart: always
-    command: /usr/local/bin/etcd --name etcd0 --data-dir /etcd-data --listen-client-urls http://0.0.0.0:2379 --advertise-client-urls http://0.0.0.0:2379 --listen-peer-urls http://0.0.0.0:2380 --initial-advertise-peer-urls http://0.0.0.0:2380 --initial-cluster etcd0=http://0.0.0.0:2380 --initial-cluster-token tkn --initial-cluster-state new
-
-  minio:
-    image: minio/minio
-    ports:
-      - 10005:9000
-      - 9090:9090
-    container_name: minio
-    volumes:
-      - /mnt/data:/data
-      - /mnt/config:/root/.minio
-    environment:
-      MINIO_ROOT_USER: user12345
-      MINIO_ROOT_PASSWORD: key12345
-    restart: always
-    command: minio server /data --console-address ':9090'
-
-  open_im_server:
-    image: openim/open_im_server:v2.3.0-rc1
-    container_name: open_im_server
-    volumes:
-      - ./logs:/Open-IM-Server/logs
-      - ./config/config.yaml:/Open-IM-Server/config/config.yaml
-      - ./db/sdk:/Open-IM-Server/db/sdk
-      - ./scripts:/Open-IM-Server/scripts
-    restart: always
-    depends_on:
-      - kafka
-      - mysql
-      - mongos
-      - redis
-      - etcd
-      - minio
-    network_mode: "host"
-    logging:
-      driver: json-file
-      options:
-        max-size: "1g"
-        max-file: "2"

docker-compose-shard-cluster.yaml

@@ -1,113 +0,0 @@
-version: '3'
-networks:
-  mongo-network:
-    external: false
-services:
-  # 配置服务器configsvr
-  config:
-    image: mongo:latest
-    networks:
-      - mongo-network
-    container_name: config
-    restart: always
-    ports:
-      - 27019:27019
-    command: --configsvr --replSet "config" --bind_ip_all
-    volumes:
-      - ./components/config_mongodb/data/db:/data/db
-      - ./components/config_mongodb/data/logs:/data/logs
-      - ./components/config_mongodb/data/conf:/etc/mongo
-      - ./components/config_mongodb/data/configdb:/data/configdb
-    environment:
-      - TZ=Asia/Shanghai
-      # cache
-      - wiredTigerCacheSizeGB=1
-
-  # shard分片1
-  shard1:
-    image: mongo:latest
-    networks:
-      - mongo-network
-    container_name: shard1
-    restart: always
-    ports:
-      - 27118:27018
-    command: --shardsvr --replSet "shard1" --bind_ip_all
-    volumes:
-      - /data01/mongo/shard1/db:/data/db
-      - /data01/mongo/shard1/configdb:/data/configdb
-    environment:
-      - TZ=Asia/Shanghai
-      # cache
-      - wiredTigerCacheSizeGB=1
-
-  # shard分片2
-  shard2:
-    image: mongo:latest
-    networks:
-      - mongo-network
-    container_name: shard2
-    restart: always
-    ports:
-      - 27218:27018
-    command: --shardsvr --replSet "shard2" --bind_ip_all
-    volumes:
-      - /data02/mongo/shard2/db:/data/db
-      - /data02/mongo/shard2/configdb:/data/configdb
-    environment:
-      - TZ=Asia/Shanghai
-      # cache
-      - wiredTigerCacheSizeGB=1
-  #      - ${PWD}/key.file:/data/mongodb/key.file
-
-  # shard分片3
-  shard3:
-    image: mongo:latest
-    networks:
-      - mongo-network
-    container_name: shard3
-    restart: always
-    ports:
-      - 27318:27018
-    command: --shardsvr --replSet "shard3" --bind_ip_all
-    volumes:
-      - /data03/mongo/shard3/db:/data/db
-      - /data03/mongo/shard3/configdb:/data/configdb
-    environment:
-      - TZ=Asia/Shanghai
-      # cache
-      - wiredTigerCacheSizeGB=1
-  # shard分片4
-  shard4:
-    image: mongo:latest
-    networks:
-      - mongo-network
-    container_name: shard4
-    restart: always
-    ports:
-      - 27418:27018
-    command: --shardsvr --replSet "shard4" --bind_ip_all
-    volumes:
-      - /data04/mongo/shard4/db:/data/db
-      - /data04/mongo/shard4/configdb:/data/configdb
-    environment:
-      - TZ=Asia/Shanghai
-      # cache
-      - wiredTigerCacheSizeGB=1
-  # shard分片5
-  shard5:
-    image: mongo:latest
-    networks:
-      - mongo-network
-    container_name: shard5
-    restart: always
-    ports:
-      - 27518:27018
-    command: --shardsvr --replSet "shard5" --bind_ip_all
-    volumes:
-      - /data05/mongo/shard5/db:/data/db
-      - /data05/mongo/shard5/configdb:/data/configdb
-    environment:
-      - TZ=Asia/Shanghai
-      # cache
-      - wiredTigerCacheSizeGB=1

docker-compose.yaml

@@ -15,7 +15,7 @@ services:
     restart: always
 
   mongodb:
-    image: mongo:6.0
+    image: mongo:4.0
     ports:
       - 37017:27017
     container_name: mongo
@@ -24,7 +24,7 @@ services:
       - ${DATA_DIR}/components/mongodb/data/db:/data/db
       - ${DATA_DIR}/components/mongodb/data/logs:/data/logs
       - ${DATA_DIR}/components/mongodb/data/conf:/etc/mongo
-      - ./scripts/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh:ro 
+      - ./script/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh:ro 
     environment:
       - TZ=Asia/Shanghai
       # cache
@@ -37,7 +37,7 @@ services:
     restart: always
 
   redis:
-    image: redis:6.2.5
+    image: redis
     ports:
       - 16379:6379
     container_name: redis
@@ -52,6 +52,7 @@ services:
       net.core.somaxconn: 1024
     command: redis-server --requirepass ${PASSWORD} --appendonly yes
 
+
   zookeeper:
     image: zookeeper
     ports:
@@ -63,6 +64,7 @@ services:
       TZ: Asia/Shanghai
     restart: always
 
+
   kafka:
     image: wurstmeister/kafka
     container_name: kafka
@@ -105,7 +107,7 @@ services:
       - ./config/config.yaml:/Open-IM-Server/config/config.yaml
       - ./config/notification.yaml:/Open-IM-Server/config/notification.yaml
       - ${DATA_DIR}/db/sdk:/Open-IM-Server/db/sdk
-      - ./scripts:/Open-IM-Server/scripts
+      - ./script:/Open-IM-Server/script
     restart: always
     depends_on:
       - kafka
@@ -120,12 +122,12 @@ services:
         max-size: "1g"
         max-file: "2"
 
-  openim_chat:
+  open_im_enterprise:
-    image: openim/openim_chat:v1.0
+    image: openim/open_im_enterprise:v1.0.2
-    container_name: openim_chat
+    container_name: open_im_enterprise
     volumes:
-      - ./logs:/openim-chat/logs
+      - ./logs:/Open-IM-Enterprise/logs
-      - ./openim-chat/config/config.yaml:/openim-chat/config/config.yaml
+      - ./.docker-compose_cfg/config.yaml:/Open-IM-Enterprise/config/config.yaml
     restart: always
     depends_on:
       - mysql
@@ -140,7 +142,7 @@ services:
         max-size: "1g"
         max-file: "2"
     environment:
-      CONFIG_NAME: "/openim-chat"
+      CONFIG_NAME: "/Open-IM-Enterprise"
 
   prometheus:
     image: prom/prometheus

init_docker.sh

@@ -1,43 +1,9 @@
 #!/usr/bin/env bash
 
-# This scripts is used to check the environment and start the docker containers
+cd script ;
-
+chmod +x *.sh ;
-# Define the directory path
+./env_check.sh;
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd .. ;
-
+docker-compose up -d;
-# Define the functions
+cd script ;
-function check_command {
-    if ! command -v $1 &> /dev/null; then
-        echo "$1 command not found. Please install it first."
-        exit 1
-    fi
-}
-
-function check_docker {
-    if ! docker ps &> /dev/null; then
-        echo "Docker is not running. Please start it first."
-        exit 1
-    fi
-}
-
-# Check if the necessary commands are installed
-check_command docker
-check_command docker-compose
-
-# Check if Docker is running
-check_docker
-
-# Change to the scripts directory
-cd $SCRIPT_DIR
-
-# Set permissions for the scripts
-chmod +x *.sh
-
-# Check the environment
-./env_check.sh
-
-# Start the docker containers
-docker-compose up -d
-
-# Check the docker services
 ./docker_check_service.sh

install_guide.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo "Welcome to the Open-IM-Server installation scripts."
+echo "Welcome to the Open-IM-Server installation script."
 echo "Please select an deploy option:"
 echo "1. docker-compose install"
 echo "2. exit"
@@ -145,13 +145,13 @@ EOF
     edit_config
     edit_enterprise_config
     
-    cd scripts;
+    cd script;
     chmod +x *.sh;
     ./init_pwd.sh;
     ./env_check.sh;
     cd ..;
     docker-compose up -d;
-    cd scripts;
+    cd script;
     ./docker_check_service.sh;
 }
 
@@ -167,10 +167,11 @@ case $choice in
   3)
     ;;
   4)
-    echo "Exiting installation scripts..."
+    echo "Exiting installation script..."
     exit 0
     ;;
   *)
     echo "Invalid option, please try again."
     ;;
 esac
+

install_im_compose.sh

@@ -9,10 +9,13 @@ if [ $MINIO_ENDPOINT == "http://127.0.0.1:10005" ]; then
 
 fi
 
-cd scripts ;
+cd script ;
 chmod +x *.sh ;
 ./init_pwd.sh
 ./env_check.sh;
 cd .. ;
 docker-compose -f im-compose.yaml up -d
 docker ps
+
+
+

install_im_server.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+internet_ip=`curl ifconfig.me -s`
+echo $internet_ip
+
+source .env
+echo $MINIO_ENDPOINT
+if [ $MINIO_ENDPOINT == "http://127.0.0.1:10005" ]; then
+	sed -i "s/127.0.0.1/${internet_ip}/" .env 
+
+fi
+	
+cd script ;
+chmod +x *.sh ;
+./init_pwd.sh
+./env_check.sh;
+cd .. ;
+docker-compose up -d;
+cd script ;
+./docker_check_service.sh

internal/api/conversation.go

@@ -26,12 +26,6 @@ func (o *ConversationApi) GetConversations(c *gin.Context) {
 	a2r.Call(conversation.ConversationClient.GetConversations, o.Client, c)
 }
 
-// deprecated
-func (o *ConversationApi) SetConversation(c *gin.Context) {
-	a2r.Call(conversation.ConversationClient.SetConversation, o.Client, c)
-}
-
-// deprecated
 func (o *ConversationApi) BatchSetConversations(c *gin.Context) {
 	a2r.Call(conversation.ConversationClient.BatchSetConversations, o.Client, c)
 }

internal/api/route.go

@@ -19,15 +19,13 @@ import (
 func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.UniversalClient) *gin.Engine {
 	discov.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials())) // 默认RPC中间件
 	gin.SetMode(gin.ReleaseMode)
-	//f, _ := os.Create("../logs/api.log")
-	//gin.DefaultWriter = io.MultiWriter(f)
-	//gin.SetMode(gin.DebugMode)
 	r := gin.New()
 	if v, ok := binding.Validator.Engine().(*validator.Validate); ok {
 		_ = v.RegisterValidation("required_if", RequiredIf)
 	}
 	log.ZInfo(context.Background(), "load config", "config", config.Config)
 	r.Use(gin.Recovery(), mw.CorsHandler(), mw.GinParseOperationID())
+	u := NewUserApi(discov)
 	if config.Config.Prometheus.Enable {
 		prome.NewApiRequestCounter()
 		prome.NewApiRequestFailedCounter()
@@ -35,90 +33,77 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 		r.Use(prome.PrometheusMiddleware)
 		r.GET("/metrics", prome.PrometheusHandler())
 	}
-	userRouterGroup := r.Group("/user")
+	ParseToken := mw.GinParseToken(rdb)
+	userRouterGroup := r.Group("/user", ParseToken)
 	{
-		u := NewUserApi(discov)
+		userRouterGroup.POST("/update_user_info", u.UpdateUserInfo)
-		userRouterGroupChild := mw.NewRouterGroup(userRouterGroup, "")
+		userRouterGroup.POST("/set_global_msg_recv_opt", u.SetGlobalRecvMessageOpt)
-		userRouterGroupChildToken := mw.NewRouterGroup(userRouterGroup, "", mw.WithGinParseToken(rdb))
+		userRouterGroup.POST("/get_users_info", u.GetUsersPublicInfo)
-		userRouterGroupChild.POST("/user_register", u.UserRegister)
+		userRouterGroup.POST("/get_all_users_uid", u.GetAllUsersID)
-		userRouterGroupChildToken.POST("/update_user_info", u.UpdateUserInfo) //1
+		userRouterGroup.POST("/account_check", u.AccountCheck)
-		userRouterGroupChildToken.POST("/set_global_msg_recv_opt", u.SetGlobalRecvMessageOpt)
+		userRouterGroup.POST("/get_users", u.GetUsers)
-		userRouterGroupChildToken.POST("/get_users_info", u.GetUsersPublicInfo) //1
+		userRouterGroup.POST("/get_users_online_status", u.GetUsersOnlineStatus)
-		userRouterGroupChildToken.POST("/get_all_users_uid", u.GetAllUsersID)   // todo
-		userRouterGroupChildToken.POST("/account_check", u.AccountCheck)        // todo
-		userRouterGroupChildToken.POST("/get_users", u.GetUsers)
-		userRouterGroupChildToken.POST("/get_users_online_status", u.GetUsersOnlineStatus)
 	}
 	//friend routing group
-	friendRouterGroup := r.Group("/friend")
+	friendRouterGroup := r.Group("/friend", ParseToken)
 	{
 		f := NewFriendApi(discov)
-		friendRouterGroup.Use(mw.GinParseToken(rdb))
+		friendRouterGroup.POST("/delete_friend", f.DeleteFriend)
-		friendRouterGroup.POST("/delete_friend", f.DeleteFriend)                  //1
+		friendRouterGroup.POST("/get_friend_apply_list", f.GetFriendApplyList)
-		friendRouterGroup.POST("/get_friend_apply_list", f.GetFriendApplyList)    //1
+		friendRouterGroup.POST("/get_self_friend_apply_list", f.GetSelfApplyList)
-		friendRouterGroup.POST("/get_self_friend_apply_list", f.GetSelfApplyList) //1
+		friendRouterGroup.POST("/get_friend_list", f.GetFriendList)
-		friendRouterGroup.POST("/get_friend_list", f.GetFriendList)               //1
+		friendRouterGroup.POST("/add_friend", f.ApplyToAddFriend)
-		friendRouterGroup.POST("/add_friend", f.ApplyToAddFriend)                 //1
+		friendRouterGroup.POST("/add_friend_response", f.RespondFriendApply)
-		friendRouterGroup.POST("/add_friend_response", f.RespondFriendApply)      //1
+		friendRouterGroup.POST("/set_friend_remark", f.SetFriendRemark)
-		friendRouterGroup.POST("/set_friend_remark", f.SetFriendRemark)           //1
+		friendRouterGroup.POST("/add_black", f.AddBlack)
-		friendRouterGroup.POST("/add_black", f.AddBlack)                          //1
+		friendRouterGroup.POST("/get_black_list", f.GetPaginationBlacks)
-		friendRouterGroup.POST("/get_black_list", f.GetPaginationBlacks)          //1
+		friendRouterGroup.POST("/remove_black", f.RemoveBlack)
-		friendRouterGroup.POST("/remove_black", f.RemoveBlack)                    //1
+		friendRouterGroup.POST("/import_friend", f.ImportFriends)
-		friendRouterGroup.POST("/import_friend", f.ImportFriends)                 //1
+		friendRouterGroup.POST("/is_friend", f.IsFriend)
-		friendRouterGroup.POST("/is_friend", f.IsFriend)                          //1
 	}
 	g := NewGroupApi(discov)
-	groupRouterGroup := r.Group("/group")
+	groupRouterGroup := r.Group("/group", ParseToken)
 	{
-
+		groupRouterGroup.POST("/create_group", g.CreateGroup)
-		groupRouterGroup.Use(mw.GinParseToken(rdb))
+		groupRouterGroup.POST("/set_group_info", g.SetGroupInfo)
-		groupRouterGroup.POST("/create_group", g.CreateGroup)                                   //1
+		groupRouterGroup.POST("/join_group", g.JoinGroup)
-		groupRouterGroup.POST("/set_group_info", g.SetGroupInfo)                                //1
+		groupRouterGroup.POST("/quit_group", g.QuitGroup)
-		groupRouterGroup.POST("/join_group", g.JoinGroup)                                       //1
+		groupRouterGroup.POST("/group_application_response", g.ApplicationGroupResponse)
-		groupRouterGroup.POST("/quit_group", g.QuitGroup)                                       //1
+		groupRouterGroup.POST("/transfer_group", g.TransferGroupOwner)
-		groupRouterGroup.POST("/group_application_response", g.ApplicationGroupResponse)        //1
+		groupRouterGroup.POST("/get_recv_group_applicationList", g.GetRecvGroupApplicationList)
-		groupRouterGroup.POST("/transfer_group", g.TransferGroupOwner)                          //1
-		groupRouterGroup.POST("/get_recv_group_applicationList", g.GetRecvGroupApplicationList) //1
 		groupRouterGroup.POST("/get_user_req_group_applicationList", g.GetUserReqGroupApplicationList)
-		groupRouterGroup.POST("/get_groups_info", g.GetGroupsInfo) //1
+		groupRouterGroup.POST("/get_groups_info", g.GetGroupsInfo)
-		groupRouterGroup.POST("/kick_group", g.KickGroupMember)    //1
+		groupRouterGroup.POST("/kick_group", g.KickGroupMember)
-		// groupRouterGroup.POST("/get_group_all_member_list", g.GetGroupAllMemberList) //1
+		groupRouterGroup.POST("/get_group_members_info", g.GetGroupMembersInfo)
-		groupRouterGroup.POST("/get_group_members_info", g.GetGroupMembersInfo) //1
+		groupRouterGroup.POST("/get_group_member_list", g.GetGroupMemberList)
-		groupRouterGroup.POST("/get_group_member_list", g.GetGroupMemberList)   //1
+		groupRouterGroup.POST("/invite_user_to_group", g.InviteUserToGroup)
-		groupRouterGroup.POST("/invite_user_to_group", g.InviteUserToGroup)     //1
 		groupRouterGroup.POST("/get_joined_group_list", g.GetJoinedGroupList)
 		groupRouterGroup.POST("/dismiss_group", g.DismissGroup) //
 		groupRouterGroup.POST("/mute_group_member", g.MuteGroupMember)
-		groupRouterGroup.POST("/cancel_mute_group_member", g.CancelMuteGroupMember) //MuteGroup
+		groupRouterGroup.POST("/cancel_mute_group_member", g.CancelMuteGroupMember)
 		groupRouterGroup.POST("/mute_group", g.MuteGroup)
 		groupRouterGroup.POST("/cancel_mute_group", g.CancelMuteGroup)
-		//groupRouterGroup.POST("/set_group_member_nickname", g.SetGroupMemberNickname)
 		groupRouterGroup.POST("/set_group_member_info", g.SetGroupMemberInfo)
 		groupRouterGroup.POST("/get_group_abstract_info", g.GetGroupAbstractInfo)
 	}
-	superGroupRouterGroup := r.Group("/super_group")
+	superGroupRouterGroup := r.Group("/super_group", ParseToken)
 	{
-		superGroupRouterGroup.Use(mw.GinParseToken(rdb))
 		superGroupRouterGroup.POST("/get_joined_group_list", g.GetJoinedSuperGroupList)
 		superGroupRouterGroup.POST("/get_groups_info", g.GetSuperGroupsInfo)
 	}
-	////certificate
+	//certificate
 	authRouterGroup := r.Group("/auth")
 	{
 		a := NewAuthApi(discov)
-		u := NewUserApi(discov)
+		authRouterGroup.POST("/user_register", u.UserRegister)
-		authRouterGroupChild := mw.NewRouterGroup(authRouterGroup, "")
+		authRouterGroup.POST("/user_token", a.UserToken)
-		authRouterGroupChildToken := mw.NewRouterGroup(authRouterGroup, "", mw.WithGinParseToken(rdb))
+		authRouterGroup.POST("/parse_token", a.ParseToken)
-		authRouterGroupChild.POST("/user_register", u.UserRegister)    //1
+		authRouterGroup.POST("/force_logout", ParseToken, a.ForceLogout)
-		authRouterGroupChild.POST("/user_token", a.UserToken)          //1
-		authRouterGroupChildToken.POST("/parse_token", a.ParseToken)   //1
-		authRouterGroupChildToken.POST("/force_logout", a.ForceLogout) //1
 	}
-	////Third service
+	//Third service
-	thirdGroup := r.Group("/third")
+	thirdGroup := r.Group("/third", ParseToken)
 	{
 		t := NewThirdApi(discov)
-		thirdGroup.Use(mw.GinParseToken(rdb))
 		thirdGroup.POST("/fcm_update_token", t.FcmUpdateToken)
 		thirdGroup.POST("/set_app_badge", t.SetAppBadge)
 
@@ -129,11 +114,10 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 		thirdGroup.POST("/object", t.GetURL)
 		thirdGroup.GET("/object", t.GetURL)
 	}
-	////Message
+	//Message
-	msgGroup := r.Group("/msg")
+	msgGroup := r.Group("/msg", ParseToken)
 	{
 		m := NewMessageApi(discov)
-		msgGroup.Use(mw.GinParseToken(rdb))
 		msgGroup.POST("/newest_seq", m.GetSeq)
 		msgGroup.POST("/send_msg", m.SendMessage)
 		msgGroup.POST("/pull_msg_by_seq", m.PullMsgBySeqs)
@@ -151,32 +135,23 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 
 		msgGroup.POST("/batch_send_msg", m.ManagementBatchSendMsg)
 		msgGroup.POST("/check_msg_is_send_success", m.CheckMsgIsSendSuccess)
-
-		//msgGroup.POST("/set_message_reaction_extensions", msg.SetMessageReactionExtensions)
-		//msgGroup.POST("/get_message_list_reaction_extensions", msg.GetMessageListReactionExtensions)
-		//msgGroup.POST("/add_message_reaction_extensions", msg.AddMessageReactionExtensions)
-		//msgGroup.POST("/delete_message_reaction_extensions", msg.DeleteMessageReactionExtensions)
 	}
-	////Conversation
+	//Conversation
-	conversationGroup := r.Group("/conversation")
+	conversationGroup := r.Group("/conversation", ParseToken)
 	{
 		c := NewConversationApi(discov)
-		conversationGroup.Use(mw.GinParseToken(rdb))
 		conversationGroup.POST("/get_all_conversations", c.GetAllConversations)
 		conversationGroup.POST("/get_conversation", c.GetConversation)
 		conversationGroup.POST("/get_conversations", c.GetConversations)
-		conversationGroup.POST("/set_conversation", c.SetConversation)
 		conversationGroup.POST("/batch_set_conversation", c.BatchSetConversations)
 		conversationGroup.POST("/set_recv_msg_opt", c.SetRecvMsgOpt)
 		conversationGroup.POST("/modify_conversation_field", c.ModifyConversationField)
 		conversationGroup.POST("/set_conversations", c.SetConversations)
 	}
 
-	statisticsGroup := r.Group("/statistics")
+	statisticsGroup := r.Group("/statistics", ParseToken)
 	{
-		s := NewStatisticsApi(discov)
+		statisticsGroup.POST("/user_register", u.UserRegisterCount)
-		conversationGroup.Use(mw.GinParseToken(rdb))
-		statisticsGroup.POST("/user_register", s.UserRegister)
 	}
 	return r
 }

internal/api/user.go

@@ -57,3 +57,7 @@ func (u *UserApi) GetUsersOnlineStatus(c *gin.Context) {
 		return
 	}
 }
+
+func (u *UserApi) UserRegisterCount(c *gin.Context) {
+	a2r.Call(user.UserClient.UserRegisterCount, u.Client, c)
+}

internal/msggateway/client.go

@@ -212,7 +212,7 @@ func (c *Client) PushMessage(ctx context.Context, msgData *sdkws.MsgData) error
 	} else {
 		msg.Msgs = m
 	}
-	log.ZDebug(ctx, "PushMessage", "msg", msg)
+	log.ZDebug(ctx, "PushMessage", "msg", &msg)
 	data, err := proto.Marshal(&msg)
 	if err != nil {
 		return err

internal/msgtransfer/init.go

@@ -53,6 +53,9 @@ func StartTransfer(prometheusPort int) error {
 	if err != nil {
 		return err
 	}
+	if client.CreateRpcRootNodes(config.GetServiceNames()); err != nil {
+		return err
+	}
 	client.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	msgModel := cache.NewMsgCacheModel(rdb)
 	msgDocModel := unrelation.NewMsgMongoDriver(mongo.GetDatabase())

internal/push/push_rpc_server.go

@@ -11,6 +11,7 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	pbPush "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/push"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 	"google.golang.org/grpc"
 )
 
@@ -26,7 +27,10 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 	cacheModel := cache.NewMsgCacheModel(rdb)
 	offlinePusher := NewOfflinePusher(cacheModel)
 	database := controller.NewPushDatabase(cacheModel)
-	pusher := NewPusher(client, offlinePusher, database, localcache.NewGroupLocalCache(client), localcache.NewConversationLocalCache(client))
+	groupRpcClient := rpcclient.NewGroupRpcClient(client)
+	conversationRpcClient := rpcclient.NewConversationRpcClient(client)
+	msgRpcClient := rpcclient.NewMessageRpcClient(client)
+	pusher := NewPusher(client, offlinePusher, database, localcache.NewGroupLocalCache(&groupRpcClient), localcache.NewConversationLocalCache(&conversationRpcClient), &conversationRpcClient, &groupRpcClient, &msgRpcClient)
 	var wg sync.WaitGroup
 	wg.Add(2)
 	go func() {

internal/push/push_to_client.go

@@ -30,7 +30,7 @@ type Pusher struct {
 	offlinePusher          offlinepush.OfflinePusher
 	groupLocalCache        *localcache.GroupLocalCache
 	conversationLocalCache *localcache.ConversationLocalCache
-	msgClient              *rpcclient.MessageRpcClient
+	msgRpcClient           *rpcclient.MessageRpcClient
 	conversationRpcClient  *rpcclient.ConversationRpcClient
 	groupRpcClient         *rpcclient.GroupRpcClient
 	successCount           int
@@ -39,19 +39,17 @@ type Pusher struct {
 var errNoOfflinePusher = errors.New("no offlinePusher is configured")
 
 func NewPusher(discov discoveryregistry.SvcDiscoveryRegistry, offlinePusher offlinepush.OfflinePusher, database controller.PushDatabase,
-	groupLocalCache *localcache.GroupLocalCache, conversationLocalCache *localcache.ConversationLocalCache) *Pusher {
+	groupLocalCache *localcache.GroupLocalCache, conversationLocalCache *localcache.ConversationLocalCache,
-	msgClient := rpcclient.NewMessageRpcClient(discov)
+	conversationRpcClient *rpcclient.ConversationRpcClient, groupRpcClient *rpcclient.GroupRpcClient, msgRpcClient *rpcclient.MessageRpcClient) *Pusher {
-	conversationRpcClient := rpcclient.NewConversationRpcClient(discov)
-	groupRpcClient := rpcclient.NewGroupRpcClient(discov)
 	return &Pusher{
 		discov:                 discov,
 		database:               database,
 		offlinePusher:          offlinePusher,
 		groupLocalCache:        groupLocalCache,
 		conversationLocalCache: conversationLocalCache,
-		msgClient:              &msgClient,
+		msgRpcClient:           msgRpcClient,
-		conversationRpcClient:  &conversationRpcClient,
+		conversationRpcClient:  conversationRpcClient,
-		groupRpcClient:         &groupRpcClient,
+		groupRpcClient:         groupRpcClient,
 	}
 }
 
@@ -70,7 +68,7 @@ func NewOfflinePusher(cache cache.MsgModel) offlinepush.OfflinePusher {
 
 func (p *Pusher) DeleteMemberAndSetConversationSeq(ctx context.Context, groupID string, userIDs []string) error {
 	conevrsationID := utils.GetConversationIDBySessionType(constant.SuperGroupChatType, groupID)
-	maxSeq, err := p.msgClient.GetConversationMaxSeq(ctx, conevrsationID)
+	maxSeq, err := p.msgRpcClient.GetConversationMaxSeq(ctx, conevrsationID)
 	if err != nil {
 		return err
 	}

internal/rpc/auth/auth.go

@@ -33,13 +33,16 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 	pbAuth.RegisterAuthServer(server, &authServer{
 		userRpcClient:  &userRpcClient,
 		RegisterCenter: client,
-		authDatabase:   controller.NewAuthDatabase(cache.NewMsgCacheModel(rdb), config.Config.TokenPolicy.AccessSecret, config.Config.TokenPolicy.AccessExpire),
+		authDatabase:   controller.NewAuthDatabase(cache.NewMsgCacheModel(rdb), config.Config.Secret, config.Config.TokenPolicy.Expire),
 	})
 	return nil
 }
 
 func (s *authServer) UserToken(ctx context.Context, req *pbAuth.UserTokenReq) (*pbAuth.UserTokenResp, error) {
 	resp := pbAuth.UserTokenResp{}
+	if req.Secret != config.Config.Secret {
+		return nil, errs.ErrIdentity.Wrap("secret invalid")
+	}
 	if _, err := s.userRpcClient.GetUserInfo(ctx, req.UserID); err != nil {
 		return nil, err
 	}
@@ -48,7 +51,7 @@ func (s *authServer) UserToken(ctx context.Context, req *pbAuth.UserTokenReq) (*
 		return nil, err
 	}
 	resp.Token = token
-	resp.ExpireTimeSeconds = config.Config.TokenPolicy.AccessExpire * 24 * 60 * 60
+	resp.ExpireTimeSeconds = config.Config.TokenPolicy.Expire * 24 * 60 * 60
 	return &resp, nil
 }
 

internal/rpc/conversation/conversaion.go

@@ -24,7 +24,6 @@ type conversationServer struct {
 	groupRpcClient                 *rpcclient.GroupRpcClient
 	conversationDatabase           controller.ConversationDatabase
 	conversationNotificationSender *notification.ConversationNotificationSender
-	msgRpcClient                   *rpcclient.MessageRpcClient
 }
 
 func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error {
@@ -43,9 +42,8 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 	groupRpcClient := rpcclient.NewGroupRpcClient(client)
 	msgRpcClient := rpcclient.NewMessageRpcClient(client)
 	pbConversation.RegisterConversationServer(server, &conversationServer{
-		conversationNotificationSender: notification.NewConversationNotificationSender(client),
+		conversationNotificationSender: notification.NewConversationNotificationSender(&msgRpcClient),
 		groupRpcClient:                 &groupRpcClient,
-		msgRpcClient:                   &msgRpcClient,
 		conversationDatabase:           controller.NewConversationDatabase(conversationDB, cache.NewConversationRedis(rdb, cache.GetDefaultOpt(), conversationDB), tx.NewGorm(db)),
 	})
 	return nil
@@ -120,7 +118,6 @@ func (c *conversationServer) SetRecvMsgOpt(ctx context.Context, req *pbConversat
 func (c *conversationServer) ModifyConversationField(ctx context.Context, req *pbConversation.ModifyConversationFieldReq) (*pbConversation.ModifyConversationFieldResp, error) {
 	resp := &pbConversation.ModifyConversationFieldResp{}
 	var err error
-	isSyncConversation := true
 	if req.Conversation.ConversationType == constant.GroupChatType {
 		groupInfo, err := c.groupRpcClient.GetGroupInfo(ctx, req.Conversation.GroupID)
 		if err != nil {
@@ -151,10 +148,6 @@ func (c *conversationServer) ModifyConversationField(ctx context.Context, req *p
 		filedMap["ex"] = req.Conversation.Ex
 	case constant.FieldAttachedInfo:
 		filedMap["attached_info"] = req.Conversation.AttachedInfo
-	case constant.FieldUnread:
-		isSyncConversation = false
-		filedMap["update_unread_count_time"] = req.Conversation.UpdateUnreadCountTime
-		filedMap["has_read_seq"] = req.Conversation.HasReadSeq
 	case constant.FieldBurnDuration:
 		filedMap["burn_duration"] = req.Conversation.BurnDuration
 	}
@@ -162,15 +155,8 @@ func (c *conversationServer) ModifyConversationField(ctx context.Context, req *p
 	if err != nil {
 		return nil, err
 	}
-
+	for _, v := range req.UserIDList {
-	if isSyncConversation {
+		c.conversationNotificationSender.ConversationChangeNotification(ctx, v)
-		for _, v := range req.UserIDList {
-			c.conversationNotificationSender.ConversationChangeNotification(ctx, v)
-		}
-	} else {
-		for _, v := range req.UserIDList {
-			c.conversationNotificationSender.ConversationUnreadChangeNotification(ctx, v, req.Conversation.ConversationID, req.Conversation.UpdateUnreadCountTime, req.Conversation.HasReadSeq)
-		}
 	}
 	return resp, nil
 }
@@ -179,7 +165,6 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbConver
 	if req.Conversation == nil {
 		return nil, errs.ErrArgs.Wrap("conversation must not be nil")
 	}
-	isSyncConversation := true
 	if req.Conversation.ConversationType == constant.GroupChatType {
 		groupInfo, err := c.groupRpcClient.GetGroupInfo(ctx, req.Conversation.GroupID)
 		if err != nil {
@@ -198,9 +183,6 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbConver
 	if req.Conversation.RecvMsgOpt != nil {
 		m["recv_msg_opt"] = req.Conversation.RecvMsgOpt.Value
 	}
-	if req.Conversation.DraftTextTime != nil {
-		m["draft_text_time"] = req.Conversation.DraftTextTime.Value
-	}
 	if req.Conversation.AttachedInfo != nil {
 		m["attached_info"] = req.Conversation.AttachedInfo.Value
 	}
@@ -231,24 +213,12 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbConver
 	if req.Conversation.BurnDuration != nil {
 		m["burn_duration"] = req.Conversation.BurnDuration.Value
 	}
-	if req.Conversation.HasReadSeq != nil && req.Conversation.UpdateUnreadCountTime != nil {
-		isSyncConversation = false
-		m["has_read_seq"] = req.Conversation.HasReadSeq.Value
-		m["update_unread_count_time"] = req.Conversation.UpdateUnreadCountTime.Value
-	}
 	err := c.conversationDatabase.SetUsersConversationFiledTx(ctx, req.UserIDs, &conversation, m)
 	if err != nil {
 		return nil, err
 	}
-
+	for _, v := range req.UserIDs {
-	if isSyncConversation {
+		c.conversationNotificationSender.ConversationChangeNotification(ctx, v)
-		for _, v := range req.UserIDs {
-			c.conversationNotificationSender.ConversationChangeNotification(ctx, v)
-		}
-	} else {
-		for _, v := range req.UserIDs {
-			c.conversationNotificationSender.ConversationUnreadChangeNotification(ctx, v, req.Conversation.ConversationID, req.Conversation.UpdateUnreadCountTime.Value, req.Conversation.HasReadSeq.Value)
-		}
 	}
 	return &pbConversation.SetConversationsResp{}, nil
 }

internal/rpc/friend/friend.go

@@ -45,7 +45,8 @@ func Start(client registry.SvcDiscoveryRegistry, server *grpc.Server) error {
 	blackDB := relation.NewBlackGorm(db)
 	friendDB := relation.NewFriendGorm(db)
 	userRpcClient := rpcclient.NewUserRpcClient(client)
-	notificationSender := notification.NewFriendNotificationSender(client, notification.WithRpcFunc(userRpcClient.GetUsersInfo))
+	msgRpcClient := rpcclient.NewMessageRpcClient(client)
+	notificationSender := notification.NewFriendNotificationSender(&msgRpcClient, notification.WithRpcFunc(userRpcClient.GetUsersInfo))
 	pbfriend.RegisterFriendServer(server, &friendServer{
 		friendDatabase:     controller.NewFriendDatabase(friendDB, relation.NewFriendRequestGorm(db), cache.NewFriendCacheRedis(rdb, friendDB, cache.GetDefaultOpt()), tx.NewGorm(db)),
 		blackDatabase:      controller.NewBlackDatabase(blackDB, cache.NewBlackCacheRedis(rdb, blackDB, cache.GetDefaultOpt())),

internal/rpc/group/group.go

@@ -48,20 +48,22 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 	if err != nil {
 		return err
 	}
-	user := rpcclient.NewUserRpcClient(client)
+	userRpcClient := rpcclient.NewUserRpcClient(client)
+	msgRpcClient := rpcclient.NewMessageRpcClient(client)
+	conversationRpcClient := rpcclient.NewConversationRpcClient(client)
 	database := controller.InitGroupDatabase(db, rdb, mongo.GetDatabase())
 	pbGroup.RegisterGroupServer(server, &groupServer{
 		GroupDatabase: database,
-		User:          user,
+		User:          userRpcClient,
-		Notification: notification.NewGroupNotificationSender(database, client, func(ctx context.Context, userIDs []string) ([]notification.CommonUser, error) {
+		Notification: notification.NewGroupNotificationSender(database, &msgRpcClient, func(ctx context.Context, userIDs []string) ([]notification.CommonUser, error) {
-			users, err := user.GetUsersInfo(ctx, userIDs)
+			users, err := userRpcClient.GetUsersInfo(ctx, userIDs)
 			if err != nil {
 				return nil, err
 			}
 			return utils.Slice(users, func(e *sdkws.UserInfo) notification.CommonUser { return e }), nil
 		}),
-		conversationRpcClient: rpcclient.NewConversationRpcClient(client),
+		conversationRpcClient: conversationRpcClient,
-		msgRpcClient:          rpcclient.NewMessageRpcClient(client),
+		msgRpcClient:          msgRpcClient,
 	})
 	return nil
 }
@@ -865,19 +867,7 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf
 	if req.GroupInfoForSet.Notification != "" {
 		num++
 		s.Notification.GroupInfoSetAnnouncementNotification(ctx, &sdkws.GroupInfoSetAnnouncementTips{Group: tips.Group, OpUser: tips.OpUser})
-		//args := &pbConversation.ModifyConversationFieldReq{
+
-		//	Conversation: &pbConversation.Conversation{
-		//		OwnerUserID:      mcontext.GetOpUserID(ctx),
-		//		ConversationID:   utils.GetConversationIDBySessionType(constant.GroupChatType, group.GroupID),
-		//		ConversationType: constant.SuperGroupChatType,
-		//		GroupID:          group.GroupID,
-		//	},
-		//	FieldType:  constant.FieldGroupAtType,
-		//	UserIDList: userIDs,
-		//}
-		//if err := s.conversationRpcClient.ModifyConversationField(ctx, args); err != nil {
-		//	log.ZWarn(ctx, "modifyConversationField failed", err, "args", args)
-		//}
 	}
 	switch len(data) - num {
 	case 0:

internal/rpc/msg/server.go

@@ -77,8 +77,8 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 		MsgDatabase:            msgDatabase,
 		ExtendMsgDatabase:      extendMsgDatabase,
 		RegisterCenter:         client,
-		GroupLocalCache:        localcache.NewGroupLocalCache(client),
+		GroupLocalCache:        localcache.NewGroupLocalCache(&groupRpcClient),
-		ConversationLocalCache: localcache.NewConversationLocalCache(client),
+		ConversationLocalCache: localcache.NewConversationLocalCache(&conversationClient),
 		friend:                 &friendRpcClient,
 		MessageLocker:          NewLockerMessage(cacheModel),
 	}

internal/rpc/user/user.go

@@ -2,6 +2,7 @@ package user
 
 import (
 	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"strings"
 	"time"
 
@@ -55,17 +56,17 @@ func Start(client registry.SvcDiscoveryRegistry, server *grpc.Server) error {
 	cache := cache.NewUserCacheRedis(rdb, userDB, cache.GetDefaultOpt())
 	database := controller.NewUserDatabase(userDB, cache, tx.NewGorm(db))
 	friendRpcClient := rpcclient.NewFriendRpcClient(client)
+	msgRpcClient := rpcclient.NewMessageRpcClient(client)
 	u := &userServer{
 		UserDatabase:       database,
 		RegisterCenter:     client,
 		friendRpcClient:    &friendRpcClient,
-		notificationSender: notification.NewFriendNotificationSender(client, notification.WithDBFunc(database.FindWithError)),
+		notificationSender: notification.NewFriendNotificationSender(&msgRpcClient, notification.WithDBFunc(database.FindWithError)),
 	}
 	pbuser.RegisterUserServer(server, u)
 	return u.UserDatabase.InitOnce(context.Background(), users)
 }
 
-// ok
 func (s *userServer) GetDesignateUsers(ctx context.Context, req *pbuser.GetDesignateUsersReq) (resp *pbuser.GetDesignateUsersResp, err error) {
 	resp = &pbuser.GetDesignateUsersResp{}
 	users, err := s.FindWithError(ctx, req.UserIDs)
@@ -79,7 +80,6 @@ func (s *userServer) GetDesignateUsers(ctx context.Context, req *pbuser.GetDesig
 	return resp, nil
 }
 
-// ok
 func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbuser.UpdateUserInfoReq) (resp *pbuser.UpdateUserInfoResp, err error) {
 	resp = &pbuser.UpdateUserInfoResp{}
 	err = tokenverify.CheckAccessV3(ctx, req.UserInfo.UserID)
@@ -105,7 +105,6 @@ func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbuser.UpdateUserI
 	return resp, nil
 }
 
-// ok
 func (s *userServer) SetGlobalRecvMessageOpt(ctx context.Context, req *pbuser.SetGlobalRecvMessageOptReq) (resp *pbuser.SetGlobalRecvMessageOptResp, err error) {
 	resp = &pbuser.SetGlobalRecvMessageOptResp{}
 	if _, err := s.FindWithError(ctx, []string{req.UserID}); err != nil {
@@ -120,7 +119,6 @@ func (s *userServer) SetGlobalRecvMessageOpt(ctx context.Context, req *pbuser.Se
 	return resp, nil
 }
 
-// ok
 func (s *userServer) AccountCheck(ctx context.Context, req *pbuser.AccountCheckReq) (resp *pbuser.AccountCheckResp, err error) {
 	resp = &pbuser.AccountCheckResp{}
 	if utils.Duplicate(req.CheckUserIDs) {
@@ -150,7 +148,6 @@ func (s *userServer) AccountCheck(ctx context.Context, req *pbuser.AccountCheckR
 	return resp, nil
 }
 
-// ok
 func (s *userServer) GetPaginationUsers(ctx context.Context, req *pbuser.GetPaginationUsersReq) (resp *pbuser.GetPaginationUsersResp, err error) {
 	var pageNumber, showNumber int32
 	if req.Pagination != nil {
@@ -164,12 +161,15 @@ func (s *userServer) GetPaginationUsers(ctx context.Context, req *pbuser.GetPagi
 	return &pbuser.GetPaginationUsersResp{Total: int32(total), Users: convert.UsersDB2Pb(users)}, err
 }
 
-// ok
 func (s *userServer) UserRegister(ctx context.Context, req *pbuser.UserRegisterReq) (resp *pbuser.UserRegisterResp, err error) {
 	resp = &pbuser.UserRegisterResp{}
 	if len(req.Users) == 0 {
 		return nil, errs.ErrArgs.Wrap("users is empty")
 	}
+	if req.Secret != config.Config.Secret {
+		log.ZDebug(ctx, "UserRegister", config.Config.Secret, req.Secret)
+		return nil, errs.ErrIdentity.Wrap("secret invalid")
+	}
 	if utils.DuplicateAny(req.Users, func(e *sdkws.UserInfo) string { return e.UserID }) {
 		return nil, errs.ErrArgs.Wrap("userID repeated")
 	}

pkg/a2r/api2rpc.go

@@ -2,6 +2,7 @@ package a2r
 
 import (
 	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/checker"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/apiresp"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
@@ -21,12 +22,9 @@ func Call[A, B, C any](
 		apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap()) // 参数错误
 		return
 	}
-	if check, ok := any(&req).(interface{ Check() error }); ok {
+	if err := checker.Validate(&req); err != nil {
-		if err := check.Check(); err != nil {
+		apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error())) // 参数校验失败
-			log.ZWarn(c, "custom check error", err, "req", req)
+		return
-			apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error())) // 参数校验失败
-			return
-		}
 	}
 	data, err := rpc(client, c, &req)
 	if err != nil {

pkg/checker/check.go

@@ -0,0 +1,14 @@
+package checker
+
+type Checker interface {
+	Check() error
+}
+
+func Validate(args any) error {
+	if checker, ok := args.(Checker); ok {
+		if err := checker.Check(); err != nil {
+			return err
+		}
+	}
+	return nil
+}

pkg/common/config/config.go

@@ -215,9 +215,9 @@ type config struct {
 	SingleMessageHasReadReceiptEnable bool   `yaml:"singleMessageHasReadReceiptEnable"`
 	RetainChatRecords                 int    `yaml:"retainChatRecords"`
 	ChatRecordsClearTime              string `yaml:"chatRecordsClearTime"`
+	Secret                            string `yaml:"secret"`
 	TokenPolicy                       struct {
-		AccessSecret string `yaml:"accessSecret"`
+		Expire int64 `yaml:"expire"`
-		AccessExpire int64  `yaml:"accessExpire"`
 	} `yaml:"tokenPolicy"`
 	MessageVerify struct {
 		FriendVerify *bool `yaml:"friendVerify"`
@@ -301,3 +301,8 @@ type notification struct {
 	ConversationChanged    NotificationConf `yaml:"conversationChanged"`
 	ConversationSetPrivate NotificationConf `yaml:"conversationSetPrivate"`
 }
+
+func GetServiceNames() []string {
+	return []string{Config.RpcRegisterName.OpenImUserName, Config.RpcRegisterName.OpenImFriendName, Config.RpcRegisterName.OpenImMsgName, Config.RpcRegisterName.OpenImPushName, Config.RpcRegisterName.OpenImMessageGatewayName,
+		Config.RpcRegisterName.OpenImGroupName, Config.RpcRegisterName.OpenImAuthName, Config.RpcRegisterName.OpenImConversationName, Config.RpcRegisterName.OpenImThirdName}
+}

pkg/common/db/controller/conversation.go

@@ -87,7 +87,7 @@ func (c *conversationDatabase) SetUsersConversationFiledTx(ctx context.Context,
 			if err != nil {
 				return err
 			}
-			cache = cache.DelConversationIDs(NotUserIDs...).DelUserConversationIDsHash(NotUserIDs...)
+			cache = cache.DelConversationIDs(NotUserIDs...).DelUserConversationIDsHash(NotUserIDs...).DelConvsersations(conversation.ConversationID, NotUserIDs...)
 		}
 		return nil
 	}); err != nil {
@@ -171,6 +171,7 @@ func (c *conversationDatabase) SetUserConversations(ctx context.Context, ownerUs
 		var conversationIDs []string
 		for _, conversation := range conversations {
 			conversationIDs = append(conversationIDs, conversation.ConversationID)
+			cache = cache.DelConvsersations(conversation.OwnerUserID, conversation.ConversationID)
 		}
 		conversationTx := c.conversationDB.NewTx(tx)
 		existConversations, err := conversationTx.Find(ctx, ownerUserID, conversationIDs)
@@ -203,7 +204,6 @@ func (c *conversationDatabase) SetUserConversations(ctx context.Context, ownerUs
 			}
 			cache = cache.DelConversationIDs(ownerUserID).DelUserConversationIDsHash(ownerUserID)
 		}
-		cache = cache.DelConvsersations(ownerUserID, existConversationIDs...)
 		return nil
 	}); err != nil {
 		return err
@@ -228,6 +228,7 @@ func (c *conversationDatabase) CreateGroupChatConversation(ctx context.Context,
 		for _, v := range notExistUserIDs {
 			conversation := relationTb.ConversationModel{ConversationType: constant.SuperGroupChatType, GroupID: groupID, OwnerUserID: v, ConversationID: conversationID}
 			conversations = append(conversations, &conversation)
+			cache = cache.DelConvsersations(v, conversationID)
 		}
 		cache = cache.DelConversationIDs(notExistUserIDs...).DelUserConversationIDsHash(notExistUserIDs...)
 		if len(conversations) > 0 {

pkg/common/db/controller/msg_test.go

@@ -19,9 +19,9 @@ import (
 
 func Test_BatchInsertChat2DB(t *testing.T) {
 	config.Config.Mongo.Address = []string{"192.168.44.128:37017"}
-	config.Config.Mongo.Timeout = 60
+	// config.Config.Mongo.Timeout = 60
 	config.Config.Mongo.Database = "openIM"
-	config.Config.Mongo.Source = "admin"
+	// config.Config.Mongo.Source = "admin"
 	config.Config.Mongo.Username = "root"
 	config.Config.Mongo.Password = "openIM123"
 	config.Config.Mongo.MaxPoolSize = 100
@@ -130,9 +130,9 @@ func Test_BatchInsertChat2DB(t *testing.T) {
 
 func GetDB() *commonMsgDatabase {
 	config.Config.Mongo.Address = []string{"192.168.44.128:37017"}
-	config.Config.Mongo.Timeout = 60
+	// config.Config.Mongo.Timeout = 60
 	config.Config.Mongo.Database = "openIM"
-	config.Config.Mongo.Source = "admin"
+	// config.Config.Mongo.Source = "admin"
 	config.Config.Mongo.Username = "root"
 	config.Config.Mongo.Password = "openIM123"
 	config.Config.Mongo.MaxPoolSize = 100

pkg/common/db/controller/storage.go

@@ -105,7 +105,6 @@ func (c *s3Database) urlName(name string) string {
 		Host:        c.url.Host,
 		Path:        c.url.Path,
 		RawPath:     c.url.RawPath,
-		OmitHost:    c.url.OmitHost,
 		ForceQuery:  c.url.ForceQuery,
 		RawQuery:    c.url.RawQuery,
 		Fragment:    c.url.Fragment,

pkg/common/db/localcache/conversation.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"sync"
 
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 )
@@ -13,7 +12,7 @@ type ConversationLocalCache struct {
 	lock                              sync.Mutex
 	superGroupRecvMsgNotNotifyUserIDs map[string]Hash
 	conversationIDs                   map[string]Hash
-	client                            *rpcclient.Conversation
+	client                            *rpcclient.ConversationRpcClient
 }
 
 type Hash struct {
@@ -21,11 +20,11 @@ type Hash struct {
 	ids  []string
 }
 
-func NewConversationLocalCache(discov discoveryregistry.SvcDiscoveryRegistry) *ConversationLocalCache {
+func NewConversationLocalCache(client *rpcclient.ConversationRpcClient) *ConversationLocalCache {
 	return &ConversationLocalCache{
 		superGroupRecvMsgNotNotifyUserIDs: make(map[string]Hash),
 		conversationIDs:                   make(map[string]Hash),
-		client:                            rpcclient.NewConversation(discov),
+		client:                            client,
 	}
 }
 

pkg/common/db/localcache/group.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"sync"
 
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/group"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
@@ -13,7 +12,7 @@ import (
 type GroupLocalCache struct {
 	lock   sync.Mutex
 	cache  map[string]GroupMemberIDsHash
-	client *rpcclient.Group
+	client *rpcclient.GroupRpcClient
 }
 
 type GroupMemberIDsHash struct {
@@ -21,8 +20,7 @@ type GroupMemberIDsHash struct {
 	userIDs        []string
 }
 
-func NewGroupLocalCache(discov discoveryregistry.SvcDiscoveryRegistry) *GroupLocalCache {
+func NewGroupLocalCache(client *rpcclient.GroupRpcClient) *GroupLocalCache {
-	client := rpcclient.NewGroup(discov)
 	return &GroupLocalCache{
 		cache:  make(map[string]GroupMemberIDsHash, 0),
 		client: client,

pkg/common/mw/check.go

@@ -26,7 +26,7 @@ func init() {
 
 func initAesKey() {
 	once.Do(func() {
-		key := md5.Sum([]byte("openim:" + config.Config.TokenPolicy.AccessSecret))
+		key := md5.Sum([]byte("openim:" + config.Config.Secret))
 		var err error
 		block, err = aes.NewCipher(key[:])
 		if err != nil {

pkg/common/mw/check_test.go

@@ -2,12 +2,11 @@ package mw
 
 import (
 	"fmt"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"testing"
 )
 
 func TestCheck(t *testing.T) {
-	config.Config.TokenPolicy.Secret = "123456"
+	// config.Config.TokenPolicy.Secret = "123456"
 
 	args := []string{"1", "2", "3"}
 

pkg/common/mw/gin.go

@@ -1,10 +1,7 @@
 package mw
 
 import (
-	"bytes"
-	"encoding/json"
 	"errors"
-	"io"
 	"net/http"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/apiresp"
@@ -19,54 +16,22 @@ import (
 	"github.com/redis/go-redis/v9"
 )
 
-type GinMwOptions func(*gin.RouterGroup)
-
-func WithRecovery() GinMwOptions {
-	return func(group *gin.RouterGroup) {
-		group.Use(gin.Recovery())
-	}
-}
-
-func WithCorsHandler() GinMwOptions {
-	return func(group *gin.RouterGroup) {
-		group.Use(CorsHandler())
-	}
-}
-
-func WithGinParseOperationID() GinMwOptions {
-	return func(group *gin.RouterGroup) {
-		group.Use(GinParseOperationID())
-	}
-}
-
-func WithGinParseToken(rdb redis.UniversalClient) GinMwOptions {
-	return func(group *gin.RouterGroup) {
-		group.Use(GinParseToken(rdb))
-	}
-}
-
-func NewRouterGroup(routerGroup *gin.RouterGroup, route string, options ...GinMwOptions) *gin.RouterGroup {
-	routerGroup = routerGroup.Group(route)
-	for _, option := range options {
-		option(routerGroup)
-	}
-	return routerGroup
-}
-
 func CorsHandler() gin.HandlerFunc {
-	return func(context *gin.Context) {
+	return func(c *gin.Context) {
-		context.Writer.Header().Set("Access-Control-Allow-Origin", "*")
+		c.Writer.Header().Set("Access-Control-Allow-Origin", "*")
-		context.Header("Access-Control-Allow-Methods", "*")
+		c.Header("Access-Control-Allow-Methods", "*")
-		context.Header("Access-Control-Allow-Headers", "*")
+		c.Header("Access-Control-Allow-Headers", "*")
-		context.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers,Cache-Control,Content-Language,Content-Type,Expires,Last-Modified,Pragma,FooBar") // 跨域关键设置 让浏览器可以解析
+		c.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers,Cache-Control,Content-Language,Content-Type,Expires,Last-Modified,Pragma,FooBar") // 跨域关键设置 让浏览器可以解析
-		context.Header("Access-Control-Max-Age", "172800")                                                                                                                                                           // 缓存请求信息 单位为秒
+		c.Header("Access-Control-Max-Age", "172800")                                                                                                                                                           // 缓存请求信息 单位为秒
-		context.Header("Access-Control-Allow-Credentials", "false")                                                                                                                                                  //  跨域请求是否需要带cookie信息 默认设置为true
+		c.Header("Access-Control-Allow-Credentials", "false")                                                                                                                                                  //  跨域请求是否需要带cookie信息 默认设置为true
-		context.Header("content-type", "application/json")                                                                                                                                                           // 设置返回格式是json
+		c.Header("content-type", "application/json")                                                                                                                                                           // 设置返回格式是json
 		//Release all option pre-requests
-		if context.Request.Method == http.MethodOptions {
+		if c.Request.Method == http.MethodOptions {
-			context.JSON(http.StatusOK, "Options Request!")
+			c.JSON(http.StatusOK, "Options Request!")
+			c.Abort()
+			return
 		}
-		context.Next()
+		c.Next()
 	}
 }
 
@@ -75,42 +40,19 @@ func GinParseOperationID() gin.HandlerFunc {
 		if c.Request.Method == http.MethodPost {
 			operationID := c.Request.Header.Get(constant.OperationID)
 			if operationID == "" {
-				body, err := io.ReadAll(c.Request.Body)
+				err := errors.New("header must have operationID")
-				if err != nil {
+				apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
-					log.ZWarn(c, "read request body error", errs.ErrArgs.Wrap("read request body error: "+err.Error()))
+				c.Abort()
-					apiresp.GinError(c, errs.ErrArgs.Wrap("read request body error: "+err.Error()))
+				return
-					c.Abort()
-					return
-				}
-				req := struct {
-					OperationID string `json:"operationID"`
-				}{}
-				if err := json.Unmarshal(body, &req); err != nil {
-					log.ZWarn(c, "json unmarshal error", errs.ErrArgs.Wrap(err.Error()))
-					apiresp.GinError(c, errs.ErrArgs.Wrap("json unmarshal error"+err.Error()))
-					c.Abort()
-					return
-				}
-				if req.OperationID == "" {
-					err := errors.New("header must have operationID")
-					log.ZWarn(c, "header must have operationID", err)
-					apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error()))
-					c.Abort()
-					return
-				}
-				c.Request.Body = io.NopCloser(bytes.NewReader(body))
-				operationID = req.OperationID
-				c.Request.Header.Set(constant.OperationID, operationID)
 			}
 			c.Set(constant.OperationID, operationID)
-			c.Next()
-			return
 		}
 		c.Next()
 	}
 }
+
 func GinParseToken(rdb redis.UniversalClient) gin.HandlerFunc {
-	dataBase := controller.NewAuthDatabase(cache.NewMsgCacheModel(rdb), config.Config.TokenPolicy.AccessSecret, config.Config.TokenPolicy.AccessExpire)
+	dataBase := controller.NewAuthDatabase(cache.NewMsgCacheModel(rdb), config.Config.Secret, config.Config.TokenPolicy.Expire)
 	return func(c *gin.Context) {
 		switch c.Request.Method {
 		case http.MethodPost:
@@ -157,6 +99,7 @@ func GinParseToken(rdb redis.UniversalClient) gin.HandlerFunc {
 				}
 			} else {
 				apiresp.GinError(c, errs.ErrTokenNotExist.Wrap())
+				c.Abort()
 				return
 			}
 			c.Set(constant.OpUserPlatform, constant.PlatformIDToName(claims.PlatformID))

pkg/common/mw/rpc_client_interceptor.go

@@ -23,7 +23,6 @@ func RpcClientInterceptor(ctx context.Context, method string, req, resp interfac
 	if ctx == nil {
 		return errs.ErrInternalServer.Wrap("call rpc request context is nil")
 	}
-	log.ZInfo(ctx, "rpc client req", "funcName", method, "req", rpcString(req), "invoker", invoker, "invoker_type", fmt.Sprintf("%T", invoker))
 	ctx, err = getRpcContext(ctx, method)
 	if err != nil {
 		return err
@@ -54,6 +53,7 @@ func RpcClientInterceptor(ctx context.Context, method string, req, resp interfac
 }
 
 func getRpcContext(ctx context.Context, method string) (context.Context, error) {
+	// ctx, _ = context.WithTimeout(ctx, time.Second*5)
 	md := metadata.Pairs()
 	if keys, _ := ctx.Value(constant.RpcCustomHeader).([]string); len(keys) > 0 {
 		for _, key := range keys {

pkg/common/mw/rpc_server_interceptor.go

@@ -3,6 +3,7 @@ package mw
 import (
 	"context"
 	"fmt"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/checker"
 	"math"
 	"runtime"
 	"strings"
@@ -92,7 +93,12 @@ func RpcServerInterceptor(ctx context.Context, req interface{}, info *grpc.Unary
 		}
 	}
 	log.ZInfo(ctx, "rpc server req", "funcName", funcName, "req", rpcString(req))
-	resp, err = handler(ctx, req)
+	resp, err = func() (interface{}, error) {
+		if err := checker.Validate(req); err != nil {
+			return nil, err
+		}
+		return handler(ctx, req)
+	}()
 	if err == nil {
 		log.ZInfo(ctx, "rpc server resp", "funcName", funcName, "resp", rpcString(resp))
 		return resp, nil

pkg/common/tokenverify/jwt_token.go

@@ -32,7 +32,7 @@ func BuildClaims(uid string, platformID int, ttl int64) Claims {
 
 func secret() jwt.Keyfunc {
 	return func(token *jwt.Token) (interface{}, error) {
-		return []byte(config.Config.TokenPolicy.AccessSecret), nil
+		return []byte(config.Config.Secret), nil
 	}
 }
 

pkg/common/tokenverify/jwt_token_test.go

@@ -9,10 +9,10 @@ import (
 )
 
 func Test_ParseToken(t *testing.T) {
-	config.Config.TokenPolicy.AccessSecret = "OpenIM_server"
+	config.Config.Secret = "OpenIM_server"
 	claims1 := BuildClaims("123456", constant.AndroidPadPlatformID, 10)
 	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims1)
-	tokenString, err := token.SignedString([]byte(config.Config.TokenPolicy.AccessSecret))
+	tokenString, err := token.SignedString([]byte(config.Config.Secret))
 	if err != nil {
 		t.Fatal(err)
 	}

pkg/discoveryregistry/discovery_register.go

@@ -20,6 +20,7 @@ type SvcDiscoveryRegistry interface {
 	Conn
 	Register(serviceName, host string, port int, opts ...grpc.DialOption) error
 	UnRegister() error
+	CreateRpcRootNodes(serviceNames []string) error
 	RegisterConf2Registry(key string, conf []byte) error
 	GetConfFromRegistry(key string) ([]byte, error)
 }

pkg/discoveryregistry/zookeeper/debug.go

@@ -1,47 +0,0 @@
-package zookeeper
-
-import (
-	"context"
-	"fmt"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
-	"google.golang.org/grpc"
-	"strings"
-)
-
-func newClientConnInterface(cc grpc.ClientConnInterface) grpc.ClientConnInterface {
-	return &clientConnInterface{cc: cc}
-}
-
-type clientConnInterface struct {
-	cc grpc.ClientConnInterface
-}
-
-func (c *clientConnInterface) callOptionToString(opts []grpc.CallOption) string {
-	arr := make([]string, 0, len(opts)+1)
-	arr = append(arr, fmt.Sprintf("opts len: %d", len(opts)))
-	for i, opt := range opts {
-		arr = append(arr, fmt.Sprintf("[%d:%T]", i, opt))
-	}
-	return strings.Join(arr, ", ")
-}
-
-func (c *clientConnInterface) Invoke(ctx context.Context, method string, args interface{}, reply interface{}, opts ...grpc.CallOption) error {
-	log.ZDebug(ctx, "grpc.ClientConnInterface.Invoke in", "method", method, "args", args, "reply", reply, "opts", c.callOptionToString(opts))
-	if err := c.cc.Invoke(ctx, method, args, reply, opts...); err != nil {
-		log.ZError(ctx, "grpc.ClientConnInterface.Invoke error", err, "method", method, "args", args, "reply", reply)
-		return err
-	}
-	log.ZDebug(ctx, "grpc.ClientConnInterface.Invoke success", "method", method, "args", args, "reply", reply)
-	return nil
-}
-
-func (c *clientConnInterface) NewStream(ctx context.Context, desc *grpc.StreamDesc, method string, opts ...grpc.CallOption) (grpc.ClientStream, error) {
-	log.ZDebug(ctx, "grpc.ClientConnInterface.NewStream in", "desc", desc, "method", method, "opts", c.callOptionToString(opts))
-	cs, err := c.cc.NewStream(ctx, desc, method, opts...)
-	if err != nil {
-		log.ZError(ctx, "grpc.ClientConnInterface.NewStream error", err, "desc", desc, "method", method, "opts", len(opts))
-		return nil, err
-	}
-	log.ZDebug(ctx, "grpc.ClientConnInterface.NewStream success", "desc", desc, "method", method, "opts", len(opts))
-	return cs, nil
-}

pkg/discoveryregistry/zookeeper/discover.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"io"
 	"strings"
-	"sync"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"github.com/pkg/errors"
 
 	"github.com/go-zookeeper/zk"
@@ -17,7 +17,7 @@ import (
 var ErrConnIsNil = errors.New("conn is nil")
 var ErrConnIsNilButLocalNotNil = errors.New("conn is nil, but local is not nil")
 
-func (s *ZkClient) watch(wg *sync.WaitGroup) {
+func (s *ZkClient) watch() {
 	for {
 		event := <-s.eventChan
 		switch event.Type {
@@ -27,12 +27,9 @@ func (s *ZkClient) watch(wg *sync.WaitGroup) {
 			s.logger.Printf("zk event: %s", event.Path)
 			l := strings.Split(event.Path, "/")
 			if len(l) > 1 {
+				serviceName := l[len(l)-1]
 				s.lock.Lock()
-				rpcName := l[len(l)-1]
+				s.flushResolverAndDeleteLocal(serviceName)
-				s.flushResolver(rpcName)
-				if len(s.localConns[rpcName]) != 0 {
-					delete(s.localConns, rpcName)
-				}
 				s.lock.Unlock()
 			}
 			s.logger.Printf("zk event handle success: %s", event.Path)
@@ -47,27 +44,26 @@ func (s *ZkClient) watch(wg *sync.WaitGroup) {
 
 func (s *ZkClient) GetConnsRemote(serviceName string) (conns []resolver.Address, err error) {
 	path := s.getPath(serviceName)
-	childNodes, _, err := s.conn.Children(path)
+	_, _, _, err = s.conn.ChildrenW(path)
-	if err != nil {
-		return nil, errors.Wrap(err, "get children error")
-	}
-	for _, child := range childNodes {
-		fullPath := path + "/" + child
-		data, _, err := s.conn.Get(fullPath)
-		if err != nil {
-			if err == zk.ErrNoNode {
-				return nil, errors.Wrap(err, "this is zk ErrNoNode")
-			}
-			return nil, errors.Wrap(err, "get children error")
-		}
-		conns = append(conns, resolver.Address{Addr: string(data), ServerName: serviceName})
-	}
-	_, _, _, err = s.conn.ChildrenW(s.getPath(serviceName))
 	if err != nil {
 		return nil, errors.Wrap(err, "children watch error")
 	}
-	if len(conns) == 0 {
+	childNodes, _, err := s.conn.Children(path)
-		return nil, fmt.Errorf("no conn for service %s, grpc server may not exist, local conn is %v, please check zookeeper server %v, path: %s", serviceName, s.localConns, s.zkServers, s.zkRoot)
+	if err != nil {
+		return nil, errors.Wrap(err, "get children error")
+	} else {
+		for _, child := range childNodes {
+			fullPath := path + "/" + child
+			data, _, err := s.conn.Get(fullPath)
+			if err != nil {
+				if err == zk.ErrNoNode {
+					return nil, errors.Wrap(err, "this is zk ErrNoNode")
+				}
+				return nil, errors.Wrap(err, "get children error")
+			}
+			log.ZDebug(context.Background(), "get conns from remote", "conn", string(data))
+			conns = append(conns, resolver.Address{Addr: string(data), ServerName: serviceName})
+		}
 	}
 	return conns, nil
 }
@@ -75,7 +71,6 @@ func (s *ZkClient) GetConnsRemote(serviceName string) (conns []resolver.Address,
 func (s *ZkClient) GetConns(ctx context.Context, serviceName string, opts ...grpc.DialOption) ([]grpc.ClientConnInterface, error) {
 	s.logger.Printf("get conns from client, serviceName: %s", serviceName)
 	s.lock.Lock()
-	defer s.lock.Unlock()
 	opts = append(s.options, opts...)
 	conns := s.localConns[serviceName]
 	if len(conns) == 0 {
@@ -83,10 +78,15 @@ func (s *ZkClient) GetConns(ctx context.Context, serviceName string, opts ...grp
 		s.logger.Printf("get conns from zk remote, serviceName: %s", serviceName)
 		conns, err = s.GetConnsRemote(serviceName)
 		if err != nil {
+			s.lock.Unlock()
 			return nil, err
 		}
+		if len(conns) == 0 {
+			return nil, fmt.Errorf("no conn for service %s, grpc server may not exist, local conn is %v, please check zookeeper server %v, path: %s", serviceName, s.localConns, s.zkServers, s.zkRoot)
+		}
 		s.localConns[serviceName] = conns
 	}
+	s.lock.Unlock()
 	var ret []grpc.ClientConnInterface
 	s.logger.Printf("get conns from zk success, serviceName: %s", serviceName)
 	for _, conn := range conns {
@@ -94,7 +94,7 @@ func (s *ZkClient) GetConns(ctx context.Context, serviceName string, opts ...grp
 		if err != nil {
 			return nil, errors.Wrap(err, fmt.Sprintf("conns dialContext error, conn: %s", conn.Addr))
 		}
-		ret = append(ret, newClientConnInterface(cc))
+		ret = append(ret, cc)
 	}
 	s.logger.Printf("dial ctx success, serviceName: %s", serviceName)
 	return ret, nil
@@ -102,11 +102,8 @@ func (s *ZkClient) GetConns(ctx context.Context, serviceName string, opts ...grp
 
 func (s *ZkClient) GetConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (grpc.ClientConnInterface, error) {
 	newOpts := append(s.options, grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, s.balancerName)))
-	cc, err := grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), append(newOpts, opts...)...)
+	s.logger.Printf("get conn from client, serviceName: %s", serviceName)
-	if err != nil {
+	return grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), append(newOpts, opts...)...)
-		return nil, err
-	}
-	return newClientConnInterface(cc), nil
 }
 
 func (s *ZkClient) CloseConn(conn grpc.ClientConnInterface) {

pkg/discoveryregistry/zookeeper/register.go

@@ -8,6 +8,15 @@ import (
 	"google.golang.org/grpc/resolver"
 )
 
+func (s *ZkClient) CreateRpcRootNodes(serviceNames []string) error {
+	for _, serviceName := range serviceNames {
+		if err := s.ensureName(serviceName); err != nil && err != zk.ErrNodeExists {
+			return err
+		}
+	}
+	return nil
+}
+
 func (s *ZkClient) Register(rpcRegisterName, host string, port int, opts ...grpc.DialOption) error {
 	if err := s.ensureName(rpcRegisterName); err != nil {
 		return err

pkg/discoveryregistry/zookeeper/resolver.go

@@ -17,8 +17,8 @@ type Resolver struct {
 	getConnsRemote func(serviceName string) (conns []resolver.Address, err error)
 }
 
-func (r *Resolver) ResolveNow(o resolver.ResolveNowOptions) {
+func (r *Resolver) ResolveNowZK(o resolver.ResolveNowOptions) {
-	log.ZDebug(context.Background(), "start resolve now", "target", r.target)
+	log.ZDebug(context.Background(), "start resolve now", "target", r.target, "cc", r.cc.UpdateState, "serviceName", strings.TrimLeft(r.target.URL.Path, "/"))
 	newConns, err := r.getConnsRemote(strings.TrimLeft(r.target.URL.Path, "/"))
 	if err != nil {
 		log.ZError(context.Background(), "resolve now error", err, "target", r.target)
@@ -26,24 +26,30 @@ func (r *Resolver) ResolveNow(o resolver.ResolveNowOptions) {
 	}
 	r.addrs = newConns
 	if err := r.cc.UpdateState(resolver.State{Addresses: newConns}); err != nil {
-		log.ZError(context.Background(), "UpdateState error", err, "conns", newConns)
+		log.ZError(context.Background(), "UpdateState error, conns is nil from svr", err, "conns", newConns, "zk path", r.target.URL.Path)
+		return
 	}
 	log.ZDebug(context.Background(), "resolve now finished", "target", r.target, "conns", r.addrs)
 }
 
+func (r *Resolver) ResolveNow(o resolver.ResolveNowOptions) {}
+
 func (s *Resolver) Close() {}
 
 func (s *ZkClient) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) {
-	s.logger.Printf("build resolver: %+v, cc: %+v", target, cc)
+	s.logger.Printf("build resolver: %+v, cc: %+v", target, cc.UpdateState)
+	// log.ZDebug(context.Background(), "build resolver start", "target", target, "cc", cc.UpdateState)
 	r := &Resolver{}
 	r.target = target
 	r.cc = cc
 	r.getConnsRemote = s.GetConnsRemote
-	r.ResolveNow(resolver.ResolveNowOptions{})
+	r.ResolveNowZK(resolver.ResolveNowOptions{})
 	s.lock.Lock()
 	defer s.lock.Unlock()
-	s.resolvers[strings.TrimLeft(target.URL.Path, "/")] = r
+	serviceName := strings.TrimLeft(target.URL.Path, "/")
-	s.logger.Printf("build resolver finished: %+v, cc: %+v", target, cc)
+	s.resolvers[serviceName] = r
+	s.logger.Printf("build resolver finished: %+v, cc: %+v, key: %s", target, cc.UpdateState, serviceName)
+	// log.ZDebug(context.Background(), "build resolver finished", "target", target, "cc", cc.UpdateState, "serviceName", serviceName)
 	return r, nil
 }
 

pkg/discoveryregistry/zookeeper/zk.go

@@ -38,7 +38,7 @@ type ZkClient struct {
 	options []grpc.DialOption
 
 	resolvers    map[string]*Resolver
-	localConns   map[string][]resolver.Address //msg gateway
+	localConns   map[string][]resolver.Address
 	balancerName string
 
 	logger Logger
@@ -114,9 +114,8 @@ func NewClient(zkServers []string, zkRoot string, options ...ZkOption) (*ZkClien
 		return nil, err
 	}
 	resolver.Register(client)
-	var wg sync.WaitGroup
+	go client.refresh()
-	go client.refresh(&wg)
+	go client.watch()
-	go client.watch(&wg)
 	return client, nil
 }
 
@@ -138,7 +137,7 @@ func (s *ZkClient) ensureAndCreate(node string) error {
 	return nil
 }
 
-func (s *ZkClient) refresh(wg *sync.WaitGroup) {
+func (s *ZkClient) refresh() {
 	for range s.ticker.C {
 		s.logger.Printf("refresh local conns")
 		s.lock.Lock()
@@ -149,16 +148,20 @@ func (s *ZkClient) refresh(wg *sync.WaitGroup) {
 			delete(s.localConns, rpcName)
 		}
 		s.lock.Unlock()
+		s.logger.Printf("refresh local conns success")
 	}
+}
 
+func (s *ZkClient) flushResolverAndDeleteLocal(serviceName string) {
+	s.logger.Printf("start flush %s", serviceName)
+	s.flushResolver(serviceName)
+	delete(s.localConns, serviceName)
 }
 
 func (s *ZkClient) flushResolver(serviceName string) {
-	s.logger.Printf("start flush")
 	r, ok := s.resolvers[serviceName]
 	if ok {
-		r.ResolveNow(resolver.ResolveNowOptions{})
+		r.ResolveNowZK(resolver.ResolveNowOptions{})
-		s.resolvers[serviceName] = r
 	}
 }
 
@@ -197,8 +200,3 @@ func (s *ZkClient) AddOption(opts ...grpc.DialOption) {
 func (s *ZkClient) GetClientLocalConns() map[string][]resolver.Address {
 	return s.localConns
 }
-
-type FakeLock struct{}
-
-func (s *FakeLock) Lock()   {}
-func (s *FakeLock) Unlock() {}

pkg/proto/auth/auth.pb.go

@@ -29,8 +29,9 @@ type UserTokenReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	PlatformID int32  `protobuf:"varint,1,opt,name=platformID,proto3" json:"platformID"`
+	Secret     string `protobuf:"bytes,1,opt,name=secret,proto3" json:"secret"`
-	UserID     string `protobuf:"bytes,2,opt,name=userID,proto3" json:"userID"`
+	PlatformID int32  `protobuf:"varint,2,opt,name=platformID,proto3" json:"platformID"`
+	UserID     string `protobuf:"bytes,3,opt,name=userID,proto3" json:"userID"`
 }
 
 func (x *UserTokenReq) Reset() {
@@ -65,6 +66,13 @@ func (*UserTokenReq) Descriptor() ([]byte, []int) {
 	return file_auth_auth_proto_rawDescGZIP(), []int{0}
 }
 
+func (x *UserTokenReq) GetSecret() string {
+	if x != nil {
+		return x.Secret
+	}
+	return ""
+}
+
 func (x *UserTokenReq) GetPlatformID() int32 {
 	if x != nil {
 		return x.PlatformID
@@ -342,52 +350,54 @@ var File_auth_auth_proto protoreflect.FileDescriptor
 var file_auth_auth_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x12, 0x11, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e,
-	0x61, 0x75, 0x74, 0x68, 0x22, 0x46, 0x0a, 0x0c, 0x75, 0x73, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65,
+	0x61, 0x75, 0x74, 0x68, 0x22, 0x5e, 0x0a, 0x0c, 0x75, 0x73, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65,
-	0x6e, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d,
+	0x6e, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x01,
-	0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x1e, 0x0a, 0x0a,
-	0x72, 0x6d, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x02,
+	0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x22, 0x53, 0x0a, 0x0d,
+	0x52, 0x0a, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06,
-	0x75, 0x73, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a,
+	0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73,
-	0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f,
+	0x65, 0x72, 0x49, 0x44, 0x22, 0x53, 0x0a, 0x0d, 0x75, 0x73, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65,
-	0x6b, 0x65, 0x6e, 0x12, 0x2c, 0x0a, 0x11, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x54, 0x69, 0x6d,
+	0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02,
-	0x65, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x11,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x2c, 0x0a, 0x11, 0x65,
-	0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64,
-	0x73, 0x22, 0x48, 0x0a, 0x0e, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74,
-	0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x49,
-	0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72,
-	0x6d, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x22, 0x11, 0x0a, 0x0f, 0x66,
-	0x6f, 0x72, 0x63, 0x65, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x25,
-	0x0a, 0x0d, 0x70, 0x61, 0x72, 0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x12,
-	0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
-	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0x72, 0x0a, 0x0e, 0x70, 0x61, 0x72, 0x73, 0x65, 0x54, 0x6f,
-	0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49,
-	0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x12,
-	0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x2c, 0x0a, 0x11, 0x65,
 	0x78, 0x70, 0x69, 0x72, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x11, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x54, 0x69,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x11, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x54, 0x69,
-	0x6d, 0x65, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x32, 0xff, 0x01, 0x0a, 0x04, 0x41, 0x75,
+	0x6d, 0x65, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x22, 0x48, 0x0a, 0x0e, 0x66, 0x6f, 0x72,
-	0x74, 0x68, 0x12, 0x4e, 0x0a, 0x09, 0x75, 0x73, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12,
+	0x63, 0x65, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x70,
-	0x1f, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x61,
+	0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x75, 0x74, 0x68, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71,
+	0x0a, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x75,
-	0x1a, 0x20, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e,
+	0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65,
-	0x61, 0x75, 0x74, 0x68, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65,
+	0x72, 0x49, 0x44, 0x22, 0x11, 0x0a, 0x0f, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x4c, 0x6f, 0x67, 0x6f,
-	0x73, 0x70, 0x12, 0x54, 0x0a, 0x0b, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x4c, 0x6f, 0x67, 0x6f, 0x75,
+	0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x25, 0x0a, 0x0d, 0x70, 0x61, 0x72, 0x73, 0x65, 0x54,
-	0x74, 0x12, 0x21, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
+	0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e,
-	0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x4c, 0x6f, 0x67, 0x6f, 0x75,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0x72, 0x0a,
-	0x74, 0x52, 0x65, 0x71, 0x1a, 0x22, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72,
+	0x0e, 0x70, 0x61, 0x72, 0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x76, 0x65, 0x72, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x4c, 0x6f,
+	0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x51, 0x0a, 0x0a, 0x70, 0x61, 0x72, 0x73,
+	0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66,
-	0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x20, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53,
+	0x6f, 0x72, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66,
-	0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x70, 0x61, 0x72, 0x73, 0x65,
+	0x6f, 0x72, 0x6d, 0x12, 0x2c, 0x0a, 0x11, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x54, 0x69, 0x6d,
-	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x1a, 0x21, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49,
+	0x65, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x11,
-	0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x70, 0x61, 0x72,
+	0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64,
-	0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x42, 0x34, 0x5a, 0x32, 0x67,
+	0x73, 0x32, 0xff, 0x01, 0x0a, 0x04, 0x41, 0x75, 0x74, 0x68, 0x12, 0x4e, 0x0a, 0x09, 0x75, 0x73,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d,
+	0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1f, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d,
-	0x53, 0x44, 0x4b, 0x2f, 0x4f, 0x70, 0x65, 0x6e, 0x2d, 0x49, 0x4d, 0x2d, 0x53, 0x65, 0x72, 0x76,
+	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x75, 0x73, 0x65, 0x72,
-	0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x61, 0x75, 0x74,
+	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x1a, 0x20, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49,
-	0x68, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x75, 0x73, 0x65,
+	0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x54, 0x0a, 0x0b, 0x66, 0x6f,
+	0x72, 0x63, 0x65, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x12, 0x21, 0x2e, 0x4f, 0x70, 0x65, 0x6e,
+	0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x66, 0x6f,
+	0x72, 0x63, 0x65, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x22, 0x2e, 0x4f,
+	0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x61, 0x75, 0x74, 0x68,
+	0x2e, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x51, 0x0a, 0x0a, 0x70, 0x61, 0x72, 0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x20,
+	0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x61, 0x75,
+	0x74, 0x68, 0x2e, 0x70, 0x61, 0x72, 0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71,
+	0x1a, 0x21, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e,
+	0x61, 0x75, 0x74, 0x68, 0x2e, 0x70, 0x61, 0x72, 0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52,
+	0x65, 0x73, 0x70, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x44, 0x4b, 0x2f, 0x4f, 0x70, 0x65, 0x6e,
+	0x2d, 0x49, 0x4d, 0x2d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (

pkg/proto/auth/auth.proto

@@ -4,37 +4,38 @@ option go_package = "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/auth";
 
 
 message userTokenReq {
-    int32  platformID = 1;
+  string secret = 1;
-    string userID = 2;
+  int32  platformID = 2;
+  string userID = 3;
 }
 message userTokenResp {
-    string token = 2;
+  string token = 2;
-    int64  expireTimeSeconds = 3;
+  int64  expireTimeSeconds = 3;
 }
 
 message forceLogoutReq {
-    int32  platformID = 1;
+  int32  platformID = 1;
-    string userID = 2;
+  string userID = 2;
 }
 message forceLogoutResp {
 }
 
 message parseTokenReq{
-    string token = 1;
+  string token = 1;
 }
 message parseTokenResp{
-    string userID = 1;
+  string userID = 1;
-    string platform = 2;
+  string platform = 2;
-    int64 expireTimeSeconds = 4;
+  int64 expireTimeSeconds = 4;
 }
 
 service Auth {
-    //生成token
+  //生成token
-    rpc userToken(userTokenReq) returns(userTokenResp);
+  rpc userToken(userTokenReq) returns(userTokenResp);
-    //强制退出登录
+  //强制退出登录
-    rpc forceLogout(forceLogoutReq) returns(forceLogoutResp);
+  rpc forceLogout(forceLogoutReq) returns(forceLogoutResp);
-    //解析token
+  //解析token
-    rpc parseToken(parseTokenReq)returns(parseTokenResp);
+  rpc parseToken(parseTokenReq)returns(parseTokenResp);
 }
 
 

pkg/proto/conversation/conversation.proto

@@ -10,18 +10,14 @@ message Conversation{
   int32 conversationType = 4;
   string userID = 5;
   string groupID = 6;
-  int32 unreadCount = 7;
+  bool isPinned = 7;
-  int64 draftTextTime = 8;
+  string attachedInfo = 8;
-  bool isPinned = 9;
+  bool isPrivateChat = 9;
-  string attachedInfo = 10;
+  int32 groupAtType = 10;
-  bool isPrivateChat = 11;
+  string ex = 11;
-  int32 groupAtType = 12;
+  int32 burnDuration = 12;
-  string ex = 13;
+  int64 minSeq = 13;
-  int64  updateUnreadCountTime = 14;
+  int64 maxSeq = 14;
-  int32 burnDuration = 15;
-  int64 minSeq = 16;
-  int64 maxSeq = 17;
-  int64 hasReadSeq = 18;
 }
 
 message ConversationReq{
@@ -30,17 +26,14 @@ message ConversationReq{
   string userID = 3;
   string groupID = 4;
   OpenIMServer.protobuf.Int32Value recvMsgOpt = 5;
-  OpenIMServer.protobuf.Int64Value draftTextTime = 6;
+  OpenIMServer.protobuf.BoolValue isPinned = 6;
-  OpenIMServer.protobuf.BoolValue isPinned = 7;
+  OpenIMServer.protobuf.StringValue attachedInfo = 7;
-  OpenIMServer.protobuf.StringValue attachedInfo = 8;
+  OpenIMServer.protobuf.BoolValue isPrivateChat = 8;
-  OpenIMServer.protobuf.BoolValue isPrivateChat = 9;
+  OpenIMServer.protobuf.StringValue ex = 9;
-  OpenIMServer.protobuf.StringValue ex = 10;
+  OpenIMServer.protobuf.Int32Value burnDuration = 10;
-  OpenIMServer.protobuf.Int64Value updateUnreadCountTime = 11;
+  OpenIMServer.protobuf.Int64Value minSeq = 11;
-  OpenIMServer.protobuf.Int32Value burnDuration = 12;
+  OpenIMServer.protobuf.Int64Value maxSeq = 12;
-  OpenIMServer.protobuf.Int64Value minSeq = 13;
+  OpenIMServer.protobuf.Int32Value groupAtType = 13;
-  OpenIMServer.protobuf.Int64Value maxSeq = 14;
-  OpenIMServer.protobuf.Int64Value hasReadSeq = 15;
-  OpenIMServer.protobuf.Int32Value groupAtType = 16;
 }
 
 message ModifyConversationFieldReq{
@@ -95,13 +88,11 @@ message GetAllConversationsResp{
 }
 
 message BatchSetConversationsReq{
-  repeated Conversation Conversations = 1;
+  repeated Conversation conversations = 1;
   string ownerUserID = 2;
 }
 
 message BatchSetConversationsResp{
-  repeated string success = 1;
-  repeated string failed = 2;
 }
 
 message GetRecvMsgNotNotifyUserIDsReq {

pkg/proto/user/user.pb.go

@@ -1267,7 +1267,8 @@ type UserRegisterReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Users []*sdkws.UserInfo `protobuf:"bytes,1,rep,name=users,proto3" json:"users"`
+	Secret string            `protobuf:"bytes,1,opt,name=secret,proto3" json:"secret"`
+	Users  []*sdkws.UserInfo `protobuf:"bytes,2,rep,name=users,proto3" json:"users"`
 }
 
 func (x *UserRegisterReq) Reset() {
@@ -1302,6 +1303,13 @@ func (*UserRegisterReq) Descriptor() ([]byte, []int) {
 	return file_user_user_proto_rawDescGZIP(), []int{24}
 }
 
+func (x *UserRegisterReq) GetSecret() string {
+	if x != nil {
+		return x.Secret
+	}
+	return ""
+}
+
 func (x *UserRegisterReq) GetUsers() []*sdkws.UserInfo {
 	if x != nil {
 		return x.Users
@@ -1761,98 +1769,99 @@ var file_user_user_proto_rawDesc = []byte{
 	0x74, 0x61, 0x6c, 0x12, 0x32, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03,
 	0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65,
 	0x72, 0x2e, 0x73, 0x64, 0x6b, 0x77, 0x73, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f,
-	0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x45, 0x0a, 0x0f, 0x75, 0x73, 0x65, 0x72, 0x52,
+	0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x5d, 0x0a, 0x0f, 0x75, 0x73, 0x65, 0x72, 0x52,
-	0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x32, 0x0a, 0x05, 0x75, 0x73,
+	0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65,
-	0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x4f, 0x70, 0x65, 0x6e,
+	0x63, 0x72, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x65, 0x63, 0x72,
-	0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x73, 0x64, 0x6b, 0x77, 0x73, 0x2e, 0x55,
+	0x65, 0x74, 0x12, 0x32, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
-	0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x12,
+	0x0b, 0x32, 0x1c, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65,
+	0x2e, 0x73, 0x64, 0x6b, 0x77, 0x73, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52,
-	0x73, 0x70, 0x22, 0x34, 0x0a, 0x1a, 0x67, 0x65, 0x74, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x52,
+	0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x12, 0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x52, 0x65,
-	0x65, 0x63, 0x76, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x52, 0x65, 0x71,
+	0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x22, 0x34, 0x0a, 0x1a, 0x67, 0x65,
-	0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x74, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x52, 0x65, 0x63, 0x76, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x22, 0x49, 0x0a, 0x1b, 0x67, 0x65, 0x74, 0x47,
+	0x67, 0x65, 0x4f, 0x70, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72,
-	0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x52, 0x65, 0x63, 0x76, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44,
-	0x4f, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2a, 0x0a, 0x10, 0x67, 0x6c, 0x6f, 0x62, 0x61,
+	0x22, 0x49, 0x0a, 0x1b, 0x67, 0x65, 0x74, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x52, 0x65, 0x63,
-	0x6c, 0x52, 0x65, 0x63, 0x76, 0x4d, 0x73, 0x67, 0x4f, 0x70, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x76, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x05, 0x52, 0x10, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x52, 0x65, 0x63, 0x76, 0x4d, 0x73, 0x67,
+	0x2a, 0x0a, 0x10, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x52, 0x65, 0x63, 0x76, 0x4d, 0x73, 0x67,
-	0x4f, 0x70, 0x74, 0x22, 0x3e, 0x0a, 0x14, 0x75, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73,
+	0x4f, 0x70, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x67, 0x6c, 0x6f, 0x62, 0x61,
-	0x74, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x73,
+	0x6c, 0x52, 0x65, 0x63, 0x76, 0x4d, 0x73, 0x67, 0x4f, 0x70, 0x74, 0x22, 0x3e, 0x0a, 0x14, 0x75,
-	0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72,
+	0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74,
-	0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03,
+	0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01,
-	0x65, 0x6e, 0x64, 0x22, 0xb2, 0x01, 0x0a, 0x15, 0x75, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69,
+	0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64,
-	0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x22, 0xb2, 0x01, 0x0a, 0x15,
-	0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x74, 0x6f,
+	0x75, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e,
-	0x74, 0x61, 0x6c, 0x12, 0x49, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x03,
+	0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x01,
-	0x28, 0x0b, 0x32, 0x33, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x49, 0x0a, 0x05, 0x63,
-	0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73,
+	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x4f, 0x70, 0x65,
-	0x74, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x43, 0x6f, 0x75,
+	0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x75,
-	0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x1a, 0x38,
+	0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74,
-	0x0a, 0x0a, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
+	0x52, 0x65, 0x73, 0x70, 0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
+	0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x1a, 0x38, 0x0a, 0x0a, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x45,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76,
+	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x32, 0x9f, 0x07, 0x0a, 0x04, 0x75, 0x73, 0x65,
+	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x72, 0x12, 0x66, 0x0a, 0x11, 0x67, 0x65, 0x74, 0x44, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74,
+	0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x65, 0x55, 0x73, 0x65, 0x72, 0x73, 0x12, 0x27, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53,
+	0x32, 0x9f, 0x07, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x66, 0x0a, 0x11, 0x67, 0x65, 0x74,
-	0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x67, 0x65, 0x74, 0x44, 0x65,
+	0x44, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x73, 0x12, 0x27,
-	0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x1a,
+	0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73,
-	0x28, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x75,
+	0x65, 0x72, 0x2e, 0x67, 0x65, 0x74, 0x44, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x65, 0x55,
-	0x73, 0x65, 0x72, 0x2e, 0x67, 0x65, 0x74, 0x44, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x65,
+	0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x28, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d,
-	0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x5d, 0x0a, 0x0e, 0x75, 0x70, 0x64,
+	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x67, 0x65, 0x74, 0x44,
-	0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x2e, 0x4f, 0x70,
+	0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x12, 0x5d, 0x0a, 0x0e, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49,
+	0x6e, 0x66, 0x6f, 0x12, 0x24, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76,
+	0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73,
+	0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x1a, 0x25, 0x2e, 0x4f, 0x70, 0x65, 0x6e,
+	0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x75, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x78, 0x0a, 0x17, 0x73, 0x65, 0x74, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x52, 0x65, 0x63,
+	0x76, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x12, 0x2d, 0x2e, 0x4f, 0x70,
 	0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e,
-	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
+	0x73, 0x65, 0x74, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x52, 0x65, 0x63, 0x76, 0x4d, 0x65, 0x73,
-	0x71, 0x1a, 0x25, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
+	0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x2e, 0x2e, 0x4f, 0x70, 0x65,
-	0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72,
+	0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73,
-	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x78, 0x0a, 0x17, 0x73, 0x65, 0x74, 0x47,
+	0x65, 0x74, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x52, 0x65, 0x63, 0x76, 0x4d, 0x65, 0x73, 0x73,
-	0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x52, 0x65, 0x63, 0x76, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x78, 0x0a, 0x17, 0x67, 0x65,
-	0x4f, 0x70, 0x74, 0x12, 0x2d, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76,
+	0x74, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x52, 0x65, 0x63, 0x76, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x74, 0x47, 0x6c, 0x6f, 0x62, 0x61,
+	0x67, 0x65, 0x4f, 0x70, 0x74, 0x12, 0x2d, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65,
-	0x6c, 0x52, 0x65, 0x63, 0x76, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x52,
+	0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x67, 0x65, 0x74, 0x47, 0x6c, 0x6f,
-	0x65, 0x71, 0x1a, 0x2e, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65,
+	0x62, 0x61, 0x6c, 0x52, 0x65, 0x63, 0x76, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70,
-	0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x74, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c,
+	0x74, 0x52, 0x65, 0x71, 0x1a, 0x2e, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72,
-	0x52, 0x65, 0x63, 0x76, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x52, 0x65,
+	0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x67, 0x65, 0x74, 0x47, 0x6c, 0x6f, 0x62,
-	0x73, 0x70, 0x12, 0x78, 0x0a, 0x17, 0x67, 0x65, 0x74, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x52,
+	0x61, 0x6c, 0x52, 0x65, 0x63, 0x76, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74,
-	0x65, 0x63, 0x76, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x12, 0x2d, 0x2e,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x57, 0x0a, 0x0c, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43,
+	0x68, 0x65, 0x63, 0x6b, 0x12, 0x22, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72,
+	0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x1a, 0x23, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49,
+	0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x61, 0x63, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x69, 0x0a,
+	0x12, 0x67, 0x65, 0x74, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x55, 0x73,
+	0x65, 0x72, 0x73, 0x12, 0x28, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76,
+	0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x67, 0x65, 0x74, 0x50, 0x61, 0x67, 0x69, 0x6e,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x29, 0x2e,
 	0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65,
-	0x72, 0x2e, 0x67, 0x65, 0x74, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x52, 0x65, 0x63, 0x76, 0x4d,
+	0x72, 0x2e, 0x67, 0x65, 0x74, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x55,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x2e, 0x2e, 0x4f,
+	0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x57, 0x0a, 0x0c, 0x75, 0x73, 0x65, 0x72,
+	0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x12, 0x22, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49,
+	0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65,
+	0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x1a, 0x23, 0x2e, 0x4f,
 	0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72,
-	0x2e, 0x67, 0x65, 0x74, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x52, 0x65, 0x63, 0x76, 0x4d, 0x65,
+	0x2e, 0x75, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x57, 0x0a, 0x0c,
+	0x70, 0x12, 0x57, 0x0a, 0x0c, 0x67, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x49,
-	0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x22, 0x2e, 0x4f,
+	0x44, 0x12, 0x22, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72,
+	0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x67, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x55, 0x73, 0x65, 0x72,
-	0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x71,
+	0x49, 0x44, 0x52, 0x65, 0x71, 0x1a, 0x23, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65,
-	0x1a, 0x23, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e,
+	0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x67, 0x65, 0x74, 0x41, 0x6c, 0x6c,
-	0x75, 0x73, 0x65, 0x72, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x68, 0x65, 0x63,
+	0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x52, 0x65, 0x73, 0x70, 0x12, 0x66, 0x0a, 0x11, 0x75, 0x73,
-	0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x69, 0x0a, 0x12, 0x67, 0x65, 0x74, 0x50, 0x61, 0x67, 0x69,
+	0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12,
-	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x55, 0x73, 0x65, 0x72, 0x73, 0x12, 0x28, 0x2e, 0x4f, 0x70,
+	0x27, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x75,
-	0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e,
+	0x73, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72,
-	0x67, 0x65, 0x74, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x55, 0x73, 0x65,
+	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x28, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49,
-	0x72, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x29, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65,
+	0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x67, 0x65, 0x74, 0x50, 0x61, 0x67,
+	0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65,
-	0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70,
+	0x73, 0x70, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x12, 0x57, 0x0a, 0x0c, 0x75, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72,
+	0x2f, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x44, 0x4b, 0x2f, 0x4f, 0x70, 0x65, 0x6e, 0x2d,
-	0x12, 0x22, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e,
+	0x49, 0x4d, 0x2d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72,
-	0x75, 0x73, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65,
+	0x6f, 0x74, 0x6f, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x72, 0x52, 0x65, 0x71, 0x1a, 0x23, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72,
-	0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67,
-	0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x57, 0x0a, 0x0c, 0x67, 0x65, 0x74,
-	0x41, 0x6c, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x12, 0x22, 0x2e, 0x4f, 0x70, 0x65, 0x6e,
-	0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x67, 0x65,
-	0x74, 0x41, 0x6c, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x52, 0x65, 0x71, 0x1a, 0x23, 0x2e,
-	0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65,
-	0x72, 0x2e, 0x67, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x66, 0x0a, 0x11, 0x75, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74,
-	0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x27, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d,
-	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72,
-	0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71,
-	0x1a, 0x28, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e,
-	0x75, 0x73, 0x65, 0x72, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65,
-	0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x4d, 0x53,
-	0x44, 0x4b, 0x2f, 0x4f, 0x70, 0x65, 0x6e, 0x2d, 0x49, 0x4d, 0x2d, 0x53, 0x65, 0x72, 0x76, 0x65,
-	0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x75, 0x73, 0x65, 0x72,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pkg/proto/user/user.proto

@@ -119,7 +119,8 @@ message getPaginationUsersResp{
 }
 
 message userRegisterReq {
-  repeated sdkws.UserInfo users = 1;
+  string secret = 1;
+  repeated sdkws.UserInfo users = 2;
 }
 message userRegisterResp {
 }

pkg/rpcclient/conversation.go

@@ -7,13 +7,12 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation"
 	pbConversation "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation"
 	"google.golang.org/grpc"
 )
 
 type Conversation struct {
-	Client conversation.ConversationClient
+	Client pbConversation.ConversationClient
 	conn   grpc.ClientConnInterface
 	discov discoveryregistry.SvcDiscoveryRegistry
 }
@@ -23,7 +22,7 @@ func NewConversation(discov discoveryregistry.SvcDiscoveryRegistry) *Conversatio
 	if err != nil {
 		panic(err)
 	}
-	client := conversation.NewConversationClient(conn)
+	client := pbConversation.NewConversationClient(conn)
 	return &Conversation{discov: discov, conn: conn, Client: client}
 }
 

pkg/rpcclient/msg.go

@@ -161,10 +161,9 @@ func WithLocalSendMsg(sendMsg func(ctx context.Context, req *msg.SendMsgReq) (*m
 	}
 }
 
-func WithDiscov(discov discoveryregistry.SvcDiscoveryRegistry) NewNotificationSenderOptions {
+func WithRpcClient(msgRpcClient *MessageRpcClient) NewNotificationSenderOptions {
 	return func(s *NotificationSender) {
-		rpcClient := NewMessageRpcClient(discov)
+		s.sendMsg = msgRpcClient.SendMsg
-		s.sendMsg = rpcClient.SendMsg
 	}
 }
 

pkg/rpcclient/notification/conevrsation.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 )
@@ -13,8 +12,8 @@ type ConversationNotificationSender struct {
 	*rpcclient.NotificationSender
 }
 
-func NewConversationNotificationSender(client discoveryregistry.SvcDiscoveryRegistry) *ConversationNotificationSender {
+func NewConversationNotificationSender(msgRpcClient *rpcclient.MessageRpcClient) *ConversationNotificationSender {
-	return &ConversationNotificationSender{rpcclient.NewNotificationSender(rpcclient.WithDiscov(client))}
+	return &ConversationNotificationSender{rpcclient.NewNotificationSender(rpcclient.WithRpcClient(msgRpcClient))}
 }
 
 // SetPrivate调用

pkg/rpcclient/notification/friend.go

@@ -2,13 +2,13 @@ package notification
 
 import (
 	"context"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
 	relationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	pbFriend "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/friend"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
@@ -62,9 +62,9 @@ func WithRpcFunc(fn func(ctx context.Context, userIDs []string) ([]*sdkws.UserIn
 	}
 }
 
-func NewFriendNotificationSender(client discoveryregistry.SvcDiscoveryRegistry, opts ...friendNotificationSenderOptions) *FriendNotificationSender {
+func NewFriendNotificationSender(msgRpcClient *rpcclient.MessageRpcClient, opts ...friendNotificationSenderOptions) *FriendNotificationSender {
 	f := &FriendNotificationSender{
-		NotificationSender: rpcclient.NewNotificationSender(rpcclient.WithDiscov(client)),
+		NotificationSender: rpcclient.NewNotificationSender(rpcclient.WithRpcClient(msgRpcClient)),
 	}
 	for _, opt := range opts {
 		opt(f)

pkg/rpcclient/notification/group.go

@@ -9,7 +9,6 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
 	pbGroup "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/group"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
@@ -17,9 +16,9 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
 )
 
-func NewGroupNotificationSender(db controller.GroupDatabase, sdr discoveryregistry.SvcDiscoveryRegistry, fn func(ctx context.Context, userIDs []string) ([]CommonUser, error)) *GroupNotificationSender {
+func NewGroupNotificationSender(db controller.GroupDatabase, msgRpcClient *rpcclient.MessageRpcClient, fn func(ctx context.Context, userIDs []string) ([]CommonUser, error)) *GroupNotificationSender {
 	return &GroupNotificationSender{
-		NotificationSender: rpcclient.NewNotificationSender(rpcclient.WithDiscov(sdr)),
+		NotificationSender: rpcclient.NewNotificationSender(rpcclient.WithRpcClient(msgRpcClient)),
 		getUsersInfo:       fn,
 		db:                 db,
 	}

pkg/rpcclient/user.go

@@ -3,6 +3,7 @@ package rpcclient
 import (
 	"context"
 	"strings"
+	"time"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/tokenverify"
@@ -21,7 +22,8 @@ type User struct {
 }
 
 func NewUser(discov discoveryregistry.SvcDiscoveryRegistry) *User {
-	conn, err := discov.GetConn(context.Background(), config.Config.RpcRegisterName.OpenImUserName)
+	ctx, _ := context.WithTimeout(context.Background(), time.Second*3)
+	conn, err := discov.GetConn(ctx, config.Config.RpcRegisterName.OpenImUserName)
 	if err != nil {
 		panic(err)
 	}

script/batch_build_all_service.sh

@@ -1,18 +1,4 @@
 #!/usr/bin/env bash
-# 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.
-
 
 source ./style_info.cfg
 source ./path_info.cfg

script/batch_start_all.sh

@@ -1,22 +1,8 @@
 #!/usr/bin/env bash
-# Copyright © 2023 OpenIM. All rights reserved.
+#fixme This script is the total startup script
-#
+#fixme The full name of the shell script that needs to be started is placed in the need_to_start_server_shell array
-# 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.
 
-#fixme This scripts is the total startup scripts
+#fixme Put the shell script name here
-#fixme The full name of the shell scripts that needs to be started is placed in the need_to_start_server_shell array
-
-#fixme Put the shell scripts name here
 need_to_start_server_shell=(
   start_rpc_service.sh
   msg_gateway_start.sh
@@ -70,3 +56,5 @@ if [ $success_num == ${#need_to_start_server_shell[*]} ]
 then
   echo -e ${YELLOW_PREFIX}"all services build success"${COLOR_SUFFIX}
 fi
+
+

script/build_all_service.sh

@@ -1,18 +1,4 @@
 #!/usr/bin/env bash
-# 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.
-
 
 source ./style_info.cfg
 source ./path_info.cfg

script/build_images.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+image=openim/open_im_server:v1.0.5
+rm Open-IM-Server -rf
+git clone https://github.com/OpenIMSDK/Open-IM-Server.git --recursive
+cd Open-IM-Server
+git checkout tuoyun
+cd cmd/Open-IM-SDK-Core/
+git checkout tuoyun
+cd ../../
+docker build -t  $image . -f deploy.Dockerfile
+docker push $image

script/build_push_k8s_images.sh

@@ -1,18 +1,4 @@
 #!/usr/bin/env bash
-# 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.
-
 version=errcode
 repository=${1}
 if [[ -z ${repository} ]]

script/check_all.sh

@@ -1,18 +1,4 @@
 #!/usr/bin/env bash
-# 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.
-
 
 source ./style_info.cfg
 source ./path_info.cfg
@@ -20,7 +6,6 @@ source ./function.sh
 service_port_name=(
   openImWsPort
   openImApiPort
-  #openImSdkWsPort
   openImUserPort
   openImFriendPort
   openImMessagePort

script/docker_check_service.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+echo "docker-compose ps..........................."
+docker-compose ps
+
+echo "check OpenIM, waiting 30s...................."
+sleep 60
+
+echo "check OpenIM................................"
+./check_all.sh
+# chmod +x ./enterprise/*.sh
+# ./enterprise/check_all.sh
+

script/docker_start_all.sh

@@ -1,22 +1,8 @@
 #!/usr/bin/env bash
-# Copyright © 2023 OpenIM. All rights reserved.
+#fixme This script is the total startup script
-#
+#fixme The full name of the shell script that needs to be started is placed in the need_to_start_server_shell array
-# 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.
 
-#fixme This scripts is the total startup scripts
+#fixme Put the shell script name here
-#fixme The full name of the shell scripts that needs to be started is placed in the need_to_start_server_shell array
-
-#fixme Put the shell scripts name here
 need_to_start_server_shell=(
   start_rpc_service.sh
   msg_gateway_start.sh

script/enterprise/check_all.sh

@@ -1,18 +1,4 @@
 #!/usr/bin/env bash
-# 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.
-
 
 source ./style_info.cfg
 source ./enterprise/path_info.cfg

script/enterprise/function.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+#input:[10023,2323,3434]
+#output:10023 2323 3434
+list_to_string(){
+ports_list=$*
+sub_s1=`echo $ports_list | sed 's/ //g'`
+sub_s2=${sub_s1//,/ }
+sub_s3=${sub_s2#*[}
+sub_s4=${sub_s3%]*}
+ports_array=$sub_s4
+}
+remove_space(){
+  value=$*
+  result=`echo $value | sed 's/ //g'`
+}

script/env_check.sh

@@ -1,18 +1,4 @@
 #!/usr/bin/env bash
-# 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.
-
 source ./style_info.cfg
 
 echo -e "check time synchronize.................................."

script/function.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+#input:[10023,2323,3434]
+#output:10023 2323 3434
+list_to_string(){
+ports_list=$*
+sub_s1=`echo $ports_list | sed 's/ //g'`
+sub_s2=${sub_s1//,/ }
+sub_s3=${sub_s2#*[}
+sub_s4=${sub_s3%]*}
+ports_array=$sub_s4
+}
+remove_space(){
+  value=$*
+  result=`echo $value | sed 's/ //g'`
+}

script/init_pwd.sh

@@ -1,17 +1,3 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 echo "your user is:$USER"
 echo "your password is:$PASSWORD"
 echo "your minio endPoint is:$MINIO_ENDPOINT"

script/mongo-init.sh

@@ -0,0 +1,12 @@
+mongo -- "$MONGO_INITDB_DATABASE" <<EOF
+db = db.getSiblingDB('admin')
+db.auth('$MONGO_INITDB_ROOT_USERNAME', '$MONGO_INITDB_ROOT_PASSWORD')
+db = db.getSiblingDB('$MONGO_INITDB_DATABASE')
+db.createUser({
+  user: "$MONGO_USERNAME",
+  pwd: "$MONGO_PASSWORD",
+  roles: [
+  { role: 'root', db: '$MONGO_INITDB_DATABASE' }
+  ]
+})
+EOF

script/msg_gateway_start.sh

@@ -1,18 +1,4 @@
 #!/usr/bin/env bash
-# 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.
-
 #Include shell font styles and some basic information
 source ./style_info.cfg
 source ./path_info.cfg

script/msg_transfer_start.sh

@@ -1,18 +1,4 @@
 #!/usr/bin/env bash
-# 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.
-
 #Include shell font styles and some basic information
 source ./style_info.cfg
 source ./path_info.cfg

script/push_start.sh

@@ -1,18 +1,4 @@
 #!/usr/bin/env bash
-# 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.
-
 #Include shell font styles and some basic information
 source ./style_info.cfg
 source ./path_info.cfg

script/sdk_svr_start.sh

@@ -1,18 +1,4 @@
 #!/usr/bin/env bash
-# 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.
-
 #Include shell font styles and some basic information
 source ./style_info.cfg
 source ./path_info.cfg

script/start_all.sh

@@ -1,27 +1,13 @@
 #!/usr/bin/env bash
-# Copyright © 2023 OpenIM. All rights reserved.
+#fixme This script is the total startup script
-#
+#fixme The full name of the shell script that needs to be started is placed in the need_to_start_server_shell array
-# 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.
 
-#fixme This scripts is the total startup scripts
+#fixme Put the shell script name here
-#fixme The full name of the shell scripts that needs to be started is placed in the need_to_start_server_shell array
-
-#fixme Put the shell scripts name here
 need_to_start_server_shell=(
   start_rpc_service.sh
   push_start.sh
   msg_transfer_start.sh
-  sdk_svr_start.sh
+#  sdk_svr_start.sh
   msg_gateway_start.sh
   start_cron.sh
 )

script/start_cron.sh

@@ -1,18 +1,4 @@
 #!/usr/bin/env bash
-# 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.
-
 #Include shell font styles and some basic information
 source ./style_info.cfg
 source ./path_info.cfg

script/start_rpc_service.sh

@@ -1,18 +1,4 @@
 #!/usr/bin/env bash
-# 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.
-
 
 source ./style_info.cfg
 source ./path_info.cfg

script/stop_all.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+#fixme This script is to stop the service
+
+source ./style_info.cfg
+source ./path_info.cfg
+
+
+for i in ${service_names[*]}; do
+  #Check whether the service exists
+  name="ps -aux |grep -w $i |grep -v grep"
+  count="${name}| wc -l"
+  if [ $(eval ${count}) -gt 0 ]; then
+    pid="${name}| awk '{print \$2}'"
+    echo -e "${SKY_BLUE_PREFIX}Killing service:$i pid:$(eval $pid)${COLOR_SUFFIX}"
+    #kill the service that existed
+    kill -9 $(eval $pid)
+    echo -e "${SKY_BLUE_PREFIX}service:$i was killed ${COLOR_SUFFIX}"
+  fi
+done

scripts/build_images.sh

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-# 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.
-
-image=openim/open_im_server:v1.0.5
-rm Open-IM-Server -rf
-git clone https://github.com/OpenIMSDK/Open-IM-Server.git --recursive
-cd Open-IM-Server
-git checkout tuoyun
-cd cmd/Open-IM-SDK-Core/
-git checkout tuoyun
-cd ../../
-docker build -t  $image . -f deploy.Dockerfile
-docker push $image

scripts/docker_check_service.sh

@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# 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.
-
-echo "docker-compose ps..........................."
-docker-compose ps
-
-echo "check OpenIM, waiting 30s...................."
-sleep 60
-
-echo "check OpenIM................................"
-./check_all.sh
-# chmod +x ./enterprise/*.sh
-# ./enterprise/check_all.sh
-

scripts/enterprise/function.sh

@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-# 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.
-
-#input:[10023,2323,3434]
-#output:10023 2323 3434
-list_to_string(){
-ports_list=$*
-sub_s1=`echo $ports_list | sed 's/ //g'`
-sub_s2=${sub_s1//,/ }
-sub_s3=${sub_s2#*[}
-sub_s4=${sub_s3%]*}
-ports_array=$sub_s4
-}
-remove_space(){
-  value=$*
-  result=`echo $value | sed 's/ //g'`
-}