690 Commits

Author SHA1 Message Date
wangchuxiao c5eb8a3f9b 入职流程 2022-06-17 12:09:42 +08:00
Gordon 92cb2e7eab config file update 2022-06-17 10:59:50 +08:00
Gordon 04136d5b9d Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-17 10:50:24 +08:00
Gordon fd256a6c28 config file update 2022-06-17 10:50:15 +08:00
wangchuxiao 52ae2c3655 fix bug 2022-06-17 10:44:23 +08:00
wangchuxiao 3892883470 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-17 10:37:03 +08:00
wangchuxiao d1049b8022 fix bug 2022-06-17 10:36:46 +08:00
Gordon 903c39206f msg transfer handle change 2022-06-16 20:35:27 +08:00
Gordon 57d96b85f1 add global recv opt 2022-06-16 14:47:39 +08:00
wangchuxiao dd4817a65a Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-16 14:45:53 +08:00
wangchuxiao b3dcff2d76 redis interface 2022-06-16 14:45:39 +08:00
skiffer-git 8c82f811cb Merge remote-tracking branch 'origin/superGroup' into superGroup
# Conflicts:
#	internal/rpc/user/user.go
2022-06-16 14:10:56 +08:00
skiffer-git dbc2713495 Handling exception: getcdv3.GetConn == nil 2022-06-16 14:09:28 +08:00
wangchuxiao 96d3ae86cc Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-16 13:41:18 +08:00
Gordon 7e6e214f08 add global recv opt 2022-06-16 12:41:31 +08:00
Gordon 5e51eebe8a msg handle 2022-06-16 12:21:49 +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
Gordon 2e7e278ba4 redis restore 2022-06-15 23:30:33 +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 f4f6ea681e Optimization for log 2022-06-15 18:02: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 1aee41e7e7 go-redis 2022-06-15 16:16:35 +08:00
wangchuxiao f4cdbe985e alter rtc timeout 2022-06-15 14:57: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 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 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
wangchuxiao d190616d34 rtc 2022-06-14 16:03:20 +08:00
wangchuxiao d7884f89f5 rtc 2022-06-14 15:56:06 +08:00
Gordon d8ce122254 redis model update 2022-06-14 15:47:34 +08:00
wangchuxiao 257e98edb2 group 2022-06-13 20:11:43 +08:00
Gordon 034201a45b redis model update 2022-06-13 16:09:34 +08:00
Gordon d43b9fc6c1 redis model update 2022-06-13 15:58:14 +08:00
wangchuxiao 52d8ab5389 singal 2022-06-13 11:53:12 +08:00
wangchuxiao dbc055efb4 org 2022-06-13 10:38:00 +08:00
wangchuxiao 1687b70bde fix signal 2022-06-10 17:31:30 +08:00
wangchuxiao dbcfcafdfc fix word 2022-06-09 18:16:23 +08:00
wangchuxiao ceca0f095b demo 2022-06-09 17:24:30 +08:00
wangchuxiao ab76d46007 demo 2022-06-09 17:19:39 +08:00
wangchuxiao 9b4890a99f fix bug 2022-06-09 15:33:37 +08:00
wangchuxiao c8bf95578c fix bug 2022-06-09 15:25:02 +08:00