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 |
|
Gordon
|
e9bf26e0ca
|
pb file
|
3 years ago |
wenxu12345
|
ec0319d256
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
3 years ago |
|
wenxu12345
|
1bfefbd083
|
super group
|
3 years ago |
|
wangchuxiao
|
8967343079
|
superGroup
|
3 years ago |
|
wangchuxiao
|
b3ba06aecb
|
superGroup
|
3 years ago |
|
wangchuxiao
|
b55e13dbeb
|
superGroup
|
3 years ago |
|
wangchuxiao
|
bbe8c46df9
|
callback
|
3 years ago |
|
wangchuxiao
|
a4c0728e28
|
callback
|
3 years ago |
|
wangchuxiao
|
3f126be081
|
callback
|
3 years ago |
|
wangchuxiao
|
f5befcc95f
|
callback
|
3 years ago |
|
wangchuxiao
|
1eeb7f8303
|
callback
|
3 years ago |
|
wangchuxiao
|
4b7177101a
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
b4da35a0ab
|
ingress
|
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
|
e961a44511
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
# internal/rpc/msg/rpcChat.go
|
3 years ago |
|
wangchuxiao
|
c16a35ec8c
|
del msg
|
3 years ago |
|
wangchuxiao
|
841566a5d1
|
del msg
|
3 years ago |
|
Gordon
|
e9a515ac34
|
message update
|
3 years ago |
|
Gordon
|
b14b53329c
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
b8641258d6
|
message update
|
3 years ago |
|
wangchuxiao
|
18eaae80ec
|
del msg
|
3 years ago |
|
Gordon
|
f8bed154ce
|
pb file
|
3 years ago |
|
Gordon
|
8ee3f7ab66
|
pb file
|
3 years ago |
|
wenxu12345
|
1246f3aa21
|
msg cache
|
3 years ago |
|
wenxu12345
|
49cd31fd41
|
msg cache
|
3 years ago |
|
Gordon
|
ae0cfe1575
|
redis add get message
|
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 |
|
Gordon
|
66c62d8875
|
consumer update
|
3 years ago |
|
Gordon
|
b7309cdda8
|
log
|
3 years ago |
|
wangchuxiao
|
8c64538207
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
d1cb176b31
|
del msg sync
|
3 years ago |
|
skiffer-git
|
d276be9594
|
Reduce memory copies
|
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 |
|
Gordon
|
ee0a71de1b
|
concurrent consumption of messages
|
3 years ago |
|
wangchuxiao
|
23b03919e6
|
office tag async send
|
3 years ago |
|
Gordon
|
4f165f3b27
|
statistic update
|
3 years ago |
|
Gordon
|
967a4c7748
|
statistic update
|
3 years ago |
|
Gordon
|
355b64fda4
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
c1632f8e65
|
tag message sender not notification
|
3 years ago |
|
skiffer-git
|
313cf858f0
|
Statistics
|
3 years ago |
|
Gordon
|
fa94fd075f
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
3433d211a5
|
options add value
|
3 years ago |
|
wangchuxiao
|
2454c50380
|
organization
|
3 years ago |
|
wangchuxiao
|
2534921af9
|
organization
|
3 years ago |
|
wangchuxiao
|
be10e6a9de
|
organization
|
3 years ago |
|
wangchuxiao
|
6b5fb81e01
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
bb5991b111
|
organization
|
3 years ago |
|
wenxu12345
|
2edd3c5614
|
When you create a group chat, the group member can be empty
|
3 years ago |
|
Gordon
|
f8af109821
|
send group message split topic
|
3 years ago |
|
wenxu12345
|
17e1fa54cf
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
a4f5dd9d89
|
add log
|
3 years ago |
|
wangchuxiao
|
3fca780132
|
update app
|
3 years ago |
|
wangchuxiao
|
b5e01dcb5e
|
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
|
2c89d80a27
|
update app
|
3 years ago |
|
wangchuxiao
|
e314fd4a0a
|
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
|
7a78e5d869
|
update app
|
3 years ago |
|
wangchuxiao
|
f85645a78a
|
update app
|
3 years ago |
|
wangchuxiao
|
e412abd017
|
update app
|
3 years ago |
|
wangchuxiao
|
1efa654e7d
|
update app
|
3 years ago |
|
wangchuxiao
|
00b58068dc
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
7be5208daf
|
update app
|
3 years ago |
|
wenxu12345
|
7ad555a41b
|
add ParseToken
|
3 years ago |
|
wenxu12345
|
872f70a418
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
c37d2e78d2
|
add ParseToken
|
3 years ago |
|
wangchuxiao
|
b606d066fc
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
d4608eec26
|
update app
|
3 years ago |
|
wenxu12345
|
2dab5e4a78
|
add ParseToken
|
3 years ago |
|
wenxu12345
|
74cea2b41c
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wangchuxiao
|
46f9a00b75
|
update app
|
3 years ago |
|
wenxu12345
|
450d8c21cf
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
2073bc77c8
|
add ParseToken
|
3 years ago |
|
wangchuxiao
|
e27b98cdc1
|
update app
|
3 years ago |
|
wangchuxiao
|
30fc4c28b7
|
cache
|
3 years ago |
|
Gordon
|
74b582369a
|
log change
|
3 years ago |
|
Gordon
|
c9ab2b507b
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
2b479319c1
|
log change
|
3 years ago |
|
wangchuxiao
|
3a3ac012bb
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
00265a7e8e
|
cache
|
3 years ago |
|
wenxu12345
|
6226f65e20
|
add ParseToken
|
3 years ago |
|
wenxu12345
|
7de29c29e9
|
add ParseToken
|
3 years ago |
|
wenxu12345
|
c234e2ca3d
|
log
|
3 years ago |
|
wenxu12345
|
98d5f5ee3e
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
ba16fceeb8
|
log
|
3 years ago |
|
Gordon
|
c49b5f78bf
|
test
|
3 years ago |
|
Gordon
|
e2cacd9c4b
|
test
|
3 years ago |
|
skiffer-git
|
a251d521a1
|
set api ip in config
|
3 years ago |
|
skiffer-git
|
dca16e83d3
|
rpc register ip
|
3 years ago |
|
skiffer-git
|
e122349f9e
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
bb07c3ab45
|
add err log
|
3 years ago |
|
wangchuxiao
|
bbc3f5c19a
|
cache
|
3 years ago |
|
skiffer-git
|
a9ce8a3b2e
|
upgrade etcd & grpc
|
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
|
e26f9c58fa
|
office
|
3 years ago |
|
wangchuxiao
|
3a06617a7d
|
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 |
|
wenxu12345
|
8e17b3ff51
|
Revert "update etcd to v3.5.2 (#206)"
This reverts commit 766b6e9f
|
3 years ago |
|
wenxu12345
|
b932a659b6
|
etcd
|
3 years ago |
|
wenxu12345
|
80b2ed19e0
|
etcd
|
3 years ago |
|
wenxu12345
|
88000926f4
|
etcd
|
3 years ago |
|
wenxu12345
|
12245fefed
|
etcd
|
3 years ago |
|
wenxu12345
|
c5b0e31d36
|
config
|
3 years ago |
|
wenxu12345
|
e68086e149
|
config
|
3 years ago |
|
wenxu12345
|
16a2d80801
|
config
|
3 years ago |
|
wenxu12345
|
d5e5659a2c
|
config
|
3 years ago |
|
wenxu12345
|
3c2e8dcf87
|
config
|
3 years ago |
|
Gordon
|
bcbade3729
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
bf154eb8c3
|
Merge branch 'main' into tuoyun
# Conflicts:
# script/sdk_svr_start.sh
|
3 years ago |
yiippee
|
766b6e9fef
|
update etcd to v3.5.2 (#206)
Co-authored-by: lizhanbin <lizhanbin@52tt.com>
|
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
|
f662defcf9
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
8f07f8e9e1
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
7e44f7f110
|
cache rpc
|
3 years ago |
|
skiffer-git
|
b211a66e99
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wangchuxiao
|
bd7266653f
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
08f968dced
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
9f9ebd838a
|
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
|
03b35721a2
|
work_moments
|
3 years ago |
|
wangchuxiao
|
1b968903e2
|
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
|
3247d84b6b
|
add modify conversation api
|
3 years ago |
|
Gordon
|
e73f0a916a
|
add modify conversation api
|
3 years ago |
|
Gordon
|
150af5ff8b
|
@ people update
|
3 years ago |
|
Gordon
|
df17dd749f
|
add rpc conversation
|
3 years ago |
|
Gordon
|
91303acdbe
|
conversation update
|
3 years ago |
|
Gordon
|
e682b408f3
|
conversation update
|
3 years ago |
|
skiffer-git
|
0a0c206998
|
add cache
|
3 years ago |
|
wangchuxiao
|
f779ed7628
|
workMoments
|
3 years ago |
|
wangchuxiao
|
f2fdb74f23
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
4ba87e3349
|
workMoments
|
3 years ago |
|
Gordon
|
159a9e00c8
|
conversation update
|
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
|
5eef365baf
|
workMoments
|
3 years ago |
|
wangchuxiao
|
937ff63af9
|
workMoments
|
3 years ago |
|
wangchuxiao
|
33211bfb27
|
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 |
|
skiffer-git
|
2bdaaa5a33
|
log
|
3 years ago |
|
Gordon
|
b865f5d6e7
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
00664822ec
|
conversation add fields
|
3 years ago |
|
skiffer-git
|
4594c15de7
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
2b6ec1672c
|
Organization
|
3 years ago |
|
Gordon
|
d44d5711cb
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
54cb13ba62
|
pb file
|
3 years ago |
|
Gordon
|
c32f5dd951
|
pb file
|
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
|
e7661fd4be
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
957e11eff0
|
workMoments
|
3 years ago |
|
skiffer-git
|
97fd107f47
|
add operationID when ws connecting
|
3 years ago |
|
skiffer-git
|
fc688dca99
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
fe3bd2a1f1
|
add operationID when ws connecting
|
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
|
f6b30ed0c6
|
organization
|
3 years ago |
|
skiffer-git
|
248de7f1f2
|
set groupmember nickname
|
3 years ago |
|
skiffer-git
|
3bbf84861e
|
organization
|
3 years ago |
|
skiffer-git
|
803d0c2ae2
|
organization
|
3 years ago |
|
skiffer-git
|
06e44cc649
|
organization
|
3 years ago |
|
skiffer-git
|
ecc47dcfbb
|
organization
|
3 years ago |
|
skiffer-git
|
b6e06dfdc2
|
organization
|
3 years ago |
|
skiffer-git
|
80ba371296
|
organization
|
3 years ago |
|
skiffer-git
|
6787563efe
|
organization
|
3 years ago |
|
skiffer-git
|
9def85f9ba
|
organization
|
3 years ago |
|
skiffer-git
|
6184eaa30e
|
organization
|
3 years ago |
|
skiffer-git
|
bbcb3e9403
|
organization
|
3 years ago |
|
skiffer-git
|
3d690b7c72
|
organization
|
3 years ago |
|
skiffer-git
|
b4ab2c69ae
|
organization
|
3 years ago |
|
skiffer-git
|
9e18bcaeb8
|
organization
|
3 years ago |
|
skiffer-git
|
af5ee45206
|
organization
|
3 years ago |
|
skiffer-git
|
42af55a740
|
organization
|
3 years ago |
|
skiffer-git
|
3c1e6d0e5c
|
organization
|
3 years ago |
|
skiffer-git
|
edf7df368e
|
organization
|
3 years ago |
|
skiffer-git
|
cde38e012f
|
organization
|
3 years ago |
|
skiffer-git
|
0d5132f710
|
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
|
9976b8132f
|
getui
|
3 years ago |
|
wangchuxiao
|
dbc5bd96f3
|
getui
|
3 years ago |
|
wangchuxiao
|
9489ab862b
|
getui
|
3 years ago |
|
wangchuxiao
|
1bb634bc6f
|
merge code
|
3 years ago |
|
wangchuxiao
|
07b5c7fef4
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
4a7cfab543
|
getui
|
3 years ago |
|
Gordon
|
4f8fcd2d3d
|
push update
|
3 years ago |
|
wangchuxiao
|
d670356388
|
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 |
|
wangchuxiao
|
4a8d37bde1
|
getui
|
3 years ago |
|
wangchuxiao
|
4264cd8830
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
edcc215774
|
getui
|
3 years ago |
|
skiffer-git
|
3085fffb49
|
add department db
|
3 years ago |
|
Gordon
|
2a0f8f5ce3
|
note
|
3 years ago |
|
wangchuxiao
|
06370a763c
|
getui
|
3 years ago |
|
wangchuxiao
|
cbe3abeab0
|
getui
|
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 |
|
wenxu12345
|
6efe13d142
|
log
|
3 years ago |
|
wangchuxiao
|
146aa497f9
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
26f8172b1a
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
f4921d1317
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
b82ff7b88d
|
tips info
|
3 years ago |
|
wangchuxiao
|
0e27b302bc
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
bb267ccae7
|
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 |
|
wenxu12345
|
ecd2f0e2bf
|
Merge log files
|
3 years ago |
|
Gordon
|
60418276bd
|
oa notification add
|
3 years ago |
|
Gordon
|
6744745152
|
token add operationID
|
3 years ago |
|
skiffer-git
|
009ae6a235
|
mute group
|
3 years ago |
|
skiffer-git
|
bf5f72c00b
|
mute group
|
3 years ago |
|
skiffer-git
|
84aca5b9e1
|
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 |
|
skiffer-git
|
373e6b6c8e
|
mute group
|
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
|
1bd8154ac4
|
tag
|
3 years ago |
|
wangchuxiao
|
d2fa0e7852
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
f2b324abc2
|
tag
|
3 years ago |
|
skiffer-git
|
d2225dd841
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
8d26aa86b9
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wangchuxiao
|
7e937d7d29
|
tag
|
3 years ago |
|
skiffer-git
|
fe4b534b78
|
mute group
|
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 |
|
wenxu12345
|
d3c8215e15
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
30bc6c274e
|
mute group
|
3 years ago |
|
skiffer-git
|
ecb1068f0b
|
mute group
|
3 years ago |
|
wenxu12345
|
f6eef21b45
|
mute group
|
3 years ago |
|
skiffer-git
|
1aeff25316
|
mute group
|
3 years ago |
|
skiffer-git
|
6de569537f
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
764bc3fead
|
mute group
|
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 |
|
skiffer-git
|
391e525fc5
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
afc32b1cfa
|
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 |
|
Gordon
|
7827749453
|
tag notification
|
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
|
a6d8f7ea24
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
574c7600e0
|
tag
|
3 years ago |
|
Gordon
|
d1c0205d77
|
add oa notification
|
3 years ago |
|
wangchuxiao
|
dc1a0f050e
|
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
|
e7b95892ff
|
minio upload api
|
3 years ago |
|
wangchuxiao
|
df4a75f4b0
|
mongo
|
3 years ago |
|
wangchuxiao
|
4bdb4cbbb5
|
mongo
|
3 years ago |
|
wangchuxiao
|
e6c36411cb
|
mongo
|
3 years ago |
|
wangchuxiao
|
cc1ad41e94
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
8a38646bc5
|
mongo
|
3 years ago |
hxnets
|
6c43f75f9f
|
新增阿里云OSS文件上传参数获取接口 (#115)
* configure update
* mongo:4.0
* open-im-server -> open_im_server
* sleep 15
* 0.0.0.0
* sleep 10 15
* Update config.yaml
* config
* Update docker-compose.yaml
* Update config.yaml
* Create ISSUE_TEMPLATE.md
* Update ISSUE_TEMPLATE.md
* Create ISSUE_TEMPLATE
* add issue template
* add issue template
* add issue template
* add issue template
* Update README.md
* script
* script
* script
* config
* script
* config update
* script update
* image: openim/open_im_server:v1.0.6
* script
* script
* script
* version update
* sender message sync
* version update
* 阿里云oss sts上传参数
* 阿里云oss sts上传参数
Co-authored-by: wenxu12345 <44203734@qq.com>
Co-authored-by: skiffer-git <72860476+skiffer-git@users.noreply.github.com>
Co-authored-by: Gordon <1432970085@qq.com>
Co-authored-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
|
3 years ago |
马守越
|
1ab3e04cba
|
新增mongo.dbUrl配置 (#174)
* 当dbUri值不为空则直接使用该值
* 新增支持ali oss
Co-authored-by: mashouyue's m1max <mashouyue@toowow.cn>
|
3 years ago |
Arthur
|
1b8f664c8a
|
fix: json tag value of UserIDResult.UserID (#178)
Signed-off-by: arthur <yang_yapo@126.com>
|
3 years ago |
|
Gordon
|
f93d22ae22
|
log update
|
3 years ago |
|
wangchuxiao
|
d77894c8fe
|
rtc add
|
3 years ago |
|
wangchuxiao
|
366f7621fa
|
rtc add
|
3 years ago |
|
wangchuxiao
|
604de144b9
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
Gordon
|
5dddaeb6e5
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
7790686a84
|
ws add token platform verify
|
3 years ago |
|
wenxu12345
|
60950f056b
|
fix bug : etcd Put failed etcdserver: requested lease not found
|
3 years ago |
|
wangchuxiao
|
ef07634e09
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
f70a20f740
|
rtc add
|
3 years ago |
|
wenxu12345
|
c1cda2d536
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
2b03e7aea8
|
add log
|
3 years ago |
|
wangchuxiao
|
58cea3e947
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
f02fb7ba15
|
rtc add
|
3 years ago |
|
Gordon
|
bf09c88e6e
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
cb8f7e0ddb
|
mongo single node
|
3 years ago |
|
wenxu12345
|
f63aa33082
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
7bdf6717e1
|
add log
|
3 years ago |
|
Gordon
|
2fc2801ad4
|
mongo single node
|
3 years ago |
|
wangchuxiao
|
a0e3488af0
|
rtc proto modify
|
3 years ago |
|
wangchuxiao
|
8fef1f975a
|
rtc add
|
3 years ago |
|
wangchuxiao
|
17fad47ca1
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
b0aa168c9a
|
rtc add
|
3 years ago |
|
wenxu12345
|
11c65e6b90
|
signaling add participant
|
3 years ago |
|
wenxu12345
|
e9699ed8cc
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
812362338e
|
signaling add participant
|
3 years ago |
|
wangchuxiao
|
fa21ae6161
|
rtc add
|
3 years ago |
|
wenxu12345
|
27c6a187a2
|
signaling
|
3 years ago |
|
wenxu12345
|
5f37414fee
|
delete msg from server
|
3 years ago |
|
wenxu12345
|
e95644ada2
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
ab4aee93c1
|
delete msg from server
|
3 years ago |
|
Gordon
|
5df94a03fe
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
ab9f3a1635
|
add friend and blacklist judge
|
3 years ago |
|
wenxu12345
|
e0a86a8016
|
delete msg from server
|
3 years ago |
|
wenxu12345
|
204b27ca5d
|
pb platformID
|
3 years ago |
|
Gordon
|
dde8f427af
|
pb modify
|
3 years ago |
|
wenxu12345
|
b4c16002ff
|
signaling
|
3 years ago |
|
Gordon
|
ca23c76426
|
pb modify
|
3 years ago |
|
wenxu12345
|
185f3c05fb
|
signaling
|
3 years ago |
|
Gordon
|
bde88ecc79
|
server modify
|
3 years ago |
|
wenxu12345
|
83fffe717e
|
signaling
|
3 years ago |
|
Gordon
|
9b61fb1f85
|
ws modify
|
3 years ago |
|
wenxu12345
|
fa53530055
|
signaling
|
3 years ago |
|
Gordon
|
02d0b4c99b
|
ws.proto
|
3 years ago |
|
wangchuxiao
|
347b1dd31c
|
livekit
|
3 years ago |
|
wangchuxiao
|
d90b31c5df
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
Gordon
|
965dac5ff9
|
constant
|
3 years ago |
|
wenxu12345
|
564f77bcdc
|
signaling
|
3 years ago |
|
Gordon
|
6136ac4116
|
ws proto modify
|
3 years ago |
|
Gordon
|
bba84b4d11
|
ws proto modify
|
3 years ago |
|
wenxu12345
|
b52317f56b
|
signaling
|
3 years ago |
|
wenxu12345
|
98f2806be6
|
signaling
|
3 years ago |
|
wangchuxiao
|
3693d2e93d
|
conversation table
|
3 years ago |
|
wenxu12345
|
9ab9ae0408
|
signal
|
3 years ago |
|
wenxu12345
|
0abb4a82b1
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
94a579e7d3
|
signal
|
3 years ago |
|
Gordon
|
24e04f1303
|
utils modify
|
3 years ago |
|
wangchuxiao
|
51c2f845d8
|
opt
|
3 years ago |
|
Gordon
|
edc81534c4
|
ws modify
|
3 years ago |
|
wenxu12345
|
b10ba999cd
|
join time
|
3 years ago |
|
wenxu12345
|
c4554cb4e9
|
1.statistics log
2. Handle exception : etcd keepalive failed
|
3 years ago |
|
wenxu12345
|
0e575a9366
|
keepalive ttl * 3
add user.ex
|
3 years ago |
|
Gordon
|
15aabb3859
|
log
|
3 years ago |
|
Gordon
|
e734b000de
|
log
|
3 years ago |
|
Gordon
|
a7c8eda290
|
log
|
3 years ago |
|
Gordon
|
1bcd2d4531
|
log
|
3 years ago |
|
Gordon
|
7e9234e712
|
log
|
3 years ago |
|
Gordon
|
af2917adb9
|
log
|
3 years ago |
|
Gordon
|
8dc04667b0
|
test recover
|
3 years ago |
|
wangchuxiao
|
bcae7720e1
|
add callback
|
3 years ago |
|
wangchuxiao
|
a5712e1216
|
msg callback
|
3 years ago |
|
wangchuxiao
|
3805db1263
|
msg callback
|
3 years ago |
|
wangchuxiao
|
4d4520226d
|
msg callback
|
3 years ago |
|
wangchuxiao
|
2ed3fd3cba
|
alter callback fg
|
3 years ago |
|
wangchuxiao
|
9cec4b0c8e
|
alter callback fg
|
3 years ago |
