Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release

# Conflicts:
#	cmd/Open-IM-SDK-Core

cmd/open_im_api/main.go

@@ -3,11 +3,11 @@ package main
 import (
 	_ "Open_IM/cmd/open_im_api/docs"
 	apiAuth "Open_IM/internal/api/auth"
-	apiChat "Open_IM/internal/api/chat"
 	"Open_IM/internal/api/conversation"
 	"Open_IM/internal/api/friend"
 	"Open_IM/internal/api/group"
 	"Open_IM/internal/api/manage"
+	apiChat "Open_IM/internal/api/msg"
 	"Open_IM/internal/api/office"
 	"Open_IM/internal/api/organization"
 	apiThird "Open_IM/internal/api/third"
@@ -131,6 +131,7 @@ func main() {
 		thirdGroup.POST("/get_download_url", apiThird.GetDownloadURL)
 		thirdGroup.POST("/get_rtc_invitation_info", apiThird.GetRTCInvitationInfo)
 		thirdGroup.POST("/get_rtc_invitation_start_app", apiThird.GetRTCInvitationInfoStartApp)
+		thirdGroup.POST("/fcm_update_token", apiThird.FcmUpdateToken)
 	}
 	//Message
 	chatGroup := r.Group("/msg")
@@ -139,14 +140,12 @@ func main() {
 		chatGroup.POST("/send_msg", apiChat.SendMsg)
 		chatGroup.POST("/pull_msg_by_seq", apiChat.PullMsgBySeqList)
 		chatGroup.POST("/del_msg", apiChat.DelMsg)
+		chatGroup.POST("/del_super_group_msg", apiChat.DelSuperGroupMsg)
 		chatGroup.POST("/clear_msg", apiChat.ClearMsg)
 		chatGroup.POST("/manage_send_msg", manage.ManagementSendMsg)
 		chatGroup.POST("/batch_send_msg", manage.ManagementBatchSendMsg)
-	}
+		chatGroup.POST("/check_msg_is_send_success", manage.CheckMsgIsSendSuccess)
-	//Manager
+		chatGroup.POST("/set_msg_min_seq", apiChat.SetMsgMinSeq)
-	managementGroup := r.Group("/manager")
-	{
-		managementGroup.POST("/delete_user", manage.DeleteUser) //1
 	}
 	//Conversation
 	conversationGroup := r.Group("/conversation")

cmd/open_im_demo/main.go

@@ -50,6 +50,7 @@ func main() {
 	}
 	address = config.Config.CmsApi.ListenIP + ":" + strconv.Itoa(*ginPort)
 	fmt.Println("start demo api server address: ", address)
+	go register.OnboardingProcessRoutine()
 	err := r.Run(address)
 	if err != nil {
 		log.Error("", "run failed ", *ginPort, err.Error())

cmd/rpc/open_im_msg/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	rpcChat "Open_IM/internal/rpc/msg"
+	"Open_IM/internal/rpc/msg"
 	"Open_IM/pkg/common/config"
 	"flag"
 	"fmt"
@@ -12,6 +12,6 @@ func main() {
 	rpcPort := flag.Int("port", defaultPorts[0], "rpc listening port")
 	flag.Parse()
 	fmt.Println("start msg rpc server, port: ", *rpcPort)
-	rpcServer := rpcChat.NewRpcChatServer(*rpcPort)
+	rpcServer := msg.NewRpcChatServer(*rpcPort)
 	rpcServer.Run()
 }

config/config.yaml

@@ -2,7 +2,7 @@
 # The class cannot be named by Pascal or camel case.
 # If it is not used, the corresponding structure will not be set,
 # and it will not be read naturally.
-serverversion: 2.0.0
+serverversion: 2.3.0-rc2
 #---------------Infrastructure configuration---------------------#
 etcd:
   etcdSchema: openim  #默认即可
@@ -38,6 +38,7 @@ redis:
   dbMaxIdle: 128
   dbMaxActive: 0
   dbIdleTimeout: 120
+  dbUserName:     #only redis version 6.0+ need username
   dbPassWord: openIM #redis密码 建议修改
   enableCluster: false #如果外部redis以集群方式启动，需要打开此开关
 
@@ -117,6 +118,7 @@ credential: #腾讯cos，发送图片、视频、文件时需要，请自行申
     endpointInnerEnable: true #是否启用minio内网地址 启用可以让桶初始化，IM server连接minio走内网地址访问
     accessKeyID: user12345
     secretAccessKey: key12345
+    storageTime: 50 #文件在minio中保存的时间
   ali: # ali oss
     regionID: "oss-cn-beijing"
     accessKeyID: ""
@@ -128,7 +130,8 @@ credential: #腾讯cos，发送图片、视频、文件时需要，请自行申
     stsDurationSeconds: 3600
     OssRoleArn: "acs:ram::xxx:role/xxx"
 
-
+dtm:
+  serverURL: 127.0.0.1:10007
 
 rpcport: #rpc服务端口 默认即可
   openImUserPort: [ 10110 ]
@@ -158,9 +161,9 @@ rpcport: #rpc服务端口 默认即可
 rpcregistername: #rpc注册服务名，默认即可
   openImUserName: User
   openImFriendName: Friend
-  openImOfflineMessageName: OfflineMessage
+  openImMsgName: Msg
   openImPushName: Push
-  openImOnlineMessageRelayName: OnlineMessageRelay
+  openImRelayName: Relay
   openImGroupName: Group
   openImAuthName: Auth
   openImStatisticsName: Statistics
@@ -174,7 +177,7 @@ rpcregistername: #rpc注册服务名，默认即可
 log:
   storageLocation: ../logs/
   rotationTime: 24
-  remainRotationCount: 3 #日志数量
+  remainRotationCount: 2 #日志数量
   #日志级别 6表示全都打印，测试阶段建议设置为6
   remainLogLevel: 6
   elasticSearchSwitch: false
@@ -209,12 +212,15 @@ push:
     pushUrl: "https://api.jpush.cn/v3/push"
     pushIntent: "intent:#Intent;component=io.openim.app.enterprisechat/io.openim.app.enterprisechat.MainActivity;end"
     enable: true
-  getui:  #个推推送，暂未测试 暂不要使用
+  getui:  #个推推送
     pushUrl: "https://restapi.getui.com/v2/$appId"
     masterSecret: ""
     appKey: ""
     intent: ""
     enable: false
+  fcm:  #firebase cloud message 消息推送
+    serviceAccount: "openim-5c6c0-firebase-adminsdk-ppwol-8765884a78.json" #帐号文件，此处需要改修配置，并且这个文件放在 config目录下
+    enable: false
 
 
 
@@ -229,7 +235,7 @@ secret: tuoyun
 # 1：多平台登录：Android、iOS、Windows、Mac 每种平台只能一个在线，web端可以多个同时在线
 multiloginpolicy: 1
 
-#chat log insert to db
+#msg log insert to db
 chatpersistencemysql: true
 #可靠性存储
 reliablestorage: false
@@ -295,6 +301,15 @@ callback:
     enable: false
     callbackTimeOut: 2
     callbackFailedContinue: true # 回调超时是否继续离线推送
+  callbackOnlinePush:
+    enable: false
+    callbackTimeOut: 2
+    callbackFailedContinue: true # 回调超时是否继续离线推送
+  callbackSuperGroupOnlinePush:
+    enable: false
+    callbackTimeOut: 2
+    callbackFailedContinue: true # 回调超时是否继续离线推送
+
 
 notification:
   groupCreated:
@@ -343,7 +358,7 @@ notification:
       desc: "memberQuit desc"
       ext: "memberQuit ext"
     defaultTips:
-      tips: "quit group chat"  # group info changed by xx
+      tips: "quit group msg"  # group info changed by xx
 
   groupApplicationAccepted:
     conversation:
@@ -631,7 +646,7 @@ notification:
   #####################conversation#########################
   conversationOptUpdate:
     conversation:
-      reliabilityLevel: 2
+      reliabilityLevel: 1
       unreadCount: false
       offlinePush:
         switch: true
@@ -706,6 +721,7 @@ demo:
   superCode: 666666 #超级验证码，建议修改掉，收不到短信验证码时可以用此替代
   #  second
   codeTTL: 60
+  useSuperCode: true
   mail: #仅支持qq邮箱，具体操作参考 https://service.mail.qq.com/cgi-bin/help?subtype=1&id=28&no=1001256 必须修改
     title: "openIM"
     senderMail: "765567899@qq.com"

deploy_k8s/admin_cms/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: admin-cms
-          image: openim/admin_cms:v2.1.0
+          image: openim/admin_cms:v2.2.0
           # imagePullPolicy: Always #每次启动都重新拉取镜像
           ports:
             - containerPort: 10200

deploy_k8s/api/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: api
-        image: openim/api:v2.1.0
+        image: openim/api:v2.2.0
         # imagePullPolicy: Always
         ports:
         - containerPort: 10002

deploy_k8s/auth/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: auth
-        image: openim/auth:v2.1.0
+        image: openim/auth:v2.2.0
         # imagePullPolicy: Always
         ports:
         - containerPort: 10160

deploy_k8s/build_push_all_images.sh

@@ -2,7 +2,7 @@
 source ./path_info.cfg
 
 # images version
-version=v2.1.0
+version=v2.2.0
 git pull
 cd ../script/; ./build_all_service.sh
 cd ../deploy_k8s/

deploy_k8s/cache/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: cache
-        image: openim/cache:v2.1.0
+        image: openim/cache:v2.2.0
         # imagePullPolicy: Always
         ports:
         - containerPort: 10240

deploy_k8s/cms_api/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: cms-api
-        image: openim/cms_api:v2.1.0
+        image: openim/cms_api:v2.2.0
         imagePullPolicy: Always
         ports:
         - containerPort: 10006

deploy_k8s/conversation/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: conversation
-          image: openim/conversation:v2.1.0
+          image: openim/conversation:v2.2.0
           # imagePullPolicy: Always
           ports:
             - containerPort: 10230

deploy_k8s/demo/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: demo
-        image: openim/demo:v2.1.0
+        image: openim/demo:v2.2.0
         imagePullPolicy: Always
         ports:
         - containerPort: 10004

deploy_k8s/friend/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: friend
-        image: openim/friend:v2.1.0
+        image: openim/friend:v2.2.0
         # imagePullPolicy: Always
         ports:
         - containerPort: 10120

deploy_k8s/group/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: group
-        image: openim/group:v2.1.0
+        image: openim/group:v2.2.0
         # imagePullPolicy: Always
         ports:
         - containerPort: 10150

deploy_k8s/ingress.yaml

@@ -48,6 +48,12 @@ kind: Ingress
 metadata:
   annotations:
     kubernetes.io/ingress.class: "nginx"
+    nginx.ingress.kubernetes.io/Access-Control-Allow-Origin: '*'
+    nginx.ingress.kubernetes.io/cors-allow-headers: DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization,x-auth-token,Pagination
+    nginx.ingress.kubernetes.io/cors-allow-methods: 'PUT, GET, POST, OPTIONS'
+    nginx.ingress.kubernetes.io/cors-allow-origin: '*'
+    nginx.ingress.kubernetes.io/enable-cors: 'true'
+    nginx.ingress.kubernetes.io/service-weight: ''
   name: api-ingress
 spec:
   rules:
@@ -67,6 +73,12 @@ kind: Ingress
 metadata:
   annotations:
     kubernetes.io/ingress.class: "nginx"
+    nginx.ingress.kubernetes.io/Access-Control-Allow-Origin: '*'
+    nginx.ingress.kubernetes.io/cors-allow-headers: DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization,x-auth-token,Pagination
+    nginx.ingress.kubernetes.io/cors-allow-methods: 'PUT, GET, POST, OPTIONS'
+    nginx.ingress.kubernetes.io/cors-allow-origin: '*'
+    nginx.ingress.kubernetes.io/enable-cors: 'true'
+    nginx.ingress.kubernetes.io/service-weight: ''
   name: demo-ingress
 spec:
   rules:
@@ -86,6 +98,12 @@ kind: Ingress
 metadata:
   annotations:
     kubernetes.io/ingress.class: "nginx"
+    nginx.ingress.kubernetes.io/Access-Control-Allow-Origin: '*'
+    nginx.ingress.kubernetes.io/cors-allow-headers: DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization,x-auth-token,Pagination
+    nginx.ingress.kubernetes.io/cors-allow-methods: 'PUT, GET, POST, OPTIONS'
+    nginx.ingress.kubernetes.io/cors-allow-origin: '*'
+    nginx.ingress.kubernetes.io/enable-cors: 'true'
+    nginx.ingress.kubernetes.io/service-weight: ''
   name: cms-api-ingress
 spec:
   rules:

deploy_k8s/message_cms/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: message-cms
-        image: openim/message_cms:v2.1.0
+        image: openim/message_cms:v2.2.0
         # imagePullPolicy: Always
         ports:
         - containerPort: 10190

deploy_k8s/msg/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: msg
-        image: openim/msg:v2.1.0
+        image: openim/msg:v2.2.0
         # imagePullPolicy: Always
         ports:
         - containerPort: 10130

deploy_k8s/msg_gateway/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: msg-gateway
-        image: openim/msg_gateway:v2.1.0
+        image: openim/msg_gateway:v2.2.0
         # imagePullPolicy: Always
         ports:
         - name: rpc-port

deploy_k8s/msg_transfer/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: msg-transfer
-        image: openim/msg_transfer:v2.1.0
+        image: openim/msg_transfer:v2.2.0
         # imagePullPolicy: Always
         volumeMounts:
           - name: config

deploy_k8s/office/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: office
-        image: openim/office:v2.1.0
+        image: openim/office:v2.2.0
         # imagePullPolicy: Always
         ports:
         - containerPort: 10210

deploy_k8s/organization/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: organization
-        image: openim/organization:v2.1.0
+        image: openim/organization:v2.2.0
         # imagePullPolicy: Always
         ports:
         - containerPort: 10220

deploy_k8s/push/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: push
-        image: openim/push:v2.1.0
+        image: openim/push:v2.2.0
         # imagePullPolicy: Always
         ports:
         - containerPort: 10170

deploy_k8s/sdk_server/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: sdk-server
-        image: openim/sdk_server:v2.1.0
+        image: openim/sdk_server:v2.2.0
         # imagePullPolicy: Always
         ports:
         - containerPort: 10003

deploy_k8s/statistics/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: statistics
-        image: openim/statistics:v2.1.0
+        image: openim/statistics:v2.2.0
         # imagePullPolicy: Always
         ports:
         - containerPort: 10180

deploy_k8s/user/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: user
-        image: openim/user:v2.1.0
+        image: openim/user:v2.2.0
         # imagePullPolicy: Always
         volumeMounts:
           - name: config

docker-compose-mongos.yaml

@@ -0,0 +1,139 @@
+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
+      - ./script:/Open-IM-Server/script
+    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

@@ -0,0 +1,113 @@
+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

@@ -25,16 +25,16 @@ services:
       - ./components/mongodb/data/db:/data/db
       - ./components/mongodb/data/logs:/data/logs
       - ./components/mongodb/data/conf:/etc/mongo
-#      - ./script/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh
+    #      - ./script/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh
     environment:
       - TZ=Asia/Shanghai
       # cache
       - wiredTigerCacheSizeGB=1
-#      - MONGO_USERNAME=openIM
+    #      - MONGO_USERNAME=openIM
-#      - MONGO_PASSWORD=openIM
+    #      - MONGO_PASSWORD=openIM
-#      - MONGO_INITDB_ROOT_USERNAME=root
+    #      - MONGO_INITDB_ROOT_USERNAME=root
-#      - MONGO_INITDB_ROOT_PASSWORD=root
+    #      - MONGO_INITDB_ROOT_PASSWORD=root
-#      - MONGO_INITDB_DATABASE=openIM
+    #      - MONGO_INITDB_DATABASE=openIM
     restart: always
 
   redis:
@@ -71,7 +71,7 @@ services:
     container_name: kafka
     restart: always
     ports:
-     - 9092:9092
+      - 9092:9092
     environment:
       TZ: Asia/Shanghai
       KAFKA_BROKER_ID: 0
@@ -112,9 +112,21 @@ services:
       MINIO_ROOT_PASSWORD: key12345
     restart: always
     command: minio server /data --console-address ':9090'
+  #
+  #  dtm:
+  #    image: yedf/dtm
+  #    ports:
+  #      - 36789:36789
+  #      - 36790:36790
+  #    environment:
+  #      STORE_DRIVER: mysql
+  #      STORE_HOST: localhost
+  #      STORE_USER: root
+  #      STORE_PASSWORD: ''
+  #      STORE_PORT: 3306
 
   open_im_server:
-    image: openim/open_im_server:v2.2.0
+    image: openim/open_im_server:v2.3.0-rc2
     container_name: open_im_server
     volumes:
       - ./logs:/Open-IM-Server/logs

go.mod

@@ -3,6 +3,8 @@ module Open_IM
 go 1.15
 
 require (
+	cloud.google.com/go/firestore v1.6.1 // indirect
+	firebase.google.com/go v3.13.0+incompatible
 	github.com/Shopify/sarama v1.32.0
 	github.com/alibabacloud-go/darabonba-openapi v0.1.11
 	github.com/alibabacloud-go/dysmsapi-20170525/v2 v2.0.8
@@ -10,25 +12,22 @@ require (
 	github.com/alibabacloud-go/tea v1.1.17
 	github.com/antonfisher/nested-logrus-formatter v1.3.0
 	github.com/bwmarrin/snowflake v0.3.0
+	github.com/dtm-labs/rockscache v0.0.11
 	github.com/fatih/structs v1.1.0
 	github.com/gin-gonic/gin v1.8.1
 	github.com/go-openapi/spec v0.20.6 // indirect
 	github.com/go-openapi/swag v0.21.1 // indirect
 	github.com/go-playground/validator/v10 v10.11.0
 	github.com/go-redis/redis/v8 v8.11.5
-	github.com/go-sql-driver/mysql v1.6.0 // indirect
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang-jwt/jwt/v4 v4.1.0
 	github.com/golang/protobuf v1.5.2
 	github.com/gorilla/websocket v1.4.2
 	github.com/jinzhu/copier v0.3.4
 	github.com/jinzhu/gorm v1.9.16
-	github.com/jinzhu/now v1.1.3 // indirect
 	github.com/jonboulle/clockwork v0.2.2 // indirect
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
 	github.com/lestrrat-go/strftime v1.0.4 // indirect
-	github.com/lib/pq v1.2.0 // indirect
-	github.com/mattn/go-sqlite3 v1.14.6 // indirect
 	github.com/minio/minio-go/v7 v7.0.22
 	github.com/mitchellh/mapstructure v1.4.2
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
@@ -47,12 +46,15 @@ require (
 	go.etcd.io/etcd/api/v3 v3.5.4
 	go.etcd.io/etcd/client/v3 v3.5.4
 	go.mongodb.org/mongo-driver v1.8.3
+	go.uber.org/atomic v1.9.0 // indirect
+	go.uber.org/multierr v1.7.0 // indirect
+	go.uber.org/zap v1.19.1 // indirect
 	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
 	golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb
 	golang.org/x/net v0.0.0-20220622184535-263ec571b305
 	golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664 // indirect
 	golang.org/x/tools v0.1.11 // indirect
-	google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71 // indirect
+	google.golang.org/api v0.59.0
 	google.golang.org/grpc v1.45.0
 	google.golang.org/protobuf v1.28.0
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
@@ -60,6 +62,8 @@ require (
 	gopkg.in/ini.v1 v1.66.2 // indirect
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
 	gopkg.in/yaml.v3 v3.0.1
+	gorm.io/driver/mysql v1.3.5
+	gorm.io/gorm v1.23.8
 )
 
 replace github.com/Shopify/sarama => github.com/Shopify/sarama v1.29.0

go.sum

@@ -1,6 +1,56 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
+cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
+cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
+cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
+cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
+cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
+cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
+cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
+cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY=
+cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM=
+cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY=
+cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ=
+cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
+cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
+cloud.google.com/go v0.97.0 h1:3DXvAyifywvq64LfkKaMOmkWPS1CikIQdMe2lY9vxU8=
+cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
+cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
+cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
+cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/firestore v1.6.1 h1:8rBq3zRjnHx8UtBvaOWqBB1xq9jH6/wltfQLlTMh2Fw=
+cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
+cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
+cloud.google.com/go/storage v1.10.0 h1:STgFzyU5/8miMl0//zKh2aQeTyeaUH3WN9bSUiJ09bA=
+cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+firebase.google.com/go v3.13.0+incompatible h1:3TdYC3DDi6aHn20qoRkxwGqNgdjtblwVAyRLQwGn/+4=
+firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIwjt8toICdV5Wh9ptHs=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
@@ -49,6 +99,8 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd
 github.com/antonfisher/nested-logrus-formatter v1.3.0 h1:8zixYquU1Odk+vzAaAQPAdRh1ZjmUXNQ1T+dUBvlhVo=
 github.com/antonfisher/nested-logrus-formatter v1.3.0/go.mod h1:6WTfyWFkBc9+zyBaKIqRrg/KwMqBbodBjgbHjDz7zjA=
 github.com/aws/aws-sdk-go v1.38.3/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
+github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
+github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
@@ -65,6 +117,7 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
 github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
@@ -80,10 +133,11 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM=
 github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+github.com/dtm-labs/rockscache v0.0.11 h1:V6M+KH9fFRFDXgB+Uux1d6zwhZt1O34sgPwM0wjud9Y=
+github.com/dtm-labs/rockscache v0.0.11/go.mod h1:vJmJJmuBNxcio03abYk1QPLmmQo/Kg92jB+28QmLcgY=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/eapache/go-resiliency v1.2.0 h1:v7g92e/KSN71Rq7vSThKaWIq68fL4YHvWyiUKorFR1Q=
@@ -95,12 +149,12 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y=
 github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
@@ -120,6 +174,9 @@ github.com/gin-gonic/gin v1.7.4/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjX
 github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
 github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8=
 github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
@@ -167,15 +224,27 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt/v4 v4.1.0 h1:XUgk2Ex5veyVFVeLm0xhusUTQybEbexJXrvPNOKkSY0=
 github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
-github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
+github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
+github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
@@ -185,26 +254,59 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.2.1 h1:d8MncMlErDFTwQGBK1xhv026j9kqhvw1Qv9IbWT1VLQ=
+github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
+github.com/googleapis/gax-go/v2 v2.1.1 h1:dp3bWCh+PPO1zjRRiCSczJav13sBvG4UhNyVTa1KqdU=
+github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
@@ -217,7 +319,10 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
 github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8=
 github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
@@ -238,8 +343,9 @@ github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBef
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/jinzhu/now v1.1.3 h1:PlHq1bSCSZL9K0wUhbm2pGLoTWs2GwVhsP6emvGV/ZI=
+github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/jinzhu/now v1.1.3/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
+github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
@@ -253,6 +359,8 @@ github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
@@ -286,8 +394,8 @@ github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECae
 github.com/lestrrat-go/strftime v1.0.4 h1:T1Rb9EPkAhgxKqbcMIPguPq8glqXTA1koF8n9BHElA8=
 github.com/lestrrat-go/strftime v1.0.4/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
 github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
+github.com/lithammer/shortuuid v3.0.0+incompatible h1:NcD0xWW/MZYXEHa6ITy6kaXN5nwm/V115vj2YXfhS0w=
-github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lithammer/shortuuid v3.0.0+incompatible/go.mod h1:FR74pbAuElzOUuenUHTK2Tciko1/vKuIKS9dSkDrA4w=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
@@ -297,8 +405,6 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
-github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg=
-github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/minio/md5-simd v1.1.0 h1:QPfiOqlZH+Cj9teu0t9b1nTBfPbyTl16Of5MeuShdK4=
 github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw=
@@ -378,6 +484,7 @@ github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqn
 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo=
 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5/go.mod h1:GEXHk5HgEKCvEIIrSpFI3ozzG5xOKA2DVlEX/gGnewM=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
@@ -443,8 +550,10 @@ github.com/xdg/scram v1.0.3/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49
 github.com/xdg/stringprep v1.0.3/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.30/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
@@ -457,17 +566,31 @@ go.etcd.io/etcd/client/v3 v3.5.4 h1:p83BUL3tAYS0OT/r0qglgc3M1JjhM0diV8DSWAhVXv4=
 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
 go.mongodb.org/mongo-driver v1.8.3 h1:TDKlTkGDKm9kkJVUOAXDK5/fkqKHJVwYQSpoRfB43R4=
 go.mongodb.org/mongo-driver v1.8.3/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
+go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
+go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/goleak v1.1.11-0.20210813005559-691160354723 h1:sHOAIxRGBp443oHZIPB+HsUGaksVCXVQENPxwTfQdH4=
+go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/zap v1.17.0 h1:MTjgFu6ZLKvY6Pvaqk97GlxNBuMpV4Hy/3P6tRGlI2U=
+go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec=
+go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
+go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI=
+go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -482,15 +605,42 @@ golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0
 golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM=
 golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb h1:fqpd0EBDzlHRCjiphRR5Zo/RSWWQlWv34418dnEixWk=
 golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
@@ -504,24 +654,40 @@ golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
 golang.org/x/net v0.0.0-20210427231257-85d9c07bbe3a/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
@@ -530,13 +696,29 @@ golang.org/x/net v0.0.0-20220622184535-263ec571b305 h1:dAgbJ2SP4jD6XYfMNLVj0BF21
 golang.org/x/net v0.0.0-20220622184535-263ec571b305/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1 h1:B333XXssMuKQeBwiNODx4TupZy7bf4sxFZnN2ZOcvUE=
+golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
@@ -546,33 +728,67 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200509044756-6aff5f38e54f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -581,27 +797,75 @@ golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
+golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200509030707-2212a7e161a5/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
+golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
+golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
 golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
@@ -612,26 +876,132 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
+google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
+google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
+google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
+google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
+google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
+google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
+google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo=
+google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4=
+google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw=
+google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU=
+google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
+google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
+google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
+google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
+google.golang.org/api v0.59.0 h1:fPfFO7gttlXYo2ALuD3HxJzh8vaF++4youI0BkFL6GE=
+google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
+google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
+google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
+google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A=
 google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71 h1:z+ErRPu0+KS02Td3fOAgdX+lnPDh/VyaABEJPD4JRQs=
+google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
+google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
+google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
+google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
+google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
+google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w=
+google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
 google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351 h1:uf3hR4mj3fn7tjJL1f0kkRqFE7GDPoBiyvLxvu1Gt/g=
+google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
+google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
+google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
+google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
 google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
 google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M=
 google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -640,6 +1010,7 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
@@ -681,8 +1052,18 @@ gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gorm.io/driver/mysql v1.3.5 h1:iWBTVW/8Ij5AG4e0G/zqzaJblYkBI1VIL1LG2HUGsvY=
+gorm.io/driver/mysql v1.3.5/go.mod h1:sSIebwZAVPiT+27jK9HIwvsqOGKx3YMPmrA3mBJR10c=
+gorm.io/gorm v1.23.8 h1:h8sGJ+biDgBA1AD1Ha9gFCx7h8npU7AsLdlkX0n2TpE=
+gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
-
-

internal/api/auth/auth.go

@@ -21,7 +21,6 @@ import (
 // @Tags 鉴权认证
 // @ID UserRegister
 // @Accept json
-// @Param token header string true "im token"
 // @Param req body api.UserRegisterReq true "secret为openIM密钥, 详细见服务端config.yaml secret字段 <br> platform为平台ID <br> ex为拓展字段 <br> gender为性别, 0为女, 1为男"
 // @Produce json
 // @Success 0 {object} api.UserRegisterResp
@@ -90,7 +89,6 @@ func UserRegister(c *gin.Context) {
 // @Tags 鉴权认证
 // @ID UserToken
 // @Accept json
-// @Param token header string true "im token"
 // @Param req body api.UserTokenReq true "secret为openIM密钥, 详细见服务端config.yaml secret字段 <br> platform为平台ID"
 // @Produce json
 // @Success 0 {object} api.UserTokenResp
@@ -152,7 +150,7 @@ func ParseToken(c *gin.Context) {
 	if err := c.BindJSON(&params); err != nil {
 		errMsg := " BindJSON failed " + err.Error()
 		log.NewError("0", errMsg)
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": errMsg})
+		c.JSON(http.StatusOK, gin.H{"errCode": 1001, "errMsg": errMsg})
 		return
 	}
 
@@ -161,9 +159,9 @@ func ParseToken(c *gin.Context) {
 	var expireTime int64
 	ok, _, errInfo, expireTime = token_verify.GetUserIDFromTokenExpireTime(c.Request.Header.Get("token"), params.OperationID)
 	if !ok {
-		errMsg := params.OperationID + " " + "GetUserIDFromTokenExpireTime failed " + errInfo + " token:" + c.Request.Header.Get("token")
+		errMsg := params.OperationID + " " + "GetUserIDFromTokenExpireTime failed " + errInfo
 		log.NewError(params.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		c.JSON(http.StatusOK, gin.H{"errCode": 1001, "errMsg": errMsg})
 		return
 	}
 

internal/api/chat/del_msg.go

@@ -1,130 +0,0 @@
-package apiChat
-
-import (
-	api "Open_IM/pkg/base_info"
-	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
-	rpc "Open_IM/pkg/proto/chat"
-	pbCommon "Open_IM/pkg/proto/sdk_ws"
-	"Open_IM/pkg/utils"
-	"context"
-	"github.com/gin-gonic/gin"
-	"net/http"
-	"strings"
-)
-
-// @Summary 根据seq列表删除消息
-// @Description 根据seq列表删除消息
-// @Tags 消息相关
-// @ID DelMsg
-// @Accept json
-// @Param token header string true "im token"
-// @Param req body api.DelMsgReq true "userID为要删除的用户ID <br> seqList为seq列表"
-// @Produce json
-// @Success 0 {object} api.DelMsgResp
-// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误"
-// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等"
-// @Router /msg/del_msg [post]
-func DelMsg(c *gin.Context) {
-	var (
-		req   api.DelMsgReq
-		resp  api.DelMsgResp
-		reqPb pbCommon.DelMsgListReq
-	)
-	if err := c.BindJSON(&req); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
-		return
-	}
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req)
-	if err := utils.CopyStructFields(&reqPb, &req); err != nil {
-		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields", err.Error())
-	}
-
-	var ok bool
-	var errInfo string
-	ok, reqPb.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
-	if !ok {
-		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
-		log.NewError(req.OperationID, errMsg)
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-
-	grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName, req.OperationID)
-	if grpcConn == nil {
-		errMsg := req.OperationID + " getcdv3.GetConn == nil"
-		log.NewError(req.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	msgClient := rpc.NewChatClient(grpcConn)
-	respPb, err := msgClient.DelMsgList(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(req.OperationID, utils.GetSelfFuncName(), "DelMsgList failed", err.Error(), reqPb)
-		c.JSON(http.StatusOK, gin.H{"errCode": constant.ErrServer.ErrCode, "errMsg": constant.ErrServer.ErrMsg + err.Error()})
-		return
-	}
-	resp.ErrCode = respPb.ErrCode
-	resp.ErrMsg = respPb.ErrMsg
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp)
-	c.JSON(http.StatusOK, resp)
-}
-
-// @Summary 清空用户消息
-// @Description 清空用户消息
-// @Tags 消息相关
-// @ID ClearMsg
-// @Accept json
-// @Param token header string true "im token"
-// @Param req body api.CleanUpMsgReq true "userID为要清空的用户ID"
-// @Produce json
-// @Success 0 {object} api.CleanUpMsgResp
-// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误"
-// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等"
-// @Router /msg/clear_msg [post]
-func ClearMsg(c *gin.Context) {
-	params := api.CleanUpMsgReq{}
-	if err := c.BindJSON(&params); err != nil {
-		log.NewError("0", "BindJSON failed ", err.Error())
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
-		return
-	}
-	//
-	req := &rpc.ClearMsgReq{}
-	utils.CopyStructFields(req, &params)
-
-	var ok bool
-	var errInfo string
-	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
-	if !ok {
-		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
-		log.NewError(req.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api args ", req.String())
-
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName, req.OperationID)
-	if etcdConn == nil {
-		errMsg := req.OperationID + " getcdv3.GetConn == nil"
-		log.NewError(req.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := rpc.NewChatClient(etcdConn)
-	RpcResp, err := client.ClearMsg(context.Background(), req)
-	if err != nil {
-		log.NewError(req.OperationID, " CleanUpMsg failed ", err.Error(), req.String(), RpcResp.ErrMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": RpcResp.ErrMsg})
-		return
-	}
-
-	resp := api.CleanUpMsgResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}}
-
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api return ", resp)
-	c.JSON(http.StatusOK, resp)
-}

internal/api/group/group.go

@@ -3,6 +3,7 @@ package group
 import (
 	api "Open_IM/pkg/base_info"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
@@ -316,7 +317,12 @@ func InviteUserToGroup(c *gin.Context) {
 	}
 	req := &rpc.InviteUserToGroupReq{}
 	utils.CopyStructFields(req, &params)
-
+	if len(req.InvitedUserIDList) > constant.MaxNotificationNum {
+		errMsg := req.OperationID + " too many, Limit: " + utils.IntToString(constant.MaxNotificationNum)
+		log.NewError(req.OperationID, errMsg, len(req.InvitedUserIDList))
+		c.JSON(http.StatusRequestEntityTooLarge, gin.H{"errCode": 400, "errMsg": errMsg})
+		return
+	}
 	var ok bool
 	var errInfo string
 	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
@@ -779,12 +785,7 @@ func SetGroupInfo(c *gin.Context) {
 	req := &rpc.SetGroupInfoReq{GroupInfoForSet: &open_im_sdk.GroupInfoForSet{}}
 	utils.CopyStructFields(req.GroupInfoForSet, &params)
 	req.OperationID = params.OperationID
-
+	argsHandle(&params, req)
-	if params.NeedVerification != nil {
-		req.GroupInfoForSet.NeedVerification = &wrappers.Int32Value{Value: *params.NeedVerification}
-		log.NewInfo(req.OperationID, "NeedVerification ", req.GroupInfoForSet.NeedVerification)
-	}
-
 	var ok bool
 	var errInfo string
 	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
@@ -815,6 +816,20 @@ func SetGroupInfo(c *gin.Context) {
 	c.JSON(http.StatusOK, resp)
 	log.NewInfo(req.OperationID, "SetGroupInfo api return ", resp)
 }
+func argsHandle(params *api.SetGroupInfoReq, req *rpc.SetGroupInfoReq) {
+	if params.NeedVerification != nil {
+		req.GroupInfoForSet.NeedVerification = &wrappers.Int32Value{Value: *params.NeedVerification}
+		log.NewInfo(req.OperationID, "NeedVerification ", req.GroupInfoForSet.NeedVerification)
+	}
+	if params.LookMemberInfo != nil {
+		req.GroupInfoForSet.LookMemberInfo = &wrappers.Int32Value{Value: *params.LookMemberInfo}
+		log.NewInfo(req.OperationID, "LookMemberInfo ", req.GroupInfoForSet.LookMemberInfo)
+	}
+	if params.ApplyMemberFriend != nil {
+		req.GroupInfoForSet.ApplyMemberFriend = &wrappers.Int32Value{Value: *params.ApplyMemberFriend}
+		log.NewInfo(req.OperationID, "ApplyMemberFriend ", req.GroupInfoForSet.ApplyMemberFriend)
+	}
+}
 
 // @Summary 转让群主
 // @Description 转让群主

internal/api/group/super_group.go

@@ -47,7 +47,7 @@ func GetJoinedSuperGroupList(c *gin.Context) {
 	}
 	GroupListResp := api.GetJoinedSuperGroupListResp{GetJoinedGroupListResp: api.GetJoinedGroupListResp{CommResp: api.CommResp{ErrCode: rpcResp.CommonResp.ErrCode, ErrMsg: rpcResp.CommonResp.ErrMsg}, GroupInfoList: rpcResp.GroupList}}
 	GroupListResp.Data = jsonData.JsonDataList(GroupListResp.GroupInfoList)
-	log.NewInfo(req.OperationID, "GetJoinedGroupList api return ", GroupListResp)
+	log.NewInfo(req.OperationID, "GetJoinedSuperGroupList api return ", GroupListResp)
 	c.JSON(http.StatusOK, GroupListResp)
 }
 

internal/api/manage/management_chat.go

@@ -13,7 +13,7 @@ import (
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
-	pbChat "Open_IM/pkg/proto/chat"
+	pbChat "Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/proto/sdk_ws"
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
@@ -28,6 +28,13 @@ import (
 
 var validate *validator.Validate
 
+func SetOptions(options map[string]bool, value bool) {
+	utils.SetSwitchFromOptions(options, constant.IsHistory, value)
+	utils.SetSwitchFromOptions(options, constant.IsPersistent, value)
+	utils.SetSwitchFromOptions(options, constant.IsSenderSync, value)
+	utils.SetSwitchFromOptions(options, constant.IsConversationUpdate, value)
+}
+
 func newUserSendMsgReq(params *api.ManagementSendMsgReq) *pbChat.SendMsgReq {
 	var newContent string
 	var err error
@@ -50,11 +57,17 @@ func newUserSendMsgReq(params *api.ManagementSendMsgReq) *pbChat.SendMsgReq {
 	}
 	options := make(map[string]bool, 5)
 	if params.IsOnlineOnly {
-		utils.SetSwitchFromOptions(options, constant.IsOfflinePush, false)
+		SetOptions(options, false)
-		utils.SetSwitchFromOptions(options, constant.IsHistory, false)
-		utils.SetSwitchFromOptions(options, constant.IsPersistent, false)
-		utils.SetSwitchFromOptions(options, constant.IsSenderSync, false)
 	}
+	if params.NotOfflinePush {
+		utils.SetSwitchFromOptions(options, constant.IsOfflinePush, false)
+	}
+	if params.ContentType == constant.CustomOnlineOnly {
+		SetOptions(options, false)
+	} else if params.ContentType == constant.CustomNotTriggerConversation {
+		utils.SetSwitchFromOptions(options, constant.IsConversationUpdate, false)
+	}
+
 	pbData := pbChat.SendMsgReq{
 		OperationID: params.OperationID,
 		MsgData: &open_im_sdk.MsgData{
@@ -135,6 +148,10 @@ func ManagementSendMsg(c *gin.Context) {
 	case constant.OANotification:
 		data = OANotificationElem{}
 		params.SessionType = constant.NotificationChatType
+	case constant.CustomNotTriggerConversation:
+		data = CustomElem{}
+	case constant.CustomOnlineOnly:
+		data = CustomElem{}
 	//case constant.HasReadReceipt:
 	//case constant.Typing:
 	//case constant.Quote:
@@ -185,22 +202,29 @@ func ManagementSendMsg(c *gin.Context) {
 	pbData := newUserSendMsgReq(&params)
 	log.Info(params.OperationID, "", "api ManagementSendMsg call start..., [data: %s]", pbData.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName, params.OperationID)
+	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, params.OperationID)
 	if etcdConn == nil {
 		errMsg := params.OperationID + "getcdv3.GetConn == nil"
 		log.NewError(params.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
-	client := pbChat.NewChatClient(etcdConn)
+	client := pbChat.NewMsgClient(etcdConn)
-
 	log.Info(params.OperationID, "", "api ManagementSendMsg call, api call rpc...")
-
 	RpcResp, err := client.SendMsg(context.Background(), pbData)
-	if err != nil {
+	if err != nil || (RpcResp != nil && RpcResp.ErrCode != 0) {
-		log.NewError(params.OperationID, "call delete UserSendMsg rpc server failed", err.Error())
+		resp, err2 := client.SetSendMsgFailedFlag(context.Background(), &pbChat.SetSendMsgFailedFlagReq{OperationID: params.OperationID})
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call UserSendMsg  rpc server failed"})
+		if err2 != nil {
-		return
+			log.NewError(params.OperationID, utils.GetSelfFuncName(), err.Error())
+		}
+		if resp != nil && resp.ErrCode != 0 {
+			log.NewError(params.OperationID, utils.GetSelfFuncName(), resp.ErrCode, resp.ErrMsg)
+		}
+		if err != nil {
+			log.NewError(params.OperationID, "call delete UserSendMsg rpc server failed", err.Error())
+			c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call UserSendMsg  rpc server failed"})
+			return
+		}
 	}
 	log.Info(params.OperationID, "", "api ManagementSendMsg call end..., [data: %s] [reply: %s]", pbData.String(), RpcResp.String())
 	resp := api.ManagementSendMsgResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, ResultList: server_api_params.UserSendMsgResp{ServerMsgID: RpcResp.ServerMsgID, ClientMsgID: RpcResp.ClientMsgID, SendTime: RpcResp.SendTime}}
@@ -255,6 +279,10 @@ func ManagementBatchSendMsg(c *gin.Context) {
 	case constant.OANotification:
 		data = OANotificationElem{}
 		params.SessionType = constant.NotificationChatType
+	case constant.CustomNotTriggerConversation:
+		data = CustomElem{}
+	case constant.CustomOnlineOnly:
+		data = CustomElem{}
 	//case constant.HasReadReceipt:
 	//case constant.Typing:
 	//case constant.Quote:
@@ -283,47 +311,90 @@ func ManagementBatchSendMsg(c *gin.Context) {
 	if !utils.IsContain(claims.UID, config.Config.Manager.AppManagerUid) {
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": "not authorized", "sendTime": 0, "MsgID": ""})
 		return
-
 	}
 	log.NewInfo(params.OperationID, "Ws call success to ManagementSendMsgReq", params)
+	var msgSendFailedFlag bool
+
+	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, params.OperationID)
+	if etcdConn == nil {
+		errMsg := params.OperationID + "getcdv3.GetConn == nil"
+		log.NewError(params.OperationID, errMsg)
+		//resp.Data.FailedIDList = params.RecvIDList
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": "rpc server error: etcdConn == nil"})
+		return
+	}
+	client := pbChat.NewMsgClient(etcdConn)
+	req := &api.ManagementSendMsgReq{
+		ManagementSendMsg: params.ManagementSendMsg,
+	}
+	pbData := newUserSendMsgReq(req)
 	for _, recvID := range params.RecvIDList {
-		req := &api.ManagementSendMsgReq{
-			ManagementSendMsg: params.ManagementSendMsg,
-			RecvID:            recvID,
-		}
-		pbData := newUserSendMsgReq(req)
 		pbData.MsgData.RecvID = recvID
 		log.Info(params.OperationID, "", "api ManagementSendMsg call start..., ", pbData.String())
-		etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName, params.OperationID)
+
-		if etcdConn == nil {
-			errMsg := params.OperationID + "getcdv3.GetConn == nil"
-			log.NewError(params.OperationID, errMsg)
-			resp.Data.FailedIDList = append(resp.Data.FailedIDList, recvID)
-			continue
-		}
-		client := pbChat.NewChatClient(etcdConn)
 		rpcResp, err := client.SendMsg(context.Background(), pbData)
 		if err != nil {
 			log.NewError(params.OperationID, "call delete UserSendMsg rpc server failed", err.Error())
 			resp.Data.FailedIDList = append(resp.Data.FailedIDList, recvID)
+			msgSendFailedFlag = true
 			continue
 		}
 		if rpcResp.ErrCode != 0 {
 			log.NewError(params.OperationID, utils.GetSelfFuncName(), "rpc failed", pbData, rpcResp)
 			resp.Data.FailedIDList = append(resp.Data.FailedIDList, recvID)
+			msgSendFailedFlag = true
 			continue
 		}
-		resp.Data.ResultList = append(resp.Data.ResultList, server_api_params.UserSendMsgResp{
+		resp.Data.ResultList = append(resp.Data.ResultList, &api.SingleReturnResult{
 			ServerMsgID: rpcResp.ServerMsgID,
 			ClientMsgID: rpcResp.ClientMsgID,
 			SendTime:    rpcResp.SendTime,
+			RecvID:      recvID,
 		})
 	}
+	if msgSendFailedFlag {
+		resp, err2 := client.SetSendMsgFailedFlag(context.Background(), &pbChat.SetSendMsgFailedFlagReq{OperationID: params.OperationID})
+		if err2 != nil {
+			log.NewError(params.OperationID, utils.GetSelfFuncName(), err2.Error())
+		}
+		if resp != nil && resp.ErrCode != 0 {
+			log.NewError(params.OperationID, utils.GetSelfFuncName(), resp.ErrCode, resp.ErrMsg)
+		}
+	}
 
 	log.NewInfo(params.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
 	c.JSON(http.StatusOK, resp)
 }
 
+func CheckMsgIsSendSuccess(c *gin.Context) {
+	var req api.CheckMsgIsSendSuccessReq
+	var resp api.CheckMsgIsSendSuccessResp
+	if err := c.BindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		log.Error(c.PostForm("operationID"), "json unmarshal err", err.Error(), c.PostForm("content"))
+		return
+	}
+	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
+	if etcdConn == nil {
+		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+
+	client := pbChat.NewMsgClient(etcdConn)
+	rpcResp, err := client.GetSendMsgStatus(context.Background(), &pbChat.GetSendMsgStatusReq{OperationID: req.OperationID})
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call GetSendMsgStatus  rpc server failed"})
+		return
+	}
+	resp.ErrMsg = rpcResp.ErrMsg
+	resp.ErrCode = rpcResp.ErrCode
+	resp.Status = rpcResp.Status
+	c.JSON(http.StatusOK, resp)
+}
+
 type PictureBaseInfo struct {
 	UUID   string `mapstructure:"uuid"`
 	Type   string `mapstructure:"type" `
@@ -391,7 +462,7 @@ type RevokeElem struct {
 }
 type OANotificationElem struct {
 	NotificationName    string      `mapstructure:"notificationName" json:"notificationName" validate:"required"`
-	NotificationFaceURL string      `mapstructure:"notificationFaceURL" json:"notificationFaceURL" validate:"required"`
+	NotificationFaceURL string      `mapstructure:"notificationFaceURL" json:"notificationFaceURL"`
 	NotificationType    int32       `mapstructure:"notificationType" json:"notificationType" validate:"required"`
 	Text                string      `mapstructure:"text" json:"text" validate:"required"`
 	Url                 string      `mapstructure:"url" json:"url"`

internal/api/manage/management_user.go

@@ -198,9 +198,9 @@ func GetUsersOnlineStatus(c *gin.Context) {
 	var wsResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult
 	var respResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult
 	flag := false
-	grpcCons := getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOnlineMessageRelayName)
+	grpcCons := getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImRelayName)
 	for _, v := range grpcCons {
-		client := pbRelay.NewOnlineMessageRelayServiceClient(v)
+		client := pbRelay.NewRelayClient(v)
 		reply, err := client.GetUsersOnlineStatus(context.Background(), req)
 		if err != nil {
 			log.NewError(params.OperationID, "GetUsersOnlineStatus rpc  err", req.String(), err.Error())

internal/api/msg/del_msg.go

@@ -0,0 +1,273 @@
+package msg
+
+import (
+	api "Open_IM/pkg/base_info"
+	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
+	"Open_IM/pkg/common/log"
+	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	rpc "Open_IM/pkg/proto/msg"
+	pbCommon "Open_IM/pkg/proto/sdk_ws"
+	"Open_IM/pkg/utils"
+	"context"
+	"github.com/gin-gonic/gin"
+	"github.com/golang/protobuf/proto"
+	"net/http"
+	"strings"
+)
+
+// @Summary 根据seq列表删除消息
+// @Description 根据seq列表删除消息
+// @Tags 消息相关
+// @ID DelMsg
+// @Accept json
+// @Param token header string true "im token"
+// @Param req body api.DelMsgReq true "userID为要删除的用户ID <br> seqList为seq列表"
+// @Produce json
+// @Success 0 {object} api.DelMsgResp
+// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误"
+// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等"
+// @Router /msg/del_msg [post]
+func DelMsg(c *gin.Context) {
+	var (
+		req   api.DelMsgReq
+		resp  api.DelMsgResp
+		reqPb pbCommon.DelMsgListReq
+	)
+	if err := c.BindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req)
+	if err := utils.CopyStructFields(&reqPb, &req); err != nil {
+		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields", err.Error())
+	}
+
+	var ok bool
+	var errInfo string
+	ok, reqPb.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	if !ok {
+		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+
+	grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
+	if grpcConn == nil {
+		errMsg := req.OperationID + " getcdv3.GetConn == nil"
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	msgClient := rpc.NewMsgClient(grpcConn)
+	respPb, err := msgClient.DelMsgList(context.Background(), &reqPb)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "DelMsgList failed", err.Error(), reqPb)
+		c.JSON(http.StatusOK, gin.H{"errCode": constant.ErrServer.ErrCode, "errMsg": constant.ErrServer.ErrMsg + err.Error()})
+		return
+	}
+	resp.ErrCode = respPb.ErrCode
+	resp.ErrMsg = respPb.ErrMsg
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp)
+	c.JSON(http.StatusOK, resp)
+}
+func DelSuperGroupMsg(c *gin.Context) {
+	var (
+		req  api.DelSuperGroupMsgReq
+		resp api.DelSuperGroupMsgResp
+	)
+	rpcReq := &rpc.DelSuperGroupMsgReq{}
+	utils.CopyStructFields(req, &req)
+	if err := c.BindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req)
+	var ok bool
+	var errInfo string
+	ok, rpcReq.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	if !ok {
+		errMsg := req.OperationID + " " + rpcReq.OpUserID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	options := make(map[string]bool, 5)
+	utils.SetSwitchFromOptions(options, constant.IsConversationUpdate, false)
+	utils.SetSwitchFromOptions(options, constant.IsSenderConversationUpdate, false)
+	utils.SetSwitchFromOptions(options, constant.IsUnreadCount, false)
+	utils.SetSwitchFromOptions(options, constant.IsOfflinePush, false)
+	pbData := rpc.SendMsgReq{
+		OperationID: req.OperationID,
+		MsgData: &pbCommon.MsgData{
+			SendID:      req.UserID,
+			RecvID:      req.UserID,
+			ClientMsgID: utils.GetMsgID(req.UserID),
+			SessionType: constant.SingleChatType,
+			MsgFrom:     constant.SysMsgType,
+			ContentType: constant.MsgDeleteNotification,
+			//	ForceList:        params.ForceList,
+			CreateTime: utils.GetCurrentTimestampByMill(),
+			Options:    options,
+		},
+	}
+	var tips pbCommon.TipsComm
+	deleteMsg := api.MsgDeleteNotificationElem{
+		GroupID:     req.GroupID,
+		IsAllDelete: req.IsAllDelete,
+		SeqList:     req.SeqList,
+	}
+	tips.JsonDetail = utils.StructToJsonString(deleteMsg)
+	var err error
+	pbData.MsgData.Content, err = proto.Marshal(&tips)
+	if err != nil {
+		log.Error(req.OperationID, "Marshal failed ", err.Error(), tips.String())
+		resp.ErrCode = 400
+		resp.ErrMsg = err.Error()
+		log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp)
+		c.JSON(http.StatusOK, resp)
+	}
+	log.Info(req.OperationID, "", "api DelSuperGroupMsg call start..., [data: %s]", pbData.String())
+	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
+	if etcdConn == nil {
+		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	client := rpc.NewMsgClient(etcdConn)
+
+	log.Info(req.OperationID, "", "api DelSuperGroupMsg call, api call rpc...")
+	if req.IsAllDelete  {
+		RpcResp, err := client.DelSuperGroupMsg(context.Background(),rpcReq)
+		if err != nil {
+			log.NewError(req.OperationID, "call delete DelSuperGroupMsg rpc server failed", err.Error())
+			c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call DelSuperGroupMsg  rpc server failed"})
+			return
+		}
+		log.Info(req.OperationID, "", "api DelSuperGroupMsg call end..., [data: %s] [reply: %s]", pbData.String(), RpcResp.String())
+		resp.ErrCode = RpcResp.ErrCode
+		resp.ErrMsg = RpcResp.ErrMsg
+		log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp)
+		c.JSON(http.StatusOK, resp)
+	}else{
+		RpcResp, err := client.SendMsg(context.Background(), &pbData)
+		if err != nil {
+			log.NewError(req.OperationID, "call delete UserSendMsg rpc server failed", err.Error())
+			c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call UserSendMsg  rpc server failed"})
+			return
+		}
+		log.Info(req.OperationID, "", "api DelSuperGroupMsg call end..., [data: %s] [reply: %s]", pbData.String(), RpcResp.String())
+		resp.ErrCode = RpcResp.ErrCode
+		resp.ErrMsg = RpcResp.ErrMsg
+		log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp)
+		c.JSON(http.StatusOK, resp)
+	}
+
+}
+
+// @Summary 清空用户消息
+// @Description 清空用户消息
+// @Tags 消息相关
+// @ID ClearMsg
+// @Accept json
+// @Param token header string true "im token"
+// @Param req body api.CleanUpMsgReq true "userID为要清空的用户ID"
+// @Produce json
+// @Success 0 {object} api.CleanUpMsgResp
+// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误"
+// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等"
+// @Router /msg/clear_msg [post]
+func ClearMsg(c *gin.Context) {
+	params := api.CleanUpMsgReq{}
+	if err := c.BindJSON(&params); err != nil {
+		log.NewError("0", "BindJSON failed ", err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	//
+	req := &rpc.ClearMsgReq{}
+	utils.CopyStructFields(req, &params)
+
+	var ok bool
+	var errInfo string
+	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	if !ok {
+		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api args ", req.String())
+
+	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
+	if etcdConn == nil {
+		errMsg := req.OperationID + " getcdv3.GetConn == nil"
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	client := rpc.NewMsgClient(etcdConn)
+	RpcResp, err := client.ClearMsg(context.Background(), req)
+	if err != nil {
+		log.NewError(req.OperationID, " CleanUpMsg failed ", err.Error(), req.String(), RpcResp.ErrMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": RpcResp.ErrMsg})
+		return
+	}
+
+	resp := api.CleanUpMsgResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}}
+
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api return ", resp)
+	c.JSON(http.StatusOK, resp)
+}
+
+// @Summary 设置用户最小seq
+// @Description 设置用户最小seq，以及用户相关读扩散群组最小seq
+// @Tags 消息相关
+// @ID SetMsgMinSeq
+// @Accept json
+// @Param token header string true "im token"
+func SetMsgMinSeq(c *gin.Context) {
+	params := api.SetMsgMinSeqReq{}
+	if err := c.BindJSON(&params); err != nil {
+		log.NewError("0", "BindJSON failed ", err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	//
+	req := &rpc.SetMsgMinSeqReq{}
+	utils.CopyStructFields(req, &params)
+
+	var ok bool
+	var errInfo string
+	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	if !ok {
+		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api args ", req.String())
+	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
+	if etcdConn == nil {
+		errMsg := req.OperationID + " getcdv3.GetConn == nil"
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	client := rpc.NewMsgClient(etcdConn)
+	RpcResp, err := client.SetMsgMinSeq(context.Background(), req)
+	if err != nil {
+		log.NewError(req.OperationID, " SetMsgMinSeq failed ", err.Error(), req.String(), RpcResp.ErrMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": RpcResp.ErrMsg})
+		return
+	}
+
+	resp := api.SetMsgMinSeqResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}}
+
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api return ", resp)
+	c.JSON(http.StatusOK, resp)
+}

internal/api/msg/get_max_min_seq.go

@@ -1,11 +1,11 @@
-package apiChat
+package msg
 
 import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
-	pbChat "Open_IM/pkg/proto/chat"
+	pbChat "Open_IM/pkg/proto/msg"
 	sdk_ws "Open_IM/pkg/proto/sdk_ws"
 	"context"
 	"github.com/gin-gonic/gin"
@@ -35,7 +35,7 @@ func GetSeq(c *gin.Context) {
 	pbData := sdk_ws.GetMaxAndMinSeqReq{}
 	pbData.UserID = params.SendID
 	pbData.OperationID = params.OperationID
-	grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName, pbData.OperationID)
+	grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, pbData.OperationID)
 	if grpcConn == nil {
 		errMsg := pbData.OperationID + " getcdv3.GetConn == nil"
 		log.NewError(pbData.OperationID, errMsg)
@@ -43,7 +43,7 @@ func GetSeq(c *gin.Context) {
 		return
 	}
 
-	msgClient := pbChat.NewChatClient(grpcConn)
+	msgClient := pbChat.NewMsgClient(grpcConn)
 	reply, err := msgClient.GetMaxAndMinSeq(context.Background(), &pbData)
 	if err != nil {
 		log.NewError(params.OperationID, "UserGetSeq rpc failed, ", params, err.Error())

internal/api/msg/pull_msg.go

@@ -1,11 +1,11 @@
-package apiChat
+package msg
 
 import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
-	"Open_IM/pkg/proto/chat"
+	"Open_IM/pkg/proto/msg"
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"context"
@@ -51,14 +51,14 @@ func PullMsgBySeqList(c *gin.Context) {
 	pbData.OperationID = params.OperationID
 	pbData.SeqList = params.SeqList
 
-	grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName, pbData.OperationID)
+	grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, pbData.OperationID)
 	if grpcConn == nil {
 		errMsg := pbData.OperationID + "getcdv3.GetConn == nil"
 		log.NewError(pbData.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
-	msgClient := pbChat.NewChatClient(grpcConn)
+	msgClient := msg.NewMsgClient(grpcConn)
 	reply, err := msgClient.PullMessageBySeqList(context.Background(), &pbData)
 	if err != nil {
 		log.Error(pbData.OperationID, "PullMessageBySeqList error", err.Error())

internal/api/msg/send_msg.go

@@ -1,9 +1,9 @@
-package apiChat
+package msg
 
 import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
-	pbChat "Open_IM/pkg/proto/chat"
+	pbChat "Open_IM/pkg/proto/msg"
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
 	"context"
 
@@ -71,14 +71,14 @@ func SendMsg(c *gin.Context) {
 	pbData := newUserSendMsgReq(token, &params)
 	log.Info(params.OperationID, "", "api SendMsg call start..., [data: %s]", pbData.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName, params.OperationID)
+	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, params.OperationID)
 	if etcdConn == nil {
 		errMsg := params.OperationID + "getcdv3.GetConn == nil"
 		log.NewError(params.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
-	client := pbChat.NewChatClient(etcdConn)
+	client := pbChat.NewMsgClient(etcdConn)
 
 	log.Info("", "", "api SendMsg call, api call rpc...")
 

internal/api/third/fcm_update_token.go

@@ -0,0 +1,52 @@
+package apiThird
+
+import (
+	"Open_IM/pkg/common/db"
+	"Open_IM/pkg/common/log"
+	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/utils"
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+)
+
+/**
+ * FCM第三方上报Token
+ */
+type FcmUpdateTokenReq struct {
+	OperationID string `json:"operationID"`
+	Platform    int    `json:"platform" binding:"required,min=1,max=2"` //only for ios + android
+	FcmToken    string `json:"fcmToken"`
+}
+
+func FcmUpdateToken(c *gin.Context) {
+	var (
+		req FcmUpdateTokenReq
+	)
+	if err := c.Bind(&req); err != nil {
+		log.NewError("0", utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req)
+
+	ok, UserId, errInfo := token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	if !ok {
+		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req, UserId)
+	//逻辑处理开始
+	err := db.DB.SetFcmToken(UserId, req.Platform, req.FcmToken, 0)
+	if err != nil {
+		errMsg := req.OperationID + " " + "SetFcmToken failed " + err.Error() + " token:" + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	//逻辑处理完毕
+	c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": ""})
+	return
+}

internal/api/third/minio_storage_credential.go

@@ -160,6 +160,7 @@ func MinioStorageCredential(c *gin.Context) {
 	resp.AccessKeyID = v.AccessKeyID
 	resp.BucketName = config.Config.Credential.Minio.Bucket
 	resp.StsEndpointURL = config.Config.Credential.Minio.Endpoint
+	resp.StorageTime = config.Config.Credential.Minio.StorageTime
 	c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": "", "data": resp})
 }
 

internal/api/user/user.go

@@ -324,8 +324,9 @@ func SetGlobalRecvMessageOpt(c *gin.Context) {
 func GetSelfUserInfo(c *gin.Context) {
 	params := api.GetSelfUserInfoReq{}
 	if err := c.BindJSON(&params); err != nil {
-		log.NewError("0", "BindJSON failed ", err.Error())
+		errMsg := "BindJSON failed " + err.Error()
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": http.StatusBadRequest, "errMsg": err.Error()})
+		log.NewError("0", "BindJSON failed ", errMsg)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
 	req := &rpc.GetUserInfoReq{}
@@ -414,9 +415,10 @@ func GetUsersOnlineStatus(c *gin.Context) {
 	var wsResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult
 	var respResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult
 	flag := false
-	grpcCons := getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOnlineMessageRelayName)
+	grpcCons := getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImRelayName)
 	for _, v := range grpcCons {
-		client := pbRelay.NewOnlineMessageRelayServiceClient(v)
+		log.Debug(params.OperationID, "get node ", *v, v.Target())
+		client := pbRelay.NewRelayClient(v)
 		reply, err := client.GetUsersOnlineStatus(context.Background(), req)
 		if err != nil {
 			log.NewError(params.OperationID, "GetUsersOnlineStatus rpc  err", req.String(), err.Error())

internal/demo/register/login.go

@@ -15,6 +15,7 @@ import (
 )
 
 type ParamsLogin struct {
+	UserID      string `json:"userID"`
 	Email       string `json:"email"`
 	PhoneNumber string `json:"phoneNumber"`
 	Password    string `json:"password"`
@@ -32,11 +33,13 @@ func Login(c *gin.Context) {
 	var account string
 	if params.Email != "" {
 		account = params.Email
-	} else {
+	} else if params.PhoneNumber != "" {
 		account = params.PhoneNumber
+	} else {
+		account = params.UserID
 	}
 
-	r, err := im_mysql_model.GetRegister(account, params.AreaCode)
+	r, err := im_mysql_model.GetRegister(account, params.AreaCode, params.UserID)
 	if err != nil {
 		log.NewError(params.OperationID, "user have not register", params.Password, account, err.Error())
 		c.JSON(http.StatusOK, gin.H{"errCode": constant.NotRegistered, "errMsg": "Mobile phone number is not registered"})

internal/demo/register/onboarding_process.go

@@ -21,6 +21,30 @@ import (
 	"time"
 )
 
+type OnboardingProcessReq struct {
+	OperationID string
+	UserID      string
+	NickName    string
+	FaceURL     string
+	PhoneNumber string
+	Email       string
+}
+
+var Ch chan OnboardingProcessReq
+
+func init() {
+	Ch = make(chan OnboardingProcessReq, 1000)
+}
+
+func OnboardingProcessRoutine() {
+	for {
+		req := <-Ch
+		go func() {
+			onboardingProcess(req.OperationID, req.UserID, req.NickName, req.FaceURL, req.PhoneNumber, req.Email)
+		}()
+	}
+}
+
 func onboardingProcess(operationID, userID, userName, faceURL, phoneNumber, email string) {
 	log.NewInfo(operationID, utils.GetSelfFuncName(), userName, userID, faceURL)
 	if err := createOrganizationUser(operationID, userID, userName, phoneNumber, email); err != nil {
@@ -208,7 +232,7 @@ func onboardingProcessNotification(operationID, userID, groupID, userName, faceU
 		Content:        []byte(welcomeString),
 		MsgFrom:        constant.UserMsgType,
 		ContentType:    constant.Text,
-		SessionType:    constant.GroupChatType,
+		SessionType:    constant.SuperGroupChatType,
 		OperationID:    operationID,
 		SenderNickname: userName,
 		SenderFaceURL:  faceURL,

internal/demo/register/reset_password.go

@@ -34,7 +34,8 @@ func ResetPassword(c *gin.Context) {
 	} else {
 		account = req.PhoneNumber
 	}
-	if req.VerificationCode != config.Config.Demo.SuperCode {
+
+	if (config.Config.Demo.UseSuperCode && req.VerificationCode != config.Config.Demo.SuperCode) || !config.Config.Demo.UseSuperCode {
 		accountKey := req.AreaCode + account + "_" + constant.VerificationCodeForResetSuffix
 		v, err := db.DB.GetAccountCode(accountKey)
 		if err != nil || v != req.VerificationCode {
@@ -43,7 +44,7 @@ func ResetPassword(c *gin.Context) {
 			return
 		}
 	}
-	user, err := im_mysql_model.GetRegister(account, req.AreaCode)
+	user, err := im_mysql_model.GetRegister(account, req.AreaCode, "")
 	if err != nil || user.Account == "" {
 		if err != nil {
 			log.NewError(req.OperationID, utils.GetSelfFuncName(), "get register error", err.Error())

internal/demo/register/send_code.go

@@ -66,7 +66,7 @@ func SendVerificationCode(c *gin.Context) {
 	}
 	switch params.UsedFor {
 	case constant.VerificationCodeForRegister:
-		_, err := im_mysql_model.GetRegister(account, params.AreaCode)
+		_, err := im_mysql_model.GetRegister(account, params.AreaCode, "")
 		if err == nil {
 			log.NewError(params.OperationID, "The phone number has been registered", params)
 			c.JSON(http.StatusOK, gin.H{"errCode": constant.HasRegistered, "errMsg": "The phone number has been registered"})

internal/demo/register/set_password.go

@@ -18,6 +18,7 @@ import (
 )
 
 type ParamsSetPassword struct {
+	UserID           string `json:"userID"`
 	Email            string `json:"email"`
 	Nickname         string `json:"nickname"`
 	PhoneNumber      string `json:"phoneNumber"`
@@ -40,29 +41,37 @@ func SetPassword(c *gin.Context) {
 	var account string
 	if params.Email != "" {
 		account = params.Email
-	} else {
+	} else if params.PhoneNumber != "" {
 		account = params.PhoneNumber
+	} else {
+		account = params.UserID
 	}
 	if params.Nickname == "" {
 		params.Nickname = account
 	}
-	if params.VerificationCode != config.Config.Demo.SuperCode {
+	if params.UserID == "" {
-		accountKey := params.AreaCode + account + "_" + constant.VerificationCodeForRegisterSuffix
+		if (config.Config.Demo.UseSuperCode && params.VerificationCode != config.Config.Demo.SuperCode) || !config.Config.Demo.UseSuperCode {
-		v, err := db.DB.GetAccountCode(accountKey)
+			accountKey := params.AreaCode + account + "_" + constant.VerificationCodeForRegisterSuffix
-		if err != nil || v != params.VerificationCode {
+			v, err := db.DB.GetAccountCode(accountKey)
-			log.NewError(params.OperationID, "password Verification code error", account, params.VerificationCode)
+			if err != nil || v != params.VerificationCode {
-			data := make(map[string]interface{})
+				log.NewError(params.OperationID, "password Verification code error", account, params.VerificationCode)
-			data["PhoneNumber"] = account
+				data := make(map[string]interface{})
-			c.JSON(http.StatusOK, gin.H{"errCode": constant.CodeInvalidOrExpired, "errMsg": "Verification code error!", "data": data})
+				data["PhoneNumber"] = account
-			return
+				c.JSON(http.StatusOK, gin.H{"errCode": constant.CodeInvalidOrExpired, "errMsg": "Verification code error!", "data": data})
+				return
+			}
 		}
 	}
 	//userID := utils.Base64Encode(account)
-
+	var userID string
-	userID := utils.Md5(params.OperationID + strconv.FormatInt(time.Now().UnixNano(), 10))
+	if params.UserID == "" {
-	bi := big.NewInt(0)
+		userID = utils.Md5(params.OperationID + strconv.FormatInt(time.Now().UnixNano(), 10))
-	bi.SetString(userID[0:8], 16)
+		bi := big.NewInt(0)
-	userID = bi.String()
+		bi.SetString(userID[0:8], 16)
+		userID = bi.String()
+	} else {
+		userID = params.UserID
+	}
 
 	url := config.Config.Demo.ImAPIURL + "/auth/user_register"
 	openIMRegisterReq := api.UserRegisterReq{}
@@ -73,6 +82,7 @@ func SetPassword(c *gin.Context) {
 	openIMRegisterReq.Secret = config.Config.Secret
 	openIMRegisterReq.FaceURL = params.FaceURL
 	openIMRegisterResp := api.UserRegisterResp{}
+	log.NewDebug(params.OperationID, utils.GetSelfFuncName(), "register req:", openIMRegisterReq)
 	bMsg, err := http2.Post(url, openIMRegisterReq, 2)
 	if err != nil {
 		log.NewError(params.OperationID, "request openIM register error", account, "err", err.Error())
@@ -97,7 +107,20 @@ func SetPassword(c *gin.Context) {
 	}
 	log.Info(params.OperationID, "end setPassword", account, params.Password)
 	// demo onboarding
-	onboardingProcess(params.OperationID, userID, params.Nickname, params.FaceURL, params.AreaCode+params.PhoneNumber, params.Email)
+	if params.UserID == "" {
+		select {
+		case Ch <- OnboardingProcessReq{
+			OperationID: params.OperationID,
+			UserID:      userID,
+			NickName:    params.Nickname,
+			FaceURL:     params.FaceURL,
+			PhoneNumber: params.AreaCode + params.PhoneNumber,
+			Email:       params.Email,
+		}:
+		case <-time.After(time.Second * 2):
+			log.NewWarn(params.OperationID, utils.GetSelfFuncName(), "to ch timeOut")
+		}
+	}
 	c.JSON(http.StatusOK, gin.H{"errCode": constant.NoError, "errMsg": "", "data": openIMRegisterResp.UserToken})
 	return
 }

internal/demo/register/verify.go

@@ -40,7 +40,7 @@ func Verify(c *gin.Context) {
 		account = params.AreaCode + params.PhoneNumber
 	}
 
-	if params.VerificationCode == config.Config.Demo.SuperCode {
+	if config.Config.Demo.UseSuperCode && params.VerificationCode == config.Config.Demo.SuperCode {
 		log.NewInfo(params.OperationID, "Super Code Verified successfully", account)
 		data := make(map[string]interface{})
 		data["account"] = account

internal/msg_gateway/gate/batch_push.go

@@ -5,7 +5,7 @@ import (
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
-	pbChat "Open_IM/pkg/proto/chat"
+	pbChat "Open_IM/pkg/proto/msg"
 	sdk_ws "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"context"
@@ -89,14 +89,14 @@ func (r *RPCServer) GetSingleUserMsg(operationID string, currentMsgSeq uint32, u
 	rpcReq.SeqList = seqList
 	rpcReq.UserID = userID
 	rpcReq.OperationID = operationID
-	grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName, rpcReq.OperationID)
+	grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, rpcReq.OperationID)
 	if grpcConn == nil {
 		errMsg := "getcdv3.GetConn == nil"
 		log.NewError(rpcReq.OperationID, errMsg)
 		return nil
 	}
 
-	msgClient := pbChat.NewChatClient(grpcConn)
+	msgClient := pbChat.NewMsgClient(grpcConn)
 	reply, err := msgClient.PullMessageBySeqList(context.Background(), &rpcReq)
 	if err != nil {
 		log.Error(operationID, "PullMessageBySeqList failed ", err.Error(), rpcReq.String())

internal/msg_gateway/gate/callback.go

@@ -17,11 +17,13 @@ func callbackUserOnline(operationID, userID string, platformID int, token string
 	callbackUserOnlineReq := cbApi.CallbackUserOnlineReq{
 		Token: token,
 		UserStatusCallbackReq: cbApi.UserStatusCallbackReq{
-			CallbackCommand: constant.CallbackUserOnlineCommand,
+			UserStatusBaseCallback: cbApi.UserStatusBaseCallback{
-			OperationID:     operationID,
+				CallbackCommand: constant.CallbackUserOnlineCommand,
-			UserID:          userID,
+				OperationID:     operationID,
-			PlatformID:      int32(platformID),
+				PlatformID:      int32(platformID),
-			Platform:        constant.PlatformIDToName(platformID),
+				Platform:        constant.PlatformIDToName(platformID),
+			},
+			UserID: userID,
 		},
 		Seq: int(time.Now().UnixNano() / 1e6),
 	}
@@ -40,11 +42,13 @@ func callbackUserOffline(operationID, userID string, platformID int) cbApi.Commo
 	}
 	callbackOfflineReq := cbApi.CallbackUserOfflineReq{
 		UserStatusCallbackReq: cbApi.UserStatusCallbackReq{
-			CallbackCommand: constant.CallbackUserOfflineCommand,
+			UserStatusBaseCallback: cbApi.UserStatusBaseCallback{
-			OperationID:     operationID,
+				CallbackCommand: constant.CallbackUserOfflineCommand,
-			UserID:          userID,
+				OperationID:     operationID,
-			PlatformID:      int32(platformID),
+				PlatformID:      int32(platformID),
-			Platform:        constant.PlatformIDToName(platformID),
+				Platform:        constant.PlatformIDToName(platformID),
+			},
+			UserID: userID,
 		},
 		Seq: int(time.Now().UnixNano() / 1e6),
 	}

internal/msg_gateway/gate/logic.go

@@ -6,7 +6,7 @@ import (
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
-	pbChat "Open_IM/pkg/proto/chat"
+	pbChat "Open_IM/pkg/proto/msg"
 	pbRtc "Open_IM/pkg/proto/rtc"
 	sdk_ws "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
@@ -52,6 +52,9 @@ func (ws *WServer) msgParse(conn *UserConn, binaryMsg []byte) {
 	case constant.WSPullMsgBySeqList:
 		log.NewInfo(m.OperationID, "pullMsgBySeqListReq ", m.SendID, m.MsgIncr, m.ReqIdentifier)
 		ws.pullMsgBySeqListReq(conn, &m)
+	case constant.WsLogoutMsg:
+		log.NewInfo(m.OperationID, "conn.Close()", m.SendID, m.MsgIncr, m.ReqIdentifier)
+	//	conn.Close()
 	default:
 		log.Error(m.OperationID, "ReqIdentifier failed ", m.SendID, m.MsgIncr, m.ReqIdentifier)
 	}
@@ -69,7 +72,7 @@ func (ws *WServer) getSeqReq(conn *UserConn, m *Req) {
 		rpcReq.UserID = m.SendID
 		rpcReq.OperationID = m.OperationID
 		log.Debug(m.OperationID, "Ws call success to getMaxAndMinSeq", m.SendID, m.ReqIdentifier, m.MsgIncr, data.(sdk_ws.GetMaxAndMinSeqReq).GroupIDList)
-		grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName, rpcReq.OperationID)
+		grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, rpcReq.OperationID)
 		if grpcConn == nil {
 			errMsg := rpcReq.OperationID + "getcdv3.GetConn == nil"
 			nReply.ErrCode = 500
@@ -78,7 +81,7 @@ func (ws *WServer) getSeqReq(conn *UserConn, m *Req) {
 			ws.getSeqResp(conn, m, nReply)
 			return
 		}
-		msgClient := pbChat.NewChatClient(grpcConn)
+		msgClient := pbChat.NewMsgClient(grpcConn)
 		rpcReply, err := msgClient.GetMaxAndMinSeq(context.Background(), &rpcReq)
 		if err != nil {
 			nReply.ErrCode = 500
@@ -124,7 +127,7 @@ func (ws *WServer) pullMsgBySeqListReq(conn *UserConn, m *Req) {
 		rpcReq.OperationID = m.OperationID
 		rpcReq.GroupSeqList = data.(sdk_ws.PullMessageBySeqListReq).GroupSeqList
 		log.NewInfo(m.OperationID, "Ws call success to pullMsgBySeqListReq middle", m.SendID, m.ReqIdentifier, m.MsgIncr, data.(sdk_ws.PullMessageBySeqListReq).SeqList)
-		grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName, m.OperationID)
+		grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, m.OperationID)
 		if grpcConn == nil {
 			errMsg := rpcReq.OperationID + "getcdv3.GetConn == nil"
 			nReply.ErrCode = 500
@@ -133,7 +136,7 @@ func (ws *WServer) pullMsgBySeqListReq(conn *UserConn, m *Req) {
 			ws.pullMsgBySeqListResp(conn, m, nReply)
 			return
 		}
-		msgClient := pbChat.NewChatClient(grpcConn)
+		msgClient := pbChat.NewMsgClient(grpcConn)
 		reply, err := msgClient.PullMessageBySeqList(context.Background(), &rpcReq)
 		if err != nil {
 			log.NewError(rpcReq.OperationID, "pullMsgBySeqListReq err", err.Error())
@@ -183,7 +186,7 @@ func (ws *WServer) sendMsgReq(conn *UserConn, m *Req) {
 			MsgData:     &data,
 		}
 		log.NewInfo(m.OperationID, "Ws call success to sendMsgReq middle", m.ReqIdentifier, m.SendID, m.MsgIncr, data.String())
-		etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName, m.OperationID)
+		etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, m.OperationID)
 		if etcdConn == nil {
 			errMsg := m.OperationID + "getcdv3.GetConn == nil"
 			nReply.ErrCode = 500
@@ -192,7 +195,7 @@ func (ws *WServer) sendMsgReq(conn *UserConn, m *Req) {
 			ws.sendMsgResp(conn, m, nReply)
 			return
 		}
-		client := pbChat.NewChatClient(etcdConn)
+		client := pbChat.NewMsgClient(etcdConn)
 		reply, err := client.SendMsg(context.Background(), &pbData)
 		if err != nil {
 			log.NewError(pbData.OperationID, "UserSendMsg err", err.Error())
@@ -264,14 +267,14 @@ func (ws *WServer) sendSignalMsgReq(conn *UserConn, m *Req) {
 			}
 			log.NewInfo(m.OperationID, utils.GetSelfFuncName(), "pbData: ", pbData)
 			log.NewInfo(m.OperationID, "Ws call success to sendSignalMsgReq middle", m.ReqIdentifier, m.SendID, m.MsgIncr, msgData)
-			etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName, m.OperationID)
+			etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, m.OperationID)
 			if etcdConn == nil {
 				errMsg := m.OperationID + "getcdv3.GetConn == nil"
 				log.NewError(m.OperationID, errMsg)
 				ws.sendSignalMsgResp(conn, 200, errMsg, m, &signalResp)
 				return
 			}
-			client := pbChat.NewChatClient(etcdConn)
+			client := pbChat.NewMsgClient(etcdConn)
 			reply, err := client.SendMsg(context.Background(), &pbData)
 			if err != nil {
 				log.NewError(pbData.OperationID, utils.GetSelfFuncName(), "rpc sendMsg err", err.Error())

internal/msg_gateway/gate/open_im_media/room.go

@@ -5,8 +5,6 @@ const (
 	Address = "127.0.0.1:11300"
 )
 
-//var roomClient *lksdk.RoomServiceClient
-
 type Media struct {
 }
 
@@ -14,45 +12,11 @@ func NewMedia() *Media {
 	return &Media{}
 }
 
-//func (m *Media) GetJoinToken(room, identity string, operationID string, data *open_im_sdk.ParticipantMetaData) (string, string, error) {
-//	var newData pbRtc.ParticipantMetaData
-//	copier.Copy(&newData, data)
-//	conn, err := grpc.Dial(Address, grpc.WithInsecure())
-//	if err != nil {
-//		return "", "", err
-//	}
-//	defer conn.Close()
-//	c := pbRtc.NewRtcServiceClient(conn)
-//	req := &pbRtc.GetJoinTokenReq{Room: room, OperationID: operationID, Identity: identity, MetaData: &newData}
-//	resp, err := c.GetJoinToken(context.Background(), req)
-//	if err != nil {
-//		return "", "", err
-//	}
-//	if resp.CommonResp.ErrCode != 0 {
-//		return "", "", errors.New(resp.CommonResp.ErrMsg)
-//	}
-//	return resp.Jwt, resp.LiveURL, nil
-//	//at := auth.NewAccessToken(m.ApiKey, m.ApiSecret)
-//	//grant := &auth.VideoGrant{
-//	//	RoomJoin: true,
-//	//	Room:     room,
-//	//}
-//	//at.AddGrant(grant).
-//	//	SetIdentity(identity).
-//	//	SetValidFor(time.Hour)
-//	//
-//	//return at.ToJWT()
-//}
-
 func init() {
-	//roomClient = lksdk.NewRoomServiceClient(MediaAddress, ApiKey, ApiSecret)
+
 }
 
 func (m *Media) CreateRoom(roomName string) (error, error) {
 	return nil, nil
-	//return roomClient.CreateRoom(context.Background(), &livekit.CreateRoomRequest{
-	//	Name:         roomName,
-	//	EmptyTimeout: 60 * 3,
-	//})
 
 }

internal/msg_gateway/gate/relay_rpc_server.go

@@ -28,11 +28,12 @@ type RPCServer struct {
 	etcdAddr        []string
 	platformList    []int
 	pushTerminal    []int
+	target          string
 }
 
 func (r *RPCServer) onInit(rpcPort int) {
 	r.rpcPort = rpcPort
-	r.rpcRegisterName = config.Config.RpcRegisterName.OpenImOnlineMessageRelayName
+	r.rpcRegisterName = config.Config.RpcRegisterName.OpenImRelayName
 	r.etcdSchema = config.Config.Etcd.EtcdSchema
 	r.etcdAddr = config.Config.Etcd.EtcdAddr
 	r.platformList = genPlatformArray()
@@ -53,7 +54,7 @@ func (r *RPCServer) run() {
 	defer listener.Close()
 	srv := grpc.NewServer()
 	defer srv.GracefulStop()
-	pbRelay.RegisterOnlineMessageRelayServiceServer(srv, r)
+	pbRelay.RegisterRelayServer(srv, r)
 
 	rpcRegisterIP := config.Config.RpcRegisterIP
 	if config.Config.RpcRegisterIP == "" {
@@ -66,6 +67,7 @@ func (r *RPCServer) run() {
 	if err != nil {
 		log.Error("", "register push message rpc to etcd err", "", "err", err.Error(), r.etcdSchema, strings.Join(r.etcdAddr, ","), rpcRegisterIP, r.rpcPort, r.rpcRegisterName)
 	}
+	r.target = getcdv3.GetTarget(r.etcdSchema, rpcRegisterIP, r.rpcPort, r.rpcRegisterName)
 	err = srv.Serve(listener)
 	if err != nil {
 		log.Error("", "push message rpc listening err", "", "err", err.Error())
@@ -301,6 +303,11 @@ func (r *RPCServer) KickUserOffline(_ context.Context, req *pbRelay.KickUserOffl
 	return &pbRelay.KickUserOfflineResp{}, nil
 }
 
+func (r *RPCServer) MultiTerminalLoginCheck(ctx context.Context, req *pbRelay.MultiTerminalLoginCheckReq) (*pbRelay.MultiTerminalLoginCheckResp, error) {
+	ws.MultiTerminalLoginCheckerWithLock(req.UserID, int(req.PlatformID), req.Token, req.OperationID)
+	return &pbRelay.MultiTerminalLoginCheckResp{}, nil
+}
+
 func sendMsgToUser(conn *UserConn, bMsg []byte, in *pbRelay.OnlinePushMsgReq, RecvPlatForm int, RecvID string) (ResultCode int64) {
 	err := ws.writeMsg(conn, websocket.BinaryMessage, bMsg)
 	if err != nil {

internal/msg_gateway/gate/ws_server.go

@@ -6,11 +6,15 @@ import (
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	pbRelay "Open_IM/pkg/proto/relay"
 	"Open_IM/pkg/utils"
 	"bytes"
+	"context"
 	"encoding/gob"
 	go_redis "github.com/go-redis/redis/v8"
 	"github.com/pkg/errors"
+	"strings"
 
 	//"gopkg.in/errgo.v2/errors"
 	"net/http"
@@ -113,6 +117,79 @@ func (ws *WServer) SetWriteTimeoutWriteMsg(conn *UserConn, a int, msg []byte, ti
 	conn.SetWriteDeadline(time.Now().Add(time.Duration(timeout) * time.Second))
 	return conn.WriteMessage(a, msg)
 }
+
+func (ws *WServer) MultiTerminalLoginRemoteChecker(userID string, platformID int32, token string, operationID string) {
+	grpcCons := getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImRelayName)
+	for _, v := range grpcCons {
+		if v.Target() == rpcSvr.target {
+			log.Debug(operationID, "Filter out this node ", rpcSvr.target)
+			continue
+		}
+		client := pbRelay.NewRelayClient(v)
+		req := &pbRelay.MultiTerminalLoginCheckReq{OperationID: operationID, PlatformID: platformID, UserID: userID, Token: token}
+		log.NewInfo(operationID, "MultiTerminalLoginCheckReq ", client, req.String())
+		resp, err := client.MultiTerminalLoginCheck(context.Background(), req)
+		if err != nil {
+			log.Error(operationID, "MultiTerminalLoginCheck failed ", err.Error())
+		}
+		if resp.ErrCode != 0 {
+			log.Error(operationID, "MultiTerminalLoginCheck errCode, errMsg: ", resp.ErrCode, resp.ErrMsg)
+		}
+	}
+}
+
+func (ws *WServer) MultiTerminalLoginCheckerWithLock(uid string, platformID int, token string, operationID string) {
+	rwLock.Lock()
+	defer rwLock.Unlock()
+	switch config.Config.MultiLoginPolicy {
+	case constant.AllLoginButSameTermKick:
+		if oldConnMap, ok := ws.wsUserToConn[uid]; ok { // user->map[platform->conn]
+			if oldConn, ok := oldConnMap[platformID]; ok {
+				log.NewDebug(operationID, uid, platformID, "kick old conn")
+				m, err := db.DB.GetTokenMapByUidPid(uid, constant.PlatformIDToName(platformID))
+				if err != nil && err != go_redis.Nil {
+					log.NewError(operationID, "get token from redis err", err.Error(), uid, constant.PlatformIDToName(platformID))
+					return
+				}
+				if m == nil {
+					log.NewError(operationID, "get token from redis err", "m is nil", uid, constant.PlatformIDToName(platformID))
+					return
+				}
+				log.NewDebug(operationID, "get token map is ", m, uid, constant.PlatformIDToName(platformID))
+
+				for k, _ := range m {
+					if k != token {
+						m[k] = constant.KickedToken
+					}
+				}
+				log.NewDebug(operationID, "set token map is ", m, uid, constant.PlatformIDToName(platformID))
+				err = db.DB.SetTokenMapByUidPid(uid, platformID, m)
+				if err != nil {
+					log.NewError(operationID, "SetTokenMapByUidPid err", err.Error(), uid, platformID, m)
+					return
+				}
+				err = oldConn.Close()
+				delete(oldConnMap, platformID)
+				ws.wsUserToConn[uid] = oldConnMap
+				if len(oldConnMap) == 0 {
+					delete(ws.wsUserToConn, uid)
+				}
+				delete(ws.wsConnToUser, oldConn)
+				if err != nil {
+					log.NewError(operationID, "conn close err", err.Error(), uid, platformID)
+				}
+			} else {
+				log.NewWarn(operationID, "abnormal uid-conn  ", uid, platformID, oldConnMap[platformID])
+			}
+
+		} else {
+			log.NewDebug(operationID, "no other conn", ws.wsUserToConn, uid, platformID)
+		}
+	case constant.SingleTerminalLogin:
+	case constant.WebAndOther:
+	}
+}
+
 func (ws *WServer) MultiTerminalLoginChecker(uid string, platformID int, newConn *UserConn, token string, operationID string) {
 	switch config.Config.MultiLoginPolicy {
 	case constant.AllLoginButSameTermKick:
@@ -191,6 +268,7 @@ func (ws *WServer) addUserConn(uid string, platformID int, conn *UserConn, token
 	if callbackResp.ErrCode != 0 {
 		log.NewError(operationID, utils.GetSelfFuncName(), "callbackUserOnline resp:", callbackResp)
 	}
+	//go ws.MultiTerminalLoginRemoteChecker(uid, int32(platformID), token, operationID)
 	ws.MultiTerminalLoginChecker(uid, platformID, conn, token, operationID)
 	if oldConnMap, ok := ws.wsUserToConn[uid]; ok {
 		oldConnMap[platformID] = conn

internal/msg_transfer/logic/db.go

@@ -3,7 +3,7 @@ package logic
 import (
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
-	pbMsg "Open_IM/pkg/proto/chat"
+	pbMsg "Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/utils"
 )
 

internal/msg_transfer/logic/online_history_msg_handler.go

@@ -7,7 +7,7 @@ import (
 	kfk "Open_IM/pkg/common/kafka"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
-	pbMsg "Open_IM/pkg/proto/chat"
+	pbMsg "Open_IM/pkg/proto/msg"
 	pbPush "Open_IM/pkg/proto/push"
 	"Open_IM/pkg/utils"
 	"context"
@@ -97,36 +97,42 @@ func (och *OnlineHistoryRedisConsumerHandler) Run(channelID int) {
 				//	return
 				//}
 				log.Debug(triggerID, "msg storage length", len(storageMsgList), "push length", len(notStoragePushMsgList))
-				err, lastSeq := saveUserChatList(msgChannelValue.aggregationID, storageMsgList, triggerID)
+				if len(storageMsgList) > 0 {
-				if err != nil {
+					err, lastSeq := saveUserChatList(msgChannelValue.aggregationID, storageMsgList, triggerID)
-					singleMsgFailedCount += uint64(len(storageMsgList))
+					if err != nil {
-					log.NewError(triggerID, "single data insert to redis err", err.Error(), storageMsgList)
+						singleMsgFailedCount += uint64(len(storageMsgList))
+						log.NewError(triggerID, "single data insert to redis err", err.Error(), storageMsgList)
+					} else {
+						singleMsgSuccessCountMutex.Lock()
+						singleMsgSuccessCount += uint64(len(storageMsgList))
+						singleMsgSuccessCountMutex.Unlock()
+						och.SendMessageToMongoCH(msgChannelValue.aggregationID, triggerID, storageMsgList, lastSeq)
+						for _, v := range storageMsgList {
+							sendMessageToPushMQ(v, msgChannelValue.aggregationID)
+						}
+						for _, x := range notStoragePushMsgList {
+							sendMessageToPushMQ(x, msgChannelValue.aggregationID)
+						}
+					}
+
 				} else {
-					singleMsgSuccessCountMutex.Lock()
+					for _, x := range notStoragePushMsgList {
-					singleMsgSuccessCount += uint64(len(storageMsgList))
+						sendMessageToPushMQ(x, msgChannelValue.aggregationID)
-					singleMsgSuccessCountMutex.Unlock()
+					}
-					och.SendMessageToMongoCH(msgChannelValue.aggregationID, triggerID, storageMsgList, lastSeq)
-					go func(push, storage []*pbMsg.MsgDataToMQ) {
-						for _, v := range storage {
-							sendMessageToPush(v, msgChannelValue.aggregationID)
-						}
-						for _, x := range push {
-							sendMessageToPush(x, msgChannelValue.aggregationID)
-						}
-
-					}(notStoragePushMsgList, storageMsgList)
-
 				}
 			}
 		}
 	}
 }
+
 func (och *OnlineHistoryRedisConsumerHandler) SendMessageToMongoCH(aggregationID string, triggerID string, messages []*pbMsg.MsgDataToMQ, lastSeq uint64) {
-	pid, offset, err := producerToMongo.SendMessage(&pbMsg.MsgDataToMongoByMQ{LastSeq: lastSeq, AggregationID: aggregationID, MessageList: messages, TriggerID: triggerID}, aggregationID, triggerID)
+	if len(messages) > 0 {
-	if err != nil {
+		pid, offset, err := producerToMongo.SendMessage(&pbMsg.MsgDataToMongoByMQ{LastSeq: lastSeq, AggregationID: aggregationID, MessageList: messages, TriggerID: triggerID}, aggregationID, triggerID)
-		log.Error(triggerID, "kafka send failed", "send data", len(messages), "pid", pid, "offset", offset, "err", err.Error(), "key", aggregationID)
+		if err != nil {
-	} else {
+			log.Error(triggerID, "kafka send failed", "send data", len(messages), "pid", pid, "offset", offset, "err", err.Error(), "key", aggregationID)
-		//	log.NewWarn(m.OperationID, "sendMsgToKafka   client msgID ", m.MsgData.ClientMsgID)
+		} else {
+			//	log.NewWarn(m.OperationID, "sendMsgToKafka   client msgID ", m.MsgData.ClientMsgID)
+		}
 	}
 	//hashCode := getHashCode(aggregationID)
 	//channelID := hashCode % ChannelNum
@@ -508,6 +514,7 @@ func (och *OnlineHistoryRedisConsumerHandler) ConsumeClaim(sess sarama.ConsumerG
 //	}
 //	return nil
 //}
+
 func sendMessageToPush(message *pbMsg.MsgDataToMQ, pushToUserID string) {
 	log.Info(message.OperationID, "msg_transfer send message to push", "message", message.String())
 	rpcPushMsg := pbPush.PushMsgReq{OperationID: message.OperationID, MsgData: message.MsgData, PushToUserID: pushToUserID}
@@ -535,6 +542,17 @@ func sendMessageToPush(message *pbMsg.MsgDataToMQ, pushToUserID string) {
 	}
 }
 
+func sendMessageToPushMQ(message *pbMsg.MsgDataToMQ, pushToUserID string) {
+	log.Info(message.OperationID, utils.GetSelfFuncName(), "msg ", message.String(), pushToUserID)
+	rpcPushMsg := pbPush.PushMsgReq{OperationID: message.OperationID, MsgData: message.MsgData, PushToUserID: pushToUserID}
+	mqPushMsg := pbMsg.PushMsgDataToMQ{OperationID: message.OperationID, MsgData: message.MsgData, PushToUserID: pushToUserID}
+	pid, offset, err := producer.SendMessage(&mqPushMsg, mqPushMsg.PushToUserID, rpcPushMsg.OperationID)
+	if err != nil {
+		log.Error(mqPushMsg.OperationID, "kafka send failed", "send data", message.String(), "pid", pid, "offset", offset, "err", err.Error())
+	}
+	return
+}
+
 // String hashes a string to a unique hashcode.
 //
 // crc32 returns a uint32, but for our use we need

internal/msg_transfer/logic/online_msg_to_mongo_handler.go

@@ -6,7 +6,7 @@ import (
 	"Open_IM/pkg/common/db"
 	kfk "Open_IM/pkg/common/kafka"
 	"Open_IM/pkg/common/log"
-	pbMsg "Open_IM/pkg/proto/chat"
+	pbMsg "Open_IM/pkg/proto/msg"
 	server_api_params "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"github.com/Shopify/sarama"
@@ -36,7 +36,12 @@ func (mc *OnlineHistoryMongoConsumerHandler) handleChatWs2Mongo(cMsg *sarama.Con
 	}
 	err = db.DB.BatchInsertChat2DB(msgFromMQ.AggregationID, msgFromMQ.MessageList, msgFromMQ.TriggerID, msgFromMQ.LastSeq)
 	if err != nil {
-		log.NewError(msgFromMQ.TriggerID, "single data insert to mongo err", err.Error(), msgFromMQ.MessageList)
+		log.NewError(msgFromMQ.TriggerID, "single data insert to mongo err", err.Error(), msgFromMQ.MessageList, msgFromMQ.AggregationID, msgFromMQ.TriggerID)
+	} else {
+		err = db.DB.DeleteMessageFromCache(msgFromMQ.MessageList, msgFromMQ.AggregationID, msgFromMQ.GetTriggerID())
+		if err != nil {
+			log.NewError(msgFromMQ.TriggerID, "remove cache msg from redis  err", err.Error(), msgFromMQ.MessageList, msgFromMQ.AggregationID, msgFromMQ.TriggerID)
+		}
 	}
 	for _, v := range msgFromMQ.MessageList {
 		if v.MsgData.ContentType == constant.DeleteMessageNotification {

internal/msg_transfer/logic/persistent_msg_handler.go

@@ -12,7 +12,7 @@ import (
 	"Open_IM/pkg/common/db/mysql_model/im_mysql_msg_model"
 	kfk "Open_IM/pkg/common/kafka"
 	"Open_IM/pkg/common/log"
-	pbMsg "Open_IM/pkg/proto/chat"
+	pbMsg "Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/utils"
 	"github.com/Shopify/sarama"
 	"github.com/golang/protobuf/proto"

internal/push/fcm/push.go

@@ -0,0 +1,90 @@
+package fcm
+
+import (
+	"Open_IM/internal/push"
+	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/db"
+	"Open_IM/pkg/common/log"
+	"Open_IM/pkg/tools"
+	"context"
+	firebase "firebase.google.com/go"
+	"firebase.google.com/go/messaging"
+	"google.golang.org/api/option"
+	"path/filepath"
+	"strconv"
+)
+
+const SinglePushCountLimit = 400
+
+type Fcm struct {
+	FcmMsgCli *messaging.Client
+}
+
+func NewFcm() *Fcm {
+	return newFcmClient()
+}
+func newFcmClient() *Fcm {
+	opt := option.WithCredentialsFile(filepath.Join(config.Root, "config", config.Config.Push.Fcm.ServiceAccount))
+	fcmApp, err := firebase.NewApp(context.Background(), nil, opt)
+	if err != nil {
+		log.Debug("", "error initializing app: ", err.Error())
+		return nil
+	}
+	//授权
+	// fcmClient, err := fcmApp.Auth(context.Background())
+	// if err != nil {
+	// 	log.Println("error getting Auth client: %v\n", err)
+	// 	return
+	// }
+	// log.Printf("%#v\r\n", fcmClient)
+	ctx := context.Background()
+	fcmMsgClient, err := fcmApp.Messaging(ctx)
+	if err != nil {
+		panic(err.Error())
+		return nil
+	}
+	return &Fcm{FcmMsgCli: fcmMsgClient}
+}
+
+func (f *Fcm) Push(accounts []string, alert, detailContent, operationID string, opts push.PushOpts) (string, error) {
+	// accounts->registrationToken
+	Tokens := make([]string, 0)
+	for _, account := range accounts {
+		IosfcmToken, IosErr := db.DB.GetFcmToken(account, 1)
+		AndroidfcmToken, AndroidErr := db.DB.GetFcmToken(account, 2)
+
+		if IosErr == nil {
+			Tokens = append(Tokens, IosfcmToken)
+		}
+		if AndroidErr == nil {
+			Tokens = append(Tokens, AndroidfcmToken)
+		}
+	}
+	Success := 0
+	Fail := 0
+	result := tools.NewSplitter(SinglePushCountLimit, Tokens).GetSplitResult()
+	Msg := new(messaging.MulticastMessage)
+	Msg.Notification = &messaging.Notification{}
+	Msg.Notification.Body = detailContent
+	Msg.Notification.Title = alert
+	ctx := context.Background()
+	for _, v := range result {
+		Msg.Tokens = v.Item
+		//SendMulticast sends the given multicast message to all the FCM registration tokens specified.
+		//The tokens array in MulticastMessage may contain up to 500 tokens.
+		//SendMulticast uses the `SendAll()` function to send the given message to all the target recipients.
+		//The responses list obtained from the return value corresponds to the order of the input tokens.
+		//An error from SendMulticast indicates a total failure -- i.e.
+		//the message could not be sent to any of the recipients.
+		//Partial failures are indicated by a `BatchResponse` return value.
+		response, err := f.FcmMsgCli.SendMulticast(ctx, Msg)
+		if err != nil {
+			Fail = Fail + len(v.Item)
+			log.Info(operationID, "some token push err", err.Error(), len(v.Item))
+			continue
+		}
+		Success = Success + response.SuccessCount
+		Fail = Fail + response.FailureCount
+	}
+	return strconv.Itoa(Success) + " Success," + strconv.Itoa(Fail) + " Fail", nil
+}

internal/push/fcm/push_test.go

@@ -0,0 +1,15 @@
+package fcm
+
+import (
+	"Open_IM/internal/push"
+	"fmt"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func Test_Push(t *testing.T) {
+	offlinePusher := NewFcm()
+	resp, err := offlinePusher.Push([]string{"test_uid"}, "test", "test", "12321", push.PushOpts{})
+	assert.Nil(t, err)
+	fmt.Println(resp)
+}

internal/push/logic/callback.go

@@ -5,22 +5,26 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/http"
+	"Open_IM/pkg/common/log"
 	commonPb "Open_IM/pkg/proto/sdk_ws"
+	"Open_IM/pkg/utils"
 	http2 "net/http"
 )
 
-func callbackOfflinePush(operationID, userID string, msg *commonPb.MsgData) cbApi.CommonCallbackResp {
+func callbackOfflinePush(operationID string, userIDList []string, msg *commonPb.MsgData, offlinePushUserIDList *[]string) cbApi.CommonCallbackResp {
 	callbackResp := cbApi.CommonCallbackResp{OperationID: operationID}
 	if !config.Config.Callback.CallbackOfflinePush.Enable {
 		return callbackResp
 	}
-	callbackOfflinePushReq := cbApi.CallbackOfflinePushReq{
+	req := cbApi.CallbackBeforePushReq{
-		UserStatusCallbackReq: cbApi.UserStatusCallbackReq{
+		UserStatusBatchCallbackReq: cbApi.UserStatusBatchCallbackReq{
-			CallbackCommand: constant.CallbackOfflinePushCommand,
+			UserStatusBaseCallback: cbApi.UserStatusBaseCallback{
-			OperationID:     operationID,
+				CallbackCommand: constant.CallbackOfflinePushCommand,
-			UserID:          userID,
+				OperationID:     operationID,
-			PlatformID:      msg.SenderPlatformID,
+				PlatformID:      msg.SenderPlatformID,
-			Platform:        constant.PlatformIDToName(int(msg.SenderPlatformID)),
+				Platform:        constant.PlatformIDToName(int(msg.SenderPlatformID)),
+			},
+			UserIDList: userIDList,
 		},
 		OfflinePushInfo: msg.OfflinePushInfo,
 		SendID:          msg.SendID,
@@ -30,8 +34,8 @@ func callbackOfflinePush(operationID, userID string, msg *commonPb.MsgData) cbAp
 		AtUserIDList:    msg.AtUserIDList,
 		Content:         string(msg.Content),
 	}
-	callbackOfflinePushResp := &cbApi.CallbackOfflinePushResp{CommonCallbackResp: &callbackResp}
+	resp := &cbApi.CallbackBeforePushResp{CommonCallbackResp: &callbackResp}
-	if err := http.PostReturn(config.Config.Callback.CallbackUrl, callbackOfflinePushReq, callbackOfflinePushResp, config.Config.Callback.CallbackOfflinePush.CallbackTimeOut); err != nil {
+	if err := http.PostReturn(config.Config.Callback.CallbackUrl, req, resp, config.Config.Callback.CallbackOfflinePush.CallbackTimeOut); err != nil {
 		callbackResp.ErrCode = http2.StatusInternalServerError
 		callbackResp.ErrMsg = err.Error()
 		if !config.Config.Callback.CallbackOfflinePush.CallbackFailedContinue {
@@ -42,5 +46,87 @@ func callbackOfflinePush(operationID, userID string, msg *commonPb.MsgData) cbAp
 			return callbackResp
 		}
 	}
+	if resp.ErrCode == constant.CallbackHandleSuccess && resp.ActionCode == constant.ActionAllow && len(resp.UserIDList) != 0 {
+		*offlinePushUserIDList = resp.UserIDList
+	}
+	log.NewDebug(operationID, utils.GetSelfFuncName(), offlinePushUserIDList, resp.UserIDList)
 	return callbackResp
 }
+
+func callbackOnlinePush(operationID string, userIDList []string, msg *commonPb.MsgData) cbApi.CommonCallbackResp {
+	callbackResp := cbApi.CommonCallbackResp{OperationID: operationID}
+	if !config.Config.Callback.CallbackOnlinePush.Enable {
+		return callbackResp
+	}
+	req := cbApi.CallbackBeforePushReq{
+		UserStatusBatchCallbackReq: cbApi.UserStatusBatchCallbackReq{
+			UserStatusBaseCallback: cbApi.UserStatusBaseCallback{
+				CallbackCommand: constant.CallbackOnlinePushCommand,
+				OperationID:     operationID,
+				PlatformID:      msg.SenderPlatformID,
+				Platform:        constant.PlatformIDToName(int(msg.SenderPlatformID)),
+			},
+			UserIDList: userIDList,
+		},
+		OfflinePushInfo: msg.OfflinePushInfo,
+		SendID:          msg.SendID,
+		GroupID:         msg.GroupID,
+		ContentType:     msg.ContentType,
+		SessionType:     msg.SessionType,
+		AtUserIDList:    msg.AtUserIDList,
+		Content:         string(msg.Content),
+	}
+	resp := &cbApi.CallbackBeforePushResp{CommonCallbackResp: &callbackResp}
+	if err := http.PostReturn(config.Config.Callback.CallbackUrl, req, resp, config.Config.Callback.CallbackOnlinePush.CallbackTimeOut); err != nil {
+		callbackResp.ErrCode = http2.StatusInternalServerError
+		callbackResp.ErrMsg = err.Error()
+		if !config.Config.Callback.CallbackOnlinePush.CallbackFailedContinue {
+			callbackResp.ActionCode = constant.ActionForbidden
+			return callbackResp
+		} else {
+			callbackResp.ActionCode = constant.ActionAllow
+			return callbackResp
+		}
+	}
+	return callbackResp
+}
+
+func callbackBeforeSuperGroupOnlinePush(operationID string, groupID string, msg *commonPb.MsgData, pushToUserList *[]string) cbApi.CommonCallbackResp {
+	callbackResp := cbApi.CommonCallbackResp{OperationID: operationID}
+	if !config.Config.Callback.CallbackBeforeSuperGroupOnlinePush.Enable {
+		return callbackResp
+	}
+	req := cbApi.CallbackBeforeSuperGroupOnlinePushReq{
+		UserStatusBaseCallback: cbApi.UserStatusBaseCallback{
+			CallbackCommand: constant.CallbackSuperGroupOnlinePushCommand,
+			OperationID:     operationID,
+			PlatformID:      msg.SenderPlatformID,
+			Platform:        constant.PlatformIDToName(int(msg.SenderPlatformID)),
+		},
+		OfflinePushInfo: msg.OfflinePushInfo,
+		SendID:          msg.SendID,
+		GroupID:         groupID,
+		ContentType:     msg.ContentType,
+		SessionType:     msg.SessionType,
+		AtUserIDList:    msg.AtUserIDList,
+		Content:         string(msg.Content),
+	}
+	resp := &cbApi.CallbackBeforeSuperGroupOnlinePushResp{CommonCallbackResp: &callbackResp}
+	if err := http.PostReturn(config.Config.Callback.CallbackUrl, req, resp, config.Config.Callback.CallbackBeforeSuperGroupOnlinePush.CallbackTimeOut); err != nil {
+		callbackResp.ErrCode = http2.StatusInternalServerError
+		callbackResp.ErrMsg = err.Error()
+		if !config.Config.Callback.CallbackBeforeSuperGroupOnlinePush.CallbackFailedContinue {
+			callbackResp.ActionCode = constant.ActionForbidden
+			return callbackResp
+		} else {
+			callbackResp.ActionCode = constant.ActionAllow
+			return callbackResp
+		}
+	}
+	if resp.ErrCode == constant.CallbackHandleSuccess && resp.ActionCode == constant.ActionAllow && len(resp.UserIDList) != 0 {
+		*pushToUserList = resp.UserIDList
+	}
+	log.NewDebug(operationID, utils.GetSelfFuncName(), pushToUserList, resp.UserIDList)
+	return callbackResp
+
+}

internal/push/logic/init.go

@@ -8,6 +8,7 @@ package logic
 
 import (
 	pusher "Open_IM/internal/push"
+	fcm "Open_IM/internal/push/fcm"
 	"Open_IM/internal/push/getui"
 	jpush "Open_IM/internal/push/jpush"
 	"Open_IM/pkg/common/config"
@@ -41,6 +42,10 @@ func init() {
 	if config.Config.Push.Jpns.Enable {
 		offlinePusher = jpush.JPushClient
 	}
+
+	if config.Config.Push.Fcm.Enable {
+		offlinePusher = fcm.NewFcm()
+	}
 }
 
 func Run() {

internal/push/logic/push_handler.go

@@ -8,9 +8,10 @@ package logic
 
 import (
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
 	kfk "Open_IM/pkg/common/kafka"
 	"Open_IM/pkg/common/log"
-	pbChat "Open_IM/pkg/proto/chat"
+	pbChat "Open_IM/pkg/proto/msg"
 	pbPush "Open_IM/pkg/proto/push"
 	"github.com/Shopify/sarama"
 	"github.com/golang/protobuf/proto"
@@ -37,8 +38,19 @@ func (ms *PushConsumerHandler) handleMs2PsChat(msg []byte) {
 		log.Error("", "push Unmarshal msg err", "msg", string(msg), "err", err.Error())
 		return
 	}
+	pbData := &pbPush.PushMsgReq{
+		OperationID:  msgFromMQ.OperationID,
+		MsgData:      msgFromMQ.MsgData,
+		PushToUserID: msgFromMQ.PushToUserID,
+	}
+	switch msgFromMQ.MsgData.SessionType {
+	case constant.SuperGroupChatType:
+		MsgToSuperGroupUser(pbData)
+	default:
+		MsgToUser(pbData)
+	}
 	//Call push module to send message to the user
-	MsgToUser((*pbPush.PushMsgReq)(&msgFromMQ))
+	//MsgToUser((*pbPush.PushMsgReq)(&msgFromMQ))
 }
 func (PushConsumerHandler) Setup(_ sarama.ConsumerGroupSession) error   { return nil }
 func (PushConsumerHandler) Cleanup(_ sarama.ConsumerGroupSession) error { return nil }

internal/push/logic/push_to_client.go

@@ -45,12 +45,24 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) {
 	log.Debug(pushMsg.OperationID, "Get msg from msg_transfer And push msg", pushMsg.String())
 	if len(grpcCons) == 0 {
 		log.NewWarn(pushMsg.OperationID, "first GetConn4Unique ")
-		grpcCons = getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOnlineMessageRelayName)
+		grpcCons = getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImRelayName)
 	}
+
+	var UIDList = []string{pushMsg.PushToUserID}
+	callbackResp := callbackOnlinePush(pushMsg.OperationID, UIDList, pushMsg.MsgData)
+	log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "OnlinePush callback Resp")
+	if callbackResp.ErrCode != 0 {
+		log.NewError(pushMsg.OperationID, utils.GetSelfFuncName(), "callbackOnlinePush result: ", callbackResp)
+	}
+	if callbackResp.ActionCode != constant.ActionAllow {
+		log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "OnlinePush stop")
+		return
+	}
+
 	//Online push message
 	log.Debug(pushMsg.OperationID, "len  grpc", len(grpcCons), "data", pushMsg.String())
 	for _, v := range grpcCons {
-		msgClient := pbRelay.NewOnlineMessageRelayServiceClient(v)
+		msgClient := pbRelay.NewRelayClient(v)
 		reply, err := msgClient.SuperGroupOnlineBatchPushOneMsg(context.Background(), &pbRelay.OnlineBatchPushOneMsgReq{OperationID: pushMsg.OperationID, MsgData: pushMsg.MsgData, PushToUserIDList: []string{pushMsg.PushToUserID}})
 		if err != nil {
 			log.NewError("SuperGroupOnlineBatchPushOneMsg push data to client rpc err", pushMsg.OperationID, "err", err)
@@ -75,9 +87,6 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) {
 				return
 			}
 		}
-		//Use offline push messaging
-		var UIDList []string
-		UIDList = append(UIDList, pushMsg.PushToUserID)
 		customContent := OpenIMContent{
 			SessionType: int(pushMsg.MsgData.SessionType),
 			From:        pushMsg.MsgData.SendID,
@@ -118,7 +127,7 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) {
 			}
 		}
 
-		callbackResp := callbackOfflinePush(pushMsg.OperationID, UIDList[0], pushMsg.MsgData)
+		callbackResp := callbackOfflinePush(pushMsg.OperationID, UIDList, pushMsg.MsgData, &[]string{})
 		log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "offline callback Resp")
 		if callbackResp.ErrCode != 0 {
 			log.NewError(pushMsg.OperationID, utils.GetSelfFuncName(), "callbackOfflinePush result: ", callbackResp)
@@ -148,32 +157,50 @@ func MsgToSuperGroupUser(pushMsg *pbPush.PushMsgReq) {
 	var wsResult []*pbRelay.SingelMsgToUserResultList
 	isOfflinePush := utils.GetSwitchFromOptions(pushMsg.MsgData.Options, constant.IsOfflinePush)
 	log.Debug(pushMsg.OperationID, "Get super group msg from msg_transfer And push msg", pushMsg.String())
-	getGroupMemberIDListFromCacheReq := &pbCache.GetGroupMemberIDListFromCacheReq{OperationID: pushMsg.OperationID, GroupID: pushMsg.MsgData.GroupID}
+	var pushToUserIDList []string
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, pushMsg.OperationID)
+	if config.Config.Callback.CallbackBeforeSuperGroupOnlinePush.Enable {
-	if etcdConn == nil {
+		callbackResp := callbackBeforeSuperGroupOnlinePush(pushMsg.OperationID, pushMsg.PushToUserID, pushMsg.MsgData, &pushToUserIDList)
-		errMsg := pushMsg.OperationID + "getcdv3.GetConn == nil"
+		log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "offline callback Resp")
-		log.NewError(pushMsg.OperationID, errMsg)
+		if callbackResp.ErrCode != 0 {
-		return
+			log.NewError(pushMsg.OperationID, utils.GetSelfFuncName(), "callbackOfflinePush result: ", callbackResp)
+		}
+		if callbackResp.ActionCode != constant.ActionAllow {
+			log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "onlinePush stop")
+			return
+		}
+		log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "callback userIDList Resp", pushToUserIDList)
 	}
-	client := pbCache.NewCacheClient(etcdConn)
+	if len(pushToUserIDList) == 0 {
-	cacheResp, err := client.GetGroupMemberIDListFromCache(context.Background(), getGroupMemberIDListFromCacheReq)
+		getGroupMemberIDListFromCacheReq := &pbCache.GetGroupMemberIDListFromCacheReq{OperationID: pushMsg.OperationID, GroupID: pushMsg.MsgData.GroupID}
-	if err != nil {
+		etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, pushMsg.OperationID)
-		log.NewError(pushMsg.OperationID, "GetGroupMemberIDListFromCache rpc call failed ", err.Error())
+		if etcdConn == nil {
-		return
+			errMsg := pushMsg.OperationID + "getcdv3.GetConn == nil"
-	}
+			log.NewError(pushMsg.OperationID, errMsg)
-	if cacheResp.CommonResp.ErrCode != 0 {
+			return
-		log.NewError(pushMsg.OperationID, "GetGroupMemberIDListFromCache rpc logic call failed ", cacheResp.String())
+		}
-		return
+		client := pbCache.NewCacheClient(etcdConn)
+		cacheResp, err := client.GetGroupMemberIDListFromCache(context.Background(), getGroupMemberIDListFromCacheReq)
+		if err != nil {
+			log.NewError(pushMsg.OperationID, "GetGroupMemberIDListFromCache rpc call failed ", err.Error())
+			return
+		}
+		if cacheResp.CommonResp.ErrCode != 0 {
+			log.NewError(pushMsg.OperationID, "GetGroupMemberIDListFromCache rpc logic call failed ", cacheResp.String())
+			return
+		}
+		pushToUserIDList = cacheResp.UserIDList
 	}
+
 	if len(grpcCons) == 0 {
 		log.NewWarn(pushMsg.OperationID, "first GetConn4Unique ")
-		grpcCons = getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOnlineMessageRelayName)
+		grpcCons = getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImRelayName)
 	}
+
 	//Online push message
 	log.Debug("test", pushMsg.OperationID, "len  grpc", len(grpcCons), "data", pushMsg.String())
 	for _, v := range grpcCons {
-		msgClient := pbRelay.NewOnlineMessageRelayServiceClient(v)
+		msgClient := pbRelay.NewRelayClient(v)
-		reply, err := msgClient.SuperGroupOnlineBatchPushOneMsg(context.Background(), &pbRelay.OnlineBatchPushOneMsgReq{OperationID: pushMsg.OperationID, MsgData: pushMsg.MsgData, PushToUserIDList: cacheResp.UserIDList})
+		reply, err := msgClient.SuperGroupOnlineBatchPushOneMsg(context.Background(), &pbRelay.OnlineBatchPushOneMsgReq{OperationID: pushMsg.OperationID, MsgData: pushMsg.MsgData, PushToUserIDList: pushToUserIDList})
 		if err != nil {
 			log.NewError("push data to client rpc err", pushMsg.OperationID, "err", err)
 			continue
@@ -192,7 +219,7 @@ func MsgToSuperGroupUser(pushMsg *pbPush.PushMsgReq) {
 				onlineSuccessUserIDList = append(onlineSuccessUserIDList, v.UserID)
 			}
 		}
-		onlineFailedUserIDList := utils.DifferenceString(onlineSuccessUserIDList, cacheResp.UserIDList)
+		onlineFailedUserIDList := utils.DifferenceString(onlineSuccessUserIDList, pushToUserIDList)
 		//Use offline push messaging
 		customContent := OpenIMContent{
 			SessionType: int(pushMsg.MsgData.SessionType),
@@ -233,30 +260,39 @@ func MsgToSuperGroupUser(pushMsg *pbPush.PushMsgReq) {
 
 			}
 		}
+		if len(onlineFailedUserIDList) > 0 {
+			var offlinePushUserIDList []string
+			var needOfflinePushUserIDList []string
+			callbackResp := callbackOfflinePush(pushMsg.OperationID, onlineFailedUserIDList, pushMsg.MsgData, &offlinePushUserIDList)
+			log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "offline callback Resp")
+			if callbackResp.ErrCode != 0 {
+				log.NewError(pushMsg.OperationID, utils.GetSelfFuncName(), "callbackOfflinePush result: ", callbackResp)
+			}
+			if callbackResp.ActionCode != constant.ActionAllow {
+				log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "offlinePush stop")
+				return
+			}
+			if len(offlinePushUserIDList) > 0 {
+				needOfflinePushUserIDList = offlinePushUserIDList
+			} else {
+				needOfflinePushUserIDList = onlineFailedUserIDList
+			}
+			if offlinePusher == nil {
+				return
+			}
+			opts, err := GetOfflinePushOpts(pushMsg)
+			if err != nil {
+				log.NewError(pushMsg.OperationID, utils.GetSelfFuncName(), "GetOfflinePushOpts failed", pushMsg, err.Error())
+			}
+			log.NewInfo(pushMsg.OperationID, utils.GetSelfFuncName(), onlineFailedUserIDList, content, jsonCustomContent, "opts:", opts)
+			pushResult, err := offlinePusher.Push(needOfflinePushUserIDList, content, jsonCustomContent, pushMsg.OperationID, opts)
+			if err != nil {
+				log.NewError(pushMsg.OperationID, "offline push error", pushMsg.String(), err.Error())
+			} else {
+				log.NewDebug(pushMsg.OperationID, "offline push return result is ", pushResult, pushMsg.MsgData)
+			}
+		}
 
-		callbackResp := callbackOfflinePush(pushMsg.OperationID, onlineFailedUserIDList[0], pushMsg.MsgData)
-		log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "offline callback Resp")
-		if callbackResp.ErrCode != 0 {
-			log.NewError(pushMsg.OperationID, utils.GetSelfFuncName(), "callbackOfflinePush result: ", callbackResp)
-		}
-		if callbackResp.ActionCode != constant.ActionAllow {
-			log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "offlinePush stop")
-			return
-		}
-		if offlinePusher == nil {
-			return
-		}
-		opts, err := GetOfflinePushOpts(pushMsg)
-		if err != nil {
-			log.NewError(pushMsg.OperationID, utils.GetSelfFuncName(), "GetOfflinePushOpts failed", pushMsg, err.Error())
-		}
-		log.NewInfo(pushMsg.OperationID, utils.GetSelfFuncName(), onlineFailedUserIDList, content, jsonCustomContent, "opts:", opts)
-		pushResult, err := offlinePusher.Push(onlineFailedUserIDList, content, jsonCustomContent, pushMsg.OperationID, opts)
-		if err != nil {
-			log.NewError(pushMsg.OperationID, "offline push error", pushMsg.String(), err.Error())
-		} else {
-			log.NewDebug(pushMsg.OperationID, "offline push return result is ", pushResult, pushMsg.MsgData)
-		}
 	}
 }
 

internal/rpc/auth/auth.go

@@ -83,9 +83,9 @@ func (rpc *rpcAuth) ForceLogout(_ context.Context, req *pbAuth.ForceLogoutReq) (
 
 func (rpc *rpcAuth) forceKickOff(userID string, platformID int32, operationID string) error {
 
-	grpcCons := getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOnlineMessageRelayName)
+	grpcCons := getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImRelayName)
 	for _, v := range grpcCons {
-		client := pbRelay.NewOnlineMessageRelayServiceClient(v)
+		client := pbRelay.NewRelayClient(v)
 		kickReq := &pbRelay.KickUserOfflineReq{OperationID: operationID, KickUserIDList: []string{userID}, PlatformID: platformID}
 		log.NewInfo(operationID, "KickUserOffline ", client, kickReq.String())
 		_, err := client.KickUserOffline(context.Background(), kickReq)

internal/rpc/cache/cache.go

@@ -3,20 +3,16 @@ package cache
 import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db"
+	"Open_IM/pkg/common/db/rocks_cache"
-	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
 	pbCache "Open_IM/pkg/proto/cache"
-	commonPb "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"context"
+	"google.golang.org/grpc"
 	"net"
 	"strconv"
 	"strings"
-	"sync"
-
-	"google.golang.org/grpc"
 )
 
 type cacheServer struct {
@@ -54,13 +50,6 @@ func (s *cacheServer) Run() {
 	defer listener.Close()
 	//grpc server
 
-	//to cache
-	err = SyncDB2Cache()
-	if err != nil {
-		log.NewError("", err.Error(), "db to cache failed")
-		panic(err.Error())
-	}
-
 	srv := grpc.NewServer()
 	defer srv.GracefulStop()
 	pbCache.RegisterCacheServer(srv, s)
@@ -86,167 +75,10 @@ func (s *cacheServer) Run() {
 	log.NewInfo("0", "message cms rpc success")
 }
 
-func SyncDB2Cache() error {
-	var err error
-	log.NewInfo("0", utils.GetSelfFuncName())
-	userList, err := imdb.GetAllUser()
-	log.NewDebug("", utils.GetSelfFuncName(), "userList", userList)
-	if err != nil {
-		return utils.Wrap(err, "")
-	}
-	//err = updateAllUserToCache(userList)
-	wg := &sync.WaitGroup{}
-	wg.Add(3)
-	go func() {
-		defer wg.Done()
-		err = updateAllFriendToCache(userList)
-	}()
-	go func() {
-		defer wg.Done()
-		err = updateAllBlackListToCache(userList)
-	}()
-	go func() {
-		defer wg.Done()
-		err = updateAllGroupMemberListToCache()
-	}()
-	wg.Wait()
-	return utils.Wrap(err, "")
-}
-
-func DelRelationCache() {}
-
-func updateAllUserToCache(userList []db.User) error {
-	wg := &sync.WaitGroup{}
-	wg.Add(len(userList))
-	for _, userInfo := range userList {
-		go func() {
-			defer wg.Done()
-			userInfoPb := &commonPb.UserInfo{
-				UserID:         userInfo.UserID,
-				Nickname:       userInfo.Nickname,
-				FaceURL:        userInfo.FaceURL,
-				Gender:         userInfo.Gender,
-				PhoneNumber:    userInfo.PhoneNumber,
-				Birth:          uint32(userInfo.Birth.Unix()),
-				Email:          userInfo.Email,
-				Ex:             userInfo.Ex,
-				CreateTime:     uint32(userInfo.CreateTime.Unix()),
-				AppMangerLevel: userInfo.AppMangerLevel,
-			}
-			m, err := utils.Pb2Map(userInfoPb)
-			if err != nil {
-				log.NewWarn("", utils.GetSelfFuncName(), err.Error())
-			}
-			if err := db.DB.SetUserInfoToCache(userInfo.UserID, m); err != nil {
-				log.NewWarn("0", utils.GetSelfFuncName(), "set userInfo to cache failed", err.Error())
-			}
-		}()
-	}
-	wg.Wait()
-	log.NewInfo("0", utils.GetSelfFuncName(), "ok")
-	return nil
-}
-
-func updateAllGroupMemberListToCache() error {
-	log.NewInfo("0", utils.GetSelfFuncName())
-	groupIDList, err := imdb.GetAllGroupIDList()
-	if err != nil {
-		log.NewWarn("0", utils.GetSelfFuncName(), "getAllGroupIDList failed", err.Error())
-		panic(err.Error())
-	}
-
-	for _, groupID := range groupIDList {
-		groupMemberIDList, err := imdb.GetGroupMemberIDListByGroupID(groupID)
-		if err != nil {
-			log.NewWarn("", utils.GetSelfFuncName(), "GetGroupMemberIDListByGroupID", err.Error())
-			continue
-		}
-		if len(groupMemberIDList) > 0 {
-			if err := db.DB.AddGroupMemberToCache(groupID, groupMemberIDList...); err != nil {
-				log.NewWarn("", utils.GetSelfFuncName(), "AddGroupMemberToCache", err.Error())
-			}
-		}
-	}
-	log.NewInfo("0", utils.GetSelfFuncName(), "ok")
-	return nil
-}
-
-func updateAllFriendToCache(userList []db.User) error {
-	log.NewInfo("0", utils.GetSelfFuncName())
-	for _, user := range userList {
-		friendIDList, err := imdb.GetFriendIDListByUserID(user.UserID)
-		if err != nil {
-			log.NewWarn("0", utils.GetSelfFuncName(), err.Error())
-			continue
-		}
-		if len(friendIDList) > 0 {
-			if err := db.DB.AddFriendToCache(user.UserID, friendIDList...); err != nil {
-				log.NewWarn("0", utils.GetSelfFuncName(), err.Error(), friendIDList, user.UserID)
-			}
-		}
-	}
-
-	log.NewInfo("0", utils.GetSelfFuncName(), "ok")
-	return nil
-}
-
-func updateAllBlackListToCache(userList []db.User) error {
-	log.NewInfo("0", utils.GetSelfFuncName())
-	for _, user := range userList {
-		blackIDList, err := imdb.GetBlackIDListByUserID(user.UserID)
-		if err != nil {
-			log.NewWarn("", utils.GetSelfFuncName(), err.Error())
-			continue
-		}
-		if len(blackIDList) > 0 {
-			if err := db.DB.AddBlackUserToCache(user.UserID, blackIDList...); err != nil {
-				log.NewWarn("0", utils.GetSelfFuncName(), err.Error())
-			}
-		}
-	}
-	log.NewInfo("0", utils.GetSelfFuncName(), "ok")
-	return nil
-}
-
-func (s *cacheServer) GetUserInfoFromCache(_ context.Context, req *pbCache.GetUserInfoFromCacheReq) (resp *pbCache.GetUserInfoFromCacheResp, err error) {
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
-	resp = &pbCache.GetUserInfoFromCacheResp{
-		CommonResp: &pbCache.CommonResp{},
-	}
-	for _, userID := range req.UserIDList {
-		userInfo, err := db.DB.GetUserInfoFromCache(userID)
-		if err != nil {
-			log.NewError(req.OperationID, utils.GetSelfFuncName(), "get userInfo from cache failed", err.Error())
-			continue
-		}
-		resp.UserInfoList = append(resp.UserInfoList, userInfo)
-	}
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
-	return resp, nil
-}
-
-func (s *cacheServer) UpdateUserInfoToCache(_ context.Context, req *pbCache.UpdateUserInfoToCacheReq) (resp *pbCache.UpdateUserInfoToCacheResp, err error) {
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
-	resp = &pbCache.UpdateUserInfoToCacheResp{
-		CommonResp: &pbCache.CommonResp{},
-	}
-	for _, userInfo := range req.UserInfoList {
-		m, err := utils.Pb2Map(userInfo)
-		if err != nil {
-			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), *userInfo)
-		}
-		if err := db.DB.SetUserInfoToCache(userInfo.UserID, m); err != nil {
-			log.NewError(req.OperationID, utils.GetSelfFuncName(), "set userInfo to cache failed", err.Error())
-		}
-	}
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
-	return resp, nil
-}
-
 func (s *cacheServer) GetFriendIDListFromCache(_ context.Context, req *pbCache.GetFriendIDListFromCacheReq) (resp *pbCache.GetFriendIDListFromCacheResp, err error) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
 	resp = &pbCache.GetFriendIDListFromCacheResp{CommonResp: &pbCache.CommonResp{}}
-	friendIDList, err := db.DB.GetFriendIDListFromCache(req.UserID)
+	friendIDList, err := rocksCache.GetFriendIDListFromCache(req.UserID)
 	if err != nil {
 		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetFriendIDListFromCache", err.Error())
 		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
@@ -259,36 +91,24 @@ func (s *cacheServer) GetFriendIDListFromCache(_ context.Context, req *pbCache.G
 	return resp, nil
 }
 
-func (s *cacheServer) AddFriendToCache(_ context.Context, req *pbCache.AddFriendToCacheReq) (resp *pbCache.AddFriendToCacheResp, err error) {
+// this is for dtm call
+func (s *cacheServer) DelFriendIDListFromCache(_ context.Context, req *pbCache.DelFriendIDListFromCacheReq) (resp *pbCache.DelFriendIDListFromCacheResp, err error) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
-	resp = &pbCache.AddFriendToCacheResp{CommonResp: &pbCache.CommonResp{}}
+	resp = &pbCache.DelFriendIDListFromCacheResp{CommonResp: &pbCache.CommonResp{}}
-	if err := db.DB.AddFriendToCache(req.UserID, req.FriendID); err != nil {
+	if err := rocksCache.DelFriendIDListFromCache(req.UserID); err != nil {
-		log.NewError(req.OperationID, utils.GetSelfFuncName(), "AddFriendToCache failed", err.Error())
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "args: ", req.UserID, err.Error())
 		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
-		resp.CommonResp.ErrMsg = constant.ErrDB.ErrMsg
+		resp.CommonResp.ErrMsg = err.Error()
 		return resp, nil
 	}
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", resp.String())
-	return resp, nil
-}
-
-func (s *cacheServer) ReduceFriendFromCache(_ context.Context, req *pbCache.ReduceFriendFromCacheReq) (resp *pbCache.ReduceFriendFromCacheResp, err error) {
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
-	resp = &pbCache.ReduceFriendFromCacheResp{CommonResp: &pbCache.CommonResp{}}
-	if err := db.DB.ReduceFriendToCache(req.UserID, req.FriendID); err != nil {
-		log.NewError(req.OperationID, utils.GetSelfFuncName(), "AddFriendToCache failed", err.Error())
-		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
-		resp.CommonResp.ErrMsg = constant.ErrDB.ErrMsg
-		return resp, nil
-	}
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
 	return resp, nil
 }
 
 func (s *cacheServer) GetBlackIDListFromCache(_ context.Context, req *pbCache.GetBlackIDListFromCacheReq) (resp *pbCache.GetBlackIDListFromCacheResp, err error) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
 	resp = &pbCache.GetBlackIDListFromCacheResp{CommonResp: &pbCache.CommonResp{}}
-	blackUserIDList, err := db.DB.GetBlackListFromCache(req.UserID)
+	blackUserIDList, err := rocksCache.GetBlackListFromCache(req.UserID)
 	if err != nil {
 		log.NewError(req.OperationID, utils.GetSelfFuncName(), "AddFriendToCache failed", err.Error())
 		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
@@ -301,29 +121,16 @@ func (s *cacheServer) GetBlackIDListFromCache(_ context.Context, req *pbCache.Ge
 	return resp, nil
 }
 
-func (s *cacheServer) AddBlackUserToCache(_ context.Context, req *pbCache.AddBlackUserToCacheReq) (resp *pbCache.AddBlackUserToCacheResp, err error) {
+func (s *cacheServer) DelBlackIDListFromCache(_ context.Context, req *pbCache.DelBlackIDListFromCacheReq) (resp *pbCache.DelBlackIDListFromCacheResp, err error) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
-	resp = &pbCache.AddBlackUserToCacheResp{CommonResp: &pbCache.CommonResp{}}
+	resp = &pbCache.DelBlackIDListFromCacheResp{CommonResp: &pbCache.CommonResp{}}
-	if err := db.DB.AddBlackUserToCache(req.UserID, req.BlackUserID); err != nil {
+	if err := rocksCache.DelBlackIDListFromCache(req.UserID); err != nil {
-		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "args: ", req.UserID, err.Error())
 		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
-		resp.CommonResp.ErrMsg = constant.ErrDB.ErrMsg
+		resp.CommonResp.ErrMsg = err.Error()
 		return resp, nil
 	}
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", resp.String())
-	return resp, nil
-}
-
-func (s *cacheServer) ReduceBlackUserFromCache(_ context.Context, req *pbCache.ReduceBlackUserFromCacheReq) (resp *pbCache.ReduceBlackUserFromCacheResp, err error) {
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
-	resp = &pbCache.ReduceBlackUserFromCacheResp{CommonResp: &pbCache.CommonResp{}}
-	if err := db.DB.ReduceBlackUserFromCache(req.UserID, req.BlackUserID); err != nil {
-		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
-		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
-		resp.CommonResp.ErrMsg = constant.ErrDB.ErrMsg
-		return resp, nil
-	}
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
 	return resp, nil
 }
 
@@ -332,7 +139,7 @@ func (s *cacheServer) GetGroupMemberIDListFromCache(_ context.Context, req *pbCa
 	resp = &pbCache.GetGroupMemberIDListFromCacheResp{
 		CommonResp: &pbCache.CommonResp{},
 	}
-	userIDList, err := db.DB.GetGroupMemberIDListFromCache(req.GroupID)
+	userIDList, err := rocksCache.GetGroupMemberIDListFromCache(req.GroupID)
 	if err != nil {
 		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupMemberIDListFromCache failed", err.Error())
 		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
@@ -344,28 +151,15 @@ func (s *cacheServer) GetGroupMemberIDListFromCache(_ context.Context, req *pbCa
 	return resp, nil
 }
 
-func (s *cacheServer) AddGroupMemberToCache(_ context.Context, req *pbCache.AddGroupMemberToCacheReq) (resp *pbCache.AddGroupMemberToCacheResp, err error) {
+func (s *cacheServer) DelGroupMemberIDListFromCache(_ context.Context, req *pbCache.DelGroupMemberIDListFromCacheReq) (resp *pbCache.DelGroupMemberIDListFromCacheResp, err error) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
-	resp = &pbCache.AddGroupMemberToCacheResp{CommonResp: &pbCache.CommonResp{}}
+	resp = &pbCache.DelGroupMemberIDListFromCacheResp{CommonResp: &pbCache.CommonResp{}}
-	if err := db.DB.AddGroupMemberToCache(req.GroupID, req.UserIDList...); err != nil {
+	if err := rocksCache.DelGroupMemberIDListFromCache(req.GroupID); err != nil {
-		log.NewError(req.OperationID, utils.GetSelfFuncName(), "AddGroupMemberToCache failed", err.Error())
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "args: ", req.GroupID, err.Error())
 		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
-		resp.CommonResp.ErrMsg = constant.ErrDB.ErrMsg
+		resp.CommonResp.ErrMsg = err.Error()
 		return resp, nil
 	}
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", resp.String())
-	return resp, nil
-}
-
-func (s *cacheServer) ReduceGroupMemberFromCache(_ context.Context, req *pbCache.ReduceGroupMemberFromCacheReq) (resp *pbCache.ReduceGroupMemberFromCacheResp, err error) {
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
-	resp = &pbCache.ReduceGroupMemberFromCacheResp{CommonResp: &pbCache.CommonResp{}}
-	if err := db.DB.ReduceGroupMemberFromCache(req.GroupID, req.UserIDList...); err != nil {
-		log.NewError(req.OperationID, utils.GetSelfFuncName(), "ReduceGroupMemberFromCache failed", err.Error())
-		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
-		resp.CommonResp.ErrMsg = constant.ErrDB.ErrMsg
-		return resp, nil
-	}
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
 	return resp, nil
 }

internal/rpc/conversation/conversaion.go

@@ -70,6 +70,9 @@ func (rpc *rpcConversation) ModifyConversationField(c context.Context, req *pbCo
 		err = imdb.UpdateColumnsConversations(haveUserID, req.Conversation.ConversationID, map[string]interface{}{"ex": conversation.Ex})
 	case constant.FieldAttachedInfo:
 		err = imdb.UpdateColumnsConversations(haveUserID, req.Conversation.ConversationID, map[string]interface{}{"attached_info": conversation.AttachedInfo})
+	case constant.FieldUnread:
+		err = imdb.UpdateColumnsConversations(haveUserID, req.Conversation.ConversationID, map[string]interface{}{"unread_count": conversation.UnreadCount})
+
 	}
 	if err != nil {
 		log.NewError(req.OperationID, utils.GetSelfFuncName(), "UpdateColumnsConversations error", err.Error())

internal/rpc/friend/friend.go

@@ -6,6 +6,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/db"
 	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
+	"Open_IM/pkg/common/db/rocks_cache"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
 	cp "Open_IM/pkg/common/utils"
@@ -95,10 +96,10 @@ func (s *friendServer) AddBlacklist(ctx context.Context, req *pbFriend.AddBlackl
 	err := imdb.InsertInToUserBlackList(black)
 	if err != nil {
 		log.NewError(req.CommID.OperationID, "InsertInToUserBlackList failed ", err.Error())
-		return &pbFriend.AddBlacklistResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
+		return &pbFriend.AddBlacklistResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: err.Error()}}, nil
 	}
 	log.NewInfo(req.CommID.OperationID, "AddBlacklist rpc ok ", req.CommID.FromUserID, req.CommID.ToUserID)
-	reqAddBlackUserToCache := &pbCache.AddBlackUserToCacheReq{UserID: req.CommID.FromUserID, BlackUserID: req.CommID.ToUserID, OperationID: req.CommID.OperationID}
+
 	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.CommID.OperationID)
 	if etcdConn == nil {
 		errMsg := req.CommID.OperationID + "getcdv3.GetConn == nil"
@@ -106,15 +107,16 @@ func (s *friendServer) AddBlacklist(ctx context.Context, req *pbFriend.AddBlackl
 		return &pbFriend.AddBlacklistResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrInternal.ErrCode, ErrMsg: errMsg}}, nil
 	}
 	cacheClient := pbCache.NewCacheClient(etcdConn)
-	cacheResp, err := cacheClient.AddBlackUserToCache(context.Background(), reqAddBlackUserToCache)
+	cacheResp, err := cacheClient.DelBlackIDListFromCache(context.Background(), &pbCache.DelBlackIDListFromCacheReq{UserID: req.CommID.FromUserID, OperationID: req.CommID.OperationID})
 	if err != nil {
-		log.NewError(req.CommID.OperationID, "AddBlackUserToCache rpc call failed ", err.Error())
+		log.NewError(req.CommID.OperationID, "DelBlackIDListFromCache rpc call failed ", err.Error())
 		return &pbFriend.AddBlacklistResp{CommonResp: &pbFriend.CommonResp{ErrCode: 500, ErrMsg: "AddBlackUserToCache rpc call failed"}}, nil
 	}
 	if cacheResp.CommonResp.ErrCode != 0 {
-		log.NewError(req.CommID.OperationID, "AddBlackUserToCache rpc logic call failed ", cacheResp.String())
+		log.NewError(req.CommID.OperationID, "DelBlackIDListFromCache rpc logic call failed ", cacheResp.String())
 		return &pbFriend.AddBlacklistResp{CommonResp: &pbFriend.CommonResp{ErrCode: cacheResp.CommonResp.ErrCode, ErrMsg: cacheResp.CommonResp.ErrMsg}}, nil
 	}
+
 	chat.BlackAddedNotification(req)
 	return &pbFriend.AddBlacklistResp{CommonResp: &pbFriend.CommonResp{}}, nil
 }
@@ -208,6 +210,51 @@ func (s *friendServer) ImportFriend(ctx context.Context, req *pbFriend.ImportFri
 			}
 		}
 	}
+
+	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.OperationID)
+	if etcdConn == nil {
+		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		log.NewError(req.OperationID, errMsg)
+		resp.CommonResp.ErrMsg = errMsg
+		resp.CommonResp.ErrCode = 500
+		return &resp, nil
+	}
+	cacheClient := pbCache.NewCacheClient(etcdConn)
+	cacheResp, err := cacheClient.DelFriendIDListFromCache(context.Background(), &pbCache.DelFriendIDListFromCacheReq{UserID: req.FromUserID, OperationID: req.OperationID})
+	if err != nil {
+		log.NewError(req.OperationID, "DelBlackIDListFromCache rpc call failed ", err.Error())
+		resp.CommonResp.ErrCode = 500
+		resp.CommonResp.ErrMsg = err.Error()
+		return &resp, nil
+	}
+	if cacheResp.CommonResp.ErrCode != 0 {
+		log.NewError(req.OperationID, "DelBlackIDListFromCache rpc logic call failed ", cacheResp.String())
+		resp.CommonResp.ErrCode = 500
+		resp.CommonResp.ErrMsg = cacheResp.CommonResp.ErrMsg
+		return &resp, nil
+	}
+	if err := rocksCache.DelAllFriendsInfoFromCache(req.FromUserID); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.FromUserID)
+	}
+
+	for _, userID := range req.FriendUserIDList {
+		cacheResp, err := cacheClient.DelFriendIDListFromCache(context.Background(), &pbCache.DelFriendIDListFromCacheReq{UserID: userID, OperationID: req.OperationID})
+		if err != nil {
+			log.NewError(req.OperationID, "DelBlackIDListFromCache rpc call failed ", err.Error())
+		}
+		if cacheResp != nil && cacheResp.CommonResp != nil {
+			if cacheResp.CommonResp.ErrCode != 0 {
+				log.NewError(req.OperationID, "DelBlackIDListFromCache rpc logic call failed ", cacheResp.String())
+				resp.CommonResp.ErrCode = 500
+				resp.CommonResp.ErrMsg = cacheResp.CommonResp.ErrMsg
+				return &resp, nil
+			}
+		}
+		if err := rocksCache.DelAllFriendsInfoFromCache(userID); err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), userID)
+		}
+	}
+
 	resp.CommonResp.ErrCode = 0
 	log.NewInfo(req.OperationID, "ImportFriend rpc ok ", resp.String())
 	return &resp, nil
@@ -267,7 +314,7 @@ func (s *friendServer) AddFriendResponse(ctx context.Context, req *pbFriend.AddF
 				return &pbFriend.AddFriendResponseResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 			}
 			// cache rpc
-			addFriendToCacheReq := &pbCache.AddFriendToCacheReq{OperationID: req.CommID.OperationID}
+			delFriendIDListFromCacheReq := &pbCache.DelFriendIDListFromCacheReq{OperationID: req.CommID.OperationID}
 			etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.CommID.OperationID)
 			if etcdConn == nil {
 				errMsg := req.CommID.OperationID + "getcdv3.GetConn == nil"
@@ -275,29 +322,32 @@ func (s *friendServer) AddFriendResponse(ctx context.Context, req *pbFriend.AddF
 				return &pbFriend.AddFriendResponseResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrInternal.ErrCode, ErrMsg: errMsg}}, nil
 			}
 			client := pbCache.NewCacheClient(etcdConn)
-			addFriendToCacheReq.UserID = req.CommID.ToUserID
+			delFriendIDListFromCacheReq.UserID = req.CommID.ToUserID
-			addFriendToCacheReq.FriendID = req.CommID.FromUserID
+			respPb, err := client.DelFriendIDListFromCache(context.Background(), delFriendIDListFromCacheReq)
-			respPb, err := client.AddFriendToCache(context.Background(), addFriendToCacheReq)
 			if err != nil {
-				log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), "AddFriendToCache failed", err.Error(), addFriendToCacheReq.String())
+				log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), "DelFriendIDListFromCache failed", err.Error())
 				return &pbFriend.AddFriendResponseResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrServer.ErrCode, ErrMsg: constant.ErrServer.ErrMsg}}, nil
 			}
 			if respPb.CommonResp.ErrCode != 0 {
-				log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), "AddFriendToCache failed", addFriendToCacheReq.String())
+				log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), "DelFriendIDListFromCache failed", respPb.CommonResp.String())
 				return &pbFriend.AddFriendResponseResp{CommonResp: &pbFriend.CommonResp{ErrCode: respPb.CommonResp.ErrCode, ErrMsg: respPb.CommonResp.ErrMsg}}, nil
 			}
-			addFriendToCacheReq.UserID = req.CommID.FromUserID
+			delFriendIDListFromCacheReq.UserID = req.CommID.FromUserID
-			addFriendToCacheReq.FriendID = req.CommID.ToUserID
+			respPb, err = client.DelFriendIDListFromCache(context.Background(), delFriendIDListFromCacheReq)
-			respPb, err = client.AddFriendToCache(context.Background(), addFriendToCacheReq)
 			if err != nil {
-				log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), "AddFriendToCache failed", err.Error(), addFriendToCacheReq.String())
+				log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), "DelFriendIDListFromCache failed", err.Error())
 				return &pbFriend.AddFriendResponseResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrServer.ErrCode, ErrMsg: constant.ErrServer.ErrMsg}}, nil
 			}
 			if respPb.CommonResp.ErrCode != 0 {
-				log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), "AddFriendToCache failed", addFriendToCacheReq.String())
+				log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), "DelFriendIDListFromCache failed", respPb.CommonResp.String())
 				return &pbFriend.AddFriendResponseResp{CommonResp: &pbFriend.CommonResp{ErrCode: respPb.CommonResp.ErrCode, ErrMsg: respPb.CommonResp.ErrMsg}}, nil
 			}
-
+			if err := rocksCache.DelAllFriendsInfoFromCache(req.CommID.ToUserID); err != nil {
+				log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), err.Error(), req.CommID.ToUserID)
+			}
+			if err := rocksCache.DelAllFriendsInfoFromCache(req.CommID.FromUserID); err != nil {
+				log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), err.Error(), req.CommID.FromUserID)
+			}
 			chat.FriendAddedNotification(req.CommID.OperationID, req.CommID.OpUserID, req.CommID.FromUserID, req.CommID.ToUserID)
 		}
 	}
@@ -327,7 +377,7 @@ func (s *friendServer) DeleteFriend(ctx context.Context, req *pbFriend.DeleteFri
 		return &pbFriend.DeleteFriendResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil
 	}
 	log.NewInfo(req.CommID.OperationID, "DeleteFriend rpc ok")
-	reduceFriendFromCache := &pbCache.ReduceFriendFromCacheReq{OperationID: req.CommID.OperationID, UserID: req.CommID.FromUserID, FriendID: req.CommID.ToUserID}
+
 	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.CommID.OperationID)
 	if etcdConn == nil {
 		errMsg := req.CommID.OperationID + "getcdv3.GetConn == nil"
@@ -335,15 +385,21 @@ func (s *friendServer) DeleteFriend(ctx context.Context, req *pbFriend.DeleteFri
 		return &pbFriend.DeleteFriendResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrInternal.ErrCode, ErrMsg: errMsg}}, nil
 	}
 	client := pbCache.NewCacheClient(etcdConn)
-	respPb, err := client.ReduceFriendFromCache(context.Background(), reduceFriendFromCache)
+	respPb, err := client.DelFriendIDListFromCache(context.Background(), &pbCache.DelFriendIDListFromCacheReq{OperationID: req.CommID.OperationID, UserID: req.CommID.FromUserID})
 	if err != nil {
-		log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), "AddFriendToCache rpc failed", err.Error())
+		log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), "DelFriendIDListFromCache rpc failed", err.Error())
 		return &pbFriend.DeleteFriendResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrServer.ErrCode, ErrMsg: constant.ErrServer.ErrMsg}}, nil
 	}
 	if respPb.CommonResp.ErrCode != 0 {
-		log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), "AddFriendToCache failed")
+		log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), "DelFriendIDListFromCache failed", respPb.CommonResp.String())
 		return &pbFriend.DeleteFriendResp{CommonResp: &pbFriend.CommonResp{ErrCode: respPb.CommonResp.ErrCode, ErrMsg: respPb.CommonResp.ErrMsg}}, nil
 	}
+	if err := rocksCache.DelAllFriendsInfoFromCache(req.CommID.FromUserID); err != nil {
+		log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), err.Error(), req.CommID.FromUserID)
+	}
+	if err := rocksCache.DelAllFriendsInfoFromCache(req.CommID.ToUserID); err != nil {
+		log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), err.Error(), req.CommID.FromUserID)
+	}
 	chat.FriendDeletedNotification(req)
 	return &pbFriend.DeleteFriendResp{CommonResp: &pbFriend.CommonResp{}}, nil
 }
@@ -351,13 +407,12 @@ func (s *friendServer) DeleteFriend(ctx context.Context, req *pbFriend.DeleteFri
 func (s *friendServer) GetBlacklist(ctx context.Context, req *pbFriend.GetBlacklistReq) (*pbFriend.GetBlacklistResp, error) {
 	log.NewInfo(req.CommID.OperationID, "GetBlacklist args ", req.String())
 
-	//Parse token, to find current user information
 	if !token_verify.CheckAccess(req.CommID.OpUserID, req.CommID.FromUserID) {
 		log.NewError(req.CommID.OperationID, "CheckAccess false ", req.CommID.OpUserID, req.CommID.FromUserID)
 		return &pbFriend.GetBlacklistResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil
 	}
 
-	blackListInfo, err := imdb.GetBlackListByUserID(req.CommID.FromUserID)
+	blackIDList, err := rocksCache.GetBlackListFromCache(req.CommID.FromUserID)
 	if err != nil {
 		log.NewError(req.CommID.OperationID, "GetBlackListByUID failed ", err.Error(), req.CommID.FromUserID)
 		return &pbFriend.GetBlacklistResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, nil
@@ -366,15 +421,14 @@ func (s *friendServer) GetBlacklist(ctx context.Context, req *pbFriend.GetBlackl
 	var (
 		userInfoList []*sdkws.PublicUserInfo
 	)
-	for _, blackUser := range blackListInfo {
+	for _, userID := range blackIDList {
-		var blackUserInfo sdkws.PublicUserInfo
+		user, err := rocksCache.GetUserInfoFromCache(userID)
-		//Find black user information
-		us, err := imdb.GetUserByUserID(blackUser.BlockUserID)
 		if err != nil {
-			log.NewError(req.CommID.OperationID, "GetUserByUserID failed ", err.Error(), blackUser.BlockUserID)
+			log.NewError(req.CommID.OperationID, "GetUserByUserID failed ", err.Error(), userID)
 			continue
 		}
-		utils.CopyStructFields(&blackUserInfo, us)
+		var blackUserInfo sdkws.PublicUserInfo
+		utils.CopyStructFields(&blackUserInfo, user)
 		userInfoList = append(userInfoList, &blackUserInfo)
 	}
 	log.NewInfo(req.CommID.OperationID, "rpc GetBlacklist ok ", pbFriend.GetBlacklistResp{BlackUserInfoList: userInfoList})
@@ -391,10 +445,15 @@ func (s *friendServer) SetFriendRemark(ctx context.Context, req *pbFriend.SetFri
 
 	err := imdb.UpdateFriendComment(req.CommID.FromUserID, req.CommID.ToUserID, req.Remark)
 	if err != nil {
-		log.NewError(req.CommID.OperationID, "UpdateFriendComment failed ", req.CommID.FromUserID, req.CommID.ToUserID, req.Remark)
+		log.NewError(req.CommID.OperationID, "UpdateFriendComment failed ", req.CommID.FromUserID, req.CommID.ToUserID, req.Remark, err.Error())
 		return &pbFriend.SetFriendRemarkResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 	}
 	log.NewInfo(req.CommID.OperationID, "rpc SetFriendComment ok")
+	err = rocksCache.DelAllFriendsInfoFromCache(req.CommID.FromUserID)
+	if err != nil {
+		log.NewError(req.CommID.OperationID, "DelAllFriendInfoFromCache failed ", req.CommID.FromUserID, err.Error())
+		return &pbFriend.SetFriendRemarkResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
+	}
 	chat.FriendRemarkSetNotification(req.CommID.OperationID, req.CommID.OpUserID, req.CommID.FromUserID, req.CommID.ToUserID)
 	return &pbFriend.SetFriendRemarkResp{CommonResp: &pbFriend.CommonResp{}}, nil
 }
@@ -413,7 +472,7 @@ func (s *friendServer) RemoveBlacklist(ctx context.Context, req *pbFriend.Remove
 
 	}
 	log.NewInfo(req.CommID.OperationID, "rpc RemoveBlacklist ok ")
-	reqReduceBlackUserFromCache := &pbCache.ReduceBlackUserFromCacheReq{UserID: req.CommID.FromUserID, BlackUserID: req.CommID.ToUserID, OperationID: req.CommID.OperationID}
+
 	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.CommID.OperationID)
 	if etcdConn == nil {
 		errMsg := req.CommID.OperationID + "getcdv3.GetConn == nil"
@@ -422,13 +481,13 @@ func (s *friendServer) RemoveBlacklist(ctx context.Context, req *pbFriend.Remove
 	}
 
 	cacheClient := pbCache.NewCacheClient(etcdConn)
-	cacheResp, err := cacheClient.ReduceBlackUserFromCache(context.Background(), reqReduceBlackUserFromCache)
+	cacheResp, err := cacheClient.DelBlackIDListFromCache(context.Background(), &pbCache.DelBlackIDListFromCacheReq{UserID: req.CommID.FromUserID, OperationID: req.CommID.OperationID})
 	if err != nil {
-		log.NewError(req.CommID.OperationID, "ReduceBlackUserFromCache rpc call failed ", err.Error())
+		log.NewError(req.CommID.OperationID, "DelBlackIDListFromCache rpc call failed ", err.Error())
 		return &pbFriend.RemoveBlacklistResp{CommonResp: &pbFriend.CommonResp{ErrCode: 500, ErrMsg: "ReduceBlackUserFromCache rpc call failed"}}, nil
 	}
 	if cacheResp.CommonResp.ErrCode != 0 {
-		log.NewError(req.CommID.OperationID, "ReduceBlackUserFromCache rpc logic call failed ", cacheResp.String())
+		log.NewError(req.CommID.OperationID, "DelBlackIDListFromCache rpc logic call failed ", cacheResp.CommonResp.String())
 		return &pbFriend.RemoveBlacklistResp{CommonResp: &pbFriend.CommonResp{ErrCode: cacheResp.CommonResp.ErrCode, ErrMsg: cacheResp.CommonResp.ErrMsg}}, nil
 	}
 	chat.BlackDeletedNotification(req)
@@ -441,10 +500,13 @@ func (s *friendServer) IsInBlackList(ctx context.Context, req *pbFriend.IsInBlac
 		log.NewError(req.CommID.OperationID, "CheckAccess false ", req.CommID.OpUserID, req.CommID.FromUserID)
 		return &pbFriend.IsInBlackListResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil
 	}
-
+	blackIDList, err := rocksCache.GetBlackListFromCache(req.CommID.FromUserID)
-	var isInBlacklist = false
+	if err != nil {
-	err := imdb.CheckBlack(req.CommID.FromUserID, req.CommID.ToUserID)
+		log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), err.Error(), req.CommID.FromUserID)
-	if err == nil {
+		return &pbFriend.IsInBlackListResp{ErrMsg: err.Error(), ErrCode: constant.ErrDB.ErrCode}, nil
+	}
+	var isInBlacklist bool
+	if utils.IsContain(req.CommID.ToUserID, blackIDList) {
 		isInBlacklist = true
 	}
 	log.NewInfo(req.CommID.OperationID, "IsInBlackList rpc ok ", pbFriend.IsInBlackListResp{Response: isInBlacklist})
@@ -453,16 +515,18 @@ func (s *friendServer) IsInBlackList(ctx context.Context, req *pbFriend.IsInBlac
 
 func (s *friendServer) IsFriend(ctx context.Context, req *pbFriend.IsFriendReq) (*pbFriend.IsFriendResp, error) {
 	log.NewInfo(req.CommID.OperationID, req.String())
-	var isFriend bool
 	if !token_verify.CheckAccess(req.CommID.OpUserID, req.CommID.FromUserID) {
 		log.NewError(req.CommID.OperationID, "CheckAccess false ", req.CommID.OpUserID, req.CommID.FromUserID)
 		return &pbFriend.IsFriendResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil
 	}
-	_, err := imdb.GetFriendRelationshipFromFriend(req.CommID.FromUserID, req.CommID.ToUserID)
+	friendIDList, err := rocksCache.GetFriendIDListFromCache(req.CommID.FromUserID)
-	if err == nil {
+	if err != nil {
+		log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), err.Error(), req.CommID.FromUserID)
+		return &pbFriend.IsFriendResp{ErrMsg: err.Error(), ErrCode: constant.ErrDB.ErrCode}, nil
+	}
+	var isFriend bool
+	if utils.IsContain(req.CommID.ToUserID, friendIDList) {
 		isFriend = true
-	} else {
-		isFriend = false
 	}
 	log.NewInfo(req.CommID.OperationID, pbFriend.IsFriendResp{Response: isFriend})
 	return &pbFriend.IsFriendResp{Response: isFriend}, nil
@@ -474,16 +538,16 @@ func (s *friendServer) GetFriendList(ctx context.Context, req *pbFriend.GetFrien
 		log.NewError(req.CommID.OperationID, "CheckAccess false ", req.CommID.OpUserID, req.CommID.FromUserID)
 		return &pbFriend.GetFriendListResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil
 	}
-
+	friendList, err := rocksCache.GetAllFriendsInfoFromCache(req.CommID.FromUserID)
-	friends, err := imdb.GetFriendListByUserID(req.CommID.FromUserID)
 	if err != nil {
-		log.NewError(req.CommID.OperationID, "FindUserInfoFromFriend failed ", err.Error(), req.CommID.FromUserID)
+		log.NewError(req.CommID.OperationID, utils.GetSelfFuncName(), "GetFriendIDListFromCache failed", err.Error(), req.CommID.FromUserID)
 		return &pbFriend.GetFriendListResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, nil
 	}
+
 	var userInfoList []*sdkws.FriendInfo
-	for _, friendUser := range friends {
+	for _, friendUser := range friendList {
 		friendUserInfo := sdkws.FriendInfo{FriendUser: &sdkws.UserInfo{}}
-		cp.FriendDBCopyOpenIM(&friendUserInfo, &friendUser)
+		cp.FriendDBCopyOpenIM(&friendUserInfo, friendUser)
 		log.NewDebug(req.CommID.OperationID, "friends : ", friendUser, "openim friends: ", friendUserInfo)
 		userInfoList = append(userInfoList, &friendUserInfo)
 	}

internal/rpc/group/group.go

@@ -6,6 +6,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/db"
 	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
+	"Open_IM/pkg/common/db/rocks_cache"
 	"Open_IM/pkg/common/http"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
@@ -106,6 +107,10 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
 	utils.CopyStructFields(&groupInfo, req.GroupInfo)
 	groupInfo.CreatorUserID = req.OpUserID
 	groupInfo.GroupID = groupId
+
+	if groupInfo.NotificationUpdateTime.Unix() < 0 {
+		groupInfo.NotificationUpdateTime = utils.UnixSecondToTime(0)
+	}
 	err := imdb.InsertIntoGroup(groupInfo)
 	if err != nil {
 		log.NewError(req.OperationID, "InsertIntoGroup failed, ", err.Error(), groupInfo)
@@ -122,7 +127,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
 			return &pbGroup.CreateGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, http.WrapError(constant.ErrDB)
 		}
 		//to group member
-		groupMember = db.GroupMember{GroupID: groupId, RoleLevel: constant.GroupOwner, OperatorUserID: req.OpUserID}
+		groupMember = db.GroupMember{GroupID: groupId, RoleLevel: constant.GroupOwner, OperatorUserID: req.OpUserID, JoinSource: constant.JoinByInvitation, InviterUserID: req.OpUserID}
 		utils.CopyStructFields(&groupMember, us)
 		err = imdb.InsertIntoGroupMember(groupMember)
 		if err != nil {
@@ -143,6 +148,8 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
 				continue
 			}
 			groupMember.RoleLevel = user.RoleLevel
+			groupMember.JoinSource = constant.JoinByInvitation
+			groupMember.InviterUserID = req.OpUserID
 			utils.CopyStructFields(&groupMember, us)
 			err = imdb.InsertIntoGroupMember(groupMember)
 			if err != nil {
@@ -159,7 +166,8 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
 			return resp, nil
 		}
 		utils.CopyStructFields(resp.GroupInfo, group)
-		resp.GroupInfo.MemberCount, err = imdb.GetGroupMemberNumByGroupID(groupId)
+		memberCount, err := imdb.GetGroupMemberNumByGroupID(groupId)
+		resp.GroupInfo.MemberCount = uint32(memberCount)
 		if err != nil {
 			log.NewError(req.OperationID, "GetGroupMemberNumByGroupID failed ", err.Error(), groupId)
 			resp.ErrCode = constant.ErrDB.ErrCode
@@ -170,6 +178,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
 			resp.GroupInfo.OwnerUserID = req.OwnerUserID
 			okUserIDList = append(okUserIDList, req.OwnerUserID)
 		}
+		// superGroup stored in mongodb
 	} else {
 		for _, v := range req.InitMemberList {
 			okUserIDList = append(okUserIDList, v.UserID)
@@ -178,36 +187,25 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
 			log.NewError(req.OperationID, "GetGroupMemberNumByGroupID failed ", err.Error(), groupId)
 			resp.ErrCode = constant.ErrDB.ErrCode
 			resp.ErrMsg = err.Error() + ": CreateSuperGroup failed"
+			return resp, nil
 		}
 	}
 
 	if len(okUserIDList) != 0 {
-		addGroupMemberToCacheReq := &pbCache.AddGroupMemberToCacheReq{
-			UserIDList:  okUserIDList,
-			GroupID:     groupId,
-			OperationID: req.OperationID,
-		}
-		etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.OperationID)
-		if etcdConn == nil {
-			errMsg := req.OperationID + "getcdv3.GetConn == nil"
-			log.NewError(req.OperationID, errMsg)
-			return &pbGroup.CreateGroupResp{ErrCode: constant.ErrInternal.ErrCode, ErrMsg: errMsg}, nil
-		}
-		cacheClient := pbCache.NewCacheClient(etcdConn)
-		cacheResp, err := cacheClient.AddGroupMemberToCache(context.Background(), addGroupMemberToCacheReq)
-		if err != nil {
-			log.NewError(req.OperationID, "AddGroupMemberToCache rpc call failed ", err.Error())
-			return &pbGroup.CreateGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, nil
-		}
-		if cacheResp.CommonResp.ErrCode != 0 {
-			log.NewError(req.OperationID, "AddGroupMemberToCache rpc logic call failed ", cacheResp.String())
-			return &pbGroup.CreateGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, nil
-		}
-
 		log.NewInfo(req.OperationID, "rpc CreateGroup return ", resp.String())
 		if req.GroupInfo.GroupType != constant.SuperGroup {
+			for _, userID := range okUserIDList {
+				if err := rocksCache.DelJoinedGroupIDListFromCache(userID); err != nil {
+					log.NewWarn(req.OperationID, utils.GetSelfFuncName(), userID, err.Error())
+				}
+			}
 			chat.GroupCreatedNotification(req.OperationID, req.OpUserID, groupId, okUserIDList)
 		} else {
+			for _, userID := range okUserIDList {
+				if err := rocksCache.DelJoinedSuperGroupIDListFromCache(userID); err != nil {
+					log.NewWarn(req.OperationID, utils.GetSelfFuncName(), userID, err.Error())
+				}
+			}
 			go func() {
 				for _, v := range okUserIDList {
 					chat.SuperGroupNotification(req.OperationID, v, v)
@@ -227,29 +225,45 @@ func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbGroup.GetJo
 		log.NewError(req.OperationID, "CheckAccess false ", req.OpUserID, req.FromUserID)
 		return &pbGroup.GetJoinedGroupListResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil
 	}
-	//group list
+
-	joinedGroupList, err := imdb.GetJoinedGroupIDListByUserID(req.FromUserID)
+	joinedGroupList, err := rocksCache.GetJoinedGroupIDListFromCache(req.FromUserID)
 	if err != nil {
-		log.NewError(req.OperationID, "GetJoinedGroupIDListByUserID failed ", err.Error(), req.FromUserID)
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetJoinedGroupIDListFromCache failed", err.Error(), req.FromUserID)
 		return &pbGroup.GetJoinedGroupListResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, nil
 	}
-
+	log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "joinedGroupList: ", joinedGroupList)
 	var resp pbGroup.GetJoinedGroupListResp
 	for _, v := range joinedGroupList {
 		var groupNode open_im_sdk.GroupInfo
 		num, err := imdb.GetGroupMemberNumByGroupID(v)
-		owner, err2 := imdb.GetGroupOwnerInfoByGroupID(v)
+		if err != nil {
-		group, err := imdb.GetGroupInfoByGroupID(v)
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), v)
-		if num > 0 && owner != nil && err2 == nil && group != nil && err == nil {
-			utils.CopyStructFields(&groupNode, group)
-			groupNode.CreateTime = uint32(group.CreateTime.Unix())
-			groupNode.MemberCount = uint32(num)
-			groupNode.OwnerUserID = owner.UserID
-			resp.GroupList = append(resp.GroupList, &groupNode)
-		} else {
-			log.NewError(req.OperationID, "check nil ", num, owner, err, group)
 			continue
 		}
+		owner, err2 := imdb.GetGroupOwnerInfoByGroupID(v)
+		if err2 != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), err2.Error(), v)
+			continue
+		}
+		group, err := rocksCache.GetGroupInfoFromCache(v)
+		if err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), v)
+			continue
+		}
+		if group.Status == constant.GroupStatusDismissed {
+			log.NewError(req.OperationID, "constant.GroupStatusDismissed ", group)
+			continue
+		}
+		utils.CopyStructFields(&groupNode, group)
+		groupNode.CreateTime = uint32(group.CreateTime.Unix())
+		groupNode.NotificationUpdateTime = uint32(group.NotificationUpdateTime.Unix())
+		if group.NotificationUpdateTime.Unix() < 0 {
+			groupNode.NotificationUpdateTime = 0
+		}
+
+		groupNode.MemberCount = uint32(num)
+		groupNode.OwnerUserID = owner.UserID
+		resp.GroupList = append(resp.GroupList, &groupNode)
 		log.NewDebug(req.OperationID, "joinedGroup ", groupNode)
 	}
 	log.NewInfo(req.OperationID, "GetJoinedGroupList rpc return ", resp.String())
@@ -266,7 +280,7 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
 	groupInfo, err := imdb.GetGroupInfoByGroupID(req.GroupID)
 	if err != nil {
 		log.NewError(req.OperationID, "GetGroupInfoByGroupID failed ", req.GroupID, err)
-		return &pbGroup.InviteUserToGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, nil
+		return &pbGroup.InviteUserToGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: err.Error()}, nil
 	}
 	if groupInfo.Status == constant.GroupStatusDismissed {
 		errMsg := " group status is dismissed "
@@ -281,6 +295,8 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
 			var groupRequest db.GroupRequest
 			groupRequest.UserID = v
 			groupRequest.GroupID = req.GroupID
+			groupRequest.JoinSource = constant.JoinByInvitation
+			groupRequest.InviterUserID = req.OpUserID
 			err = imdb.InsertIntoGroupRequest(groupRequest)
 			if err != nil {
 				var resultNode pbGroup.Id2Result
@@ -334,6 +350,8 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
 			toInsertInfo.GroupID = req.GroupID
 			toInsertInfo.RoleLevel = constant.GroupOrdinaryUsers
 			toInsertInfo.OperatorUserID = req.OpUserID
+			toInsertInfo.InviterUserID = req.OpUserID
+			toInsertInfo.JoinSource = constant.JoinByInvitation
 			err = imdb.InsertIntoGroupMember(toInsertInfo)
 			if err != nil {
 				log.NewError(req.OperationID, "InsertIntoGroupMember failed ", req.GroupID, toUserInfo.UserID, toUserInfo.Nickname, toUserInfo.FaceURL)
@@ -414,13 +432,8 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
 			log.NewError(req.OperationID, "AddUserToSuperGroup failed ", req.GroupID, err)
 			return &pbGroup.InviteUserToGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: err.Error()}, nil
 		}
+	}
 
-	}
-	addGroupMemberToCacheReq := &pbCache.AddGroupMemberToCacheReq{
-		UserIDList:  okUserIDList,
-		GroupID:     req.GroupID,
-		OperationID: req.OperationID,
-	}
 	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.OperationID)
 	if etcdConn == nil {
 		errMsg := req.OperationID + "getcdv3.GetConn == nil"
@@ -428,19 +441,36 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
 		return &pbGroup.InviteUserToGroupResp{ErrCode: constant.ErrInternal.ErrCode, ErrMsg: errMsg}, nil
 	}
 	cacheClient := pbCache.NewCacheClient(etcdConn)
-	cacheResp, err := cacheClient.AddGroupMemberToCache(context.Background(), addGroupMemberToCacheReq)
+	cacheResp, err := cacheClient.DelGroupMemberIDListFromCache(context.Background(), &pbCache.DelGroupMemberIDListFromCacheReq{
+		GroupID:     req.GroupID,
+		OperationID: req.OperationID,
+	})
 	if err != nil {
-		log.NewError(req.OperationID, "AddGroupMemberToCache rpc call failed ", err.Error())
+		log.NewError(req.OperationID, "DelGroupMemberIDListFromCache rpc call failed ", err.Error())
 		return &pbGroup.InviteUserToGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, nil
 	}
 	if cacheResp.CommonResp.ErrCode != 0 {
-		log.NewError(req.OperationID, "AddGroupMemberToCache rpc logic call failed ", cacheResp.String())
+		log.NewError(req.OperationID, "DelGroupMemberIDListFromCache rpc logic call failed ", cacheResp.String())
 		return &pbGroup.InviteUserToGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, nil
 	}
 
 	if groupInfo.GroupType != constant.SuperGroup {
+		for _, userID := range okUserIDList {
+			err = rocksCache.DelJoinedGroupIDListFromCache(userID)
+			if err != nil {
+				log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), userID)
+			}
+		}
+		if err := rocksCache.DelAllGroupMembersInfoFromCache(req.GroupID); err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID)
+		}
 		chat.MemberInvitedNotification(req.OperationID, req.GroupID, req.OpUserID, req.Reason, okUserIDList)
 	} else {
+		for _, v := range req.InvitedUserIDList {
+			if err := rocksCache.DelJoinedSuperGroupIDListFromCache(v); err != nil {
+				log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
+			}
+		}
 		go func() {
 			for _, v := range req.InvitedUserIDList {
 				chat.SuperGroupNotification(req.OperationID, v, v)
@@ -455,7 +485,8 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
 func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbGroup.GetGroupAllMemberReq) (*pbGroup.GetGroupAllMemberResp, error) {
 	log.NewInfo(req.OperationID, "GetGroupAllMember, args ", req.String())
 	var resp pbGroup.GetGroupAllMemberResp
-	groupInfo, err := imdb.GetGroupInfoByGroupID(req.GroupID)
+	//groupInfo, err := imdb.GetGroupInfoByGroupID(req.GroupID)
+	groupInfo, err := rocksCache.GetGroupInfoFromCache(req.GroupID)
 	if err != nil {
 		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID)
 		resp.ErrCode = constant.ErrDB.ErrCode
@@ -463,20 +494,16 @@ func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbGroup.GetGro
 		return &resp, nil
 	}
 	if groupInfo.GroupType != constant.SuperGroup {
-		memberList, err := imdb.GetGroupMemberListByGroupID(req.GroupID)
+		memberList, err := rocksCache.GetAllGroupMembersInfoFromCache(req.GroupID)
 		if err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID)
 			resp.ErrCode = constant.ErrDB.ErrCode
 			resp.ErrMsg = constant.ErrDB.ErrMsg
-			log.NewError(req.OperationID, "GetGroupMemberListByGroupID failed,", err.Error(), req.GroupID)
 			return &resp, nil
 		}
-
 		for _, v := range memberList {
-			//log.Debug(req.OperationID, v)
 			var node open_im_sdk.GroupMemberFullInfo
-			cp.GroupMemberDBCopyOpenIM(&node, &v)
+			cp.GroupMemberDBCopyOpenIM(&node, v)
-			//log.Debug(req.OperationID, "db value:", v.MuteEndTime, "seconds: ", v.MuteEndTime.Unix())
-			//log.Debug(req.OperationID, "cp value: ", node)
 			resp.MemberList = append(resp.MemberList, &node)
 		}
 	}
@@ -506,7 +533,6 @@ func (s *groupServer) GetGroupMemberList(ctx context.Context, req *pbGroup.GetGr
 	} else {
 		resp.NextSeq = req.NextSeq + int32(len(memberList))
 	}
-
 	resp.ErrCode = 0
 	log.NewInfo(req.OperationID, "GetGroupMemberList rpc return ", resp.String())
 	return &resp, nil
@@ -635,11 +661,6 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou
 		}
 	}
 
-	reduceGroupMemberFromCacheReq := &pbCache.ReduceGroupMemberFromCacheReq{
-		UserIDList:  okUserIDList,
-		GroupID:     req.GroupID,
-		OperationID: req.OperationID,
-	}
 	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.OperationID)
 	if etcdConn == nil {
 		errMsg := req.OperationID + "getcdv3.GetConn == nil"
@@ -647,18 +668,37 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou
 		return &pbGroup.KickGroupMemberResp{ErrCode: constant.ErrInternal.ErrCode, ErrMsg: errMsg}, nil
 	}
 	cacheClient := pbCache.NewCacheClient(etcdConn)
-	cacheResp, err := cacheClient.ReduceGroupMemberFromCache(context.Background(), reduceGroupMemberFromCacheReq)
+	cacheResp, err := cacheClient.DelGroupMemberIDListFromCache(context.Background(), &pbCache.DelGroupMemberIDListFromCacheReq{
+		GroupID:     req.GroupID,
+		OperationID: req.OperationID,
+	})
 	if err != nil {
-		log.NewError(req.OperationID, "ReduceGroupMemberFromCache rpc call failed ", err.Error())
+		log.NewError(req.OperationID, "DelGroupMemberIDListFromCache rpc call failed ", err.Error())
 		return &pbGroup.KickGroupMemberResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, nil
 	}
 	if cacheResp.CommonResp.ErrCode != 0 {
-		log.NewError(req.OperationID, "ReduceGroupMemberFromCache rpc logic call failed ", cacheResp.String())
+		log.NewError(req.OperationID, "DelGroupMemberIDListFromCache rpc logic call failed ", cacheResp.String())
 		return &pbGroup.KickGroupMemberResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, nil
 	}
+
 	if groupInfo.GroupType != constant.SuperGroup {
+		for _, userID := range okUserIDList {
+			err = rocksCache.DelJoinedGroupIDListFromCache(userID)
+			if err != nil {
+				log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), userID)
+			}
+		}
+		if err := rocksCache.DelAllGroupMembersInfoFromCache(req.GroupID); err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID)
+		}
 		chat.MemberKickedNotification(req, okUserIDList)
 	} else {
+		for _, userID := range okUserIDList {
+			err = rocksCache.DelJoinedSuperGroupIDListFromCache(userID)
+			if err != nil {
+				log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), userID)
+			}
+		}
 		go func() {
 			for _, v := range req.KickedUserIDList {
 				chat.SuperGroupNotification(req.OperationID, v, v)
@@ -666,35 +706,38 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou
 		}()
 
 	}
+
 	log.NewInfo(req.OperationID, "GetGroupMemberList rpc return ", resp.String())
 	return &resp, nil
 }
 
 func (s *groupServer) GetGroupMembersInfo(ctx context.Context, req *pbGroup.GetGroupMembersInfoReq) (*pbGroup.GetGroupMembersInfoResp, error) {
 	log.NewInfo(req.OperationID, "GetGroupMembersInfo args ", req.String())
-
 	var resp pbGroup.GetGroupMembersInfoResp
-
+	resp.MemberList = []*open_im_sdk.GroupMemberFullInfo{}
-	for _, v := range req.MemberList {
+	groupMembers, err := rocksCache.GetAllGroupMembersInfoFromCache(req.GroupID)
-		var memberNode open_im_sdk.GroupMemberFullInfo
+	if err != nil {
-		memberInfo, err := imdb.GetMemberInfoByID(req.GroupID, v)
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), req.GroupID, err.Error())
-		memberNode.UserID = v
+		resp.ErrCode = constant.ErrDB.ErrCode
-		if err != nil {
+		resp.ErrMsg = constant.ErrDB.ErrMsg
-			log.NewError(req.OperationID, "GetMemberInfoById failed ", err.Error(), req.GroupID, v)
+		return &resp, nil
-			continue
+	}
-		} else {
+	for _, member := range groupMembers {
-			utils.CopyStructFields(&memberNode, memberInfo)
+		if utils.IsContain(member.UserID, req.MemberList) {
-			memberNode.JoinTime = int32(memberInfo.JoinTime.Unix())
+			var memberNode open_im_sdk.GroupMemberFullInfo
+			utils.CopyStructFields(&memberNode, member)
+			memberNode.JoinTime = int32(member.JoinTime.Unix())
 			resp.MemberList = append(resp.MemberList, &memberNode)
 		}
 	}
+
 	resp.ErrCode = 0
 	log.NewInfo(req.OperationID, "GetGroupMembersInfo rpc return ", resp.String())
 	return &resp, nil
 }
 
 func (s *groupServer) GetGroupApplicationList(_ context.Context, req *pbGroup.GetGroupApplicationListReq) (*pbGroup.GetGroupApplicationListResp, error) {
-	log.NewInfo(req.OperationID, "GetGroupMembersInfo args ", req.String())
+	log.NewInfo(req.OperationID, "GetGroupApplicationList args ", req.String())
 	reply, err := imdb.GetGroupApplicationList(req.FromUserID)
 	if err != nil {
 		log.NewError(req.OperationID, "GetGroupApplicationList failed ", err.Error(), req.FromUserID)
@@ -710,6 +753,10 @@ func (s *groupServer) GetGroupApplicationList(_ context.Context, req *pbGroup.Ge
 			log.Error(req.OperationID, "GetGroupInfoByGroupID failed ", err.Error(), v.GroupID)
 			continue
 		}
+		if group.Status == constant.GroupStatusDismissed {
+			log.Debug(req.OperationID, "group constant.GroupStatusDismissed  ", group.GroupID)
+			continue
+		}
 		user, err := imdb.GetUserByUserID(v.UserID)
 		if err != nil {
 			log.Error(req.OperationID, "GetUserByUserID failed ", err.Error(), v.UserID)
@@ -730,16 +777,16 @@ func (s *groupServer) GetGroupsInfo(ctx context.Context, req *pbGroup.GetGroupsI
 	log.NewInfo(req.OperationID, "GetGroupsInfo args ", req.String())
 	groupsInfoList := make([]*open_im_sdk.GroupInfo, 0)
 	for _, groupID := range req.GroupIDList {
-		groupInfoFromMysql, err := imdb.GetGroupInfoByGroupID(groupID)
+		groupInfoFromRedis, err := rocksCache.GetGroupInfoFromCache(groupID)
 		if err != nil {
 			log.NewError(req.OperationID, "GetGroupInfoByGroupID failed ", err.Error(), groupID)
 			continue
 		}
 		var groupInfo open_im_sdk.GroupInfo
-		cp.GroupDBCopyOpenIM(&groupInfo, groupInfoFromMysql)
+		cp.GroupDBCopyOpenIM(&groupInfo, groupInfoFromRedis)
 		//groupInfo.NeedVerification
 
-		groupInfo.NeedVerification = groupInfoFromMysql.NeedVerification
+		groupInfo.NeedVerification = groupInfoFromRedis.NeedVerification
 		groupsInfoList = append(groupsInfoList, &groupInfo)
 	}
 
@@ -762,10 +809,14 @@ func (s *groupServer) GroupApplicationResponse(_ context.Context, req *pbGroup.G
 	}
 	err := imdb.UpdateGroupRequest(groupRequest)
 	if err != nil {
-		//{openIM002 7836e478bc43ce1d3b8889cac983f59b 1  ok 0001-01-01 00:00:00 +0000 UTC openIM001 0001-01-01 00:00:00 +0000 UTC }
 		log.NewError(req.OperationID, "GroupApplicationResponse failed ", err.Error(), groupRequest)
 		return &pbGroup.GroupApplicationResponseResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 	}
+	request, err := imdb.GetGroupRequestByGroupIDAndUserID(req.GroupID, req.FromUserID)
+	if err != nil {
+		log.NewError(req.OperationID, "GroupApplicationResponse failed ", err.Error(), req.GroupID, req.FromUserID)
+		return &pbGroup.GroupApplicationResponseResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
+	}
 
 	if req.HandleResult == constant.GroupResponseAgree {
 		user, err := imdb.GetUserByUserID(req.FromUserID)
@@ -780,7 +831,8 @@ func (s *groupServer) GroupApplicationResponse(_ context.Context, req *pbGroup.G
 		member.OperatorUserID = req.OpUserID
 		member.FaceURL = user.FaceURL
 		member.Nickname = user.Nickname
-
+		member.JoinSource = request.JoinSource
+		member.InviterUserID = request.InviterUserID
 		err = imdb.InsertIntoGroupMember(member)
 		if err != nil {
 			log.NewError(req.OperationID, "GroupApplicationResponse failed ", err.Error(), member)
@@ -823,23 +875,36 @@ func (s *groupServer) GroupApplicationResponse(_ context.Context, req *pbGroup.G
 		} else {
 			log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "SetConversation success", respPb.String())
 		}
-		addGroupMemberToCacheReq := &pbCache.AddGroupMemberToCacheReq{OperationID: req.OperationID, GroupID: req.GroupID, UserIDList: []string{req.FromUserID}}
+
 		etcdCacheConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.OperationID)
-		if etcdConn == nil {
+		if etcdCacheConn == nil {
 			errMsg := req.OperationID + "getcdv3.GetConn == nil"
 			log.NewError(req.OperationID, errMsg)
 			return &pbGroup.GroupApplicationResponseResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrInternal.ErrCode, ErrMsg: errMsg}}, nil
 		}
 		cacheClient := pbCache.NewCacheClient(etcdCacheConn)
-		cacheResp, err := cacheClient.AddGroupMemberToCache(context.Background(), addGroupMemberToCacheReq)
+		cacheResp, err := cacheClient.DelGroupMemberIDListFromCache(context.Background(), &pbCache.DelGroupMemberIDListFromCacheReq{OperationID: req.OperationID, GroupID: req.GroupID})
 		if err != nil {
-			log.NewError(req.OperationID, "AddGroupMemberToCache rpc call failed ", err.Error())
+			log.NewError(req.OperationID, "DelGroupMemberIDListFromCache rpc call failed ", err.Error())
 			return &pbGroup.GroupApplicationResponseResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 		}
 		if cacheResp.CommonResp.ErrCode != 0 {
-			log.NewError(req.OperationID, "AddGroupMemberToCache rpc logic call failed ", cacheResp.String())
+			log.NewError(req.OperationID, "DelGroupMemberIDListFromCache rpc logic call failed ", cacheResp.String())
 			return &pbGroup.GroupApplicationResponseResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 		}
+
+		group, err := rocksCache.GetGroupInfoFromCache(req.GroupID)
+		if err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), req.GroupID, err.Error())
+		}
+		if group != nil {
+			if group.GroupType != constant.SuperGroup {
+				if err := rocksCache.DelAllGroupMembersInfoFromCache(req.GroupID); err != nil {
+					log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID)
+				}
+			}
+		}
+
 		chat.GroupApplicationAcceptedNotification(req)
 		chat.MemberEnterNotification(req)
 	} else if req.HandleResult == constant.GroupResponseRefuse {
@@ -872,24 +937,19 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq)
 	}
 
 	if groupInfo.NeedVerification == constant.Directly {
-		us, err := imdb.GetUserByUserID(req.OpUserID)
-		if err != nil {
-			log.NewError(req.OperationID, "GetUserByUserID failed ", err.Error(), req.OpUserID)
-			return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
-		}
-		//to group member
-		groupMember := db.GroupMember{GroupID: req.GroupID, RoleLevel: constant.GroupOwner, OperatorUserID: req.OpUserID}
-		utils.CopyStructFields(&groupMember, us)
-		err = imdb.InsertIntoGroupMember(groupMember)
-		if err != nil {
-			log.NewError(req.OperationID, "InsertIntoGroupMember failed ", err.Error(), groupMember)
-			return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
-		}
 		if groupInfo.GroupType != constant.SuperGroup {
-			addGroupMemberToCacheReq := &pbCache.AddGroupMemberToCacheReq{
+			us, err := imdb.GetUserByUserID(req.OpUserID)
-				UserIDList:  []string{req.OpUserID},
+			if err != nil {
-				GroupID:     req.GroupID,
+				log.NewError(req.OperationID, "GetUserByUserID failed ", err.Error(), req.OpUserID)
-				OperationID: req.OperationID,
+				return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
+			}
+			//to group member
+			groupMember := db.GroupMember{GroupID: req.GroupID, RoleLevel: constant.GroupOrdinaryUsers, OperatorUserID: req.OpUserID}
+			utils.CopyStructFields(&groupMember, us)
+			err = imdb.InsertIntoGroupMember(groupMember)
+			if err != nil {
+				log.NewError(req.OperationID, "InsertIntoGroupMember failed ", err.Error(), groupMember)
+				return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 			}
 			etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.OperationID)
 			if etcdConn == nil {
@@ -898,20 +958,39 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq)
 				return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrInternal.ErrCode, ErrMsg: constant.ErrInternal.ErrMsg}}, nil
 			}
 			cacheClient := pbCache.NewCacheClient(etcdConn)
-			cacheResp, err := cacheClient.AddGroupMemberToCache(context.Background(), addGroupMemberToCacheReq)
+			cacheResp, err := cacheClient.DelGroupMemberIDListFromCache(context.Background(), &pbCache.DelGroupMemberIDListFromCacheReq{
+				GroupID:     req.GroupID,
+				OperationID: req.OperationID,
+			})
 			if err != nil {
-				log.NewError(req.OperationID, "AddGroupMemberToCache rpc call failed ", err.Error())
+				log.NewError(req.OperationID, "DelGroupMemberIDListFromCache rpc call failed ", err.Error())
 				return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 			}
 			if cacheResp.CommonResp.ErrCode != 0 {
-				log.NewError(req.OperationID, "AddGroupMemberToCache rpc logic call failed ", cacheResp.String())
+				log.NewError(req.OperationID, "DelGroupMemberIDListFromCache rpc logic call failed ", cacheResp.String())
 				return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 			}
+			//for _, userID := range okUserIDList {
+			//	err = rocksCache.DelJoinedGroupIDListFromCache(userID)
+			//	if err != nil {
+			//		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), userID)
+			//	}
+			//}
+			err = rocksCache.DelJoinedGroupIDListFromCache(req.OpUserID)
+			if err != nil {
+				log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
+			}
+
+			err = rocksCache.DelAllGroupMembersInfoFromCache(req.GroupID)
+			if err != nil {
+				log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
+			}
+
 			chat.MemberEnterDirectlyNotification(req.GroupID, req.OpUserID, req.OperationID)
 			log.NewInfo(req.OperationID, "JoinGroup rpc return ")
 			return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}, nil
 		} else {
-			log.Error(req.OperationID, "JoinGroup rpc failed, group type: ", groupInfo.GroupType)
+			log.Error(req.OperationID, "JoinGroup rpc failed, group type:  ", groupInfo.GroupType, "not support directly")
 			return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrArgs.ErrCode, ErrMsg: constant.ErrArgs.ErrMsg}}, nil
 		}
 	}
@@ -920,13 +999,13 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq)
 	groupRequest.UserID = req.OpUserID
 	groupRequest.ReqMsg = req.ReqMessage
 	groupRequest.GroupID = req.GroupID
+	groupRequest.JoinSource = req.JoinSource
 	err = imdb.InsertIntoGroupRequest(groupRequest)
 	if err != nil {
 		log.NewError(req.OperationID, "InsertIntoGroupRequest failed ", err.Error(), groupRequest)
 		return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 	}
 
-	//
 	//_, err = imdb.GetGroupMemberListByGroupIDAndRoleLevel(req.GroupID, constant.GroupOwner)
 	//if err != nil {
 	//	log.NewError(req.OperationID, "GetGroupMemberListByGroupIDAndRoleLevel failed ", err.Error(), req.GroupID, constant.GroupOwner)
@@ -994,34 +1073,40 @@ func (s *groupServer) QuitGroup(ctx context.Context, req *pbGroup.QuitGroupReq)
 		}
 	}
 
-	reduceGroupMemberFromCacheReq := &pbCache.ReduceGroupMemberFromCacheReq{
+	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.OperationID)
-		UserIDList:  []string{req.OpUserID},
+	if etcdConn == nil {
-		GroupID:     req.GroupID,
-		OperationID: req.OperationID,
-	}
-	etcdConnCache := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.OperationID)
-	if etcdConnCache == nil {
 		errMsg := req.OperationID + "getcdv3.GetConn == nil"
 		log.NewError(req.OperationID, errMsg)
-		return &pbGroup.QuitGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrInternal.ErrCode, ErrMsg: errMsg}}, nil
+		return &pbGroup.QuitGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrInternal.ErrCode, ErrMsg: constant.ErrInternal.ErrMsg}}, nil
 	}
-	cacheClient := pbCache.NewCacheClient(etcdConnCache)
+	cacheClient := pbCache.NewCacheClient(etcdConn)
-	cacheResp, err := cacheClient.ReduceGroupMemberFromCache(context.Background(), reduceGroupMemberFromCacheReq)
+	cacheResp, err := cacheClient.DelGroupMemberIDListFromCache(context.Background(), &pbCache.DelGroupMemberIDListFromCacheReq{
+		GroupID:     req.GroupID,
+		OperationID: req.OperationID,
+	})
 	if err != nil {
-		log.NewError(req.OperationID, "ReduceGroupMemberFromCache rpc call failed ", err.Error())
+		log.NewError(req.OperationID, "DelGroupMemberIDListFromCache rpc call failed ", err.Error())
 		return &pbGroup.QuitGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 	}
 	if cacheResp.CommonResp.ErrCode != 0 {
-		log.NewError(req.OperationID, "ReduceGroupMemberFromCache rpc logic call failed ", cacheResp.String())
+		log.NewError(req.OperationID, "DelGroupMemberIDListFromCache rpc logic call failed ", cacheResp.String())
 		return &pbGroup.QuitGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 	}
 
 	if groupInfo.GroupType != constant.SuperGroup {
+		if err := rocksCache.DelAllGroupMembersInfoFromCache(req.GroupID); err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID)
+		}
+		if err := rocksCache.DelJoinedGroupIDListFromCache(req.OpUserID); err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.OpUserID)
+		}
 		chat.MemberQuitNotification(req)
 	} else {
+		if err := rocksCache.DelJoinedSuperGroupIDListFromCache(req.OpUserID); err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.OpUserID)
+		}
 		chat.SuperGroupNotification(req.OperationID, req.OpUserID, req.OpUserID)
 	}
-
 	log.NewInfo(req.OperationID, "rpc QuitGroup return ", pbGroup.QuitGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}})
 	return &pbGroup.QuitGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}, nil
 }
@@ -1092,7 +1177,24 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf
 			return &pbGroup.SetGroupInfoResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, http.WrapError(constant.ErrDB)
 		}
 	}
-
+	if req.GroupInfoForSet.LookMemberInfo != nil {
+		changedType = changedType | (1 << 5)
+		m := make(map[string]interface{})
+		m["look_member_info"] = req.GroupInfoForSet.LookMemberInfo.Value
+		if err := imdb.UpdateGroupInfoDefaultZero(req.GroupInfoForSet.GroupID, m); err != nil {
+			log.NewError(req.OperationID, "UpdateGroupInfoDefaultZero failed ", err.Error(), m)
+			return &pbGroup.SetGroupInfoResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, http.WrapError(constant.ErrDB)
+		}
+	}
+	if req.GroupInfoForSet.ApplyMemberFriend != nil {
+		changedType = changedType | (1 << 6)
+		m := make(map[string]interface{})
+		m["apply_member_friend"] = req.GroupInfoForSet.ApplyMemberFriend.Value
+		if err := imdb.UpdateGroupInfoDefaultZero(req.GroupInfoForSet.GroupID, m); err != nil {
+			log.NewError(req.OperationID, "UpdateGroupInfoDefaultZero failed ", err.Error(), m)
+			return &pbGroup.SetGroupInfoResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, http.WrapError(constant.ErrDB)
+		}
+	}
 	//
 	//if req.RoleLevel != nil {
 	//
@@ -1100,11 +1202,20 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf
 	//only administrators can set group information
 	var groupInfo db.Group
 	utils.CopyStructFields(&groupInfo, req.GroupInfoForSet)
+	if req.GroupInfoForSet.Notification != "" {
+		groupInfo.NotificationUserID = req.OpUserID
+		groupInfo.NotificationUpdateTime = time.Now()
+	}
 	err = imdb.SetGroupInfo(groupInfo)
 	if err != nil {
 		log.NewError(req.OperationID, "SetGroupInfo failed ", err.Error(), groupInfo)
 		return &pbGroup.SetGroupInfoResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, http.WrapError(constant.ErrDB)
 	}
+	if err := rocksCache.DelGroupInfoFromCache(req.GroupInfoForSet.GroupID); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "DelGroupInfoFromCache failed ", err.Error(), req.GroupInfoForSet.GroupID)
+		return &pbGroup.SetGroupInfoResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, http.WrapError(constant.ErrDB)
+	}
+
 	log.NewInfo(req.OperationID, "SetGroupInfo rpc return ", pbGroup.SetGroupInfoResp{CommonResp: &pbGroup.CommonResp{}})
 	if changedType != 0 {
 		chat.GroupInfoSetNotification(req.OperationID, req.OpUserID, req.GroupInfoForSet.GroupID, groupName, notification, introduction, faceURL, req.GroupInfoForSet.NeedVerification)
@@ -1187,8 +1298,10 @@ func (s *groupServer) TransferGroupOwner(_ context.Context, req *pbGroup.Transfe
 		log.NewError(req.OperationID, "UpdateGroupMemberInfo failed ", groupMemberInfo)
 		return &pbGroup.TransferGroupOwnerResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 	}
+	if err := rocksCache.DelAllGroupMembersInfoFromCache(req.GroupID); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), req.GroupID, err.Error())
+	}
 	chat.GroupOwnerTransferredNotification(req)
-
 	return &pbGroup.TransferGroupOwnerResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}, nil
 
 }
@@ -1379,7 +1492,7 @@ func (s *groupServer) GetGroupMembersCMS(_ context.Context, req *pbGroup.GetGrou
 		return resp, http.WrapError(constant.ErrDB)
 	}
 	log.NewInfo(req.OperationID, groupMembersCount)
-	resp.MemberNums = groupMembersCount
+	resp.MemberNums = int32(groupMembersCount)
 	for _, groupMember := range groupMembers {
 		resp.Members = append(resp.Members, &open_im_sdk.GroupMemberFullInfo{
 			GroupID:    req.GroupId,
@@ -1443,27 +1556,28 @@ func (s *groupServer) RemoveGroupMembersCMS(_ context.Context, req *pbGroup.Remo
 		}
 	}
 
-	reduceGroupMemberFromCacheReq := &pbCache.ReduceGroupMemberFromCacheReq{
+	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.OperationID)
-		UserIDList:  resp.Success,
+	if etcdConn == nil {
-		GroupID:     req.GroupId,
-		OperationID: req.OperationID,
-	}
-	etcdConnCache := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.OperationID)
-	if etcdConnCache == nil {
 		errMsg := req.OperationID + "getcdv3.GetConn == nil"
 		log.NewError(req.OperationID, errMsg)
-		return resp, http.WrapError(constant.ErrInternal)
+		return resp, http.WrapError(constant.ErrDB)
 	}
-	cacheClient := pbCache.NewCacheClient(etcdConnCache)
+	cacheClient := pbCache.NewCacheClient(etcdConn)
-	cacheResp, err := cacheClient.ReduceGroupMemberFromCache(context.Background(), reduceGroupMemberFromCacheReq)
+	cacheResp, err := cacheClient.DelGroupMemberIDListFromCache(context.Background(), &pbCache.DelGroupMemberIDListFromCacheReq{
+		GroupID:     req.GroupId,
+		OperationID: req.OperationID,
+	})
 	if err != nil {
-		log.NewError(req.OperationID, "ReduceGroupMemberFromCache rpc call failed ", err.Error())
+		log.NewError(req.OperationID, "DelGroupMemberIDListFromCache rpc call failed ", err.Error())
 		return resp, http.WrapError(constant.ErrDB)
 	}
 	if cacheResp.CommonResp.ErrCode != 0 {
-		log.NewError(req.OperationID, "ReduceGroupMemberFromCache rpc logic call failed ", cacheResp.String())
+		log.NewError(req.OperationID, "DelGroupMemberIDListFromCache rpc logic call failed ", cacheResp.String())
 		return resp, http.WrapError(constant.ErrDB)
 	}
+	if err := rocksCache.DelAllGroupMembersInfoFromCache(req.GroupId); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupId)
+	}
 
 	chat.MemberKickedNotification(reqKick, resp.Success)
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
@@ -1504,27 +1618,28 @@ func (s *groupServer) AddGroupMembersCMS(_ context.Context, req *pbGroup.AddGrou
 		}
 	}
 
-	addGroupMemberToCacheReq := &pbCache.AddGroupMemberToCacheReq{
-		UserIDList:  resp.Success,
-		GroupID:     req.GroupId,
-		OperationID: req.OperationId,
-	}
 	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.OperationId)
 	if etcdConn == nil {
 		errMsg := req.OperationId + "getcdv3.GetConn == nil"
 		log.NewError(req.OperationId, errMsg)
-		return resp, http.WrapError(constant.ErrInternal)
+		return resp, http.WrapError(constant.ErrDB)
 	}
 	cacheClient := pbCache.NewCacheClient(etcdConn)
-	cacheResp, err := cacheClient.AddGroupMemberToCache(context.Background(), addGroupMemberToCacheReq)
+	cacheResp, err := cacheClient.DelGroupMemberIDListFromCache(context.Background(), &pbCache.DelGroupMemberIDListFromCacheReq{
+		GroupID:     req.GroupId,
+		OperationID: req.OperationId,
+	})
 	if err != nil {
-		log.NewError(req.OperationId, "AddGroupMemberToCache rpc call failed ", err.Error())
+		log.NewError(req.OperationId, "DelGroupMemberIDListFromCache rpc call failed ", err.Error())
 		return resp, http.WrapError(constant.ErrDB)
 	}
 	if cacheResp.CommonResp.ErrCode != 0 {
-		log.NewError(req.OperationId, "AddGroupMemberToCache rpc logic call failed ", cacheResp.String())
+		log.NewError(req.OperationId, "DelGroupMemberIDListFromCache rpc logic call failed ", cacheResp.String())
 		return resp, http.WrapError(constant.ErrDB)
 	}
+	if err := rocksCache.DelAllGroupMembersInfoFromCache(req.GroupId); err != nil {
+		log.NewError(req.OperationId, utils.GetSelfFuncName(), err.Error(), req.GroupId)
+	}
 
 	chat.MemberInvitedNotification(req.OperationId, req.GroupId, req.OpUserId, "admin add you to group", resp.Success)
 	return resp, nil
@@ -1627,6 +1742,28 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou
 
 		}
 	}
+	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.OperationID)
+	if etcdConn == nil {
+		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		log.NewError(req.OperationID, errMsg)
+		return &pbGroup.DismissGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: 500, ErrMsg: errMsg}}, nil
+	}
+	cacheClient := pbCache.NewCacheClient(etcdConn)
+	cacheResp, err := cacheClient.DelGroupMemberIDListFromCache(context.Background(), &pbCache.DelGroupMemberIDListFromCacheReq{
+		GroupID:     req.GroupID,
+		OperationID: req.OperationID,
+	})
+	if err != nil {
+		log.NewError(req.OperationID, "DelGroupMemberIDListFromCache rpc call failed ", err.Error())
+		return &pbGroup.DismissGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: 500, ErrMsg: err.Error()}}, nil
+	}
+	if cacheResp.CommonResp.ErrCode != 0 {
+		log.NewError(req.OperationID, "DelGroupMemberIDListFromCache rpc logic call failed ", cacheResp.String())
+		return &pbGroup.DismissGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: cacheResp.CommonResp.ErrCode, ErrMsg: cacheResp.CommonResp.ErrMsg}}, nil
+	}
+	if err := rocksCache.DelAllGroupMembersInfoFromCache(req.GroupID); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID)
+	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc return ", pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""})
 	return &pbGroup.DismissGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}, nil
 }
@@ -1672,6 +1809,9 @@ func (s *groupServer) MuteGroupMember(ctx context.Context, req *pbGroup.MuteGrou
 		log.Error(req.OperationID, "UpdateGroupMemberInfo failed ", err.Error(), groupMemberInfo)
 		return &pbGroup.MuteGroupMemberResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 	}
+	if err := rocksCache.DelAllGroupMembersInfoFromCache(req.GroupID); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID)
+	}
 	chat.GroupMemberMutedNotification(req.OperationID, req.OpUserID, req.GroupID, req.UserID, req.MutedSeconds)
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc return ", pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""})
 	return &pbGroup.MuteGroupMemberResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}, nil
@@ -1713,6 +1853,9 @@ func (s *groupServer) CancelMuteGroupMember(ctx context.Context, req *pbGroup.Ca
 		log.Error(req.OperationID, "UpdateGroupMemberInfo failed ", err.Error(), groupMemberInfo)
 		return &pbGroup.CancelMuteGroupMemberResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 	}
+	if err := rocksCache.DelAllGroupMembersInfoFromCache(req.GroupID); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID)
+	}
 	chat.GroupMemberCancelMutedNotification(req.OperationID, req.OpUserID, req.GroupID, req.UserID)
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc return ", pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""})
 	return &pbGroup.CancelMuteGroupMemberResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}, nil
@@ -1752,6 +1895,9 @@ func (s *groupServer) MuteGroup(ctx context.Context, req *pbGroup.MuteGroupReq)
 		log.Error(req.OperationID, "OperateGroupStatus failed ", err.Error(), req.GroupID, constant.GroupStatusMuted)
 		return &pbGroup.MuteGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 	}
+	if err := rocksCache.DelGroupInfoFromCache(req.GroupID); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID)
+	}
 	chat.GroupMutedNotification(req.OperationID, req.OpUserID, req.GroupID)
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc return ", pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""})
 	return &pbGroup.MuteGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}, nil
@@ -1791,6 +1937,9 @@ func (s *groupServer) CancelMuteGroup(ctx context.Context, req *pbGroup.CancelMu
 		log.Error(req.OperationID, "UpdateGroupInfoDefaultZero failed ", err.Error(), req.GroupID)
 		return &pbGroup.CancelMuteGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 	}
+	if err := rocksCache.DelGroupInfoFromCache(req.GroupID); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID)
+	}
 	chat.GroupCancelMutedNotification(req.OperationID, req.OpUserID, req.GroupID)
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc return ", pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""})
 	return &pbGroup.CancelMuteGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}, nil
@@ -1824,6 +1973,9 @@ func (s *groupServer) SetGroupMemberNickname(ctx context.Context, req *pbGroup.S
 		log.Error(req.OperationID, errMsg)
 		return &pbGroup.SetGroupMemberNicknameResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 	}
+	if err := rocksCache.DelAllGroupMembersInfoFromCache(req.GroupID); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID)
+	}
 	chat.GroupMemberInfoSetNotification(req.OperationID, req.OpUserID, req.GroupID, req.UserID)
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc return ", pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""})
 	return &pbGroup.SetGroupMemberNicknameResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}, nil
@@ -1856,13 +2008,16 @@ func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbGroup.SetGr
 		resp.CommonResp.ErrMsg = constant.ErrDB.ErrMsg + ":" + err.Error()
 		return resp, nil
 	}
+	if err := rocksCache.DelAllGroupMembersInfoFromCache(req.GroupID); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID)
+	}
 	if req.RoleLevel != nil {
 		switch req.RoleLevel.Value {
 		case constant.GroupOrdinaryUsers:
-			//chat.GroupMemberRoleLevelChangeNotification(req.OperationID, req.OpUserID, req.GroupID, req.UserID, constant.GroupMemberSetToOrdinaryUserNotification)
+			//msg.GroupMemberRoleLevelChangeNotification(req.OperationID, req.OpUserID, req.GroupID, req.UserID, constant.GroupMemberSetToOrdinaryUserNotification)
 			chat.GroupMemberInfoSetNotification(req.OperationID, req.OpUserID, req.GroupID, req.UserID)
 		case constant.GroupAdmin, constant.GroupOwner:
-			//chat.GroupMemberRoleLevelChangeNotification(req.OperationID, req.OpUserID, req.GroupID, req.UserID, constant.GroupMemberSetToAdminNotification)
+			//msg.GroupMemberRoleLevelChangeNotification(req.OperationID, req.OpUserID, req.GroupID, req.UserID, constant.GroupMemberSetToAdminNotification)
 			chat.GroupMemberInfoSetNotification(req.OperationID, req.OpUserID, req.GroupID, req.UserID)
 		}
 	} else {

internal/rpc/group/super_group.go

@@ -1,43 +1,46 @@
 package group
 
 import (
-	"Open_IM/pkg/common/constant"
+	rocksCache "Open_IM/pkg/common/db/rocks_cache"
-	"Open_IM/pkg/common/db"
-	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
 	"Open_IM/pkg/common/log"
 	cp "Open_IM/pkg/common/utils"
 	pbGroup "Open_IM/pkg/proto/group"
 	commonPb "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"context"
+	"github.com/go-redis/redis/v8"
 )
 
 func (s *groupServer) GetJoinedSuperGroupList(ctx context.Context, req *pbGroup.GetJoinedSuperGroupListReq) (*pbGroup.GetJoinedSuperGroupListResp, error) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
 	resp := &pbGroup.GetJoinedSuperGroupListResp{CommonResp: &pbGroup.CommonResp{}}
-	userToSuperGroup, err := db.DB.GetSuperGroupByUserID(req.UserID)
+	groupIDList, err := rocksCache.GetJoinedSuperGroupListFromCache(req.UserID)
 	if err != nil {
-		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetSuperGroupByUserID failed", err.Error())
+		if err == redis.Nil {
-		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetSuperGroupByUserID nil ", err.Error(), req.UserID)
-		resp.CommonResp.ErrMsg = constant.ErrDB.ErrMsg
+			return resp, nil
+		}
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetSuperGroupByUserID failed ", err.Error(), req.UserID)
+		//resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		//resp.CommonResp.ErrMsg = constant.ErrDB.ErrMsg
 		return resp, nil
 	}
-	for _, groupID := range userToSuperGroup.GroupIDList {
+	for _, groupID := range groupIDList {
-		groupInfoDB, err := imdb.GetGroupInfoByGroupID(groupID)
+		groupInfoFromCache, err := rocksCache.GetGroupInfoFromCache(groupID)
 		if err != nil {
 			log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupInfoByGroupID failed", groupID, err.Error())
 			continue
 		}
 		groupInfo := &commonPb.GroupInfo{}
-		if err := utils.CopyStructFields(groupInfo, groupInfoDB); err != nil {
+		if err := utils.CopyStructFields(groupInfo, groupInfoFromCache); err != nil {
 			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
 		}
-		group, err := db.DB.GetSuperGroup(groupID)
+		groupMemberIDList, err := rocksCache.GetGroupMemberIDListFromCache(groupID)
 		if err != nil {
 			log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetSuperGroup failed", groupID, err.Error())
 			continue
 		}
-		groupInfo.MemberCount = uint32(len(group.MemberIDList))
+		groupInfo.MemberCount = uint32(len(groupMemberIDList))
 		resp.GroupList = append(resp.GroupList, groupInfo)
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
@@ -49,13 +52,13 @@ func (s *groupServer) GetSuperGroupsInfo(_ context.Context, req *pbGroup.GetSupe
 	resp = &pbGroup.GetSuperGroupsInfoResp{CommonResp: &pbGroup.CommonResp{}}
 	groupsInfoList := make([]*commonPb.GroupInfo, 0)
 	for _, groupID := range req.GroupIDList {
-		groupInfoFromMysql, err := imdb.GetGroupInfoByGroupID(groupID)
+		groupInfoFromRedis, err := rocksCache.GetGroupInfoFromCache(groupID)
 		if err != nil {
 			log.NewError(req.OperationID, "GetGroupInfoByGroupID failed ", err.Error(), groupID)
 			continue
 		}
 		var groupInfo commonPb.GroupInfo
-		cp.GroupDBCopyOpenIM(&groupInfo, groupInfoFromMysql)
+		cp.GroupDBCopyOpenIM(&groupInfo, groupInfoFromRedis)
 		groupsInfoList = append(groupsInfoList, &groupInfo)
 	}
 	resp.GroupInfoList = groupsInfoList

internal/rpc/msg/callback.go

@@ -6,7 +6,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/http"
 	"Open_IM/pkg/common/log"
-	pbChat "Open_IM/pkg/proto/chat"
+	pbChat "Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/utils"
 	http2 "net/http"
 )

internal/rpc/msg/chat.go

@@ -5,7 +5,7 @@ import (
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/proto/chat"
+	pbChat "Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/utils"
 	"context"
 )
@@ -15,7 +15,7 @@ func (rpc *rpcChat) ClearMsg(_ context.Context, req *pbChat.ClearMsgReq) (*pbCha
 	if req.OpUserID != req.UserID && !token_verify.IsManagerUserID(req.UserID) {
 		errMsg := "No permission" + req.OpUserID + req.UserID
 		log.Error(req.OperationID, errMsg)
-		return &pbChat.ClearMsgResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil
+		return &pbChat.ClearMsgResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}, nil
 	}
 	log.Debug(req.OperationID, "CleanUpOneUserAllMsgFromRedis args", req.UserID)
 	err := db.DB.CleanUpOneUserAllMsgFromRedis(req.UserID, req.OperationID)
@@ -36,3 +36,28 @@ func (rpc *rpcChat) ClearMsg(_ context.Context, req *pbChat.ClearMsgReq) (*pbCha
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
 	return &resp, nil
 }
+
+func (rpc *rpcChat) SetMsgMinSeq(_ context.Context, req *pbChat.SetMsgMinSeqReq) (*pbChat.SetMsgMinSeqResp, error) {
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc req: ", req.String())
+	if req.OpUserID != req.UserID && !token_verify.IsManagerUserID(req.UserID) {
+		errMsg := "No permission" + req.OpUserID + req.UserID
+		log.Error(req.OperationID, errMsg)
+		return &pbChat.SetMsgMinSeqResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}, nil
+	}
+	if req.GroupID == "" {
+		err := db.DB.SetUserMinSeq(req.UserID, req.MinSeq)
+		if err != nil {
+			errMsg := "SetUserMinSeq failed " + err.Error() + req.OperationID + req.UserID + utils.Uint32ToString(req.MinSeq)
+			log.Error(req.OperationID, errMsg)
+			return &pbChat.SetMsgMinSeqResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil
+		}
+		return &pbChat.SetMsgMinSeqResp{}, nil
+	}
+	err := db.DB.SetGroupUserMinSeq(req.GroupID, req.UserID, uint64(req.MinSeq))
+	if err != nil {
+		errMsg := "SetGroupUserMinSeq failed " + err.Error() + req.OperationID + req.GroupID + req.UserID + utils.Uint32ToString(req.MinSeq)
+		log.Error(req.OperationID, errMsg)
+		return &pbChat.SetMsgMinSeqResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil
+	}
+	return &pbChat.SetMsgMinSeqResp{}, nil
+}

internal/rpc/msg/del_msg.go

@@ -2,8 +2,11 @@ package msg
 
 import (
 	"Open_IM/pkg/common/constant"
+	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
+	"Open_IM/pkg/common/token_verify"
 	commonPb "Open_IM/pkg/proto/sdk_ws"
+	"Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/utils"
 	"context"
 	"time"
@@ -27,3 +30,27 @@ func (rpc *rpcChat) DelMsgList(_ context.Context, req *commonPb.DelMsgListReq) (
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
 	return resp, nil
 }
+func (rpc *rpcChat) DelSuperGroupMsg(_ context.Context, req *msg.DelSuperGroupMsgReq) (*msg.DelSuperGroupMsgResp, error) {
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
+	if !token_verify.CheckAccess(req.OpUserID, req.UserID) {
+		log.NewError(req.OperationID, "CheckAccess false ", req.OpUserID, req.UserID)
+		return &msg.DelSuperGroupMsgResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil
+	}
+	resp := &msg.DelSuperGroupMsgResp{}
+	groupMaxSeq, err := db.DB.GetGroupMaxSeq(req.GroupID)
+	if err != nil {
+		log.NewError(req.OperationID, "GetGroupMaxSeq false ", req.OpUserID, req.UserID,req.GroupID)
+		resp.ErrCode = constant.ErrDB.ErrCode
+		resp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	 err = db.DB.SetGroupUserMinSeq(req.GroupID,req.UserID, groupMaxSeq)
+	if err != nil {
+		log.NewError(req.OperationID, "SetGroupUserMinSeq false ", req.OpUserID, req.UserID,req.GroupID)
+		resp.ErrCode = constant.ErrDB.ErrCode
+		resp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
+	return resp, nil
+}

internal/rpc/msg/group_notification.go

@@ -57,7 +57,8 @@ func setGroupInfo(groupID string, groupInfo *open_im_sdk.GroupInfo) error {
 	}
 	err = utils2.GroupDBCopyOpenIM(groupInfo, group)
 	if err != nil {
-		return utils.Wrap(err, "GetGroupMemberNumByGroupID failed")
+		log.NewWarn("", "GroupDBCopyOpenIM failed ", groupID, err.Error())
+		return nil
 	}
 	return nil
 }
@@ -183,7 +184,16 @@ func groupNotification(contentType int32, m proto.Message, sendID, groupID, recv
 	n.SendID = sendID
 	if groupID != "" {
 		n.RecvID = groupID
-		n.SessionType = constant.GroupChatType
+		group, err := imdb.GetGroupInfoByGroupID(groupID)
+		if err != nil {
+			log.NewError(operationID, "GetGroupInfoByGroupID failed ", err.Error(), groupID)
+		}
+		switch group.GroupType {
+		case constant.NormalGroup:
+			n.SessionType = constant.GroupChatType
+		default:
+			n.SessionType = constant.SuperGroupChatType
+		}
 	} else {
 		n.RecvID = recvUserID
 		n.SessionType = constant.SingleChatType
@@ -223,6 +233,9 @@ func GroupCreatedNotification(operationID, opUserID, groupID string, initMemberL
 			continue
 		}
 		GroupCreatedTips.MemberList = append(GroupCreatedTips.MemberList, &groupMemberInfo)
+		if len(GroupCreatedTips.MemberList) == constant.MaxNotificationNum {
+			break
+		}
 	}
 	groupNotification(constant.GroupCreatedNotification, &GroupCreatedTips, opUserID, groupID, "", operationID)
 }
@@ -527,7 +540,6 @@ func MemberInvitedNotification(operationID, groupID, opUserID, reason string, in
 		}
 		MemberInvitedTips.InvitedUserList = append(MemberInvitedTips.InvitedUserList, &groupMemberInfo)
 	}
-
 	groupNotification(constant.MemberInvitedNotification, &MemberInvitedTips, opUserID, groupID, "", operationID)
 }
 

internal/rpc/msg/msg_status.go

@@ -0,0 +1,42 @@
+package msg
+
+import (
+	"Open_IM/pkg/common/constant"
+	"Open_IM/pkg/common/db"
+	"Open_IM/pkg/common/log"
+	pbMsg "Open_IM/pkg/proto/msg"
+	"Open_IM/pkg/utils"
+	"context"
+	goRedis "github.com/go-redis/redis/v8"
+)
+
+func (rpc *rpcChat) SetSendMsgFailedFlag(_ context.Context, req *pbMsg.SetSendMsgFailedFlagReq) (resp *pbMsg.SetSendMsgFailedFlagResp, err error) {
+	resp = &pbMsg.SetSendMsgFailedFlagResp{}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req.String())
+	if err := db.DB.SetSendMsgFailedFlag(req.OperationID); err != nil {
+		resp.ErrCode = constant.ErrDB.ErrCode
+		resp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp.String())
+	return resp, nil
+}
+
+func (rpc *rpcChat) GetSendMsgStatus(_ context.Context, req *pbMsg.GetSendMsgStatusReq) (resp *pbMsg.GetSendMsgStatusResp, err error) {
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req.String())
+	resp = &pbMsg.GetSendMsgStatusResp{}
+	if err := db.DB.GetSendMsgStatus(req.OperationID); err != nil {
+		if err == goRedis.Nil {
+			resp.Status = 0
+			return resp, nil
+		} else {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
+			resp.ErrMsg = err.Error()
+			resp.ErrCode = constant.ErrDB.ErrCode
+			return resp, nil
+		}
+	}
+	resp.Status = 1
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp.String())
+	return resp, nil
+}

internal/rpc/msg/pull_message.go

@@ -1,6 +1,7 @@
 package msg
 
 import (
+	"Open_IM/pkg/utils"
 	"context"
 	go_redis "github.com/go-redis/redis/v8"
 
@@ -13,36 +14,36 @@ func (rpc *rpcChat) GetMaxAndMinSeq(_ context.Context, in *open_im_sdk.GetMaxAnd
 	log.NewInfo(in.OperationID, "rpc getMaxAndMinSeq is arriving", in.String())
 	resp := new(open_im_sdk.GetMaxAndMinSeqResp)
 	m := make(map[string]*open_im_sdk.MaxAndMinSeq)
-	//seq, err := model.GetBiggestSeqFromReceive(in.UserID)
+	var maxSeq, minSeq uint64
-	maxSeq, err1 := commonDB.DB.GetUserMaxSeq(in.UserID)
+	var err1, err2 error
-	//minSeq, err2 := commonDB.DB.GetUserMinSeq(in.UserID)
+	maxSeq, err1 = commonDB.DB.GetUserMaxSeq(in.UserID)
-	if err1 == nil {
+	minSeq, err2 = commonDB.DB.GetUserMinSeq(in.UserID)
-		resp.MaxSeq = uint32(maxSeq)
+	if (err1 != nil && err1 != go_redis.Nil) || (err2 != nil && err2 != go_redis.Nil) {
-		for _, v := range in.GroupIDList {
+		log.NewError(in.OperationID, "getMaxSeq from redis error", in.String())
-			x := new(open_im_sdk.MaxAndMinSeq)
+		if err1 != nil {
-			maxSeq, _ := commonDB.DB.GetUserMaxSeq(v)
+			log.NewError(in.OperationID, utils.GetSelfFuncName(), err1.Error())
-			x.MaxSeq = uint32(maxSeq)
+		}
-			m[v] = x
+		if err2 != nil {
+			log.NewError(in.OperationID, utils.GetSelfFuncName(), err2.Error())
 		}
-		resp.GroupMaxAndMinSeq = m
-	} else if err1 == go_redis.Nil {
-		resp.MaxSeq = 0
-	} else {
-		log.NewError(in.OperationID, "getMaxSeq from redis error", in.String(), err1.Error())
 		resp.ErrCode = 200
 		resp.ErrMsg = "redis get err"
+		return resp, nil
 	}
-	//if err2 == nil {
+	resp.MaxSeq = uint32(maxSeq)
-	//	resp.MinSeq = uint32(minSeq)
+	resp.MinSeq = uint32(minSeq)
-	//} else if err2 == redis.ErrNil {
+	for _, groupID := range in.GroupIDList {
-	//	resp.MinSeq = 0
+		x := new(open_im_sdk.MaxAndMinSeq)
-	//} else {
+		maxSeq, _ := commonDB.DB.GetGroupMaxSeq(groupID)
-	//	log.NewError(in.OperationID, "getMaxSeq from redis error", in.String(), err2.Error())
+		minSeq, _ := commonDB.DB.GetGroupUserMinSeq(groupID, in.UserID)
-	//	resp.ErrCode = 201
+		x.MaxSeq = uint32(maxSeq)
-	//	resp.ErrMsg = "redis get err"
+		x.MinSeq = uint32(minSeq)
-	//}
+		m[groupID] = x
+	}
+	resp.GroupMaxAndMinSeq = m
 	return resp, nil
 }
+
 func (rpc *rpcChat) PullMessageBySeqList(_ context.Context, in *open_im_sdk.PullMessageBySeqListReq) (*open_im_sdk.PullMessageBySeqListResp, error) {
 	log.NewInfo(in.OperationID, "rpc PullMessageBySeqList is arriving", in.String())
 	resp := new(open_im_sdk.PullMessageBySeqListResp)

internal/rpc/msg/rpcChat.go

@@ -7,7 +7,7 @@ import (
 	"Open_IM/pkg/common/kafka"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
-	pbChat "Open_IM/pkg/proto/chat"
+	"Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/utils"
 	"google.golang.org/grpc"
 	"net"
@@ -36,7 +36,7 @@ func NewRpcChatServer(port int) *rpcChat {
 	log.NewPrivateLog(constant.LogFileName)
 	rc := rpcChat{
 		rpcPort:         port,
-		rpcRegisterName: config.Config.RpcRegisterName.OpenImOfflineMessageName,
+		rpcRegisterName: config.Config.RpcRegisterName.OpenImMsgName,
 		etcdSchema:      config.Config.Etcd.EtcdSchema,
 		etcdAddr:        config.Config.Etcd.EtcdAddr,
 	}
@@ -65,7 +65,7 @@ func (rpc *rpcChat) Run() {
 	defer srv.GracefulStop()
 
 	rpcRegisterIP := config.Config.RpcRegisterIP
-	pbChat.RegisterChatServer(srv, rpc)
+	msg.RegisterMsgServer(srv, rpc)
 	if config.Config.RpcRegisterIP == "" {
 		rpcRegisterIP, err = utils.GetLocalIP()
 		if err != nil {

internal/rpc/msg/send_msg.go

@@ -9,8 +9,8 @@ import (
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
 	cacheRpc "Open_IM/pkg/proto/cache"
 	pbCache "Open_IM/pkg/proto/cache"
-	pbChat "Open_IM/pkg/proto/chat"
 	pbConversation "Open_IM/pkg/proto/conversation"
+	pbChat "Open_IM/pkg/proto/msg"
 	pbRelay "Open_IM/pkg/proto/relay"
 	sdk_ws "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
@@ -68,13 +68,14 @@ func isMessageHasReadEnabled(pb *pbChat.SendMsgReq) (bool, int32, string) {
 	return true, 0, ""
 }
 
-func userRelationshipVerification(data *pbChat.SendMsgReq) (bool, int32, string) {
+func messageVerification(data *pbChat.SendMsgReq) (bool, int32, string, []string) {
-	if data.MsgData.SessionType == constant.SingleChatType {
+	switch data.MsgData.SessionType {
+	case constant.SingleChatType:
 		if utils.IsContain(data.MsgData.SendID, config.Config.Manager.AppManagerUid) {
-			return true, 0, ""
+			return true, 0, "", nil
 		}
-		if data.MsgData.ContentType <= constant.FriendApplicationNotification && data.MsgData.ContentType >= constant.FriendApplicationApprovedNotification {
+		if data.MsgData.ContentType <= constant.NotificationEnd && data.MsgData.ContentType >= constant.NotificationBegin {
-			return true, 0, ""
+			return true, 0, "", nil
 		}
 		log.NewDebug(data.OperationID, config.Config.MessageVerify.FriendVerify)
 		reqGetBlackIDListFromCache := &cacheRpc.GetBlackIDListFromCacheReq{UserID: data.MsgData.RecvID, OperationID: data.OperationID}
@@ -82,7 +83,7 @@ func userRelationshipVerification(data *pbChat.SendMsgReq) (bool, int32, string)
 		if etcdConn == nil {
 			errMsg := data.OperationID + "getcdv3.GetConn == nil"
 			log.NewError(data.OperationID, errMsg)
-			return true, 0, ""
+			return true, 0, "", nil
 		}
 
 		cacheClient := cacheRpc.NewCacheClient(etcdConn)
@@ -94,7 +95,7 @@ func userRelationshipVerification(data *pbChat.SendMsgReq) (bool, int32, string)
 				log.NewError(data.OperationID, "GetBlackIDListFromCache rpc logic call failed ", cacheResp.String())
 			} else {
 				if utils.IsContain(data.MsgData.SendID, cacheResp.UserIDList) {
-					return false, 600, "in black list"
+					return false, 600, "in black list", nil
 				}
 			}
 		}
@@ -105,7 +106,7 @@ func userRelationshipVerification(data *pbChat.SendMsgReq) (bool, int32, string)
 			if etcdConn == nil {
 				errMsg := data.OperationID + "getcdv3.GetConn == nil"
 				log.NewError(data.OperationID, errMsg)
-				return true, 0, ""
+				return true, 0, "", nil
 			}
 			cacheClient := cacheRpc.NewCacheClient(etcdConn)
 			cacheResp, err := cacheClient.GetFriendIDListFromCache(context.Background(), reqGetFriendIDListFromCache)
@@ -116,18 +117,49 @@ func userRelationshipVerification(data *pbChat.SendMsgReq) (bool, int32, string)
 					log.NewError(data.OperationID, "GetFriendIDListFromCache rpc logic call failed ", cacheResp.String())
 				} else {
 					if !utils.IsContain(data.MsgData.SendID, cacheResp.UserIDList) {
-						return false, 601, "not friend"
+						return false, 601, "not friend", nil
 					}
 				}
 			}
-			return true, 0, ""
+			return true, 0, "", nil
 		} else {
-			return true, 0, ""
+			return true, 0, "", nil
 		}
+	case constant.GroupChatType:
+		fallthrough
+	case constant.SuperGroupChatType:
+		getGroupMemberIDListFromCacheReq := &pbCache.GetGroupMemberIDListFromCacheReq{OperationID: data.OperationID, GroupID: data.MsgData.GroupID}
+		etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, data.OperationID)
+		if etcdConn == nil {
+			errMsg := data.OperationID + "getcdv3.GetConn == nil"
+			log.NewError(data.OperationID, errMsg)
+			//return returnMsg(&replay, pb, 201, errMsg, "", 0)
+			return false, 201, errMsg, nil
+		}
+		client := pbCache.NewCacheClient(etcdConn)
+		cacheResp, err := client.GetGroupMemberIDListFromCache(context.Background(), getGroupMemberIDListFromCacheReq)
+		if err != nil {
+			log.NewError(data.OperationID, "GetGroupMemberIDListFromCache rpc call failed ", err.Error())
+			//return returnMsg(&replay, pb, 201, "GetGroupMemberIDListFromCache failed", "", 0)
+			return false, 201, err.Error(), nil
+		}
+		if cacheResp.CommonResp.ErrCode != 0 {
+			log.NewError(data.OperationID, "GetGroupMemberIDListFromCache rpc logic call failed ", cacheResp.String())
+			//return returnMsg(&replay, pb, 201, "GetGroupMemberIDListFromCache logic failed", "", 0)
+			return false, cacheResp.CommonResp.ErrCode, cacheResp.CommonResp.ErrMsg, nil
+		}
+		if !token_verify.IsManagerUserID(data.MsgData.SendID) {
+			if !utils.IsContain(data.MsgData.SendID, cacheResp.UserIDList) {
+				//return returnMsg(&replay, pb, 202, "you are not in group", "", 0)
+				return false, 202, "you are not in group", nil
+			}
+		}
+		return true, 0, "", cacheResp.UserIDList
 
-	} else {
+	default:
-		return true, 0, ""
+		return true, 0, "", nil
 	}
+
 }
 func (rpc *rpcChat) encapsulateMsgData(msg *sdk_ws.MsgData) {
 	msg.ServerMsgID = GetMsgID(msg.SendID)
@@ -186,7 +218,7 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
 	if !flag {
 		return returnMsg(&replay, pb, errCode, errMsg, "", 0)
 	}
-	flag, errCode, errMsg = userRelationshipVerification(pb)
+	flag, errCode, errMsg, _ = messageVerification(pb)
 	log.Info(pb.OperationID, "userRelationshipVerification ", flag)
 	if !flag {
 		return returnMsg(&replay, pb, errCode, errMsg, "", 0)
@@ -257,25 +289,11 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
 			log.NewDebug(pb.OperationID, utils.GetSelfFuncName(), "callbackBeforeSendSingleMsg result", "end rpc and return", callbackResp)
 			return returnMsg(&replay, pb, int32(callbackResp.ErrCode), callbackResp.ErrMsg, "", 0)
 		}
-		getGroupMemberIDListFromCacheReq := &pbCache.GetGroupMemberIDListFromCacheReq{OperationID: pb.OperationID, GroupID: pb.MsgData.GroupID}
+		var memberUserIDList []string
-		etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, msgToMQSingle.OperationID)
+		if flag, errCode, errMsg, memberUserIDList = messageVerification(pb); !flag {
-		if etcdConn == nil {
+			return returnMsg(&replay, pb, errCode, errMsg, "", 0)
-			errMsg := msgToMQSingle.OperationID + "getcdv3.GetConn == nil"
-			log.NewError(msgToMQSingle.OperationID, errMsg)
-			return returnMsg(&replay, pb, 201, errMsg, "", 0)
 		}
-		client := pbCache.NewCacheClient(etcdConn)
+		log.Debug(pb.OperationID, "GetGroupAllMember userID list", memberUserIDList, "len: ", len(memberUserIDList))
-		cacheResp, err := client.GetGroupMemberIDListFromCache(context.Background(), getGroupMemberIDListFromCacheReq)
-		if err != nil {
-			log.NewError(pb.OperationID, "GetGroupMemberIDListFromCache rpc call failed ", err.Error())
-			return returnMsg(&replay, pb, 201, "GetGroupMemberIDListFromCache failed", "", 0)
-		}
-		if cacheResp.CommonResp.ErrCode != 0 {
-			log.NewError(pb.OperationID, "GetGroupMemberIDListFromCache rpc logic call failed ", cacheResp.String())
-			return returnMsg(&replay, pb, 201, "GetGroupMemberIDListFromCache logic failed", "", 0)
-		}
-		memberUserIDList := cacheResp.UserIDList
-		log.Debug(pb.OperationID, "GetGroupAllMember userID list", cacheResp.UserIDList, "len: ", len(cacheResp.UserIDList))
 		var addUidList []string
 		switch pb.MsgData.ContentType {
 		case constant.MemberKickedNotification:
@@ -301,11 +319,6 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
 		if len(addUidList) > 0 {
 			memberUserIDList = append(memberUserIDList, addUidList...)
 		}
-		if !token_verify.IsManagerUserID(pb.MsgData.SendID) {
-			if !utils.IsContain(pb.MsgData.SendID, memberUserIDList) {
-				return returnMsg(&replay, pb, 202, "you are not in group", "", 0)
-			}
-		}
 		m := make(map[string][]string, 2)
 		m[constant.OnlineStatus] = memberUserIDList
 		log.Debug(pb.OperationID, "send msg cost time1 ", db.GetCurrentTimestampByMill()-newTime, pb.MsgData.ClientMsgID)
@@ -331,8 +344,8 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
 			}
 		}
 		log.Debug(pb.OperationID, "send msg cost time22 ", db.GetCurrentTimestampByMill()-newTime, pb.MsgData.ClientMsgID, "uidList : ", len(addUidList))
-		wg.Add(1)
+		//wg.Add(1)
-		go rpc.sendMsgToGroup(addUidList, *pb, constant.OnlineStatus, &sendTag, &wg)
+		//go rpc.sendMsgToGroup(addUidList, *pb, constant.OnlineStatus, &sendTag, &wg)
 		wg.Wait()
 		newTime = db.GetCurrentTimestampByMill()
 		// callback
@@ -440,6 +453,9 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
 			log.NewDebug(pb.OperationID, utils.GetSelfFuncName(), "callbackBeforeSendSuperGroupMsg result", "end rpc and return", callbackResp)
 			return returnMsg(&replay, pb, int32(callbackResp.ErrCode), callbackResp.ErrMsg, "", 0)
 		}
+		if flag, errCode, errMsg, _ = messageVerification(pb); !flag {
+			return returnMsg(&replay, pb, errCode, errMsg, "", 0)
+		}
 		msgToMQSingle.MsgData = pb.MsgData
 		log.NewInfo(msgToMQSingle.OperationID, msgToMQSingle)
 		err1 := rpc.sendMsgToKafka(&msgToMQSingle, msgToMQSingle.MsgData.GroupID, constant.OnlineStatus)
@@ -447,7 +463,6 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
 			log.NewError(msgToMQSingle.OperationID, "kafka send msg err:RecvID", msgToMQSingle.MsgData.RecvID, msgToMQSingle.String())
 			return returnMsg(&replay, pb, 201, "kafka send msg err", "", 0)
 		}
-
 		// callback
 		callbackResp = callbackAfterSendSingleMsg(pb)
 		if callbackResp.ErrCode != 0 {
@@ -830,14 +845,14 @@ func Notification(n *NotificationMsg) {
 	offlineInfo.Ex = ex
 	msg.OfflinePushInfo = &offlineInfo
 	req.MsgData = &msg
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName, req.OperationID)
+	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
 	if etcdConn == nil {
 		errMsg := req.OperationID + "getcdv3.GetConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		return
 	}
 
-	client := pbChat.NewChatClient(etcdConn)
+	client := pbChat.NewMsgClient(etcdConn)
 	reply, err := client.SendMsg(context.Background(), &req)
 	if err != nil {
 		log.NewError(req.OperationID, "SendMsg rpc failed, ", req.String(), err.Error())
@@ -853,9 +868,9 @@ func getOnlineAndOfflineUserIDList(memberList []string, m map[string][]string, o
 	req.OperationID = operationID
 	req.OpUserID = config.Config.Manager.AppManagerUid[0]
 	flag := false
-	grpcCons := getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOnlineMessageRelayName)
+	grpcCons := getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImRelayName)
 	for _, v := range grpcCons {
-		client := pbRelay.NewOnlineMessageRelayServiceClient(v)
+		client := pbRelay.NewRelayClient(v)
 		reply, err := client.GetUsersOnlineStatus(context.Background(), req)
 		if err != nil {
 			log.NewError(operationID, "GetUsersOnlineStatus rpc  err", req.String(), err.Error())

internal/rpc/msg/tag_send_msg.go

@@ -6,7 +6,7 @@ import (
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
-	pbChat "Open_IM/pkg/proto/chat"
+	pbChat "Open_IM/pkg/proto/msg"
 	pbCommon "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"context"
@@ -33,14 +33,14 @@ func TagSendMessage(operationID string, user *db.User, recvID, content string, s
 	msgData.SenderPlatformID = senderPlatformID
 	req.MsgData = &msgData
 	req.OperationID = operationID
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName, operationID)
+	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, operationID)
 	if etcdConn == nil {
 		errMsg := req.OperationID + "getcdv3.GetConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		return
 	}
 
-	client := pbChat.NewChatClient(etcdConn)
+	client := pbChat.NewMsgClient(etcdConn)
 	respPb, err := client.SendMsg(context.Background(), &req)
 	if err != nil {
 		log.NewError(operationID, utils.GetSelfFuncName(), "send msg failed", err.Error())

internal/rpc/organization/organization.go

@@ -6,6 +6,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/db"
 	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
+	rocksCache "Open_IM/pkg/common/db/rocks_cache"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
@@ -112,8 +113,12 @@ func (s *organizationServer) CreateDepartment(ctx context.Context, req *rpc.Crea
 	resp := &rpc.CreateDepartmentResp{DepartmentInfo: &open_im_sdk.Department{}}
 	utils.CopyStructFields(resp.DepartmentInfo, createdDepartment)
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", *resp)
+	if err := rocksCache.DelAllDepartmentsFromCache(); err != nil {
+		errMsg := req.OperationID + " " + "UpdateDepartment failed " + err.Error()
+		log.Error(req.OperationID, errMsg)
+		return &rpc.CreateDepartmentResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil
+	}
 	chat.OrganizationNotificationToAll(req.OpUserID, req.OperationID)
-
 	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
 		errMsg := req.OperationID + "getcdv3.GetConn == nil"
@@ -169,11 +174,15 @@ func (s *organizationServer) UpdateDepartment(ctx context.Context, req *rpc.Upda
 	utils.CopyStructFields(&department, req.DepartmentInfo)
 	log.Debug(req.OperationID, "dst ", department, "src ", req.DepartmentInfo)
 	if err := imdb.UpdateDepartment(&department, nil); err != nil {
+		errMsg := req.OperationID + " " + "UpdateDepartment failed " + err.Error()
+		log.Error(req.OperationID, errMsg, department)
+		return &rpc.UpdateDepartmentResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil
+	}
+	if err := rocksCache.DelAllDepartmentsFromCache(); err != nil {
 		errMsg := req.OperationID + " " + "UpdateDepartment failed " + err.Error()
 		log.Error(req.OperationID, errMsg)
 		return &rpc.UpdateDepartmentResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil
 	}
-
 	resp := &rpc.UpdateDepartmentResp{}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", *resp)
 	chat.OrganizationNotificationToAll(req.OpUserID, req.OperationID)
@@ -182,12 +191,24 @@ func (s *organizationServer) UpdateDepartment(ctx context.Context, req *rpc.Upda
 
 func (s *organizationServer) GetSubDepartment(ctx context.Context, req *rpc.GetSubDepartmentReq) (*rpc.GetSubDepartmentResp, error) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String())
-	err, departmentList := imdb.GetSubDepartmentList(req.DepartmentID)
+	var departmentList []db.Department
-	if err != nil {
+	var err error
-		errMsg := req.OperationID + " " + "GetDepartment failed " + err.Error()
+	if req.DepartmentID == "-1" {
-		log.Error(req.OperationID, errMsg)
+		departmentList, err = rocksCache.GetAllDepartmentsFromCache()
-		return &rpc.GetSubDepartmentResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil
+		if err != nil {
+			errMsg := req.OperationID + " " + "GetDepartment failed " + err.Error()
+			log.Error(req.OperationID, errMsg)
+			return &rpc.GetSubDepartmentResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil
+		}
+	} else {
+		departmentList, err = imdb.GetSubDepartmentList(req.DepartmentID)
+		if err != nil {
+			errMsg := req.OperationID + " " + "GetDepartment failed " + err.Error()
+			log.Error(req.OperationID, errMsg)
+			return &rpc.GetSubDepartmentResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil
+		}
 	}
+
 	log.Debug(req.OperationID, "GetSubDepartmentList ", req.DepartmentID, departmentList)
 	resp := &rpc.GetSubDepartmentResp{}
 	for _, v := range departmentList {
@@ -224,6 +245,12 @@ func (s *organizationServer) DeleteDepartment(ctx context.Context, req *rpc.Dele
 		return &rpc.DeleteDepartmentResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil
 	}
 	log.Debug(req.OperationID, "DeleteDepartment ", req.DepartmentID)
+
+	if err := rocksCache.DelAllDepartmentsFromCache(); err != nil {
+		errMsg := req.OperationID + " " + "UpdateDepartment failed " + err.Error()
+		log.Error(req.OperationID, errMsg)
+		return &rpc.DeleteDepartmentResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil
+	}
 	resp := &rpc.DeleteDepartmentResp{}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", resp)
 	chat.OrganizationNotificationToAll(req.OpUserID, req.OperationID)
@@ -273,7 +300,7 @@ func (s *organizationServer) CreateOrganizationUser(ctx context.Context, req *rp
 	log.Debug(req.OperationID, "CreateOrganizationUser ", organizationUser)
 	resp := &rpc.CreateOrganizationUserResp{}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", *resp)
-	chat.OrganizationNotificationToAll(req.OpUserID, req.OperationID)
+	//chat.OrganizationNotificationToAll(req.OpUserID, req.OperationID)
 	return resp, nil
 }
 
@@ -353,7 +380,9 @@ func (s *organizationServer) CreateDepartmentMember(ctx context.Context, req *rp
 		return &rpc.CreateDepartmentMemberResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil
 	}
 	log.Debug(req.OperationID, "UpdateOrganizationUser ", departmentMember)
-
+	if err := rocksCache.DelAllDepartmentMembersFromCache(); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
+	}
 	resp := &rpc.CreateDepartmentMemberResp{}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", *resp)
 	chat.OrganizationNotificationToAll(req.OpUserID, req.OperationID)
@@ -477,11 +506,22 @@ func (s *organizationServer) DeleteOrganizationUser(ctx context.Context, req *rp
 
 func (s *organizationServer) GetDepartmentMember(ctx context.Context, req *rpc.GetDepartmentMemberReq) (*rpc.GetDepartmentMemberResp, error) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String())
-	err, departmentMemberList := imdb.GetDepartmentMemberList(req.DepartmentID)
+	var departmentMemberList []db.DepartmentMember
-	if err != nil {
+	var err error
-		errMsg := req.OperationID + " " + req.OpUserID + " is not app manager"
+	if req.DepartmentID == "-1" {
-		log.Error(req.OperationID, errMsg)
+		departmentMemberList, err = rocksCache.GetAllDepartmentMembersFromCache()
-		return &rpc.GetDepartmentMemberResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}, nil
+		if err != nil {
+			errMsg := req.OperationID + " " + req.OpUserID + " is not app manager"
+			log.Error(req.OperationID, errMsg)
+			return &rpc.GetDepartmentMemberResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}, nil
+		}
+	} else {
+		departmentMemberList, err = imdb.GetDepartmentMemberList(req.DepartmentID)
+		if err != nil {
+			errMsg := req.OperationID + " " + req.OpUserID + " is not app manager"
+			log.Error(req.OperationID, errMsg)
+			return &rpc.GetDepartmentMemberResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}, nil
+		}
 	}
 
 	log.Debug(req.OperationID, "GetDepartmentMemberList ", departmentMemberList)

internal/rpc/user/user.go

@@ -6,6 +6,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/db"
 	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
+	"Open_IM/pkg/common/db/rocks_cache"
 	errors "Open_IM/pkg/common/http"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
@@ -112,7 +113,7 @@ func (s *userServer) GetUserInfo(ctx context.Context, req *pbUser.GetUserInfoReq
 	if len(req.UserIDList) > 0 {
 		for _, userID := range req.UserIDList {
 			var userInfo sdkws.UserInfo
-			user, err := imdb.GetUserByUserID(userID)
+			user, err := rocksCache.GetUserInfoFromCache(userID)
 			if err != nil {
 				log.NewError(req.OperationID, "GetUserByUserID failed ", err.Error(), userID)
 				continue
@@ -151,7 +152,7 @@ func (s *userServer) BatchSetConversations(ctx context.Context, req *pbUser.Batc
 			continue
 		}
 		resp.Success = append(resp.Success, v.ConversationID)
-		// if is set private chat operation，then peer user need to sync and set tips\
+		// if is set private msg operation，then peer user need to sync and set tips\
 		if v.ConversationType == constant.SingleChatType && req.NotificationType == constant.ConversationPrivateChatNotification {
 			if err := syncPeerUserConversation(v, req.OperationID); err != nil {
 				log.NewError(req.OperationID, utils.GetSelfFuncName(), "syncPeerUserConversation", err.Error())
@@ -378,6 +379,13 @@ func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbUser.UpdateUserI
 		return &pbUser.UpdateUserInfoResp{CommonResp: &pbUser.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil
 	}
 
+	oldNickname := ""
+	if req.UserInfo.Nickname != "" {
+		u, err := imdb.GetUserByUserID(req.UserInfo.UserID)
+		if err == nil {
+			oldNickname = u.Nickname
+		}
+	}
 	var user db.User
 	utils.CopyStructFields(&user, req.UserInfo)
 	if req.UserInfo.Birth != 0 {
@@ -401,21 +409,27 @@ func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbUser.UpdateUserI
 		CommID: &pbFriend.CommID{OperationID: req.OperationID, FromUserID: req.UserInfo.UserID, OpUserID: req.OpUserID},
 	}
 
-	RpcResp, err := client.GetFriendList(context.Background(), newReq)
+	rpcResp, err := client.GetFriendList(context.Background(), newReq)
 	if err != nil {
 		log.NewError(req.OperationID, "GetFriendList failed ", err.Error(), newReq)
-		return &pbUser.UpdateUserInfoResp{CommonResp: &pbUser.CommonResp{}}, nil
+		return &pbUser.UpdateUserInfoResp{CommonResp: &pbUser.CommonResp{ErrCode: 500, ErrMsg: err.Error()}}, nil
 	}
-	for _, v := range RpcResp.FriendInfoList {
+	for _, v := range rpcResp.FriendInfoList {
 		log.Info(req.OperationID, "UserInfoUpdatedNotification ", req.UserInfo.UserID, v.FriendUser.UserID)
 		chat.UserInfoUpdatedNotification(req.OperationID, req.UserInfo.UserID, v.FriendUser.UserID)
 	}
-
+	if err := rocksCache.DelUserInfoFromCache(user.UserID); err != nil {
+		log.NewError(req.OperationID, "GetFriendList failed ", err.Error(), newReq)
+		return &pbUser.UpdateUserInfoResp{CommonResp: &pbUser.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: err.Error()}}, nil
+	}
 	chat.UserInfoUpdatedNotification(req.OperationID, req.UserInfo.UserID, req.OpUserID)
 	log.Info(req.OperationID, "UserInfoUpdatedNotification ", req.UserInfo.UserID, req.OpUserID)
 	if req.UserInfo.FaceURL != "" {
 		go s.SyncJoinedGroupMemberFaceURL(req.UserInfo.UserID, req.UserInfo.FaceURL, req.OperationID, req.OpUserID)
 	}
+	if req.UserInfo.Nickname != "" {
+		go s.SyncJoinedGroupMemberNickname(req.UserInfo.UserID, req.UserInfo.Nickname, oldNickname, req.OperationID, req.OpUserID)
+	}
 	//updateUserInfoToCacheReq := &cache.UpdateUserInfoToCacheReq{
 	//	OperationID:  req.OperationID,
 	//	UserInfoList: []*sdkws.UserInfo{req.UserInfo},
@@ -455,16 +469,51 @@ func (s *userServer) SetGlobalRecvMessageOpt(ctx context.Context, req *pbUser.Se
 	chat.UserInfoUpdatedNotification(req.OperationID, req.UserID, req.UserID)
 	return &pbUser.SetGlobalRecvMessageOptResp{CommonResp: &pbUser.CommonResp{}}, nil
 }
+
 func (s *userServer) SyncJoinedGroupMemberFaceURL(userID string, faceURL string, operationID string, opUserID string) {
+	joinedGroupIDList, err := rocksCache.GetJoinedGroupIDListFromCache(userID)
+	if err != nil {
+		log.NewWarn(operationID, "GetJoinedGroupIDListByUserID failed ", userID, err.Error())
+		return
+	}
+	for _, groupID := range joinedGroupIDList {
+		groupMemberInfo := db.GroupMember{UserID: userID, GroupID: groupID, FaceURL: faceURL}
+		if err := imdb.UpdateGroupMemberInfo(groupMemberInfo); err != nil {
+			log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), groupMemberInfo)
+			continue
+		}
+		if err := rocksCache.DelAllGroupMembersInfoFromCache(groupID); err != nil {
+			log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), groupID)
+			continue
+		}
+		chat.GroupMemberInfoSetNotification(operationID, opUserID, groupID, userID)
+	}
+}
+
+func (s *userServer) SyncJoinedGroupMemberNickname(userID string, newNickname, oldNickname string, operationID string, opUserID string) {
 	joinedGroupIDList, err := imdb.GetJoinedGroupIDListByUserID(userID)
 	if err != nil {
 		log.NewWarn(operationID, "GetJoinedGroupIDListByUserID failed ", userID, err.Error())
 		return
 	}
 	for _, v := range joinedGroupIDList {
-		groupMemberInfo := db.GroupMember{UserID: userID, GroupID: v, FaceURL: faceURL}
+		member, err := imdb.GetGroupMemberInfoByGroupIDAndUserID(v, userID)
-		imdb.UpdateGroupMemberInfo(groupMemberInfo)
+		if err != nil {
-		chat.GroupMemberInfoSetNotification(operationID, opUserID, v, userID)
+			log.NewWarn(operationID, "GetGroupMemberInfoByGroupIDAndUserID failed ", err.Error(), v, userID)
+			continue
+		}
+		if member.Nickname == oldNickname {
+			groupMemberInfo := db.GroupMember{UserID: userID, GroupID: v, Nickname: newNickname}
+			if err := imdb.UpdateGroupMemberInfo(groupMemberInfo); err != nil {
+				log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), groupMemberInfo)
+				continue
+			}
+			if err := rocksCache.DelAllGroupMembersInfoFromCache(v); err != nil {
+				log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), v)
+				continue
+			}
+			chat.GroupMemberInfoSetNotification(operationID, opUserID, v, userID)
+		}
 	}
 }
 

pkg/base_info/friend_api_struct.go

@@ -72,7 +72,7 @@ type GetBlackListResp struct {
 
 type SetFriendRemarkReq struct {
 	ParamsCommFriend
-	Remark string `json:"remark" binding:"required"`
+	Remark string `json:"remark"`
 }
 type SetFriendRemarkResp struct {
 	CommResp

pkg/base_info/group_api_struct.go

@@ -161,10 +161,13 @@ type ApplicationGroupResponseResp struct {
 }
 
 type JoinGroupReq struct {
-	GroupID     string `json:"groupID" binding:"required"`
+	GroupID       string `json:"groupID" binding:"required"`
-	ReqMessage  string `json:"reqMessage"`
+	ReqMessage    string `json:"reqMessage"`
-	OperationID string `json:"operationID" binding:"required"`
+	OperationID   string `json:"operationID" binding:"required"`
+	JoinSource    int32  `json:"joinSource"`
+	InviterUserID string `json:"inviterUserID"`
 }
+
 type JoinGroupResp struct {
 	CommResp
 }
@@ -178,14 +181,16 @@ type QuitGroupResp struct {
 }
 
 type SetGroupInfoReq struct {
-	GroupID          string `json:"groupID" binding:"required"`
+	GroupID           string `json:"groupID" binding:"required"`
-	GroupName        string `json:"groupName"`
+	GroupName         string `json:"groupName"`
-	Notification     string `json:"notification"`
+	Notification      string `json:"notification"`
-	Introduction     string `json:"introduction"`
+	Introduction      string `json:"introduction"`
-	FaceURL          string `json:"faceURL"`
+	FaceURL           string `json:"faceURL"`
-	Ex               string `json:"ex"`
+	Ex                string `json:"ex"`
-	OperationID      string `json:"operationID" binding:"required"`
+	OperationID       string `json:"operationID" binding:"required"`
-	NeedVerification *int32 `json:"needVerification" binding "oneof=0 1 2"`
+	NeedVerification  *int32 `json:"needVerification" `
+	LookMemberInfo    *int32 `json:"lookMemberInfo"`
+	ApplyMemberFriend *int32 `json:"applyMemberFriend"`
 }
 
 type SetGroupInfoResp struct {

pkg/base_info/manage_api_struct.go

@@ -40,17 +40,19 @@ type AccountCheckResp struct {
 }
 
 type ManagementSendMsg struct {
-	OperationID      string `json:"operationID" binding:"required"`
+	OperationID         string `json:"operationID" binding:"required"`
-	SendID           string `json:"sendID" binding:"required"`
+	BusinessOperationID string `json:"businessOperationID"`
-	GroupID          string `json:"groupID" `
+	SendID              string `json:"sendID" binding:"required"`
-	SenderNickname   string `json:"senderNickname" `
+	GroupID             string `json:"groupID" `
-	SenderFaceURL    string `json:"senderFaceURL" `
+	SenderNickname      string `json:"senderNickname" `
-	SenderPlatformID int32  `json:"senderPlatformID"`
+	SenderFaceURL       string `json:"senderFaceURL" `
+	SenderPlatformID    int32  `json:"senderPlatformID"`
 	//ForceList        []string                     `json:"forceList" `
 	Content         map[string]interface{}       `json:"content" binding:"required" swaggerignore:"true"`
 	ContentType     int32                        `json:"contentType" binding:"required"`
 	SessionType     int32                        `json:"sessionType" binding:"required"`
 	IsOnlineOnly    bool                         `json:"isOnlineOnly"`
+	NotOfflinePush  bool                         `json:"notOfflinePush"`
 	OfflinePushInfo *open_im_sdk.OfflinePushInfo `json:"offlinePushInfo"`
 }
 
@@ -72,7 +74,22 @@ type ManagementBatchSendMsgReq struct {
 type ManagementBatchSendMsgResp struct {
 	CommResp
 	Data struct {
-		ResultList   []server_api_params.UserSendMsgResp `json:"resultList"`
+		ResultList   []*SingleReturnResult `json:"resultList"`
 		FailedIDList []string
 	} `json:"data"`
 }
+type SingleReturnResult struct {
+	ServerMsgID string `json:"serverMsgID"`
+	ClientMsgID string `json:"clientMsgID"`
+	SendTime    int64  `json:"sendTime"`
+	RecvID      string `json:"recvID" `
+}
+
+type CheckMsgIsSendSuccessReq struct {
+	OperationID string `json:"operationID"`
+}
+
+type CheckMsgIsSendSuccessResp struct {
+	CommResp
+	Status int32 `json:"status"`
+}

pkg/base_info/msg.go

@@ -18,3 +18,34 @@ type CleanUpMsgReq struct {
 type CleanUpMsgResp struct {
 	CommResp
 }
+type DelSuperGroupMsgReq struct {
+	UserID      string   `json:"userID,omitempty" binding:"required"`
+	GroupID     string   `json:"groupID,omitempty" binding:"required"`
+	SeqList     []uint32 `json:"seqList,omitempty"`
+	IsAllDelete bool     `json:"isAllDelete"`
+	OperationID string   `json:"operationID,omitempty" binding:"required"`
+}
+
+type DelSuperGroupMsgResp struct {
+	CommResp
+}
+type MsgDeleteNotificationElem struct {
+	GroupID     string   `json:"groupID"`
+	IsAllDelete bool     `json:"isAllDelete"`
+	SeqList     []uint32 `json:"seqList"`
+}
+
+//UserID               string   `protobuf:"bytes,1,opt,name=userID" json:"userID,omitempty"`
+//	GroupID              string   `protobuf:"bytes,2,opt,name=groupID" json:"groupID,omitempty"`
+//	MinSeq               uint32   `protobuf:"varint,3,opt,name=minSeq" json:"minSeq,omitempty"`
+//	OperationID          string   `protobuf:"bytes,4,opt,name=operationID" json:"operationID,omitempty"`
+//	OpUserID             string   `protobuf:"bytes,5,opt,name=opUserID" json:"opUserID,omitempty"`
+type SetMsgMinSeqReq struct {
+	UserID      string `json:"userID"  binding:"required"`
+	GroupID     string `json:"groupID"`
+	MinSeq      uint32 `json:"minSeq"  binding:"required"`
+	OperationID string `json:"operationID"  binding:"required"`
+}
+type SetMsgMinSeqResp struct {
+	CommResp
+}

pkg/base_info/public_struct.go

@@ -32,7 +32,7 @@ type ApiUserInfo struct {
 
 type GroupAddMemberInfo struct {
 	UserID    string `json:"userID" binding:"required"`
-	RoleLevel int32  `json:"roleLevel" binding:"required"`
+	RoleLevel int32  `json:"roleLevel" binding:"required,oneof= 1 3"`
 }
 
 func SetErrCodeMsg(c *gin.Context, status int) *CommResp {

pkg/base_info/third_api_struct.go

@@ -12,6 +12,7 @@ type MiniostorageCredentialResp struct {
 	SessionToken    string `json:"sessionToken"`
 	BucketName      string `json:"bucketName"`
 	StsEndpointURL  string `json:"stsEndpointURL"`
+	StorageTime     int    `json:"storageTime"`
 }
 
 type MinioUploadFileReq struct {

pkg/call_back_struct/common.go

@@ -25,10 +25,19 @@ type CommonCallbackResp struct {
 	OperationID string `json:"operationID"`
 }
 
-type UserStatusCallbackReq struct {
+type UserStatusBaseCallback struct {
 	CallbackCommand string `json:"callbackCommand"`
 	OperationID     string `json:"operationID"`
-	UserID          string `json:"userID"`
 	PlatformID      int32  `json:"platformID"`
 	Platform        string `json:"platform"`
 }
+
+type UserStatusCallbackReq struct {
+	UserStatusBaseCallback
+	UserID string `json:"userID"`
+}
+
+type UserStatusBatchCallbackReq struct {
+	UserStatusBaseCallback
+	UserIDList []string `json:"userIDList"`
+}

pkg/call_back_struct/push.go

@@ -2,18 +2,34 @@ package call_back_struct
 
 import commonPb "Open_IM/pkg/proto/sdk_ws"
 
-type CallbackOfflinePushReq struct {
+type CallbackBeforePushReq struct {
-	UserStatusCallbackReq
+	UserStatusBatchCallbackReq
 	*commonPb.OfflinePushInfo
-	//CommonCallbackReq
 	SendID       string   `json:"sendID"`
 	GroupID      string   `json:"groupID"`
 	ContentType  int32    `json:"contentType"`
 	SessionType  int32    `json:"sessionType"`
 	AtUserIDList []string `json:"atUserIDList"`
-	Content      string   `json`
+	Content      string   `json:"content"`
 }
 
-type CallbackOfflinePushResp struct {
+type CallbackBeforePushResp struct {
 	*CommonCallbackResp
+	UserIDList []string `json:"userIDList"`
+}
+
+type CallbackBeforeSuperGroupOnlinePushReq struct {
+	*commonPb.OfflinePushInfo
+	UserStatusBaseCallback
+	SendID       string   `json:"sendID"`
+	GroupID      string   `json:"groupID"`
+	ContentType  int32    `json:"contentType"`
+	SessionType  int32    `json:"sessionType"`
+	AtUserIDList []string `json:"atUserIDList"`
+	Content      string   `json:"content"`
+}
+
+type CallbackBeforeSuperGroupOnlinePushResp struct {
+	*CommonCallbackResp
+	UserIDList []string `json:"userIDList"`
 }

pkg/common/config/config.go

@@ -71,9 +71,14 @@ type config struct {
 			SecretAccessKey     string `yaml:"secretAccessKey"`
 			EndpointInner       string `yaml:"endpointInner"`
 			EndpointInnerEnable bool   `yaml:"endpointInnerEnable"`
+			StorageTime         int    `yaml:"storageTime"`
 		} `yaml:"minio"`
 	}
 
+	Dtm struct {
+		ServerURL string `json:"serverURL"`
+	}
+
 	Mysql struct {
 		DBAddress      []string `yaml:"dbMysqlAddress"`
 		DBUserName     string   `yaml:"dbMysqlUserName"`
@@ -102,6 +107,7 @@ type config struct {
 		DBMaxIdle     int      `yaml:"dbMaxIdle"`
 		DBMaxActive   int      `yaml:"dbMaxActive"`
 		DBIdleTimeout int      `yaml:"dbIdleTimeout"`
+		DBUserName    string   `yaml:"dbUserName"`
 		DBPassWord    string   `yaml:"dbPassWord"`
 		EnableCluster bool     `yaml:"enableCluster"`
 	}
@@ -122,21 +128,22 @@ type config struct {
 		OpenImCachePort          []int `yaml:"openImCachePort"`
 	}
 	RpcRegisterName struct {
-		OpenImStatisticsName         string `yaml:"openImStatisticsName"`
+		OpenImStatisticsName string `yaml:"openImStatisticsName"`
-		OpenImUserName               string `yaml:"openImUserName"`
+		OpenImUserName       string `yaml:"openImUserName"`
-		OpenImFriendName             string `yaml:"openImFriendName"`
+		OpenImFriendName     string `yaml:"openImFriendName"`
-		OpenImOfflineMessageName     string `yaml:"openImOfflineMessageName"`
+		//	OpenImOfflineMessageName     string `yaml:"openImOfflineMessageName"`
-		OpenImPushName               string `yaml:"openImPushName"`
+		OpenImMsgName          string `yaml:"openImMsgName"`
-		OpenImOnlineMessageRelayName string `yaml:"openImOnlineMessageRelayName"`
+		OpenImPushName         string `yaml:"openImPushName"`
-		OpenImGroupName              string `yaml:"openImGroupName"`
+		OpenImRelayName        string `yaml:"openImRelayName"`
-		OpenImAuthName               string `yaml:"openImAuthName"`
+		OpenImGroupName        string `yaml:"openImGroupName"`
-		OpenImMessageCMSName         string `yaml:"openImMessageCMSName"`
+		OpenImAuthName         string `yaml:"openImAuthName"`
-		OpenImAdminCMSName           string `yaml:"openImAdminCMSName"`
+		OpenImMessageCMSName   string `yaml:"openImMessageCMSName"`
-		OpenImOfficeName             string `yaml:"openImOfficeName"`
+		OpenImAdminCMSName     string `yaml:"openImAdminCMSName"`
-		OpenImOrganizationName       string `yaml:"openImOrganizationName"`
+		OpenImOfficeName       string `yaml:"openImOfficeName"`
-		OpenImConversationName       string `yaml:"openImConversationName"`
+		OpenImOrganizationName string `yaml:"openImOrganizationName"`
-		OpenImCacheName              string `yaml:"openImCacheName"`
+		OpenImConversationName string `yaml:"openImConversationName"`
-		OpenImRealTimeCommName       string `yaml:"openImRealTimeCommName"`
+		OpenImCacheName        string `yaml:"openImCacheName"`
+		OpenImRealTimeCommName string `yaml:"openImRealTimeCommName"`
 	}
 	Etcd struct {
 		EtcdSchema string   `yaml:"etcdSchema"`
@@ -190,6 +197,10 @@ type config struct {
 			Intent       string `yaml:"intent"`
 			MasterSecret string `yaml:"masterSecret"`
 		}
+		Fcm struct {
+			ServiceAccount string `yaml:"serviceAccount"`
+			Enable         bool   `yaml:"enable"`
+		}
 	}
 	Manager struct {
 		AppManagerUid          []string `yaml:"appManagerUid"`
@@ -243,15 +254,17 @@ type config struct {
 	}
 
 	Callback struct {
-		CallbackUrl                 string         `yaml:"callbackUrl"`
+		CallbackUrl                        string         `yaml:"callbackUrl"`
-		CallbackBeforeSendSingleMsg callBackConfig `yaml:"callbackBeforeSendSingleMsg"`
+		CallbackBeforeSendSingleMsg        callBackConfig `yaml:"callbackBeforeSendSingleMsg"`
-		CallbackAfterSendSingleMsg  callBackConfig `yaml:"callbackAfterSendSingleMsg"`
+		CallbackAfterSendSingleMsg         callBackConfig `yaml:"callbackAfterSendSingleMsg"`
-		CallbackBeforeSendGroupMsg  callBackConfig `yaml:"callbackBeforeSendGroupMsg"`
+		CallbackBeforeSendGroupMsg         callBackConfig `yaml:"callbackBeforeSendGroupMsg"`
-		CallbackAfterSendGroupMsg   callBackConfig `yaml:"callbackAfterSendGroupMsg"`
+		CallbackAfterSendGroupMsg          callBackConfig `yaml:"callbackAfterSendGroupMsg"`
-		CallbackWordFilter          callBackConfig `yaml:"callbackWordFilter"`
+		CallbackWordFilter                 callBackConfig `yaml:"callbackWordFilter"`
-		CallbackUserOnline          callBackConfig `yaml:"callbackUserOnline"`
+		CallbackUserOnline                 callBackConfig `yaml:"callbackUserOnline"`
-		CallbackUserOffline         callBackConfig `yaml:"callbackUserOffline"`
+		CallbackUserOffline                callBackConfig `yaml:"callbackUserOffline"`
-		CallbackOfflinePush         callBackConfig `yaml:"callbackOfflinePush"`
+		CallbackOfflinePush                callBackConfig `yaml:"callbackOfflinePush"`
+		CallbackOnlinePush                 callBackConfig `yaml:"callbackOnlinePush"`
+		CallbackBeforeSuperGroupOnlinePush callBackConfig `yaml:"callbackSuperGroupOnlinePush"`
 	} `yaml:"callback"`
 	Notification struct {
 		///////////////////////group/////////////////////////////
@@ -464,9 +477,10 @@ type config struct {
 			VerificationCodeTemplateCode string `yaml:"verificationCodeTemplateCode"`
 			Enable                       bool   `yaml:"enable"`
 		}
-		SuperCode string `yaml:"superCode"`
+		SuperCode    string `yaml:"superCode"`
-		CodeTTL   int    `yaml:"codeTTL"`
+		CodeTTL      int    `yaml:"codeTTL"`
-		Mail      struct {
+		UseSuperCode bool   `yaml:"useSuperCode"`
+		Mail         struct {
 			Title                   string `yaml:"title"`
 			SenderMail              string `yaml:"senderMail"`
 			SenderAuthorizationCode string `yaml:"senderAuthorizationCode"`

pkg/common/constant/constant.go

@@ -28,24 +28,30 @@ const (
 
 	///ContentType
 	//UserRelated
-	Text                = 101
+	Text                         = 101
-	Picture             = 102
+	Picture                      = 102
-	Voice               = 103
+	Voice                        = 103
-	Video               = 104
+	Video                        = 104
-	File                = 105
+	File                         = 105
-	AtText              = 106
+	AtText                       = 106
-	Merger              = 107
+	Merger                       = 107
-	Card                = 108
+	Card                         = 108
-	Location            = 109
+	Location                     = 109
-	Custom              = 110
+	Custom                       = 110
-	Revoke              = 111
+	Revoke                       = 111
-	HasReadReceipt      = 112
+	HasReadReceipt               = 112
-	Typing              = 113
+	Typing                       = 113
-	Quote               = 114
+	Quote                        = 114
-	GroupHasReadReceipt = 116
+	GroupHasReadReceipt          = 116
-	Common              = 200
+	AdvancedText                 = 117
-	GroupMsg            = 201
+	AdvancedRevoke               = 118 //影响前者消息
-	SignalMsg           = 202
+	CustomNotTriggerConversation = 119
+	CustomOnlineOnly             = 120
+
+	Common             = 200
+	GroupMsg           = 201
+	SignalMsg          = 202
+	CustomNotification = 203
 
 	//SysRelated
 	NotificationBegin                     = 1000
@@ -58,6 +64,7 @@ const (
 	FriendRemarkSetNotification           = 1206 //set_friend_remark?
 	BlackAddedNotification                = 1207 //add_black
 	BlackDeletedNotification              = 1208 //remove_black
+	MsgDeleteNotification                 = 1209
 
 	ConversationOptChangeNotification = 1300 // change conversation opt
 
@@ -161,9 +168,9 @@ const (
 	GroupStatusMuted     = 3
 
 	//GroupType
-	NormalGroup     = 0
+	NormalGroup  = 0
-	SuperGroup      = 1
+	SuperGroup   = 1
-	DepartmentGroup = 2
+	WorkingGroup = 2
 
 	GroupBaned          = 3
 	GroupBanPrivateChat = 4
@@ -171,6 +178,10 @@ const (
 	//UserJoinGroupSource
 	JoinByAdmin = 1
 
+	JoinByInvitation = 2
+	JoinBySearch     = 3
+	JoinByQRCode     = 4
+
 	//Minio
 	MinioDurationTimes = 3600
 
@@ -181,14 +192,16 @@ const (
 	VerificationCodeForResetSuffix    = "_forReset"
 
 	//callbackCommand
-	CallbackBeforeSendSingleMsgCommand = "callbackBeforeSendSingleMsgCommand"
+	CallbackBeforeSendSingleMsgCommand  = "callbackBeforeSendSingleMsgCommand"
-	CallbackAfterSendSingleMsgCommand  = "callbackAfterSendSingleMsgCommand"
+	CallbackAfterSendSingleMsgCommand   = "callbackAfterSendSingleMsgCommand"
-	CallbackBeforeSendGroupMsgCommand  = "callbackBeforeSendGroupMsgCommand"
+	CallbackBeforeSendGroupMsgCommand   = "callbackBeforeSendGroupMsgCommand"
-	CallbackAfterSendGroupMsgCommand   = "callbackAfterSendGroupMsgCommand"
+	CallbackAfterSendGroupMsgCommand    = "callbackAfterSendGroupMsgCommand"
-	CallbackWordFilterCommand          = "callbackWordFilterCommand"
+	CallbackWordFilterCommand           = "callbackWordFilterCommand"
-	CallbackUserOnlineCommand          = "callbackUserOnlineCommand"
+	CallbackUserOnlineCommand           = "callbackUserOnlineCommand"
-	CallbackUserOfflineCommand         = "callbackUserOfflineCommand"
+	CallbackUserOfflineCommand          = "callbackUserOfflineCommand"
-	CallbackOfflinePushCommand         = "callbackOfflinePushCommand"
+	CallbackOfflinePushCommand          = "callbackOfflinePushCommand"
+	CallbackOnlinePushCommand           = "callbackOnlinePushCommand"
+	CallbackSuperGroupOnlinePushCommand = "callbackSuperGroupOnlinePushCommand"
 	//callback actionCode
 	ActionAllow     = 0
 	ActionForbidden = 1
@@ -241,6 +254,7 @@ const (
 	FieldGroupAtType   = 5
 	FieldIsNotInGroup  = 6
 	FieldEx            = 7
+	FieldUnread        = 8
 )
 
 const (
@@ -298,3 +312,5 @@ const BigVersion = "v2"
 const LogFileName = "OpenIM.log"
 
 const StatisticsTimeInterval = 60
+
+const MaxNotificationNum = 100

pkg/common/db/RedisModel.go

@@ -4,12 +4,11 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	log2 "Open_IM/pkg/common/log"
-	pbChat "Open_IM/pkg/proto/chat"
+	pbChat "Open_IM/pkg/proto/msg"
 	pbRtc "Open_IM/pkg/proto/rtc"
 	pbCommon "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	go_redis "github.com/go-redis/redis/v8"
@@ -18,6 +17,7 @@ import (
 	"strconv"
 	"time"
 )
+
 const (
 	accountTempCode               = "ACCOUNT_TEMP_CODE"
 	resetPwdTempCode              = "RESET_PWD_TEMP_CODE"
@@ -27,26 +27,19 @@ const (
 	uidPidToken                   = "UID_PID_TOKEN_STATUS:"
 	conversationReceiveMessageOpt = "CON_RECV_MSG_OPT:"
 	getuiToken                    = "GETUI_TOKEN"
-	userInfoCache                 = "USER_INFO_CACHE:"
-	friendRelationCache           = "FRIEND_RELATION_CACHE:"
-	blackListCache                = "BLACK_LIST_CACHE:"
-	groupCache                    = "GROUP_CACHE:"
 	messageCache                  = "MESSAGE_CACHE:"
 	SignalCache                   = "SIGNAL_CACHE:"
 	SignalListCache               = "SIGNAL_LIST_CACHE:"
 	GlobalMsgRecvOpt              = "GLOBAL_MSG_RECV_OPT"
+	FcmToken                      = "FCM_TOKEN:"
+	groupUserMinSeq               = "GROUP_USER_MIN_SEQ:"
+	groupMaxSeq                   = "GROUP_MAX_SEQ:"
+	sendMsgFailedFlag             = "SEND_MSG_FAILED_FLAG:"
 )
 
-
-//func  (d *  DataBases)pubMessage(channel, msg string) {
-//   d.rdb.Publish(context.Background(),channel,msg)
-//}
-//func  (d *  DataBases)pubMessage(channel, msg string) {
-//	d.rdb.Publish(context.Background(),channel,msg)
-//}
 func (d *DataBases) JudgeAccountEXISTS(account string) (bool, error) {
 	key := accountTempCode + account
-	n, err := d.rdb.Exists(context.Background(), key).Result()
+	n, err := d.RDB.Exists(context.Background(), key).Result()
 	if n > 0 {
 		return true, err
 	} else {
@@ -55,57 +48,84 @@ func (d *DataBases) JudgeAccountEXISTS(account string) (bool, error) {
 }
 func (d *DataBases) SetAccountCode(account string, code, ttl int) (err error) {
 	key := accountTempCode + account
-	return d.rdb.Set(context.Background(), key, code, time.Duration(ttl)*time.Second).Err()
+	return d.RDB.Set(context.Background(), key, code, time.Duration(ttl)*time.Second).Err()
 }
 func (d *DataBases) GetAccountCode(account string) (string, error) {
 	key := accountTempCode + account
-	return d.rdb.Get(context.Background(), key).Result()
+	return d.RDB.Get(context.Background(), key).Result()
 }
 
 //Perform seq auto-increment operation of user messages
 func (d *DataBases) IncrUserSeq(uid string) (uint64, error) {
 	key := userIncrSeq + uid
-	seq, err := d.rdb.Incr(context.Background(), key).Result()
+	seq, err := d.RDB.Incr(context.Background(), key).Result()
 	return uint64(seq), err
 }
 
 //Get the largest Seq
 func (d *DataBases) GetUserMaxSeq(uid string) (uint64, error) {
 	key := userIncrSeq + uid
-	seq, err := d.rdb.Get(context.Background(), key).Result()
+	seq, err := d.RDB.Get(context.Background(), key).Result()
 	return uint64(utils.StringToInt(seq)), err
 }
 
 //set the largest Seq
 func (d *DataBases) SetUserMaxSeq(uid string, maxSeq uint64) error {
 	key := userIncrSeq + uid
-	return d.rdb.Set(context.Background(), key, maxSeq, 0).Err()
+	return d.RDB.Set(context.Background(), key, maxSeq, 0).Err()
 }
 
 //Set the user's minimum seq
 func (d *DataBases) SetUserMinSeq(uid string, minSeq uint32) (err error) {
 	key := userMinSeq + uid
-	return d.rdb.Set(context.Background(), key, minSeq, 0).Err()
+	return d.RDB.Set(context.Background(), key, minSeq, 0).Err()
 }
 
 //Get the smallest Seq
 func (d *DataBases) GetUserMinSeq(uid string) (uint64, error) {
 	key := userMinSeq + uid
-	seq, err := d.rdb.Get(context.Background(), key).Result()
+	seq, err := d.RDB.Get(context.Background(), key).Result()
 	return uint64(utils.StringToInt(seq)), err
 }
 
+func (d *DataBases) SetGroupUserMinSeq(groupID, userID string, minSeq uint64) (err error) {
+	key := groupUserMinSeq + "g:" + groupID + "u:" + userID
+	return d.RDB.Set(context.Background(), key, minSeq, 0).Err()
+}
+func (d *DataBases) GetGroupUserMinSeq(groupID, userID string) (uint64, error) {
+	key := groupUserMinSeq + "g:" + groupID + "u:" + userID
+	seq, err := d.RDB.Get(context.Background(), key).Result()
+	return uint64(utils.StringToInt(seq)), err
+}
+
+func (d *DataBases) GetGroupMaxSeq(groupID string) (uint64, error) {
+	key := groupMaxSeq + groupID
+	seq, err := d.RDB.Get(context.Background(), key).Result()
+	return uint64(utils.StringToInt(seq)), err
+}
+
+func (d *DataBases) IncrGroupMaxSeq(groupID string) (uint64, error) {
+	key := groupMaxSeq + groupID
+	seq, err := d.RDB.Incr(context.Background(), key).Result()
+	return uint64(seq), err
+}
+
+func (d *DataBases) SetGroupMaxSeq(groupID string, maxSeq uint64) error {
+	key := groupMaxSeq + groupID
+	return d.RDB.Set(context.Background(), key, maxSeq, 0).Err()
+}
+
 //Store userid and platform class to redis
 func (d *DataBases) AddTokenFlag(userID string, platformID int, token string, flag int) error {
 	key := uidPidToken + userID + ":" + constant.PlatformIDToName(platformID)
 	log2.NewDebug("", "add token key is ", key)
-	return d.rdb.HSet(context.Background(), key, token, flag).Err()
+	return d.RDB.HSet(context.Background(), key, token, flag).Err()
 }
 
 func (d *DataBases) GetTokenMapByUidPid(userID, platformID string) (map[string]int, error) {
 	key := uidPidToken + userID + ":" + platformID
 	log2.NewDebug("", "get token key is ", key)
-	m, err := d.rdb.HGetAll(context.Background(), key).Result()
+	m, err := d.RDB.HGetAll(context.Background(), key).Result()
 	mm := make(map[string]int)
 	for k, v := range m {
 		mm[k] = utils.StringToInt(v)
@@ -118,29 +138,29 @@ func (d *DataBases) SetTokenMapByUidPid(userID string, platformID int, m map[str
 	for k, v := range m {
 		mm[k] = v
 	}
-	return d.rdb.HSet(context.Background(), key, mm).Err()
+	return d.RDB.HSet(context.Background(), key, mm).Err()
 }
 func (d *DataBases) DeleteTokenByUidPid(userID string, platformID int, fields []string) error {
 	key := uidPidToken + userID + ":" + constant.PlatformIDToName(platformID)
-	return d.rdb.HDel(context.Background(), key, fields...).Err()
+	return d.RDB.HDel(context.Background(), key, fields...).Err()
 }
 func (d *DataBases) SetSingleConversationRecvMsgOpt(userID, conversationID string, opt int32) error {
 	key := conversationReceiveMessageOpt + userID
-	return d.rdb.HSet(context.Background(), key, conversationID, opt).Err()
+	return d.RDB.HSet(context.Background(), key, conversationID, opt).Err()
 }
 
 func (d *DataBases) GetSingleConversationRecvMsgOpt(userID, conversationID string) (int, error) {
 	key := conversationReceiveMessageOpt + userID
-	result, err := d.rdb.HGet(context.Background(), key, conversationID).Result()
+	result, err := d.RDB.HGet(context.Background(), key, conversationID).Result()
 	return utils.StringToInt(result), err
 }
 func (d *DataBases) SetUserGlobalMsgRecvOpt(userID string, opt int32) error {
 	key := conversationReceiveMessageOpt + userID
-	return d.rdb.HSet(context.Background(), key, GlobalMsgRecvOpt, opt).Err()
+	return d.RDB.HSet(context.Background(), key, GlobalMsgRecvOpt, opt).Err()
 }
 func (d *DataBases) GetUserGlobalMsgRecvOpt(userID string) (int, error) {
 	key := conversationReceiveMessageOpt + userID
-	result, err := d.rdb.HGet(context.Background(), key, GlobalMsgRecvOpt).Result()
+	result, err := d.RDB.HGet(context.Background(), key, GlobalMsgRecvOpt).Result()
 	if err != nil {
 		if err == go_redis.Nil {
 			return 0, nil
@@ -155,7 +175,7 @@ func (d *DataBases) GetMessageListBySeq(userID string, seqList []uint32, operati
 		//MESSAGE_CACHE:169.254.225.224_reliability1653387820_0_1
 		key := messageCache + userID + "_" + strconv.Itoa(int(v))
 
-		result, err := d.rdb.Get(context.Background(), key).Result()
+		result, err := d.RDB.Get(context.Background(), key).Result()
 		if err != nil {
 			errResult = err
 			failedSeqList = append(failedSeqList, v)
@@ -178,7 +198,7 @@ func (d *DataBases) GetMessageListBySeq(userID string, seqList []uint32, operati
 }
 func (d *DataBases) SetMessageToCache(msgList []*pbChat.MsgDataToMQ, uid string, operationID string) error {
 	ctx := context.Background()
-	pipe := d.rdb.Pipeline()
+	pipe := d.RDB.Pipeline()
 	var failedList []pbChat.MsgDataToMQ
 	for _, msg := range msgList {
 		key := messageCache + uid + "_" + strconv.Itoa(int(msg.MsgData.Seq))
@@ -201,11 +221,24 @@ func (d *DataBases) SetMessageToCache(msgList []*pbChat.MsgDataToMQ, uid string,
 	_, err := pipe.Exec(ctx)
 	return err
 }
+func (d *DataBases) DeleteMessageFromCache(msgList []*pbChat.MsgDataToMQ, uid string, operationID string) error {
+	ctx := context.Background()
+	var keys []string
+	for _, msg := range msgList {
+		key := messageCache + uid + "_" + strconv.Itoa(int(msg.MsgData.Seq))
+		keys = append(keys, key)
+	}
+	err := d.RDB.Del(ctx, keys...).Err()
+	if err != nil {
+		log2.NewWarn(operationID, utils.GetSelfFuncName(), "redis failed", "args:", keys, uid, err.Error(), msgList)
+	}
+	return err
+}
 
 func (d *DataBases) CleanUpOneUserAllMsgFromRedis(userID string, operationID string) error {
 	ctx := context.Background()
 	key := messageCache + userID + "_" + "*"
-	vals, err := d.rdb.Keys(ctx, key).Result()
+	vals, err := d.RDB.Keys(ctx, key).Result()
 	log2.Debug(operationID, "vals: ", vals)
 	if err == go_redis.Nil {
 		return nil
@@ -213,7 +246,7 @@ func (d *DataBases) CleanUpOneUserAllMsgFromRedis(userID string, operationID str
 	if err != nil {
 		return utils.Wrap(err, "")
 	}
-	if err = d.rdb.Del(ctx, vals...).Err(); err != nil {
+	if err = d.RDB.Del(ctx, vals...).Err(); err != nil {
 		return utils.Wrap(err, "")
 	}
 	return nil
@@ -249,16 +282,16 @@ func (d *DataBases) HandleSignalInfo(operationID string, msg *pbCommon.MsgData)
 				return err
 			}
 			keyList := SignalListCache + userID
-			err = d.rdb.LPush(context.Background(), keyList, msg.ClientMsgID).Err()
+			err = d.RDB.LPush(context.Background(), keyList, msg.ClientMsgID).Err()
 			if err != nil {
 				return err
 			}
-			err = d.rdb.Expire(context.Background(), keyList, time.Duration(timeout)*time.Second).Err()
+			err = d.RDB.Expire(context.Background(), keyList, time.Duration(timeout)*time.Second).Err()
 			if err != nil {
 				return err
 			}
 			key := SignalCache + msg.ClientMsgID
-			err = d.rdb.Set(context.Background(), key, msg.Content, time.Duration(timeout)*time.Second).Err()
+			err = d.RDB.Set(context.Background(), key, msg.Content, time.Duration(timeout)*time.Second).Err()
 			if err != nil {
 				return err
 			}
@@ -270,7 +303,7 @@ func (d *DataBases) HandleSignalInfo(operationID string, msg *pbCommon.MsgData)
 func (d *DataBases) GetSignalInfoFromCacheByClientMsgID(clientMsgID string) (invitationInfo *pbRtc.SignalInviteReq, err error) {
 	key := SignalCache + clientMsgID
 	invitationInfo = &pbRtc.SignalInviteReq{}
-	bytes, err := d.rdb.Get(context.Background(), key).Bytes()
+	bytes, err := d.RDB.Get(context.Background(), key).Bytes()
 	if err != nil {
 		return nil, err
 	}
@@ -291,7 +324,7 @@ func (d *DataBases) GetSignalInfoFromCacheByClientMsgID(clientMsgID string) (inv
 
 func (d *DataBases) GetAvailableSignalInvitationInfo(userID string) (invitationInfo *pbRtc.SignalInviteReq, err error) {
 	keyList := SignalListCache + userID
-	result := d.rdb.LPop(context.Background(), keyList)
+	result := d.RDB.LPop(context.Background(), keyList)
 	if err = result.Err(); err != nil {
 		return nil, utils.Wrap(err, "GetAvailableSignalInvitationInfo failed")
 	}
@@ -313,14 +346,14 @@ func (d *DataBases) GetAvailableSignalInvitationInfo(userID string) (invitationI
 
 func (d *DataBases) DelUserSignalList(userID string) error {
 	keyList := SignalListCache + userID
-	err := d.rdb.Del(context.Background(), keyList).Err()
+	err := d.RDB.Del(context.Background(), keyList).Err()
 	return err
 }
 
 func (d *DataBases) DelMsgFromCache(uid string, seqList []uint32, operationID string) {
 	for _, seq := range seqList {
 		key := messageCache + uid + "_" + strconv.Itoa(int(seq))
-		result := d.rdb.Get(context.Background(), key).String()
+		result := d.RDB.Get(context.Background(), key).String()
 		var msg pbCommon.MsgData
 		if err := utils.String2Pb(result, &msg); err != nil {
 			log2.Error(operationID, utils.GetSelfFuncName(), "String2Pb failed", msg, err.Error())
@@ -332,98 +365,35 @@ func (d *DataBases) DelMsgFromCache(uid string, seqList []uint32, operationID st
 			log2.Error(operationID, utils.GetSelfFuncName(), "Pb2String failed", msg, err.Error())
 			continue
 		}
-		if err := d.rdb.Set(context.Background(), key, s, time.Duration(config.Config.MsgCacheTimeout)*time.Second).Err(); err != nil {
+		if err := d.RDB.Set(context.Background(), key, s, time.Duration(config.Config.MsgCacheTimeout)*time.Second).Err(); err != nil {
 			log2.Error(operationID, utils.GetSelfFuncName(), "Set failed", err.Error())
 		}
 	}
 }
 
 func (d *DataBases) SetGetuiToken(token string, expireTime int64) error {
-	return d.rdb.Set(context.Background(), getuiToken, token, time.Duration(expireTime)*time.Second).Err()
+	return d.RDB.Set(context.Background(), getuiToken, token, time.Duration(expireTime)*time.Second).Err()
 }
 
 func (d *DataBases) GetGetuiToken() (string, error) {
-	result := d.rdb.Get(context.Background(), getuiToken)
+	result := d.RDB.Get(context.Background(), getuiToken)
 	return result.String(), result.Err()
 }
 
-func (d *DataBases) AddFriendToCache(userID string, friendIDList ...string) error {
+func (d *DataBases) SetSendMsgFailedFlag(operationID string) error {
-	var IDList []interface{}
+	return d.RDB.Set(context.Background(), sendMsgFailedFlag+operationID, 1, time.Hour*24).Err()
-	for _, id := range friendIDList {
-		IDList = append(IDList, id)
-	}
-	return d.rdb.SAdd(context.Background(), friendRelationCache+userID, IDList...).Err()
 }
 
-func (d *DataBases) ReduceFriendToCache(userID string, friendIDList ...string) error {
+func (d *DataBases) GetSendMsgStatus(operationID string) error {
-	var IDList []interface{}
+	return d.RDB.Get(context.Background(), sendMsgFailedFlag+operationID).Err()
-	for _, id := range friendIDList {
-		IDList = append(IDList, id)
-	}
-	return d.rdb.SRem(context.Background(), friendRelationCache+userID, IDList...).Err()
 }
 
-func (d *DataBases) GetFriendIDListFromCache(userID string) ([]string, error) {
+func (d *DataBases) SetFcmToken(account string, platformid int, fcmToken string, expireTime int64) (err error) {
-	result := d.rdb.SMembers(context.Background(), friendRelationCache+userID)
+	key := FcmToken + account + ":" + strconv.Itoa(platformid)
-	return result.Result()
+	return d.RDB.Set(context.Background(), key, fcmToken, time.Duration(expireTime)*time.Second).Err()
 }
 
-func (d *DataBases) AddBlackUserToCache(userID string, blackList ...string) error {
+func (d *DataBases) GetFcmToken(account string, platformid int) (string, error) {
-	var IDList []interface{}
+	key := FcmToken + account + ":" + strconv.Itoa(platformid)
-	for _, id := range blackList {
+	return d.RDB.Get(context.Background(), key).Result()
-		IDList = append(IDList, id)
-	}
-	return d.rdb.SAdd(context.Background(), blackListCache+userID, IDList...).Err()
-}
-
-func (d *DataBases) ReduceBlackUserFromCache(userID string, blackList ...string) error {
-	var IDList []interface{}
-	for _, id := range blackList {
-		IDList = append(IDList, id)
-	}
-	return d.rdb.SRem(context.Background(), blackListCache+userID, IDList...).Err()
-}
-
-func (d *DataBases) GetBlackListFromCache(userID string) ([]string, error) {
-	result := d.rdb.SMembers(context.Background(), blackListCache+userID)
-	return result.Result()
-}
-
-func (d *DataBases) AddGroupMemberToCache(groupID string, userIDList ...string) error {
-	var IDList []interface{}
-	for _, id := range userIDList {
-		IDList = append(IDList, id)
-	}
-	return d.rdb.SAdd(context.Background(), groupCache+groupID, IDList...).Err()
-}
-
-func (d *DataBases) ReduceGroupMemberFromCache(groupID string, userIDList ...string) error {
-	var IDList []interface{}
-	for _, id := range userIDList {
-		IDList = append(IDList, id)
-	}
-	return d.rdb.SRem(context.Background(), groupCache+groupID, IDList...).Err()
-}
-
-func (d *DataBases) GetGroupMemberIDListFromCache(groupID string) ([]string, error) {
-	result := d.rdb.SMembers(context.Background(), groupCache+groupID)
-	return result.Result()
-}
-
-func (d *DataBases) SetUserInfoToCache(userID string, m map[string]interface{}) error {
-	return d.rdb.HSet(context.Background(), userInfoCache+userID, m).Err()
-}
-
-func (d *DataBases) GetUserInfoFromCache(userID string) (*pbCommon.UserInfo, error) {
-	result, err := d.rdb.HGetAll(context.Background(), userInfoCache+userID).Result()
-	bytes, err := json.Marshal(result)
-	if err != nil {
-		return nil, err
-	}
-	userInfo := &pbCommon.UserInfo{}
-	if err := proto.Unmarshal(bytes, userInfo); err != nil {
-		return nil, err
-	}
-	err = json.Unmarshal(bytes, userInfo)
-	return userInfo, err
 }

pkg/common/db/batch_insert_chat.go

@@ -2,8 +2,9 @@ package db
 
 import (
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
-	pbMsg "Open_IM/pkg/proto/chat"
+	pbMsg "Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/utils"
 	"context"
 	"errors"
@@ -100,25 +101,32 @@ func (d *DataBases) BatchInsertChat2DB(userID string, msgList []*pbMsg.MsgDataTo
 			return utils.Wrap(err, "")
 		}
 	}
-	log.NewWarn(operationID, "batch mgo  cost time ", getCurrentTimestampByMill()-newTime, userID, len(msgList))
+	log.Debug(operationID, "batch mgo  cost time ", getCurrentTimestampByMill()-newTime, userID, len(msgList))
 	return nil
 }
 
-func (d *DataBases) BatchInsertChat2Cache(userID string, msgList []*pbMsg.MsgDataToMQ, operationID string) (error, uint64) {
+func (d *DataBases) BatchInsertChat2Cache(insertID string, msgList []*pbMsg.MsgDataToMQ, operationID string) (error, uint64) {
 	newTime := getCurrentTimestampByMill()
-	if len(msgList) > GetSingleGocMsgNum() {
+	lenList := len(msgList)
+	if lenList > GetSingleGocMsgNum() {
 		return errors.New("too large"), 0
 	}
-	currentMaxSeq, err := d.GetUserMaxSeq(userID)
+	if lenList < 1 {
-	if err == nil {
+		return errors.New("too short as 0"), 0
-
+	}
-	} else if err == go_redis.Nil {
+	// judge sessionType to get seq
-		currentMaxSeq = 0
+	var currentMaxSeq uint64
+	var err error
+	if msgList[0].MsgData.SessionType == constant.SuperGroupChatType {
+		currentMaxSeq, err = d.GetGroupMaxSeq(insertID)
 	} else {
+		currentMaxSeq, err = d.GetUserMaxSeq(insertID)
+	}
+	if err != nil && err != go_redis.Nil {
 		return utils.Wrap(err, ""), 0
 	}
-	lastMaxSeq := currentMaxSeq
 
+	lastMaxSeq := currentMaxSeq
 	for _, m := range msgList {
 		log.Debug(operationID, "msg node ", m.String(), m.MsgData.ClientMsgID)
 		currentMaxSeq++
@@ -126,13 +134,18 @@ func (d *DataBases) BatchInsertChat2Cache(userID string, msgList []*pbMsg.MsgDat
 		sMsg.SendTime = m.MsgData.SendTime
 		m.MsgData.Seq = uint32(currentMaxSeq)
 	}
-	log.Debug(operationID, "SetMessageToCache ", userID, len(msgList))
+	log.Debug(operationID, "SetMessageToCache ", insertID, len(msgList))
-	err = d.SetMessageToCache(msgList, userID, operationID)
+	err = d.SetMessageToCache(msgList, insertID, operationID)
 	if err != nil {
-		log.Error(operationID, "setMessageToCache failed, continue ", err.Error(), len(msgList), userID)
+		log.Error(operationID, "setMessageToCache failed, continue ", err.Error(), len(msgList), insertID)
 	}
-	log.NewWarn(operationID, "batch to redis  cost time ", getCurrentTimestampByMill()-newTime, userID, len(msgList))
+	log.Debug(operationID, "batch to redis  cost time ", getCurrentTimestampByMill()-newTime, insertID, len(msgList))
-	return utils.Wrap(d.SetUserMaxSeq(userID, uint64(currentMaxSeq)), ""), lastMaxSeq
+	if msgList[0].MsgData.SessionType == constant.SuperGroupChatType {
+		err = d.SetGroupMaxSeq(insertID, currentMaxSeq)
+	} else {
+		err = d.SetUserMaxSeq(insertID, currentMaxSeq)
+	}
+	return utils.Wrap(err, ""), lastMaxSeq
 }
 
 //func (d *DataBases) BatchInsertChatBoth(userID string, msgList []*pbMsg.MsgDataToMQ, operationID string) (error, uint64) {

pkg/common/db/model.go

@@ -2,6 +2,7 @@ package db
 
 import (
 	"Open_IM/pkg/common/config"
+	"github.com/dtm-labs/rockscache"
 	"go.mongodb.org/mongo-driver/x/bsonx"
 	"strings"
 
@@ -28,7 +29,9 @@ type DataBases struct {
 	mgoSession *mgo.Session
 	//redisPool   *redis.Pool
 	mongoClient *mongo.Client
-	rdb         go_redis.UniversalClient
+	RDB         go_redis.UniversalClient
+	Rc          *rockscache.Client
+	WeakRc      *rockscache.Client
 }
 
 type RedisClient struct {
@@ -56,10 +59,10 @@ func init() {
 		uri = config.Config.Mongo.DBUri
 	} else {
 		if config.Config.Mongo.DBPassword != "" && config.Config.Mongo.DBUserName != "" {
-			uri = fmt.Sprintf("mongodb://%s:%s@%s/%s?maxPoolSize=%d", config.Config.Mongo.DBUserName, config.Config.Mongo.DBPassword, config.Config.Mongo.DBAddress,
+			uri = fmt.Sprintf("mongodb://%s:%s@%s/%s?maxPoolSize=%d&authSource=admin", config.Config.Mongo.DBUserName, config.Config.Mongo.DBPassword, config.Config.Mongo.DBAddress,
 				config.Config.Mongo.DBDatabase, config.Config.Mongo.DBMaxPoolSize)
 		} else {
-			uri = fmt.Sprintf("mongodb://%s/%s/?maxPoolSize=%d",
+			uri = fmt.Sprintf("mongodb://%s/%s/?maxPoolSize=%d&authSource=admin",
 				config.Config.Mongo.DBAddress, config.Config.Mongo.DBDatabase,
 				config.Config.Mongo.DBMaxPoolSize)
 		}
@@ -88,16 +91,14 @@ func init() {
 	if err := createMongoIndex(mongoClient, cWorkMoment, true, "work_moment_id"); err != nil {
 		fmt.Println("work_moment_id", "index create failed", err.Error())
 	}
-
 	if err := createMongoIndex(mongoClient, cWorkMoment, false, "user_id", "-create_time"); err != nil {
 		fmt.Println("user_id", "-create_time", "index create failed", err.Error())
 	}
-
 	if err := createMongoIndex(mongoClient, cTag, false, "user_id", "-create_time"); err != nil {
 		fmt.Println("user_id", "-create_time", "index create failed", err.Error())
 	}
 	if err := createMongoIndex(mongoClient, cTag, true, "tag_id"); err != nil {
-		fmt.Println("user_id", "-create_time", "index create failed", err.Error())
+		fmt.Println("tag_id", "index create failed", err.Error())
 	}
 	fmt.Println("create index success")
 	DB.mongoClient = mongoClient
@@ -122,26 +123,36 @@ func init() {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 	if config.Config.Redis.EnableCluster {
-		DB.rdb = go_redis.NewClusterClient(&go_redis.ClusterOptions{
+		DB.RDB = go_redis.NewClusterClient(&go_redis.ClusterOptions{
 			Addrs:    config.Config.Redis.DBAddress,
+			Username: config.Config.Redis.DBUserName,
+			Password: config.Config.Redis.DBPassWord, // no password set
 			PoolSize: 50,
 		})
-		_, err = DB.rdb.Ping(ctx).Result()
+		_, err = DB.RDB.Ping(ctx).Result()
 		if err != nil {
 			panic(err.Error())
 		}
 	} else {
-		DB.rdb = go_redis.NewClient(&go_redis.Options{
+		DB.RDB = go_redis.NewClient(&go_redis.Options{
 			Addr:     config.Config.Redis.DBAddress[0],
+			Username: config.Config.Redis.DBUserName,
 			Password: config.Config.Redis.DBPassWord, // no password set
 			DB:       0,                              // use default DB
 			PoolSize: 100,                            // 连接池大小
 		})
-		_, err = DB.rdb.Ping(ctx).Result()
+		_, err = DB.RDB.Ping(ctx).Result()
 		if err != nil {
 			panic(err.Error())
 		}
 	}
+	// 强一致性缓存，当一个key被标记删除，其他请求线程会被锁住轮询直到新的key生成，适合各种同步的拉取, 如果弱一致可能导致拉取还是老数据，毫无意义
+	DB.Rc = rockscache.NewClient(DB.RDB, rockscache.NewDefaultOptions())
+	DB.Rc.Options.StrongConsistency = true
+
+	// 弱一致性缓存，当一个key被标记删除，其他请求线程直接返回该key的value，适合高频并且生成很缓存很慢的情况 如大群发消息缓存的缓存
+	DB.WeakRc = rockscache.NewClient(DB.RDB, rockscache.NewDefaultOptions())
+	DB.WeakRc.Options.StrongConsistency = false
 }
 
 func createMongoIndex(client *mongo.Client, collection string, isUnique bool, keys ...string) error {

pkg/common/db/model_struct.go

@@ -77,17 +77,21 @@ func (FriendRequest) TableName() string {
 type Group struct {
 	//`json:"operationID" binding:"required"`
 	//`protobuf:"bytes,1,opt,name=GroupID" json:"GroupID,omitempty"` `json:"operationID" binding:"required"`
-	GroupID          string    `gorm:"column:group_id;primary_key;size:64" json:"groupID" binding:"required"`
+	GroupID                string    `gorm:"column:group_id;primary_key;size:64" json:"groupID" binding:"required"`
-	GroupName        string    `gorm:"column:name;size:255" json:"groupName"`
+	GroupName              string    `gorm:"column:name;size:255" json:"groupName"`
-	Notification     string    `gorm:"column:notification;size:255" json:"notification"`
+	Notification           string    `gorm:"column:notification;size:255" json:"notification"`
-	Introduction     string    `gorm:"column:introduction;size:255" json:"introduction"`
+	Introduction           string    `gorm:"column:introduction;size:255" json:"introduction"`
-	FaceURL          string    `gorm:"column:face_url;size:255" json:"faceURL"`
+	FaceURL                string    `gorm:"column:face_url;size:255" json:"faceURL"`
-	CreateTime       time.Time `gorm:"column:create_time"`
+	CreateTime             time.Time `gorm:"column:create_time"`
-	Ex               string    `gorm:"column:ex" json:"ex;size:1024" json:"ex"`
+	Ex                     string    `gorm:"column:ex" json:"ex;size:1024" json:"ex"`
-	Status           int32     `gorm:"column:status"`
+	Status                 int32     `gorm:"column:status"`
-	CreatorUserID    string    `gorm:"column:creator_user_id;size:64"`
+	CreatorUserID          string    `gorm:"column:creator_user_id;size:64"`
-	GroupType        int32     `gorm:"column:group_type"`
+	GroupType              int32     `gorm:"column:group_type"`
-	NeedVerification int32     `gorm:"column:need_verification"`
+	NeedVerification       int32     `gorm:"column:need_verification"`
+	LookMemberInfo         int32     `gorm:"column:look_member_info" json:"lookMemberInfo"`
+	ApplyMemberFriend      int32     `gorm:"column:apply_member_friend" json:"applyMemberFriend"`
+	NotificationUpdateTime time.Time `gorm:"column:notification_update_time"`
+	NotificationUserID     string    `gorm:"column:notification_user_id;size:64"`
 }
 
 //message GroupMemberFullInfo {
@@ -110,6 +114,7 @@ type GroupMember struct {
 	RoleLevel      int32     `gorm:"column:role_level"`
 	JoinTime       time.Time `gorm:"column:join_time"`
 	JoinSource     int32     `gorm:"column:join_source"`
+	InviterUserID  string    `gorm:"column:inviter_user_id;size:64"`
 	OperatorUserID string    `gorm:"column:operator_user_id;size:64"`
 	MuteEndTime    time.Time `gorm:"column:mute_end_time"`
 	Ex             string    `gorm:"column:ex;size:1024"`
@@ -127,15 +132,17 @@ type GroupMember struct {
 //string Ex = 9;
 //}open_im_sdk.GroupRequest == imdb.GroupRequest
 type GroupRequest struct {
-	UserID       string    `gorm:"column:user_id;primary_key;size:64"`
+	UserID        string    `gorm:"column:user_id;primary_key;size:64"`
-	GroupID      string    `gorm:"column:group_id;primary_key;size:64"`
+	GroupID       string    `gorm:"column:group_id;primary_key;size:64"`
-	HandleResult int32     `gorm:"column:handle_result"`
+	HandleResult  int32     `gorm:"column:handle_result"`
-	ReqMsg       string    `gorm:"column:req_msg;size:1024"`
+	ReqMsg        string    `gorm:"column:req_msg;size:1024"`
-	HandledMsg   string    `gorm:"column:handle_msg;size:1024"`
+	HandledMsg    string    `gorm:"column:handle_msg;size:1024"`
-	ReqTime      time.Time `gorm:"column:req_time"`
+	ReqTime       time.Time `gorm:"column:req_time"`
-	HandleUserID string    `gorm:"column:handle_user_id;size:64"`
+	HandleUserID  string    `gorm:"column:handle_user_id;size:64"`
-	HandledTime  time.Time `gorm:"column:handle_time"`
+	HandledTime   time.Time `gorm:"column:handle_time"`
-	Ex           string    `gorm:"column:ex;size:1024"`
+	JoinSource    int32     `gorm:"column:join_source"`
+	InviterUserID string    `gorm:"column:inviter_user_id;size:64"`
+	Ex            string    `gorm:"column:ex;size:1024"`
 }
 
 //string UserID = 1;
@@ -161,6 +168,7 @@ type User struct {
 	CreateTime       time.Time `gorm:"column:create_time"`
 	AppMangerLevel   int32     `gorm:"column:app_manger_level"`
 	GlobalRecvMsgOpt int32     `gorm:"column:global_recv_msg_opt"`
+	status           int32     `gorm:"column:status"`
 }
 
 //message BlackInfo{

pkg/common/db/mongoModel.go

@@ -4,7 +4,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
-	pbMsg "Open_IM/pkg/proto/chat"
+	pbMsg "Open_IM/pkg/proto/msg"
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"context"
@@ -908,8 +908,8 @@ func (d *DataBases) GetUserWorkMoments(opUserID, userID string, showNumber, page
 	result, err := c.Find(ctx, bson.D{ // 等价条件: select * from
 		{"user_id", userID},
 		{"$or", bson.A{
-			bson.D{{"permission", constant.WorkMomentPermissionCantSee}, {"permission_user_id_list", bson.D{{"$nin", bson.A{userID}}}}},
+			bson.D{{"permission", constant.WorkMomentPermissionCantSee}, {"permission_user_id_list", bson.D{{"$nin", bson.A{opUserID}}}}},
-			bson.D{{"permission", constant.WorkMomentPermissionCanSee}, {"permission_user_id_list", bson.D{{"$in", bson.A{userID}}}}},
+			bson.D{{"permission", constant.WorkMomentPermissionCanSee}, {"permission_user_id_list", bson.D{{"$in", bson.A{opUserID}}}}},
 			bson.D{{"permission", constant.WorkMomentPublic}},
 		}},
 	}, findOpts)
@@ -970,7 +970,7 @@ func (d *DataBases) CreateSuperGroup(groupID string, initMemberIDList []string,
 	}
 	_, err = c.InsertOne(sCtx, superGroup)
 	if err != nil {
-		session.AbortTransaction(ctx)
+		_ = session.AbortTransaction(ctx)
 		return utils.Wrap(err, "transaction failed")
 	}
 	var users []UserToSuperGroup
@@ -992,7 +992,7 @@ func (d *DataBases) CreateSuperGroup(groupID string, initMemberIDList []string,
 	for _, userID := range initMemberIDList {
 		_, err = c.UpdateOne(sCtx, bson.M{"user_id": userID}, bson.M{"$addToSet": bson.M{"group_id_list": groupID}}, opts)
 		if err != nil {
-			session.AbortTransaction(ctx)
+			_ = session.AbortTransaction(ctx)
 			return utils.Wrap(err, "transaction failed")
 		}
 
@@ -1022,7 +1022,7 @@ func (d *DataBases) AddUserToSuperGroup(groupID string, userIDList []string) err
 	}
 	_, err = c.UpdateOne(sCtx, bson.M{"group_id": groupID}, bson.M{"$addToSet": bson.M{"member_id_list": bson.M{"$each": userIDList}}})
 	if err != nil {
-		session.AbortTransaction(ctx)
+		_ = session.AbortTransaction(ctx)
 		return utils.Wrap(err, "transaction failed")
 	}
 	c = d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cUserToSuperGroup)
@@ -1039,11 +1039,11 @@ func (d *DataBases) AddUserToSuperGroup(groupID string, userIDList []string) err
 	for _, userID := range userIDList {
 		_, err = c.UpdateOne(sCtx, bson.M{"user_id": userID}, bson.M{"$addToSet": bson.M{"group_id_list": groupID}}, opts)
 		if err != nil {
-			session.AbortTransaction(ctx)
+			_ = session.AbortTransaction(ctx)
 			return utils.Wrap(err, "transaction failed")
 		}
 	}
-	session.CommitTransaction(ctx)
+	_ = session.CommitTransaction(ctx)
 	return err
 }
 
@@ -1058,15 +1058,15 @@ func (d *DataBases) RemoverUserFromSuperGroup(groupID string, userIDList []strin
 	sCtx := mongo.NewSessionContext(ctx, session)
 	_, err = c.UpdateOne(ctx, bson.M{"group_id": groupID}, bson.M{"$pull": bson.M{"member_id_list": bson.M{"$in": userIDList}}})
 	if err != nil {
-		session.AbortTransaction(ctx)
+		_ = session.AbortTransaction(ctx)
 		return utils.Wrap(err, "transaction failed")
 	}
 	err = d.RemoveGroupFromUser(ctx, sCtx, groupID, userIDList)
 	if err != nil {
-		session.AbortTransaction(ctx)
+		_ = session.AbortTransaction(ctx)
 		return utils.Wrap(err, "transaction failed")
 	}
-	session.CommitTransaction(ctx)
+	_ = session.CommitTransaction(ctx)
 	return err
 }
 

pkg/common/db/mysql.go

@@ -2,18 +2,25 @@ package db
 
 import (
 	"Open_IM/pkg/common/config"
+	"gorm.io/gorm/logger"
 
 	"fmt"
 	"sync"
 	"time"
 
-	"github.com/jinzhu/gorm"
+	"gorm.io/driver/mysql"
-	_ "github.com/jinzhu/gorm/dialects/mysql"
+	"gorm.io/gorm"
 )
 
 type mysqlDB struct {
 	sync.RWMutex
-	dbMap map[string]*gorm.DB
+	db *gorm.DB
+}
+
+type Writer struct{}
+
+func (w Writer) Printf(format string, args ...interface{}) {
+	fmt.Printf(format, args...)
 }
 
 func initMysqlDB() {
@@ -22,13 +29,13 @@ func initMysqlDB() {
 		config.Config.Mysql.DBUserName, config.Config.Mysql.DBPassword, config.Config.Mysql.DBAddress[0], "mysql")
 	var db *gorm.DB
 	var err1 error
-	db, err := gorm.Open("mysql", dsn)
+	db, err := gorm.Open(mysql.Open(dsn), nil)
 	if err != nil {
 		fmt.Println("0", "Open failed ", err.Error(), dsn)
 	}
 	if err != nil {
 		time.Sleep(time.Duration(30) * time.Second)
-		db, err1 = gorm.Open("mysql", dsn)
+		db, err1 = gorm.Open(mysql.Open(dsn), nil)
 		if err1 != nil {
 			fmt.Println("0", "Open failed ", err1.Error(), dsn)
 			panic(err1.Error())
@@ -42,11 +49,22 @@ func initMysqlDB() {
 		fmt.Println("0", "Exec failed ", err.Error(), sql)
 		panic(err.Error())
 	}
-	db.Close()
 
 	dsn = fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=true&loc=Local",
 		config.Config.Mysql.DBUserName, config.Config.Mysql.DBPassword, config.Config.Mysql.DBAddress[0], config.Config.Mysql.DBDatabaseName)
-	db, err = gorm.Open("mysql", dsn)
+
+	newLogger := logger.New(
+		Writer{},
+		logger.Config{
+			SlowThreshold:             200 * time.Millisecond, // Slow SQL threshold
+			LogLevel:                  logger.Error,           // Log level
+			IgnoreRecordNotFoundError: true,                   // Ignore ErrRecordNotFound error for logger
+			Colorful:                  true,                   // Disable color
+		},
+	)
+	db, err = gorm.Open(mysql.Open(dsn), &gorm.Config{
+		Logger: newLogger,
+	})
 	if err != nil {
 		fmt.Println("0", "Open failed ", err.Error(), dsn)
 		panic(err.Error())
@@ -65,103 +83,70 @@ func initMysqlDB() {
 	db.Set("gorm:table_options", "CHARSET=utf8")
 	db.Set("gorm:table_options", "collation=utf8_unicode_ci")
 
-	if !db.HasTable(&Friend{}) {
+	if !db.Migrator().HasTable(&Friend{}) {
 		fmt.Println("CreateTable Friend")
-		db.CreateTable(&Friend{})
+		db.Migrator().CreateTable(&Friend{})
 	}
 
-	if !db.HasTable(&FriendRequest{}) {
+	if !db.Migrator().HasTable(&FriendRequest{}) {
 		fmt.Println("CreateTable FriendRequest")
-		db.CreateTable(&FriendRequest{})
+		db.Migrator().CreateTable(&FriendRequest{})
 	}
 
-	if !db.HasTable(&Group{}) {
+	if !db.Migrator().HasTable(&Group{}) {
 		fmt.Println("CreateTable Group")
-		db.CreateTable(&Group{})
+		db.Migrator().CreateTable(&Group{})
 	}
 
-	if !db.HasTable(&GroupMember{}) {
+	if !db.Migrator().HasTable(&GroupMember{}) {
 		fmt.Println("CreateTable GroupMember")
-		db.CreateTable(&GroupMember{})
+		db.Migrator().CreateTable(&GroupMember{})
 	}
-	if !db.HasTable(&GroupRequest{}) {
+	if !db.Migrator().HasTable(&GroupRequest{}) {
 		fmt.Println("CreateTable GroupRequest")
-		db.CreateTable(&GroupRequest{})
+		db.Migrator().CreateTable(&GroupRequest{})
 	}
-	if !db.HasTable(&User{}) {
+	if !db.Migrator().HasTable(&User{}) {
 		fmt.Println("CreateTable User")
-		db.CreateTable(&User{})
+		db.Migrator().CreateTable(&User{})
 	}
-	if !db.HasTable(&Black{}) {
+	if !db.Migrator().HasTable(&Black{}) {
 		fmt.Println("CreateTable Black")
-		db.CreateTable(&Black{})
+		db.Migrator().CreateTable(&Black{})
 	}
-	if !db.HasTable(&ChatLog{}) {
+	if !db.Migrator().HasTable(&ChatLog{}) {
 		fmt.Println("CreateTable ChatLog")
-		db.CreateTable(&ChatLog{})
+		db.Migrator().CreateTable(&ChatLog{})
 	}
-	if !db.HasTable(&Register{}) {
+	if !db.Migrator().HasTable(&Register{}) {
 		fmt.Println("CreateTable Register")
-		db.CreateTable(&Register{})
+		db.Migrator().CreateTable(&Register{})
 	}
-	if !db.HasTable(&Conversation{}) {
+	if !db.Migrator().HasTable(&Conversation{}) {
 		fmt.Println("CreateTable Conversation")
-		db.CreateTable(&Conversation{})
+		db.Migrator().CreateTable(&Conversation{})
 	}
 
-	if !db.HasTable(&Department{}) {
+	if !db.Migrator().HasTable(&Department{}) {
 		fmt.Println("CreateTable Department")
-		db.CreateTable(&Department{})
+		db.Migrator().CreateTable(&Department{})
 	}
-	if !db.HasTable(&OrganizationUser{}) {
+	if !db.Migrator().HasTable(&OrganizationUser{}) {
 		fmt.Println("CreateTable OrganizationUser")
-		db.CreateTable(&OrganizationUser{})
+		db.Migrator().CreateTable(&OrganizationUser{})
 	}
-	if !db.HasTable(&DepartmentMember{}) {
+	if !db.Migrator().HasTable(&DepartmentMember{}) {
 		fmt.Println("CreateTable DepartmentMember")
-		db.CreateTable(&DepartmentMember{})
+		db.Migrator().CreateTable(&DepartmentMember{})
 	}
-	if !db.HasTable(&AppVersion{}) {
+	if !db.Migrator().HasTable(&AppVersion{}) {
 		fmt.Println("CreateTable DepartmentMember")
-		db.CreateTable(&AppVersion{})
+		db.Migrator().CreateTable(&AppVersion{})
 	}
+	DB.MysqlDB.db = db
 	return
 }
 
-func (m *mysqlDB) DefaultGormDB() (*gorm.DB, error) {
+func (m *mysqlDB) DefaultGormDB() *gorm.DB {
-	return m.GormDB(config.Config.Mysql.DBAddress[0], config.Config.Mysql.DBDatabaseName)
+	return DB.MysqlDB.db
-}
-
-func (m *mysqlDB) GormDB(dbAddress, dbName string) (*gorm.DB, error) {
-	m.Lock()
-	defer m.Unlock()
-
-	k := key(dbAddress, dbName)
-	if _, ok := m.dbMap[k]; !ok {
-		if err := m.open(dbAddress, dbName); err != nil {
-			return nil, err
-		}
-	}
-	return m.dbMap[k], nil
-}
-
-func (m *mysqlDB) open(dbAddress, dbName string) error {
-	dsn := fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=true&loc=Local",
-		config.Config.Mysql.DBUserName, config.Config.Mysql.DBPassword, dbAddress, dbName)
-	db, err := gorm.Open("mysql", dsn)
-	if err != nil {
-		return err
-	}
-
-	db.SingularTable(true)
-	db.DB().SetMaxOpenConns(config.Config.Mysql.DBMaxOpenConns)
-	db.DB().SetMaxIdleConns(config.Config.Mysql.DBMaxIdleConns)
-	db.DB().SetConnMaxLifetime(time.Duration(config.Config.Mysql.DBMaxLifeTime) * time.Second)
-
-	if m.dbMap == nil {
-		m.dbMap = make(map[string]*gorm.DB)
-	}
-	k := key(dbAddress, dbName)
-	m.dbMap[k] = db
-	return nil
 }

pkg/common/db/mysql_model/im_mysql_model/conversation_model.go

@@ -7,99 +7,65 @@ import (
 )
 
 func SetConversation(conversation db.Conversation) error {
-	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
-	if err != nil {
-		return err
-	}
-	dbConn.LogMode(false)
 	newConversation := conversation
-	if dbConn.Model(&db.Conversation{}).Find(&newConversation).RowsAffected == 0 {
+	if db.DB.MysqlDB.DefaultGormDB().Model(&db.Conversation{}).Find(&newConversation).RowsAffected == 0 {
 		log.NewDebug("", utils.GetSelfFuncName(), "conversation", conversation, "not exist in db, create")
-		return dbConn.Model(&db.Conversation{}).Create(conversation).Error
+		return db.DB.MysqlDB.DefaultGormDB().Model(&db.Conversation{}).Create(conversation).Error
 		// if exist, then update record
 	} else {
 		log.NewDebug("", utils.GetSelfFuncName(), "conversation", conversation, "exist in db, update")
 		//force update
-		return dbConn.Model(conversation).Where("owner_user_id = ? and conversation_id = ?", conversation.OwnerUserID, conversation.ConversationID).
+		return db.DB.MysqlDB.DefaultGormDB().Model(conversation).Where("owner_user_id = ? and conversation_id = ?", conversation.OwnerUserID, conversation.ConversationID).
-			Update(map[string]interface{}{"recv_msg_opt": conversation.RecvMsgOpt, "is_pinned": conversation.IsPinned, "is_private_chat": conversation.IsPrivateChat,
+			Updates(map[string]interface{}{"recv_msg_opt": conversation.RecvMsgOpt, "is_pinned": conversation.IsPinned, "is_private_chat": conversation.IsPrivateChat,
 				"group_at_type": conversation.GroupAtType, "is_not_in_group": conversation.IsNotInGroup}).Error
 	}
 }
 func SetOneConversation(conversation db.Conversation) error {
-	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	return db.DB.MysqlDB.DefaultGormDB().Model(&db.Conversation{}).Create(conversation).Error
-	if err != nil {
-		return err
-	}
-	dbConn.LogMode(false)
-	return dbConn.Model(&db.Conversation{}).Create(conversation).Error
 
 }
 
 func PeerUserSetConversation(conversation db.Conversation) error {
-	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
-	if err != nil {
-		return err
-	}
-	dbConn.LogMode(false)
 	newConversation := conversation
-	if dbConn.Model(&db.Conversation{}).Find(&newConversation).RowsAffected == 0 {
+	if db.DB.MysqlDB.DefaultGormDB().Model(&db.Conversation{}).Find(&newConversation).RowsAffected == 0 {
 		log.NewDebug("", utils.GetSelfFuncName(), "conversation", conversation, "not exist in db, create")
-		return dbConn.Model(&db.Conversation{}).Create(conversation).Error
+		return db.DB.MysqlDB.DefaultGormDB().Model(&db.Conversation{}).Create(conversation).Error
 		// if exist, then update record
 	}
 	log.NewDebug("", utils.GetSelfFuncName(), "conversation", conversation, "exist in db, update")
 	//force update
-	return dbConn.Model(conversation).Where("owner_user_id = ? and conversation_id = ?", conversation.OwnerUserID, conversation.ConversationID).
+	return db.DB.MysqlDB.DefaultGormDB().Model(conversation).Where("owner_user_id = ? and conversation_id = ?", conversation.OwnerUserID, conversation.ConversationID).
-		Update(map[string]interface{}{"is_private_chat": conversation.IsPrivateChat}).Error
+		Updates(map[string]interface{}{"is_private_chat": conversation.IsPrivateChat}).Error
 
 }
 
 func SetRecvMsgOpt(conversation db.Conversation) error {
-	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
-	if err != nil {
-		return err
-	}
-	dbConn.LogMode(false)
 	newConversation := conversation
-	if dbConn.Model(&db.Conversation{}).Find(&newConversation).RowsAffected == 0 {
+	if db.DB.MysqlDB.DefaultGormDB().Model(&db.Conversation{}).Find(&newConversation).RowsAffected == 0 {
 		log.NewDebug("", utils.GetSelfFuncName(), "conversation", conversation, "not exist in db, create")
-		return dbConn.Model(&db.Conversation{}).Create(conversation).Error
+		return db.DB.MysqlDB.DefaultGormDB().Model(&db.Conversation{}).Create(conversation).Error
 		// if exist, then update record
 	} else {
 		log.NewDebug("", utils.GetSelfFuncName(), "conversation", conversation, "exist in db, update")
 		//force update
-		return dbConn.Model(conversation).Where("owner_user_id = ? and conversation_id = ?", conversation.OwnerUserID, conversation.ConversationID).
+		return db.DB.MysqlDB.DefaultGormDB().Model(conversation).Where("owner_user_id = ? and conversation_id = ?", conversation.OwnerUserID, conversation.ConversationID).
-			Update(map[string]interface{}{"recv_msg_opt": conversation.RecvMsgOpt}).Error
+			Updates(map[string]interface{}{"recv_msg_opt": conversation.RecvMsgOpt}).Error
 	}
 }
 
 func GetUserAllConversations(ownerUserID string) ([]db.Conversation, error) {
 	var conversations []db.Conversation
-	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	err := db.DB.MysqlDB.DefaultGormDB().Model(&db.Conversation{}).Where("owner_user_id=?", ownerUserID).Find(&conversations).Error
-	if err != nil {
-		return conversations, err
-	}
-	dbConn.LogMode(false)
-	err = dbConn.Model(&db.Conversation{}).Where("owner_user_id=?", ownerUserID).Find(&conversations).Error
 	return conversations, err
 }
 func GetMultipleUserConversationByConversationID(ownerUserIDList []string, conversationID string) ([]db.Conversation, error) {
 	var conversations []db.Conversation
-	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	err := db.DB.MysqlDB.DefaultGormDB().Model(&db.Conversation{}).Where("owner_user_id IN ? and  conversation_id=?", ownerUserIDList, conversationID).Find(&conversations).Error
-	if err != nil {
-		return conversations, err
-	}
-	dbConn.LogMode(false)
-	err = dbConn.Model(&db.Conversation{}).Where("owner_user_id IN ? and  conversation_id=?", ownerUserIDList, conversationID).Find(&conversations).Error
 	return conversations, err
 }
 func GetExistConversationUserIDList(ownerUserIDList []string, conversationID string) ([]string, error) {
-	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
-	if err != nil {
-		return nil, err
-	}
 	var resultArr []string
-	err = dbConn.Table("conversations").Where(" owner_user_id IN (?) and conversation_id=?", ownerUserIDList, conversationID).Pluck("owner_user_id", &resultArr).Error
+	err := db.DB.MysqlDB.DefaultGormDB().Table("conversations").Where(" owner_user_id IN (?) and conversation_id=?", ownerUserIDList, conversationID).Pluck("owner_user_id", &resultArr).Error
 	if err != nil {
 		return nil, err
 	}
@@ -108,38 +74,21 @@ func GetExistConversationUserIDList(ownerUserIDList []string, conversationID str
 
 func GetConversation(OwnerUserID, conversationID string) (db.Conversation, error) {
 	var conversation db.Conversation
-	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	err := db.DB.MysqlDB.DefaultGormDB().Table("conversations").Where("owner_user_id=? and conversation_id=?", OwnerUserID, conversationID).Take(&conversation).Error
-	if err != nil {
-		return conversation, err
-	}
-	err = dbConn.Table("conversations").Where("owner_user_id=? and conversation_id=?", OwnerUserID, conversationID).Take(&conversation).Error
 	return conversation, err
 }
 
 func GetConversations(OwnerUserID string, conversationIDs []string) ([]db.Conversation, error) {
 	var conversations []db.Conversation
-	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	err := db.DB.MysqlDB.DefaultGormDB().Model(&db.Conversation{}).Where("conversation_id IN (?) and  owner_user_id=?", conversationIDs, OwnerUserID).Find(&conversations).Error
-	if err != nil {
-		return conversations, err
-	}
-	err = dbConn.Model(&db.Conversation{}).Where("conversation_id IN (?) and  owner_user_id=?", conversationIDs, OwnerUserID).Find(&conversations).Error
 	return conversations, err
 }
 func GetConversationsByConversationIDMultipleOwner(OwnerUserIDList []string, conversationID string) ([]db.Conversation, error) {
 	var conversations []db.Conversation
-	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	err := db.DB.MysqlDB.DefaultGormDB().Model(&db.Conversation{}).Where("owner_user_id IN (?) and  conversation_id=?", OwnerUserIDList, conversationID).Find(&conversations).Error
-	if err != nil {
-		return conversations, err
-	}
-	err = dbConn.Model(&db.Conversation{}).Where("owner_user_id IN (?) and  conversation_id=?", OwnerUserIDList, conversationID).Find(&conversations).Error
 	return conversations, err
 }
 func UpdateColumnsConversations(ownerUserIDList []string, conversationID string, args map[string]interface{}) error {
-	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	return db.DB.MysqlDB.DefaultGormDB().Model(&db.Conversation{}).Where("owner_user_id IN (?) and  conversation_id=?", ownerUserIDList, conversationID).Updates(args).Error
-	if err != nil {
-		return err
-	}
-	dbConn.LogMode(false)
-	return dbConn.Debug().Model(&db.Conversation{}).Where("owner_user_id IN (?) and  conversation_id=?", ownerUserIDList, conversationID).Updates(args).Error
 
 }