wangchuxiao
|
96d3ae86cc
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
Gordon
|
7e6e214f08
|
add global recv opt
|
2 years ago |
|
Gordon
|
5e51eebe8a
|
msg handle
|
2 years ago |
|
wangchuxiao
|
f9a26e9195
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
ea76f20825
|
GlobalRecvMsgOpt
|
2 years ago |
|
Gordon
|
2e7e278ba4
|
redis restore
|
2 years ago |
|
Gordon
|
d74bea25aa
|
redis replace to go_redis
|
2 years ago |
|
Gordon
|
f96e12a8b3
|
redis replace to go_redis
|
2 years ago |
|
Gordon
|
eef47017a3
|
redis replace to go_redis
|
2 years ago |
|
Gordon
|
4315d9dfbb
|
redis replace to go_redis
|
2 years ago |
|
Gordon
|
d7961bf226
|
redis replace to go_redis
|
2 years ago |
|
wangchuxiao
|
1aee41e7e7
|
go-redis
|
2 years ago |
|
wangchuxiao
|
f4cdbe985e
|
alter rtc timeout
|
2 years ago |
|
Gordon
|
d3279694b7
|
add global msg recv opt
|
2 years ago |
|
Gordon
|
8fe6231ebc
|
add global msg recv opt
|
2 years ago |
|
Gordon
|
6f0860d954
|
add global msg recv opt
|
2 years ago |
|
Gordon
|
ccc69ac2d0
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
# Conflicts:
# pkg/proto/sdk_ws/ws.pb.go
|
2 years ago |
|
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
|
cfcccd0240
|
user add global set message recv opt
|
2 years ago |
|
wangchuxiao
|
d190616d34
|
rtc
|
2 years ago |
|
wangchuxiao
|
d7884f89f5
|
rtc
|
2 years ago |
|
Gordon
|
d8ce122254
|
redis model update
|
2 years ago |
|
wangchuxiao
|
257e98edb2
|
group
|
2 years ago |
|
Gordon
|
034201a45b
|
redis model update
|
2 years ago |
|
Gordon
|
d43b9fc6c1
|
redis model update
|
2 years ago |
|
wangchuxiao
|
52d8ab5389
|
singal
|
2 years ago |
|
wangchuxiao
|
dbc055efb4
|
org
|
2 years ago |
|
wangchuxiao
|
1687b70bde
|
fix signal
|
2 years ago |
|
wangchuxiao
|
ceca0f095b
|
demo
|
2 years ago |
|
wangchuxiao
|
ab76d46007
|
demo
|
2 years ago |
|
wangchuxiao
|
9b4890a99f
|
fix bug
|
2 years ago |
|
wangchuxiao
|
c8bf95578c
|
fix bug
|
2 years ago |
|
wangchuxiao
|
7b08d98647
|
fix bug
|
2 years ago |
|
wangchuxiao
|
6525d63459
|
fix bug
|
2 years ago |
|
wangchuxiao
|
ae684d6d39
|
fix bug
|
2 years ago |
|
wangchuxiao
|
d9710ac244
|
fix bug
|
2 years ago |
|
wangchuxiao
|
dff7a28094
|
fix bug
|
2 years ago |
|
wangchuxiao
|
da18950b3d
|
fix bug
|
2 years ago |
|
wangchuxiao
|
f650e73d5c
|
fix bug
|
2 years ago |
|
wangchuxiao
|
a4f69351ce
|
fix bug
|
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
|
f3fc452904
|
group set memberInfo
|
2 years ago |
|
wangchuxiao
|
34c091f232
|
signal
|
2 years ago |
|
wangchuxiao
|
f8b4cbcc13
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
1a42f6dded
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
4efdd342d6
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
f15684a562
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
78dfba8771
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
ebf07eddfb
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
d3abc44976
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
2b25fea86c
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
64fa52452c
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
16d33b1c1f
|
singal offline push
|
2 years ago |
|
Gordon
|
a18dcfce9e
|
ws and push update
|
2 years ago |
|
Gordon
|
48410c428a
|
redis update
|
2 years ago |
wenxu12345
|
b2df6e6d41
|
Clear msg
|
3 years ago |
|
wenxu12345
|
8315c61240
|
Clear msg
|
3 years ago |
|
wenxu12345
|
2b4df5be16
|
Clear personal chat history
|
3 years ago |
|
wangchuxiao
|
f98da25fda
|
organization
|
3 years ago |
|
Gordon
|
4c305b7cc0
|
redis replace go redis
|
3 years ago |
|
Gordon
|
5c979a532f
|
redis replace go redis
|
3 years ago |
|
Gordon
|
31e923fc67
|
redis replace go redis
|
3 years ago |
|
Gordon
|
1c2ebb8c5d
|
redis replace go redis
|
3 years ago |
|
wangchuxiao
|
29e75a4851
|
organization
|
3 years ago |
|
Gordon
|
3765661a4e
|
redis replace go redis
|
3 years ago |
|
Gordon
|
628984c09d
|
redis replace go redis
|
3 years ago |
|
Gordon
|
a630653d88
|
redis replace go redis
|
3 years ago |
|
Gordon
|
e693b908be
|
redis replace go redis
|
3 years ago |
|
Gordon
|
f36b2433a0
|
redis replace go redis
|
3 years ago |
|
Gordon
|
47af0d0356
|
redis replace go redis
|
3 years ago |
|
Gordon
|
d4c587c668
|
redis replace go redis
|
3 years ago |
|
Gordon
|
dda453975b
|
redis replace go redis
|
3 years ago |
|
Gordon
|
c28801ff27
|
redis replace go redis
|
3 years ago |
|
Gordon
|
4e609ebc33
|
redis replace go redis
|
3 years ago |
|
Gordon
|
1257e96d5e
|
redis replace go redis
|
3 years ago |
|
Gordon
|
122a3ab4ce
|
redis replace go redis
|
3 years ago |
|
Gordon
|
136cb43cd1
|
redis replace go redis
|
3 years ago |
|
Gordon
|
ad8086d2b6
|
redis replace go redis
|
3 years ago |
|
Gordon
|
d00641a73c
|
redis replace go redis
|
3 years ago |
|
Gordon
|
0aefab34f1
|
log
|
3 years ago |
|
wangchuxiao
|
0168ef4014
|
superGroup
|
3 years ago |
|
wangchuxiao
|
8cc6b048fd
|
superGroup
|
3 years ago |
|
wangchuxiao
|
cf094a2048
|
superGroup
|
3 years ago |
|
wangchuxiao
|
10881c8f5b
|
superGroup
|
3 years ago |
|
wangchuxiao
|
23c6c8b331
|
superGroup
|
3 years ago |
|
wangchuxiao
|
653c0faa18
|
superGroup
|
3 years ago |
|
wangchuxiao
|
edb5cb4ee5
|
superGroup
|
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 |
|
Gordon
|
7285e2b2c9
|
add super group
|
3 years ago |
|
wangchuxiao
|
b3ba06aecb
|
superGroup
|
3 years ago |
|
wangchuxiao
|
b55e13dbeb
|
superGroup
|
3 years ago |
|
wangchuxiao
|
bbe8c46df9
|
callback
|
3 years ago |
|
wenxu12345
|
8addb49012
|
add error handling : mongo
|
3 years ago |
|
wenxu12345
|
ac1e557c46
|
add error handling : mongo
|
3 years ago |
|
wangchuxiao
|
eb2218c220
|
del msg
|
3 years ago |
|
wangchuxiao
|
657ec411c3
|
del msg
|
3 years ago |
|
Gordon
|
061af3f827
|
push update
|
3 years ago |
|
wangchuxiao
|
c16a35ec8c
|
del msg
|
3 years ago |
|
wangchuxiao
|
841566a5d1
|
del msg
|
3 years ago |
|
wangchuxiao
|
18eaae80ec
|
del msg
|
3 years ago |
|
wenxu12345
|
1246f3aa21
|
msg cache
|
3 years ago |
|
wenxu12345
|
49cd31fd41
|
msg cache
|
3 years ago |
|
Gordon
|
79ff36d49a
|
redis add get message
|
3 years ago |
|
Gordon
|
d6742812c8
|
redis add get message
|
3 years ago |
|
Gordon
|
57967835bd
|
redis add get message
|
3 years ago |
|
wenxu12345
|
e2db8c07af
|
msg cache
|
3 years ago |
|
Gordon
|
c224892609
|
redis add get message
|
3 years ago |
|
Gordon
|
f5ed9d93c3
|
redis add get message
|
3 years ago |
|
Gordon
|
88145694ce
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
d58f7fd089
|
redis add get message
|
3 years ago |
|
wangchuxiao
|
c32b53b3c0
|
msg cache
|
3 years ago |
|
wangchuxiao
|
9dfef527a3
|
msg cache
|
3 years ago |
|
wangchuxiao
|
df51c8b9a4
|
msg cache
|
3 years ago |
|
wangchuxiao
|
499c4a27d3
|
k8s deploy
|
3 years ago |
|
skiffer-git
|
821ad4de2e
|
log
|
3 years ago |
|
skiffer-git
|
17b4a0525d
|
log
|
3 years ago |
|
skiffer-git
|
c2e7863ca0
|
fix bug
|
3 years ago |
|
skiffer-git
|
6e9dcdbb50
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
# pkg/common/db/batch_insert_chat.go
|
3 years ago |
|
skiffer-git
|
0265ea45b2
|
fix bug
|
3 years ago |
|
Gordon
|
ccb7e41434
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
38317c5497
|
concurrent consumption of messages
|
3 years ago |
|
skiffer-git
|
9f62de0420
|
fix bug
|
3 years ago |
|
Gordon
|
adb6337a27
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
624bb0a7e5
|
concurrent consumption of messages
|
3 years ago |
|
skiffer-git
|
abcfaa05e2
|
log
|
3 years ago |
|
skiffer-git
|
223b2678b4
|
fix bug
|
3 years ago |
|
skiffer-git
|
f0c6295cff
|
batch to mongo
|
3 years ago |
|
skiffer-git
|
866c7d4f2f
|
batch to mongo
|
3 years ago |
|
skiffer-git
|
17695927d5
|
batch to mongo
|
3 years ago |
|
skiffer-git
|
ea8638c843
|
batch to mongo
|
3 years ago |
|
skiffer-git
|
0fbc1095be
|
batch to mongo
|
3 years ago |
|
skiffer-git
|
b914e8388d
|
batch to mongo
|
3 years ago |
|
skiffer-git
|
31911a40c0
|
batch to mongo
|
3 years ago |
|
skiffer-git
|
00a2a23190
|
batch to mongo
|
3 years ago |
|
skiffer-git
|
d4f81f086c
|
batch to mongo
|
3 years ago |
|
wangchuxiao
|
2534921af9
|
organization
|
3 years ago |
|
wangchuxiao
|
bb5991b111
|
organization
|
3 years ago |
|
wangchuxiao
|
3fca780132
|
update app
|
3 years ago |
|
wangchuxiao
|
98a903e60c
|
update app
|
3 years ago |
|
wangchuxiao
|
17759f9a98
|
update app
|
3 years ago |
|
wangchuxiao
|
6c0e96213f
|
update app
|
3 years ago |
|
wangchuxiao
|
7a423eb6e1
|
update app
|
3 years ago |
|
wangchuxiao
|
7137924baa
|
update app
|
3 years ago |
|
wangchuxiao
|
f5d4397f0b
|
update app
|
3 years ago |
|
wangchuxiao
|
472cda8315
|
update app
|
3 years ago |
|
wangchuxiao
|
7be5208daf
|
update app
|
3 years ago |
|
wangchuxiao
|
30fc4c28b7
|
cache
|
3 years ago |
|
wangchuxiao
|
00265a7e8e
|
cache
|
3 years ago |
|
wangchuxiao
|
bbc3f5c19a
|
cache
|
3 years ago |
|
wangchuxiao
|
7914e7bc14
|
office
|
3 years ago |
|
wangchuxiao
|
ed8716510b
|
office
|
3 years ago |
|
wangchuxiao
|
efd2ae59f5
|
office
|
3 years ago |
|
wangchuxiao
|
1923d0b809
|
office
|
3 years ago |
|
wangchuxiao
|
99f6752590
|
office
|
3 years ago |
|
wangchuxiao
|
131746f94e
|
office
|
3 years ago |
|
wangchuxiao
|
f0ed6973c8
|
office
|
3 years ago |
|
wangchuxiao
|
2cf070a26c
|
office
|
3 years ago |
|
wangchuxiao
|
3c68ecb7f1
|
office
|
3 years ago |
|
wangchuxiao
|
d75eb456dc
|
office
|
3 years ago |
|
skiffer-git
|
185e0dce6e
|
delete msg by index
|
3 years ago |
|
skiffer-git
|
d9e74a78f0
|
delete msg by index
|
3 years ago |
|
wangchuxiao
|
f1dbec122a
|
cache
|
3 years ago |
|
wangchuxiao
|
47cb54461f
|
cache
|
3 years ago |
|
wangchuxiao
|
91e03f7cfd
|
cache
|
3 years ago |
|
wangchuxiao
|
d24a7d7b22
|
cache & workMoments
|
3 years ago |
|
wangchuxiao
|
88d4a670d4
|
cache
|
3 years ago |
|
wangchuxiao
|
ea0b6c5ee5
|
cache
|
3 years ago |
|
wangchuxiao
|
20f61042fc
|
cache
|
3 years ago |
|
wangchuxiao
|
93057870a7
|
cache
|
3 years ago |
|
wangchuxiao
|
b72787f5bb
|
cache
|
3 years ago |
|
wangchuxiao
|
0793b2ab38
|
cache
|
3 years ago |
|
wangchuxiao
|
604ed3e3e1
|
cache
|
3 years ago |
|
wangchuxiao
|
65f02e5139
|
cache
|
3 years ago |
|
wangchuxiao
|
59468eb162
|
fix work moments bug
|
3 years ago |
|
wangchuxiao
|
17f6b8eb2a
|
work moments
|
3 years ago |
|
wangchuxiao
|
bd7266653f
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
08f968dced
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
a03f89fb68
|
cache rpc
|
3 years ago |
|
Gordon
|
9a9f26c435
|
conversation update
|
3 years ago |
|
Gordon
|
eebe9cbd5f
|
conversation update
|
3 years ago |
|
Gordon
|
b3077fc15d
|
conversation update
|
3 years ago |
|
wangchuxiao
|
bccaf16343
|
work_moments
|
3 years ago |
|
wangchuxiao
|
30df45ef2e
|
work_moments
|
3 years ago |
|
wangchuxiao
|
6500ba48a7
|
work_moments
|
3 years ago |
|
wangchuxiao
|
010f24e5c3
|
work_moments
|
3 years ago |
|
wangchuxiao
|
db9762c5b2
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
d1ebcde725
|
work_moments
|
3 years ago |
|
Gordon
|
150af5ff8b
|
@ people update
|
3 years ago |
|
wangchuxiao
|
4ba87e3349
|
workMoments
|
3 years ago |
|
Gordon
|
17d8a124cd
|
kick group invite group update
|
3 years ago |
|
Gordon
|
67010e20d7
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
704604f6fe
|
kick group invite group update
|
3 years ago |
|
wangchuxiao
|
ff85575e98
|
workMoments
|
3 years ago |
|
wangchuxiao
|
a243da8b1e
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
62e605a443
|
workMoments
|
3 years ago |
|
Gordon
|
00664822ec
|
conversation add fields
|
3 years ago |
|
wangchuxiao
|
9df4a79827
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
071dd46a4c
|
workMoments
|
3 years ago |
|
skiffer-git
|
030d619910
|
Organization
|
3 years ago |
|
skiffer-git
|
51c3a753a9
|
Organization
|
3 years ago |
|
skiffer-git
|
88e9dd54b2
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
f53f34559a
|
organization
|
3 years ago |
|
wangchuxiao
|
3e5d9a394f
|
workMoments
|
3 years ago |
|
wangchuxiao
|
3f287eb148
|
workMoments
|
3 years ago |
|
wangchuxiao
|
dfe854a236
|
workMoments
|
3 years ago |
|
wangchuxiao
|
01c066419d
|
workMoments
|
3 years ago |
|
wangchuxiao
|
040b1d9bc8
|
workMoments
|
3 years ago |
|
wangchuxiao
|
b5c11ece57
|
workMoments
|
3 years ago |
|
wangchuxiao
|
50696d2e88
|
workMoments
|
3 years ago |
|
wangchuxiao
|
957e11eff0
|
workMoments
|
3 years ago |
|
wangchuxiao
|
3625befc0b
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
# pkg/common/constant/constant.go
|
3 years ago |
|
wangchuxiao
|
6e6508aafd
|
workMoments
|
3 years ago |
|
skiffer-git
|
b1c66997ca
|
organization
|
3 years ago |
|
skiffer-git
|
ad1770ec95
|
organization
|
3 years ago |
|
skiffer-git
|
c11094a11e
|
organization
|
3 years ago |
|
skiffer-git
|
ecc47dcfbb
|
organization
|
3 years ago |
|
skiffer-git
|
edf7df368e
|
organization
|
3 years ago |
|
skiffer-git
|
cde38e012f
|
organization
|
3 years ago |
|
skiffer-git
|
cc405b83e2
|
organization
|
3 years ago |
|
skiffer-git
|
c65f5b7279
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
c216340120
|
organization
|
3 years ago |
|
wangchuxiao
|
27cba5ba31
|
getui
|
3 years ago |
|
wangchuxiao
|
dbc5bd96f3
|
getui
|
3 years ago |
|
wangchuxiao
|
9489ab862b
|
getui
|
3 years ago |
|
wangchuxiao
|
1bb634bc6f
|
merge code
|
3 years ago |
|
wangchuxiao
|
4a7cfab543
|
getui
|
3 years ago |
|
skiffer-git
|
659c3bc1cf
|
add department db
|
3 years ago |
|
skiffer-git
|
f5684f2c45
|
add department db
|
3 years ago |
|
skiffer-git
|
bc06ba54b9
|
organization && department
|
3 years ago |
|
skiffer-git
|
3085fffb49
|
add department db
|
3 years ago |
|
wangchuxiao
|
3d5e3ce6cf
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
# internal/rpc/msg/tag_send_msg.go
|
3 years ago |
|
wangchuxiao
|
4efdabc1ff
|
getui
|
3 years ago |
|
wenxu12345
|
42225dd35e
|
log
|
3 years ago |
|
Gordon
|
59cc45eaab
|
replace log
|
3 years ago |
|
wenxu12345
|
0232f52281
|
log
|
3 years ago |
|
wangchuxiao
|
0e27b302bc
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
4390302384
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
929c5e7a5b
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
d600042110
|
tag and set private tips
|
3 years ago |
|
Gordon
|
0a58e7433e
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
5639c985df
|
OA tag fields modify
|
3 years ago |
|
wenxu12345
|
9fbfbfb23b
|
Merge log files
|
3 years ago |
|
skiffer-git
|
009ae6a235
|
mute group
|
3 years ago |
|
skiffer-git
|
bf5f72c00b
|
mute group
|
3 years ago |
|
wangchuxiao
|
29a268d476
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
18d7aab703
|
tag
|
3 years ago |
|
Gordon
|
e8517e954d
|
group add
|
3 years ago |
|
Gordon
|
bc260fffde
|
group add
|
3 years ago |
|
Gordon
|
acca147ff2
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
d53da0e422
|
group add
|
3 years ago |
|
wangchuxiao
|
f2b324abc2
|
tag
|
3 years ago |
|
wangchuxiao
|
7e937d7d29
|
tag
|
3 years ago |
|
wangchuxiao
|
d0a65c7c68
|
tag
|
3 years ago |
|
wangchuxiao
|
416f87f4bb
|
tag
|
3 years ago |
|
wangchuxiao
|
7eeb67be28
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
7ed6ee5075
|
tag
|
3 years ago |
|
Gordon
|
c5828aba91
|
Merge branch 'tuoyun'
# Conflicts:
# cmd/open_im_api/main.go
# config/config.yaml
# go.sum
# pkg/common/config/config.go
# pkg/common/db/model.go
|
3 years ago |
|
skiffer-git
|
1286f9dcb6
|
mute group
|
3 years ago |
|
wangchuxiao
|
0797181967
|
tag
|
3 years ago |
|
wangchuxiao
|
14c5e631ff
|
tag
|
3 years ago |
|
wangchuxiao
|
5cdb039c33
|
tag
|
3 years ago |
|
wangchuxiao
|
a11c4fcb58
|
tag
|
3 years ago |
|
wangchuxiao
|
e95400988e
|
tag
|
3 years ago |
|
wangchuxiao
|
d92ac8f588
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
169665da32
|
tag
|
3 years ago |
|
Gordon
|
c4d80b4844
|
auto migrate test
|
3 years ago |
|
wangchuxiao
|
e9ea117985
|
tag
|
3 years ago |
|
wangchuxiao
|
b9ddb0140f
|
tag
|
3 years ago |
|
wangchuxiao
|
228cbb4082
|
tag
|
3 years ago |
|
wangchuxiao
|
c39f5a27b2
|
tag
|
3 years ago |
|
wangchuxiao
|
dbdb516f3c
|
tag
|
3 years ago |
|
wangchuxiao
|
c1a97b7356
|
tag
|
3 years ago |
|
wangchuxiao
|
574c7600e0
|
tag
|
3 years ago |
|
wangchuxiao
|
9d619d520d
|
tag
|
3 years ago |
|
wangchuxiao
|
46605479e9
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into office_tag
|
3 years ago |
|
wangchuxiao
|
6d20eddd43
|
mongo
|
3 years ago |
|
skiffer-git
|
9d29d49ada
|
group dismissed
|
3 years ago |
|
wangchuxiao
|
8a38646bc5
|
mongo
|
3 years ago |
马守越
|
1ab3e04cba
|
新增mongo.dbUrl配置 (#174)
* 当dbUri值不为空则直接使用该值
* 新增支持ali oss
Co-authored-by: mashouyue's m1max <mashouyue@toowow.cn>
|
3 years ago |
|
wangchuxiao
|
366f7621fa
|
rtc add
|
3 years ago |
|
Gordon
|
cb8f7e0ddb
|
mongo single node
|
3 years ago |
|
Gordon
|
2fc2801ad4
|
mongo single node
|
3 years ago |
|
wangchuxiao
|
b0aa168c9a
|
rtc add
|
3 years ago |
|
wangchuxiao
|
51c2f845d8
|
opt
|
3 years ago |
|
Gordon
|
e734b000de
|
log
|
3 years ago |
|
skiffer-git
|
04f8a7247d
|
replace find with take
|
3 years ago |
|
skiffer-git
|
7b6ef76d54
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
ed65ad842f
|
Replace find with take
|
3 years ago |
|
Gordon
|
b30da3eea4
|
database judge modify
|
3 years ago |
|
Gordon
|
2c26efb5a9
|
log remove
|
3 years ago |
|
Gordon
|
e31da8bbd0
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
1e602975f3
|
test
|
3 years ago |
|
wangchuxiao
|
541ccda754
|
test mongo driver
|
3 years ago |
|
wangchuxiao
|
1b68363b80
|
test mongo driver
|
3 years ago |
|
wangchuxiao
|
fc11b3c463
|
test mongo driver
|
3 years ago |
|
wangchuxiao
|
f9f36cd1d6
|
test mongo driver
|
3 years ago |
|
wangchuxiao
|
566c05bcef
|
mongodriver test
|
3 years ago |
|
Gordon
|
b751156b5c
|
redis ttl
|
3 years ago |
|
wangchuxiao
|
55d7c6e672
|
add log
|
3 years ago |
|
wangchuxiao
|
dfdb952e2b
|
fix reset password api
|
3 years ago |
|
wangchuxiao
|
079efe5de6
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
4d28ccebad
|
add reset pwd
|
3 years ago |
|
wenxu12345
|
2171acc909
|
replace mongo driver
|
3 years ago |
|
wenxu12345
|
1e05811c13
|
replace mongo driver
|
3 years ago |
|
wenxu12345
|
ec023ec13e
|
replace mongo driver
|
3 years ago |
|
wenxu12345
|
996570cc57
|
replace mongo driver
|
3 years ago |
|
wenxu12345
|
7cf712daff
|
replace mongo driver
|
3 years ago |
|
wenxu12345
|
ede3b07963
|
replace mongo driver
|
3 years ago |
|
wenxu12345
|
53a4b90d96
|
replace mongo driver
|
3 years ago |
|
wenxu12345
|
db116f39fd
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
571c83314a
|
Refactoring code
|
3 years ago |
|
Gordon
|
d906d49930
|
model modify
|
3 years ago |
|
Gordon
|
45c43888e7
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
68e7dfb1cc
|
conversation add
|
3 years ago |
|
wangchuxiao
|
737ce2c2e7
|
fix bug
|
3 years ago |
|
wangchuxiao
|
65be1263b9
|
make file
|
3 years ago |
|
wangchuxiao
|
8cdea2bfeb
|
cms dev
|
3 years ago |
|
wangchuxiao
|
22bfb6be4b
|
merge code
|
3 years ago |
|
wangchuxiao
|
7797e47561
|
add
|
3 years ago |
|
wangchuxiao
|
52579c5fab
|
add
|
3 years ago |
|
wenxu12345
|
a5ed6d897c
|
Refactor code
|
3 years ago |
|
wenxu12345
|
439605bafc
|
Refactor code
|
3 years ago |
|
wenxu12345
|
109e8b53a1
|
Refactor code
|
3 years ago |
|
wenxu12345
|
77bb88ed59
|
Refactor code
|
3 years ago |
|
wenxu12345
|
45816fa84f
|
Refactor code
|
3 years ago |
|
Gordon
|
fd59cc6226
|
demo modify
|
3 years ago |
|
Gordon
|
a885d7f003
|
demo modify
|
3 years ago |
|
Gordon
|
c99cbec3df
|
db
|
3 years ago |
|
Gordon
|
6eb44cb9d8
|
db
|
3 years ago |
|
Gordon
|
e02ca2f7e3
|
db
|
3 years ago |
|
Gordon
|
84a2197027
|
db
|
3 years ago |
|
Gordon
|
41dd808c9a
|
db
|
3 years ago |
|
Gordon
|
b7a8f6c2a1
|
db
|
3 years ago |
|
Gordon
|
f574017b66
|
db
|
3 years ago |
|
wangchuxiao
|
375b400b1e
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
192ac0e013
|
api
|
3 years ago |
|
Gordon
|
e91f2b89df
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
93706c94af
|
mysql coding
|
3 years ago |
|
wangchuxiao
|
6de61cb214
|
cms dev
|
3 years ago |
|
wenxu12345
|
ee3490a520
|
Refactor code
|
3 years ago |
|
wenxu12345
|
02b95b16f9
|
Refactor code
|
3 years ago |
|
wenxu12345
|
3e16519793
|
Refactor code
|
3 years ago |
|
wenxu12345
|
a4b6cb3232
|
Refactor code
|
3 years ago |
|
wenxu12345
|
8883701297
|
Refactor code
|
3 years ago |
|
wenxu12345
|
225c0a9b03
|
Refactor code
|
3 years ago |
|
wenxu12345
|
2c670b3b21
|
Refactor code
|
3 years ago |
|
wangchuxiao
|
02aad295f9
|
group
|
3 years ago |
|
wenxu12345
|
163da78bc6
|
Refactor code
|
3 years ago |
|
wenxu12345
|
14cf30cd98
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wangchuxiao
|
e94dbe4965
|
cms dev
|
3 years ago |
|
wangchuxiao
|
a7f9faf868
|
statistics
|
3 years ago |
|
wangchuxiao
|
fb396d9cf0
|
add
|
3 years ago |
|
wangchuxiao
|
0ed393b1a5
|
group
|
3 years ago |
|
wangchuxiao
|
b992faa468
|
group rpc
|
3 years ago |
|
wangchuxiao
|
cdc2428aca
|
cms
|
3 years ago |
|
wangchuxiao
|
1607853393
|
cms
|
3 years ago |
|
Gordon
|
5a9f3f1f5e
|
msg test
|
3 years ago |
|
Gordon
|
64f2fb9e73
|
msg test
|
3 years ago |
|
Gordon
|
cbed698a1c
|
msg test
|
3 years ago |
|
Gordon
|
cd7efee49c
|
msg test
|
3 years ago |
|
Gordon
|
911100923f
|
chat log model update
|
3 years ago |
|
Gordon
|
184f0900fb
|
protocol modify
|
3 years ago |
|
wenxu12345
|
99a8eaea91
|
Refactor code
|
3 years ago |
|
Gordon
|
d2b411ecbb
|
nil modify
|
3 years ago |
|
Gordon
|
ca0f095d6b
|
db charset set utf-8
|
3 years ago |
|
Gordon
|
1a0f626a80
|
model length add
|
3 years ago |
|
Gordon
|
c23426425e
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
757b296fd0
|
model length add
|
3 years ago |
|
wenxu12345
|
f3507569b5
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
da5e60a009
|
Refactor code
|
3 years ago |
|
Gordon
|
896a69086b
|
ws send msg modify
|
3 years ago |
|
wenxu12345
|
d12d571c2b
|
Refactor code
|
3 years ago |
|
wenxu12345
|
7e13cc84c8
|
Refactor code
|
3 years ago |
|
wenxu12345
|
17b96dd7c1
|
Refactor code
|
3 years ago |
|
wenxu12345
|
4601633605
|
Refactor code
|
3 years ago |
|
wenxu12345
|
6f411e96ed
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
3d994cc2cf
|
Refactor code
|
3 years ago |
|
Gordon
|
6bc69d5a75
|
proto json tag modify
|
3 years ago |
|
wenxu12345
|
b495761283
|
Refactor code
|
3 years ago |
|
wenxu12345
|
29e92015d5
|
Refactor code
|
3 years ago |
|
wenxu12345
|
c71f2f7fae
|
Refactor code
|
3 years ago |
|
wenxu12345
|
59a5f675f6
|
Refactor code
|
3 years ago |
|
wenxu12345
|
d80a669515
|
Refactor code
|
3 years ago |
|
wenxu12345
|
bc0c5d4fcb
|
Refactor code
|
3 years ago |
|
wenxu12345
|
d5b5929e9b
|
Refactor code
|
3 years ago |
|
wenxu12345
|
fea89ad451
|
Refactor code
|
3 years ago |
|
wenxu12345
|
3d6f1e42d2
|
Refactor code
|
3 years ago |
|
wenxu12345
|
1ad80e1870
|
Refactor code
|
3 years ago |
|
wenxu12345
|
ea0b8df5d4
|
Refactor code
|
3 years ago |
|
wenxu12345
|
0e39aac5cd
|
Refactor code
|
3 years ago |
|
wenxu12345
|
7e88621aa1
|
Refactor code
|
3 years ago |
|
wenxu12345
|
9b76407193
|
Refactor code
|
3 years ago |
|
wenxu12345
|
b6bd2687d2
|
Refactor code
|
3 years ago |
|
wenxu12345
|
82c0f8a863
|
Refactor code
|
3 years ago |
|
wenxu12345
|
1290bc8cc9
|
Refactor code
|
3 years ago |
|
wenxu12345
|
fe285ecd6b
|
Refactor code
|
3 years ago |
|
wenxu12345
|
da7d187612
|
Refactor code
|
3 years ago |
|
wenxu12345
|
492915567b
|
Refactor code
|
3 years ago |
|
wenxu12345
|
8b1a7def38
|
Refactor code
|
3 years ago |
|
wenxu12345
|
7574d06718
|
Refactor code
|
3 years ago |
|
wenxu12345
|
4336a1a13e
|
Refactor code
|
3 years ago |
|
Gordon
|
6790d2be44
|
err log
|
3 years ago |
|
wenxu12345
|
e8ffcb0630
|
Refactor code
|
3 years ago |
|
wenxu12345
|
88aaa38676
|
Refactor code
|
3 years ago |
|
wenxu12345
|
6692867db5
|
Refactor code
|
3 years ago |
|
wenxu12345
|
7c3e429f22
|
Refactor code
|
3 years ago |
|
wenxu12345
|
cb79b1aea5
|
Refactor code
|
3 years ago |
|
wenxu12345
|
83874ad466
|
Refactor code
|
3 years ago |
|
wenxu12345
|
c0172b0a49
|
Refactor code
|
3 years ago |
|
wenxu12345
|
6d9ee74360
|
Refactor code
|
3 years ago |
|
wenxu12345
|
3f639e2ffe
|
Refactor code
|
3 years ago |
|
wenxu12345
|
2725a1cd8d
|
Refactor code
|
3 years ago |
|
wenxu12345
|
d7dbe986f1
|
Refactor code
|
3 years ago |
|
wenxu12345
|
e39312828c
|
Refactor code
|
3 years ago |
|
wenxu12345
|
faae2d7a1e
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
ca92bc899b
|
Refactor code
|
3 years ago |
|
Gordon
|
ace5fd61bd
|
nil return modify
|
3 years ago |
|
Gordon
|
b4935fef76
|
nil return modify
|
3 years ago |
|
Gordon
|
d1fba4c125
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
de8ac68466
|
nil return modify
|
3 years ago |
|
Gordon
|
0392eab129
|
nil return modify
|
3 years ago |
|
wenxu12345
|
479ce592fa
|
Refactor code
|
3 years ago |
|
Gordon
|
abd91260ab
|
nil return modify
|
3 years ago |
|
Gordon
|
6f03c470ae
|
nil return modify
|
3 years ago |
|
Gordon
|
8faf1140fb
|
nil return modify
|
3 years ago |
|
Gordon
|
bd5480b264
|
nil return modify
|
3 years ago |
|
Gordon
|
7c04bcae26
|
nil return modify
|
3 years ago |
|
Gordon
|
1ce2a86f37
|
nil return modify
|
3 years ago |
|
wenxu12345
|
667ceb2115
|
Refactor code
|
3 years ago |
|
wenxu12345
|
943f58f2c0
|
Refactor code
|
3 years ago |
|
wenxu12345
|
740dd0e0a6
|
Refactor code
|
3 years ago |
|
wenxu12345
|
2fcd21ae94
|
Refactor code
|
3 years ago |
|
wenxu12345
|
c312f079fb
|
Refactor code
|
3 years ago |
|
wenxu12345
|
a480dfe59e
|
Refactor code
|
3 years ago |
|
wenxu12345
|
51cb558317
|
Refactor code
|
3 years ago |
|
wenxu12345
|
f0c5b1e544
|
Refactor code
|
3 years ago |
|
wenxu12345
|
3737e889ea
|
Refactor code
|
3 years ago |
|
wenxu12345
|
ec144da8ce
|
Refactor code
|
3 years ago |
|
wenxu12345
|
47a3c3c253
|
tidy code
|
3 years ago |
|
wenxu12345
|
39ceb20332
|
tidy code
|
3 years ago |
|
wenxu12345
|
da73347231
|
tidy code
|
3 years ago |
|
wenxu12345
|
e26c3d9462
|
tidy code
|
3 years ago |
|
wenxu12345
|
f4c3c86dd1
|
tidy code
|
3 years ago |
|
wenxu12345
|
2b60430c55
|
tidy code
|
3 years ago |
|
wenxu12345
|
b6944c4308
|
tidy code
|
3 years ago |
|
wenxu12345
|
4223b2d0f0
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
c0db257e9b
|
tidy code
|
3 years ago |
|
wenxu12345
|
6b1f4e1686
|
tidy code
|
3 years ago |
|
Gordon
|
6e8080b87d
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
292a8620e0
|
remove invalid token
|
3 years ago |
|
wenxu12345
|
f0f1c54244
|
tidy code
|
3 years ago |
|
wenxu12345
|
e439ef4ddd
|
tidy code
|
3 years ago |
|
wenxu12345
|
3d4e0a0479
|
tidy code
|
3 years ago |
|
wenxu12345
|
e64bc40ca9
|
notification
|
3 years ago |
|
Gordon
|
b76aa03d3a
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
# pkg/proto/sdk_ws/ws.pb.go
|
3 years ago |
|
Gordon
|
5f09d6a26f
|
send msg file modify
|
3 years ago |
|
wenxu12345
|
27fd4f444b
|
notification
|
3 years ago |
|
wenxu12345
|
75e1e2e678
|
notification
|
3 years ago |
|
Gordon
|
f933abe48e
|
add check user is registered
|
3 years ago |
|
Gordon
|
d6ec8f4930
|
pb change
|
3 years ago |
|
Gordon
|
7da98935b9
|
redis add func
|
3 years ago |
|
Gordon
|
d50a0abd2a
|
send message by message receive opt
|
3 years ago |
|
Gordon
|
cd14f3e649
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
70eaa7d968
|
redis add message receive opt
|
3 years ago |
|
wenxu12345
|
f1b51f9c97
|
fix bug: QuitGroup Find ->Scan
|
3 years ago |
|
Gordon
|
e6b5819099
|
redis prefix modify
|
3 years ago |
|
Gordon
|
f08941c0bd
|
demo merge into project
|
3 years ago |
|
Gordon
|
15660663f6
|
demo merge into project
|
3 years ago |
|
Gordon
|
bd62da8e1a
|
test modify
|
3 years ago |
|
Gordon
|
df592d99dd
|
test modify
|
3 years ago |
|
Gordon
|
39f5e13463
|
test modify
|
3 years ago |
|
Gordon
|
58785e9470
|
test modify
|
3 years ago |
|
Gordon
|
3495d75a6f
|
test modify
|
3 years ago |
|
Gordon
|
bee12423b0
|
test modify
|
3 years ago |
|
Gordon
|
a705e595ee
|
test modify
|
3 years ago |
|
Gordon
|
45f29c4c6f
|
test modify
|
3 years ago |
|
Gordon
|
5f90851458
|
test modify
|
3 years ago |
|
Gordon
|
01515f919d
|
test modify
|
3 years ago |
|
Gordon
|
a2292b1177
|
test modify
|
3 years ago |
|
Gordon
|
b2f5f56fa0
|
test modify
|
3 years ago |
|
Gordon
|
2be1e1a70d
|
test modify
|
3 years ago |
|
Gordon
|
b416cd380a
|
test modify
|
3 years ago |
|
Gordon
|
f18f54afc6
|
test modify
|
3 years ago |
|
Gordon
|
0ea48af892
|
panic output detail info
|
3 years ago |
|
Gordon
|
72b09864ce
|
panic output detail info
|
3 years ago |
|
Gordon
|
7a3b56955c
|
multi terminal kick eachOther
|
3 years ago |
|
Gordon
|
5dcb7f2a80
|
multi terminal kick eachOther
|
3 years ago |
|
Gordon
|
e7e3b6dd15
|
multi terminal kick eachOther
|
3 years ago |
|
Gordon
|
46deb5a099
|
merge newest branch
|
3 years ago |
|
Gordon
|
6158ea436d
|
merge newest branch
|
3 years ago |
|
Gordon
|
b729cac998
|
add timer update redis minSeq
|
3 years ago |
|
Gordon
|
8a92326241
|
merge all branch and change project structure
|
3 years ago |
binyan.li
|
04ad424efa
|
fix :mysql index field is too long, resulting in table creation failure (#40)
|
3 years ago |
xmcy0011
|
737edb985b
|
mv src/common src/utils src/grpc-etcdv3 to pkg
|
3 years ago |
