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
|
2 years ago |
Gordon
|
926de3fa94
|
log
|
2 years ago |
|
Gordon
|
38ded2c43d
|
send message remove online status split
|
2 years ago |
|
wangchuxiao
|
f324bb603d
|
rtc
|
2 years ago |
|
wangchuxiao
|
d7884f89f5
|
rtc
|
2 years ago |
|
wangchuxiao
|
9c1ca78fed
|
rtc
|
2 years ago |
|
wangchuxiao
|
31c123a09b
|
rtc
|
2 years ago |
|
wangchuxiao
|
0e93295cdf
|
rtc
|
2 years ago |
|
wangchuxiao
|
5e7eda6781
|
rtc
|
2 years ago |
|
wangchuxiao
|
f31179bb9a
|
rtc
|
2 years ago |
skiffer-git
|
7308d0f9c6
|
config
|
2 years ago |
|
skiffer-git
|
5be23220e4
|
super group
|
2 years ago |
|
skiffer-git
|
25310d5e88
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
2 years ago |
|
skiffer-git
|
4bc9da3910
|
set groupID
|
2 years ago |
|
wangchuxiao
|
6dfba3c7b8
|
group
|
2 years ago |
|
wangchuxiao
|
94ec584dc3
|
signal
|
2 years ago |
|
Gordon
|
043188ab5e
|
push update
|
2 years ago |
|
Gordon
|
50f7057f68
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
f3b083cafd
|
push update
|
2 years ago |
|
wangchuxiao
|
d881ab5fea
|
signal
|
2 years ago |
|
skiffer-git
|
464200e693
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
9ae84a69be
|
SuperGroupOnlineBatchPushOneMsg
|
2 years ago |
|
wangchuxiao
|
47184ca01e
|
org
|
2 years ago |
|
wangchuxiao
|
39d4d01814
|
org
|
2 years ago |
|
wangchuxiao
|
5419478c48
|
org
|
2 years ago |
|
wangchuxiao
|
7d6701780c
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
dbc055efb4
|
org
|
2 years ago |
|
skiffer-git
|
f9c2b4c28e
|
SuperGroupOnlineBatchPushOneMsg
|
2 years ago |
|
Gordon
|
7c90baf7bf
|
remove online offline split
|
2 years ago |
|
skiffer-git
|
67807a3aa7
|
remove kick
|
2 years ago |
|
skiffer-git
|
dca39d6eae
|
set time out
|
2 years ago |
|
skiffer-git
|
768d139789
|
set time out
|
2 years ago |
|
skiffer-git
|
af612e4b92
|
log
|
2 years ago |
|
skiffer-git
|
ef23fba147
|
log
|
2 years ago |
|
skiffer-git
|
5f813c6f70
|
fix bug
|
2 years ago |
|
skiffer-git
|
c171728749
|
fix bug
|
2 years ago |
|
skiffer-git
|
85c0e1f330
|
debug log
|
2 years ago |
|
skiffer-git
|
8269e61163
|
debug log
|
2 years ago |
|
skiffer-git
|
ae6c09aae2
|
debug log
|
2 years ago |
|
skiffer-git
|
9619584de5
|
debug
|
2 years ago |
|
skiffer-git
|
dad40d60b3
|
debug
|
2 years ago |
|
skiffer-git
|
9216a085cf
|
log
|
2 years ago |
|
skiffer-git
|
952033f409
|
compile
|
2 years ago |
|
skiffer-git
|
dc10c7e3e7
|
batch push
|
2 years ago |
|
skiffer-git
|
a84c8bd273
|
SetWriteTimeoutWriteMsg
|
2 years ago |
|
skiffer-git
|
2d3d351e26
|
log
|
2 years ago |
|
skiffer-git
|
e375188889
|
log
|
2 years ago |
|
skiffer-git
|
5860f1fa7a
|
add send msg timeout
|
2 years ago |
|
skiffer-git
|
6a149c74d1
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
2 years ago |
|
skiffer-git
|
6ae71dba4f
|
add send msg timeout
|
2 years ago |
|
wangchuxiao
|
8a471a5455
|
base64 userID
|
2 years ago |
|
wangchuxiao
|
fdaf4380fa
|
base64 userID
|
2 years ago |
|
wangchuxiao
|
e95f09191a
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
fa02c20e1c
|
fix signal
|
2 years ago |
|
wangchuxiao
|
1687b70bde
|
fix signal
|
2 years ago |
|
skiffer-git
|
d49ceef637
|
log
|
2 years ago |
|
skiffer-git
|
da573ac573
|
log
|
2 years ago |
|
skiffer-git
|
743eaab9f6
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
202811f3c6
|
groupID digitization
|
2 years ago |
|
wangchuxiao
|
6250603440
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
650c7a3ae0
|
fix json word
|
2 years ago |
|
Gordon
|
42d75decb0
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
55f6aa9ff8
|
add batch push
|
2 years ago |
|
skiffer-git
|
0e77caa329
|
batch push
|
2 years ago |
|
wangchuxiao
|
da0e73fe11
|
fix json word
|
2 years ago |
|
wangchuxiao
|
fc5ab3572e
|
fix word
|
2 years ago |
|
wangchuxiao
|
1c52e731e1
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
ee615fbadf
|
fix word
|
2 years ago |
|
Gordon
|
2ede9ef8ed
|
add batch push
|
2 years ago |
|
Gordon
|
7d63c82ddd
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
1d4dc81e55
|
add batch push
|
2 years ago |
|
wangchuxiao
|
793996e047
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
ab76d46007
|
demo
|
2 years ago |
|
skiffer-git
|
ed1e22bac5
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
e57ce28d2b
|
batch push
|
2 years ago |
|
wangchuxiao
|
2b596e226a
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
2 years ago |
|
wangchuxiao
|
c46f574aa8
|
fix bug
|
2 years ago |
|
wangchuxiao
|
3f129513bb
|
fix bug
|
2 years ago |
|
skiffer-git
|
60f8f93a02
|
batch push
|
2 years ago |
|
skiffer-git
|
11e619d1b3
|
log
|
2 years ago |
|
skiffer-git
|
4f184a6723
|
batch push
|
2 years ago |
|
skiffer-git
|
5fd91e808a
|
batch push
|
2 years ago |
|
skiffer-git
|
32565dd188
|
config for msg read receipt
|
2 years ago |
|
skiffer-git
|
96f09c45f5
|
batch push
|
2 years ago |
|
skiffer-git
|
d2474c8a72
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
9eb0dd5e70
|
batch push
|
2 years ago |
|
wangchuxiao
|
bbdcb34ab6
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
6525d63459
|
fix bug
|
2 years ago |
|
skiffer-git
|
0babf89aa5
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
317e6f81bb
|
batch push
|
2 years ago |
|
wangchuxiao
|
d9710ac244
|
fix bug
|
2 years ago |
|
wangchuxiao
|
da18950b3d
|
fix bug
|
2 years ago |
|
wangchuxiao
|
6055ce9b6b
|
fix bug
|
2 years ago |
|
wangchuxiao
|
bd14739a9e
|
fix bug
|
2 years ago |
|
wangchuxiao
|
843cbe4f80
|
organization
|
2 years ago |
|
wangchuxiao
|
f650e73d5c
|
fix bug
|
2 years ago |
|
Gordon
|
d1293dd047
|
log
|
2 years ago |
|
skiffer-git
|
553b56d094
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
2 years ago |
|
skiffer-git
|
fec57c4ed7
|
log
|
2 years ago |
|
Gordon
|
b46f106a91
|
log
|
2 years ago |
|
Gordon
|
d587d14f86
|
log
|
2 years ago |
|
wangchuxiao
|
a115151616
|
fix bug
|
2 years ago |
|
wangchuxiao
|
26771ee7d0
|
organization
|
2 years ago |
|
Gordon
|
731263638b
|
log
|
2 years ago |
|
wangchuxiao
|
a4f69351ce
|
fix bug
|
2 years ago |
|
wangchuxiao
|
fa5f234a38
|
fix bug
|
2 years ago |
|
wangchuxiao
|
5d2c981368
|
fix bug
|
2 years ago |
|
wangchuxiao
|
4a55842724
|
fix bug
|
2 years ago |
|
wangchuxiao
|
e9655ed05e
|
fix bug
|
2 years ago |
|
wangchuxiao
|
ed7d2bbdd7
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
276328e0fd
|
fix bug
|
2 years ago |
|
Gordon
|
7d0c8b0c5f
|
super group add notification
|
2 years ago |
|
Gordon
|
88c4cff50c
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
cfe01bb820
|
super group push
|
2 years ago |
|
wangchuxiao
|
4f1bd4e509
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
Gordon
|
88544a89b7
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
a87e41eecd
|
super group push
|
2 years ago |
|
wangchuxiao
|
e52639d1d4
|
fix bug
|
2 years ago |
|
skiffer-git
|
0463f5e83d
|
fix bug
|
2 years ago |
|
skiffer-git
|
eb90314b38
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
6ce1d60ebb
|
log
|
2 years ago |
|
wangchuxiao
|
5fa62c9fbd
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
Gordon
|
ef93a1f42e
|
add conversation sync
|
2 years ago |
|
wangchuxiao
|
5f42748e1b
|
Merge branch 'tuoyun' into superGroup
# Conflicts:
# internal/msg_gateway/gate/callback.go
# internal/msg_transfer/logic/online_history_msg_handler.go
# internal/push/logic/callback.go
# internal/push/logic/push_to_client.go
# pkg/common/db/model.go
# pkg/common/db/newRedisModel.go
# pkg/proto/group/group.pb.go
# pkg/proto/group/group.proto
|
2 years ago |
|
wangchuxiao
|
269df23851
|
set group memberInfo
|
2 years ago |
|
wangchuxiao
|
c40dc64bd0
|
set group memberInfo
|
2 years ago |
|
skiffer-git
|
2b150e3c1c
|
KickUserOffline
|
2 years ago |
|
skiffer-git
|
3f2638efaf
|
KickUserOffline
|
2 years ago |
|
skiffer-git
|
afe8dcc1ff
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
wangchuxiao
|
8f1e439381
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
2 years ago |
|
skiffer-git
|
4418d031e1
|
log
|
2 years ago |
|
wangchuxiao
|
f3fc452904
|
group set memberInfo
|
2 years ago |
|
Gordon
|
89f40fe3de
|
kick
|
2 years ago |
|
Gordon
|
f8962beca6
|
kick
|
2 years ago |
|
skiffer-git
|
dae1569f0e
|
debug userid == ""
|
2 years ago |
|
skiffer-git
|
dd76c268c5
|
debug userid == ""
|
2 years ago |
|
skiffer-git
|
52c52f23d3
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
# internal/msg_transfer/logic/online_history_msg_handler.go
|
2 years ago |
|
skiffer-git
|
3adcb9f164
|
debug userid == ""
|
2 years ago |
|
Gordon
|
0f1a061afe
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
2 years ago |
|
Gordon
|
95705cc95a
|
log
|
2 years ago |
|
wangchuxiao
|
07b652c1d4
|
singal offline push
|
2 years ago |
|
skiffer-git
|
eac137a9a9
|
ForceLogout
|
2 years ago |
|
Gordon
|
6ec65965a4
|
log
|
2 years ago |
|
skiffer-git
|
290ae774e0
|
ForceLogout
|
2 years ago |
|
Gordon
|
ae52f85502
|
log
|
2 years ago |
|
skiffer-git
|
fcda79eb3c
|
fix bug: v.MsgData == nil
|
2 years ago |
|
skiffer-git
|
385f371c06
|
fix bug: v.MsgData == nil
|
2 years ago |
|
skiffer-git
|
6efb1a6705
|
fix bug: v.MsgData == nil
|
2 years ago |
|
Gordon
|
4695ef3208
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
34e8b79e7e
|
pb file
|
2 years ago |
|
skiffer-git
|
3639f943bf
|
group administrator access
|
2 years ago |
|
skiffer-git
|
d373369649
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
9106e70b37
|
group administrator access
|
2 years ago |
|
Gordon
|
4678189ed4
|
pb file
|
2 years ago |
|
skiffer-git
|
064b650fac
|
group administrator access
|
2 years ago |
|
wangchuxiao
|
f8b4cbcc13
|
singal offline push
|
2 years ago |
|
Gordon
|
2f9c8dbb33
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
8bd5db431b
|
add function
|
2 years ago |
|
skiffer-git
|
5754510d7a
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
797e2fea1e
|
group info set
|
2 years ago |
|
wangchuxiao
|
538656fcc7
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
0f66fa528d
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
e428e186f0
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
d3abc44976
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
a647007a0f
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
cfe0272022
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
2e3b55d9e8
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
6b8ebe11de
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
1fffd36054
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
2b25fea86c
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
409a8311b1
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
6996c008d0
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
16d33b1c1f
|
singal offline push
|
2 years ago |
|
Gordon
|
0a260a67d5
|
ws and push update
|
3 years ago |
|
Gordon
|
1aacd3cb23
|
ws and push update
|
3 years ago |
|
Gordon
|
5af3ba9db6
|
ws and push update
|
3 years ago |
|
Gordon
|
febc672e6e
|
ws and push update
|
3 years ago |
|
Gordon
|
a18dcfce9e
|
ws and push update
|
3 years ago |
|
wenxu12345
|
da1df91f49
|
Clear msg
|
3 years ago |
|
wenxu12345
|
b2df6e6d41
|
Clear msg
|
3 years ago |
|
wenxu12345
|
2b4df5be16
|
Clear personal chat history
|
3 years ago |
|
wangchuxiao
|
f98da25fda
|
organization
|
3 years ago |
|
Gordon
|
0aefab34f1
|
log
|
3 years ago |
|
Gordon
|
5392c9fd38
|
log
|
3 years ago |
|
Gordon
|
1db3ecca22
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
3 years ago |
|
Gordon
|
25450a4182
|
message update
|
3 years ago |
|
wangchuxiao
|
cf094a2048
|
superGroup
|
3 years ago |
|
wangchuxiao
|
10881c8f5b
|
superGroup
|
3 years ago |
|
wangchuxiao
|
653c0faa18
|
superGroup
|
3 years ago |
|
wangchuxiao
|
3b81108738
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
3 years ago |
|
wangchuxiao
|
110f5e02f4
|
superGroup
|
3 years ago |
|
Gordon
|
a4a7ce51ad
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
3 years ago |
|
Gordon
|
08a7dbe319
|
message update
|
3 years ago |
|
wangchuxiao
|
ecf0a4f299
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
3 years ago |
|
wangchuxiao
|
d3fe5cdf34
|
superGroup
|
3 years ago |
|
Gordon
|
bda1b0a304
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
3 years ago |
|
Gordon
|
839f3e52ef
|
pull message update
|
3 years ago |
|
wangchuxiao
|
a85f6b8287
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
3 years ago |
|
wangchuxiao
|
fe9f86b432
|
superGroup
|
3 years ago |
|
wangchuxiao
|
c0a3bdcf99
|
k8s
|
3 years ago |
