IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-01 07:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,704 Commits 35 Branches 142 Tags
077482d759cca8da8342ef71d545a261bbf35b9d
Commit Graph

2704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wangchuxiao 077482d759 Merge branch 'tuoyun' into superGroup 
# Conflicts:
#	internal/push/logic/push_to_client.go
 2022-06-16 12:47:06 +08:00
wangchuxiao b6634d26d1 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-16 12:36:00 +08:00
Gordon 5e51eebe8a msg handle 2022-06-16 12:21:49 +08:00
skiffer-git 310997f978 update chat.pb 2022-06-16 12:04:57 +08:00
wangchuxiao b67643ed95 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 
# Conflicts:
#	go.sum
 2022-06-16 11:58:18 +08:00
wangchuxiao 1b1f4464ee GlobalRecvMsgOpt 2022-06-16 11:53:43 +08:00
skiffer-git 1111cf48f3 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-16 11:46:25 +08:00
skiffer-git 41833712f0 has read default->true 2022-06-16 11:45:52 +08:00
wangchuxiao f9a26e9195 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-16 11:35:22 +08:00
wangchuxiao ea76f20825 GlobalRecvMsgOpt 2022-06-16 11:27:55 +08:00
skiffer-git 1a6a0d3592 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-16 10:27:02 +08:00
skiffer-git 0d2c0e91c8 use sarama v1.29.0 2022-06-16 10:26:37 +08:00
wangchuxiao bc2a7b902e k8s 2022-06-16 00:19:41 +08:00
Gordon 2e7e278ba4 redis restore 2022-06-15 23:30:33 +08:00
skiffer-git 06915f5dc3 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-15 19:55:06 +08:00
skiffer-git 7cbd840060 Optimization for log 2022-06-15 19:51:16 +08:00
Gordon cc8301cc6e redis replace to go_redis 2022-06-15 19:28:15 +08:00
skiffer-git a9603f44f4 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-15 19:26:05 +08:00
skiffer-git 04ee5269fe Optimization for log 2022-06-15 19:25:47 +08:00
Gordon afa93aaf9e Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-15 19:20:33 +08:00
Gordon d74bea25aa redis replace to go_redis 2022-06-15 19:17:49 +08:00
skiffer-git 1af78c9bcb Optimization for log 2022-06-15 18:15:00 +08:00
skiffer-git 9f7cc1ae69 Optimization for log 2022-06-15 18:11:15 +08:00
skiffer-git f4f6ea681e Optimization for log 2022-06-15 18:02:48 +08:00
wangchuxiao 21051900f9 hash userID 2022-06-15 17:33:48 +08:00
Gordon f96e12a8b3 redis replace to go_redis 2022-06-15 16:50:45 +08:00
Gordon eef47017a3 redis replace to go_redis 2022-06-15 16:39:03 +08:00
Gordon 4315d9dfbb redis replace to go_redis 2022-06-15 16:35:24 +08:00
Gordon d7961bf226 redis replace to go_redis 2022-06-15 16:33:30 +08:00
wangchuxiao 7dbc8a4253 go-redis 2022-06-15 16:18:41 +08:00
wangchuxiao 1aee41e7e7 go-redis 2022-06-15 16:16:35 +08:00
wangchuxiao f4cdbe985e alter rtc timeout 2022-06-15 14:57:21 +08:00
wangchuxiao 8a0c112072 alter rtc timeout 2022-06-15 13:55:37 +08:00
wangchuxiao 16641f0494 alter rtc timeout 2022-06-15 13:44:45 +08:00
wangchuxiao 5965dcd029 alter rtc timeout 2022-06-15 13:39:49 +08:00
wangchuxiao e45ef5c49a alter rtc timeout 2022-06-15 13:30:58 +08:00
wangchuxiao 9a1682ebaf Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-15 13:24:35 +08:00
wangchuxiao 9eed6ce197 alter rtc timeout 2022-06-15 13:24:21 +08:00
Gordon d3279694b7 add global msg recv opt 2022-06-15 13:12:16 +08:00
Gordon 8fe6231ebc add global msg recv opt 2022-06-15 13:11:08 +08:00
Gordon 6f0860d954 add global msg recv opt 2022-06-15 12:57:40 +08:00
Gordon 1e62ddce73 super update 2022-06-15 11:31:24 +08:00
wangchuxiao 956d745034 alter rtc timeout 2022-06-15 11:13:10 +08:00
Gordon ccc69ac2d0 Merge remote-tracking branch 'origin/superGroup' into superGroup 
# Conflicts:
#	pkg/proto/sdk_ws/ws.pb.go
 2022-06-15 11:08:52 +08:00
wangchuxiao 68365aa3b7 alter rtc timeout 2022-06-15 10:34:32 +08:00
wangchuxiao a0581618a4 Merge branch 'tuoyun' into superGroup 
# Conflicts:
#	config/config.yaml
#	internal/msg_gateway/gate/logic.go
#	internal/msg_gateway/gate/ws_server.go
#	internal/push/logic/push_to_client.go
#	internal/rpc/group/group.go
#	internal/rpc/msg/send_msg.go
#	pkg/common/config/config.go
#	pkg/proto/sdk_ws/ws.pb.go
 2022-06-15 10:31:58 +08:00
Gordon cfcccd0240 user add global set message recv opt 2022-06-14 18:20:08 +08:00
Gordon 926de3fa94 log 2022-06-14 17:27:04 +08:00
Gordon 38ded2c43d send message remove online status split 2022-06-14 17:24:40 +08:00
wangchuxiao f324bb603d rtc 2022-06-14 16:05:45 +08:00