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
|
3 years ago |
|
wangchuxiao
|
2e3b55d9e8
|
singal offline push
|
3 years ago |
|
wangchuxiao
|
6b8ebe11de
|
singal offline push
|
3 years ago |
|
wangchuxiao
|
1fffd36054
|
singal offline push
|
3 years ago |
|
wangchuxiao
|
2b25fea86c
|
singal offline push
|
3 years ago |
|
wangchuxiao
|
409a8311b1
|
singal offline push
|
3 years ago |
|
wangchuxiao
|
6996c008d0
|
singal offline push
|
3 years ago |
|
wangchuxiao
|
16d33b1c1f
|
singal offline push
|
3 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 |
|
Gordon
|
7285e2b2c9
|
add super group
|
3 years ago |
|
wangchuxiao
|
8967343079
|
superGroup
|
3 years ago |
|
wangchuxiao
|
8cdcd7105a
|
superGroup
|
3 years ago |
|
wangchuxiao
|
cc6d8d28b5
|
superGroup
|
3 years ago |
|
wangchuxiao
|
b55e13dbeb
|
superGroup
|
3 years ago |
|
wangchuxiao
|
bbe8c46df9
|
callback
|
3 years ago |
|
wangchuxiao
|
16a56457ed
|
callback
|
3 years ago |
|
wangchuxiao
|
d6907f3f3a
|
callback
|
3 years ago |
|
wangchuxiao
|
cbf0b3c05e
|
callback
|
3 years ago |
|
wangchuxiao
|
0f0470b93c
|
callback
|
3 years ago |
|
wangchuxiao
|
f54ba4b018
|
callback
|
3 years ago |
|
wangchuxiao
|
884b410dce
|
callback
|
3 years ago |
|
wangchuxiao
|
e5945fa720
|
callback
|
3 years ago |
|
wangchuxiao
|
b155a9908b
|
callback
|
3 years ago |
|
wangchuxiao
|
d67e4a3491
|
callback
|
3 years ago |
|
wangchuxiao
|
f5befcc95f
|
callback
|
3 years ago |
|
wangchuxiao
|
098f8a52f7
|
callback
|
3 years ago |
|
wangchuxiao
|
1eeb7f8303
|
callback
|
3 years ago |
|
wangchuxiao
|
b4da35a0ab
|
ingress
|
3 years ago |
|
wangchuxiao
|
9beff11125
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
d8c0a82411
|
ingress
|
3 years ago |
|
Gordon
|
2add9a02f9
|
channelNum
|
3 years ago |
|
Gordon
|
2910a6effd
|
channelNum
|
3 years ago |
|
Gordon
|
5621a651a1
|
channelNum
|
3 years ago |
|
Gordon
|
c83e816bda
|
channelNum
|
3 years ago |
|
Gordon
|
948e5a2dde
|
channelNum
|
3 years ago |
|
Gordon
|
94cd17909d
|
channelNum
|
3 years ago |
|
Gordon
|
bcfa3efef7
|
channelNum
|
3 years ago |
|
Gordon
|
bf87eb68e2
|
channelNum
|
3 years ago |
|
Gordon
|
ee47c6d727
|
channelNum
|
3 years ago |
|
Gordon
|
c997fbafb0
|
channelNum
|
3 years ago |
|
Gordon
|
17b7ef80ba
|
channelNum
|
3 years ago |
|
Gordon
|
dc2bc7fbf7
|
channelNum
|
3 years ago |
|
Gordon
|
7267fd080e
|
channelNum
|
3 years ago |
|
Gordon
|
2d8e03cc69
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
b797492dbd
|
channelNum
|
3 years ago |
|
Gordon
|
eb41d8b16d
|
channelNum
|
3 years ago |
|
Gordon
|
84e7935971
|
channelNum
|
3 years ago |
|
wenxu12345
|
e8fe7cc853
|
debug
|
3 years ago |
|
Gordon
|
746b01f8ca
|
push update
|
3 years ago |
|
wangchuxiao
|
9895806d23
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
5957e4b264
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
# internal/rpc/msg/rpcChat.go
|
3 years ago |
|
Gordon
|
c544c4d6b5
|
push update
|
3 years ago |
|
wangchuxiao
|
4d8708a5ee
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
# internal/rpc/msg/rpcChat.go
|
3 years ago |
|
wangchuxiao
|
9eb1870196
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
# internal/rpc/msg/rpcChat.go
|
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
|
841566a5d1
|
del msg
|
3 years ago |
|
Gordon
|
4a822c5920
|
push update
|
3 years ago |
|
Gordon
|
ce554fc442
|
push 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
|
6022aff965
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
18eaae80ec
|
del msg
|
3 years ago |
|
Gordon
|
a4e41462c7
|
message update
|
3 years ago |
|
Gordon
|
77c7efbe89
|
redis add get message
|
3 years ago |
|
Gordon
|
8d78ef5946
|
redis add get message
|
3 years ago |
|
Gordon
|
4571a3b50b
|
redis add get message
|
3 years ago |
|
Gordon
|
b48197c8aa
|
redis add get message
|
3 years ago |
|
Gordon
|
bb45c0c34b
|
redis add get message
|
3 years ago |
|
Gordon
|
25c316165e
|
redis add get message
|
3 years ago |
|
wenxu12345
|
1246f3aa21
|
msg cache
|
3 years ago |
|
Gordon
|
94e6380485
|
redis add get message
|
3 years ago |
|
Gordon
|
36b5315075
|
redis add get message
|
3 years ago |
|
Gordon
|
c66ccfeda2
|
redis add get message
|
3 years ago |
|
wenxu12345
|
db9913c725
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
c3e3f4e947
|
msg cache
|
3 years ago |
|
wangchuxiao
|
f33937bc5d
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
c176a5b80a
|
msg cache
|
3 years ago |
|
Gordon
|
d58f7fd089
|
redis add get message
|
3 years ago |
|
Gordon
|
ffae976e11
|
compose file update
|
3 years ago |
|
Gordon
|
a4d2740f24
|
consumer update test
|
3 years ago |
|
Gordon
|
df7266cc75
|
consumer update test
|
3 years ago |
|
Gordon
|
3255b73a44
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
305e81bef1
|
consumer update test
|
3 years ago |
|
wangchuxiao
|
84cc6e9140
|
k8s deploy
|
3 years ago |
|
Gordon
|
7fc6b61f21
|
consumer update
|
3 years ago |
|
Gordon
|
ed3a1296d8
|
consumer update
|
3 years ago |
|
wangchuxiao
|
ce15c26b59
|
k8s deploy
|
3 years ago |
|
wangchuxiao
|
8c64538207
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
0460033281
|
k8s deploy
|
3 years ago |
|
Gordon
|
e385f054df
|
message handle
|
3 years ago |
|
Gordon
|
50bb13b7cd
|
message handle
|
3 years ago |
|
wangchuxiao
|
d1cb176b31
|
del msg sync
|
3 years ago |
|
Gordon
|
767131a117
|
message handle
|
3 years ago |
|
Gordon
|
f0dadcef70
|
message handle
|
3 years ago |
|
skiffer-git
|
1f20024b91
|
log
|
3 years ago |
|
skiffer-git
|
f5c7197dda
|
log
|
3 years ago |
|
skiffer-git
|
bef0e40db8
|
log
|
3 years ago |
|
skiffer-git
|
24073b20ab
|
log
|
3 years ago |
|
skiffer-git
|
64d83d9048
|
log
|
3 years ago |
|
skiffer-git
|
5c0b06f27d
|
log
|
3 years ago |
|
skiffer-git
|
b09e2c11eb
|
sess == nil
|
3 years ago |
|
skiffer-git
|
8c119a76d1
|
sess == nil
|
3 years ago |
|
skiffer-git
|
04a9788bc0
|
log
|
3 years ago |
|
skiffer-git
|
883e7f96ee
|
log
|
3 years ago |
|
skiffer-git
|
d276be9594
|
Reduce memory copies
|
3 years ago |
|
skiffer-git
|
2fc6b0a8cb
|
log
|
3 years ago |
|
skiffer-git
|
9f295d8399
|
log
|
3 years ago |
|
skiffer-git
|
024f454702
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
821ad4de2e
|
log
|
3 years ago |
|
Gordon
|
b864f9c6a9
|
message
|
3 years ago |
|
Gordon
|
31e0a8a88b
|
log change
|
3 years ago |
|
Gordon
|
be3d2b6552
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
# internal/msg_transfer/logic/online_history_msg_handler.go
|
3 years ago |
|
Gordon
|
e2eb546069
|
log change
|
3 years ago |
|
skiffer-git
|
b2ae3b4fee
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
5b9e5f904b
|
log
|
3 years ago |
|
Gordon
|
7d1843f485
|
log change
|
3 years ago |
|
skiffer-git
|
f1e2704407
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
17b4a0525d
|
log
|
3 years ago |
|
Gordon
|
5cdba3c00a
|
log change
|
3 years ago |
|
Gordon
|
79b5551ec1
|
log change
|
3 years ago |
|
Gordon
|
01b065b3c2
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
55907a9a05
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
757829d286
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
c5f055718a
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
a12c8f4dbc
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
686d77dcc1
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
aa144b0439
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
15329a97fe
|
concurrent consumption of messages
|
3 years ago |
|
skiffer-git
|
223b2678b4
|
fix bug
|
3 years ago |
|
Gordon
|
930923e330
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
8fe929d8ab
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
e12207fc73
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
a2f7edcbcd
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
aa733542e3
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
2b142baf19
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
7ea1309146
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
06726758d2
|
concurrent consumption of messages
|
3 years ago |
|
skiffer-git
|
00a2a23190
|
batch to mongo
|
3 years ago |
|
skiffer-git
|
5f25e605d3
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
d4f81f086c
|
batch to mongo
|
3 years ago |
|
Gordon
|
d086de8103
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
a2888b009d
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
143e2908ad
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
ee0a71de1b
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
d92d6e84d0
|
push message
|
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 |
|
wangchuxiao
|
18a61061e1
|
office tag async send
|
3 years ago |
|
wangchuxiao
|
b0e349212d
|
office tag async send
|
3 years ago |
|
wangchuxiao
|
9913e67928
|
office tag async send
|
3 years ago |
|
wangchuxiao
|
888c837cdd
|
office tag async send
|
3 years ago |
|
wangchuxiao
|
0e03fb6393
|
organization
|
3 years ago |
|
wangchuxiao
|
317fed304c
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
681cf349e6
|
organization
|
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 |
|
skiffer-git
|
3046d63ad4
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
de9c2d3d85
|
mutex
|
3 years ago |
|
wangchuxiao
|
2454c50380
|
organization
|
3 years ago |
|
wangchuxiao
|
e2f8156a4d
|
organization
|
3 years ago |
|
wangchuxiao
|
6ea6a61e90
|
organization
|
3 years ago |
|
Gordon
|
381e72f1ef
|
send message
|
3 years ago |
|
Gordon
|
91fe549c25
|
add log
|
3 years ago |
|
Gordon
|
a472da9ea6
|
msg bug fix
|
3 years ago |
|
Gordon
|
20c7fe81dc
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
3ef445eb2e
|
msg bug fix
|
3 years ago |
|
wangchuxiao
|
4afc38523d
|
organization
|
3 years ago |
|
wangchuxiao
|
2534921af9
|
organization
|
3 years ago |
|
wangchuxiao
|
098dae9640
|
organization
|
3 years ago |
|
wangchuxiao
|
42c38de3e2
|
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
|
8f261970e9
|
Update group members' faceURL immediately
|
3 years ago |
|
Gordon
|
093a8f18ef
|
test
|
3 years ago |
|
Gordon
|
9c19b5b785
|
test
|
3 years ago |
|
Gordon
|
35958ca3a2
|
test
|
3 years ago |
|
Gordon
|
3bc2e97e8b
|
test
|
3 years ago |
|
Gordon
|
eb7ff77461
|
test
|
3 years ago |
|
Gordon
|
d36f4cf6f8
|
test
|
3 years ago |
|
Gordon
|
f373669f02
|
test
|
3 years ago |
|
Gordon
|
37596589a7
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
3e90426d8e
|
test
|
3 years ago |
|
wenxu12345
|
35a184827a
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
2edd3c5614
|
When you create a group chat, the group member can be empty
|
3 years ago |
|
Gordon
|
cec5a6ceeb
|
test
|
3 years ago |
|
Gordon
|
dc6b0b4dde
|
test
|
3 years ago |
|
Gordon
|
9a90c2e568
|
test
|
3 years ago |
|
Gordon
|
ab747d0338
|
test
|
3 years ago |
|
Gordon
|
8753f91a4a
|
send group message split topic
|
3 years ago |
|
Gordon
|
f8af109821
|
send group message split topic
|
3 years ago |
|
Gordon
|
804eb6c076
|
video message send
|
3 years ago |
|
wenxu12345
|
38535bde84
|
add RpcRegisterIP
|
3 years ago |
|
wenxu12345
|
17e1fa54cf
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
a4f5dd9d89
|
add log
|
3 years ago |
|
wangchuxiao
|
6269902140
|
update app
|
3 years ago |
|
wangchuxiao
|
b964e424b2
|
update app
|
3 years ago |
|
wangchuxiao
|
73665f62b3
|
update app
|
3 years ago |
|
wangchuxiao
|
98a903e60c
|
update app
|
3 years ago |
|
wangchuxiao
|
2c89d80a27
|
update app
|
3 years ago |
|
wangchuxiao
|
e314fd4a0a
|
update app
|
3 years ago |
|
wangchuxiao
|
affbe9f5a9
|
update app
|
3 years ago |
|
wangchuxiao
|
7137924baa
|
update app
|
3 years ago |
|
wangchuxiao
|
c998bce34f
|
update app
|
3 years ago |
|
wangchuxiao
|
f5d4397f0b
|
update app
|
3 years ago |
|
wangchuxiao
|
608b166b32
|
update app
|
3 years ago |
|
wangchuxiao
|
472cda8315
|
update app
|
3 years ago |
|
wangchuxiao
|
7a78e5d869
|
update app
|
3 years ago |
|
wangchuxiao
|
8effca3a7c
|
update app
|
3 years ago |
|
wangchuxiao
|
fab52b6a56
|
update app
|
3 years ago |
|
wangchuxiao
|
e98ef5f5f2
|
update app
|
3 years ago |
|
wangchuxiao
|
7aa84607c8
|
update app
|
3 years ago |
|
wangchuxiao
|
928fc374c7
|
update app
|
3 years ago |
|
wangchuxiao
|
4ea8cb5903
|
update app
|
3 years ago |
|
wangchuxiao
|
db6acacf2e
|
update app
|
3 years ago |
|
wangchuxiao
|
59aa71b3b8
|
update app
|
3 years ago |
|
wangchuxiao
|
ccfa487493
|
update app
|
3 years ago |
|
wangchuxiao
|
9fcc41aeff
|
update app
|
3 years ago |
|
wangchuxiao
|
d9a4fa3f49
|
update app
|
3 years ago |
|
wangchuxiao
|
6c821dc42a
|
update app
|
3 years ago |
|
wangchuxiao
|
d58e34ed3d
|
update app
|
3 years ago |
|
wangchuxiao
|
ff37d1cb02
|
update app
|
3 years ago |
|
wangchuxiao
|
dcf119ae59
|
update app
|
3 years ago |
|
wangchuxiao
|
1338cf875a
|
update app
|
3 years ago |
|
wangchuxiao
|
ed3e299e0b
|
update app
|
3 years ago |
|
wangchuxiao
|
f85645a78a
|
update app
|
3 years ago |
|
wangchuxiao
|
e412abd017
|
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
|
c37d2e78d2
|
add ParseToken
|
3 years ago |
|
wenxu12345
|
0bc8e231ad
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
2dab5e4a78
|
add ParseToken
|
3 years ago |
|
wangchuxiao
|
31bd106ffd
|
update app
|
3 years ago |
|
wangchuxiao
|
46f9a00b75
|
update app
|
3 years ago |
|
wangchuxiao
|
b6a5501f71
|
update app
|
3 years ago |
|
wangchuxiao
|
e27b98cdc1
|
update app
|
3 years ago |
|
wangchuxiao
|
8af500462f
|
update app
|
3 years ago |
|
wangchuxiao
|
30fc4c28b7
|
cache
|
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
|
7de29c29e9
|
add ParseToken
|
3 years ago |
|
Gordon
|
9303096430
|
log change
|
3 years ago |
|
Gordon
|
446688d5b2
|
test
|
3 years ago |
|
Gordon
|
e2cacd9c4b
|
test
|
3 years ago |
|
Gordon
|
d5c9e08888
|
manager send message to mysql duplicate primary key fix
|
3 years ago |
|
wangchuxiao
|
97e5d9f610
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
305ee394b1
|
cache
|
3 years ago |
|
skiffer-git
|
b5065cb52f
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
dca16e83d3
|
rpc register ip
|
3 years ago |
|
wangchuxiao
|
1b93ba5355
|
cache
|
3 years ago |
|
wangchuxiao
|
685fc1a37b
|
cache
|
3 years ago |
|
wangchuxiao
|
a738c93163
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
4ac863fa6a
|
cache
|
3 years ago |
|
skiffer-git
|
fed369ad5d
|
add err log
|
3 years ago |
|
skiffer-git
|
f2c91d015e
|
add err log
|
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
|
65a4b38ee5
|
cache
|
3 years ago |
|
wangchuxiao
|
bbc3f5c19a
|
cache
|
3 years ago |
|
wangchuxiao
|
0b4ba548a5
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
747b963bd4
|
cache
|
3 years ago |
|
skiffer-git
|
a9ce8a3b2e
|
upgrade etcd & grpc
|
3 years ago |
|
wangchuxiao
|
2cf070a26c
|
office
|
3 years ago |
|
wangchuxiao
|
3c68ecb7f1
|
office
|
3 years ago |
|
wangchuxiao
|
243f5fcda4
|
fix bug
|
3 years ago |
|
wangchuxiao
|
e22b7f36ce
|
fix bug
|
3 years ago |
|
Gordon
|
4ca758174e
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
bf8e35e168
|
log change
|
3 years ago |
|
wangchuxiao
|
2a3265ed71
|
office
|
3 years ago |
|
wangchuxiao
|
d75eb456dc
|
office
|
3 years ago |
|
skiffer-git
|
d9e74a78f0
|
delete msg by index
|
3 years ago |
|
skiffer-git
|
700483dd48
|
group chat log
|
3 years ago |
|
skiffer-git
|
1c80b820cb
|
group chat log
|
3 years ago |
|
skiffer-git
|
59e5cfb04d
|
group chat log
|
3 years ago |
|
skiffer-git
|
b06550e2cb
|
group chat log
|
3 years ago |
|
skiffer-git
|
ca4bf13569
|
group chat log
|
3 years ago |
|
skiffer-git
|
eae3a50435
|
group chat log
|
3 years ago |
|
skiffer-git
|
de2956ec3c
|
group chat log
|
3 years ago |
|
skiffer-git
|
a2e62c9fb5
|
fix bug: group chat share pb
|
3 years ago |
|
wangchuxiao
|
e7fdc318f1
|
cache bug fix
|
3 years ago |
|
wangchuxiao
|
62dd559b7c
|
cache bug fix
|
3 years ago |
|
skiffer-git
|
4a631753a0
|
add msgToMQSingle && msgToMQGroup
|
3 years ago |
|
wangchuxiao
|
91e03f7cfd
|
cache
|
3 years ago |
|
Gordon
|
c0314d95c9
|
send message parallel
|
3 years ago |
|
wangchuxiao
|
40ae6ccf2f
|
cache & workMoments
|
3 years ago |
|
wangchuxiao
|
d24a7d7b22
|
cache & workMoments
|
3 years ago |
|
wangchuxiao
|
6260cf24cc
|
cache
|
3 years ago |
|
wangchuxiao
|
20f61042fc
|
cache
|
3 years ago |
|
wangchuxiao
|
2751a967e8
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
93057870a7
|
cache
|
3 years ago |
|
Gordon
|
eb63ed926d
|
log modify
|
3 years ago |
|
wangchuxiao
|
0aefbc2c7d
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
# internal/rpc/friend/firend.go
|
3 years ago |
|
wangchuxiao
|
eb1fa90788
|
cache
|
3 years ago |
|
wangchuxiao
|
65f02e5139
|
cache
|
3 years ago |
|
Gordon
|
bbfe65a905
|
send message add cache
|
3 years ago |
|
wangchuxiao
|
59468eb162
|
fix work moments bug
|
3 years ago |
|
wangchuxiao
|
1889a283ee
|
fix work moments bug
|
3 years ago |
|
wangchuxiao
|
a1b8c9b6fd
|
fix work moments bug
|
3 years ago |
|
wangchuxiao
|
74ee36f43a
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
f8c3e4d66f
|
Merge branch 'tuoyun'
# Conflicts:
# cmd/open_im_cms_api/main.go
# config/config.yaml
|
3 years ago |
|
wenxu12345
|
6db8d9a38a
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
61145a2d03
|
fix bug user_register port
|
3 years ago |
|
wangchuxiao
|
7b0eb4e79d
|
work moments
|
3 years ago |
|
wangchuxiao
|
17f6b8eb2a
|
work moments
|
3 years ago |
|
wangchuxiao
|
37c40d7dda
|
work moments
|
3 years ago |
|
wangchuxiao
|
1a2aa876e3
|
work moments
|
3 years ago |
|
wangchuxiao
|
39822f323f
|
work moments
|
3 years ago |
|
wangchuxiao
|
338acfba75
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
490f4f36f1
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
69c46f684f
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
1626406557
|
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 |
|
wenxu12345
|
4ee84e10fd
|
fix bug
|
3 years ago |
|
wenxu12345
|
ab706f4076
|
fix bug
|
3 years ago |
|
wangchuxiao
|
08f968dced
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
a03f89fb68
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
51146a4ed5
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
80301f2cb2
|
alter router
|
3 years ago |
|
Gordon
|
9a9f26c435
|
conversation update
|
3 years ago |
|
wenxu12345
|
a89bb33015
|
Adjust port
|
3 years ago |
|
wenxu12345
|
7659cca8ba
|
Adjust port
|
3 years ago |
|
wenxu12345
|
f754e951f7
|
Adjust port
|
3 years ago |
|
wenxu12345
|
e2905d01ac
|
Adjust port
|
3 years ago |
|
wangchuxiao
|
ac31c612b3
|
work_moments
|
3 years ago |
|
wangchuxiao
|
03c3eea54e
|
work_moments
|
3 years ago |
|
wangchuxiao
|
bccaf16343
|
work_moments
|
3 years ago |
|
wangchuxiao
|
6500ba48a7
|
work_moments
|
3 years ago |
|
wangchuxiao
|
1b968903e2
|
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
|
545f9cad2d
|
add modify conversation api
|
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 |
|
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
|
7abee90992
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
159a9e00c8
|
conversation update
|
3 years ago |
|
wangchuxiao
|
9c62f38345
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
1443f5f997
|
workMoments
|
3 years ago |
|
Gordon
|
5cd565306e
|
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
|
e687f56c7f
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
ff85575e98
|
workMoments
|
3 years ago |
|
Gordon
|
26be25c218
|
quit group and dismiss group update
|
3 years ago |
|
Gordon
|
d3d5e0cbfb
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
4796bf632c
|
quit group and dismiss group update
|
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
|
bcad3c1ced
|
add save message to mysql switch
|
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 |
|
wangchuxiao
|
5757b86d39
|
workMoments
|
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
|
c56fd399c1
|
Organization
|
3 years ago |
|
skiffer-git
|
31c954db0e
|
Organization
|
3 years ago |
|
skiffer-git
|
cb6a040c4d
|
Organization
|
3 years ago |
|
skiffer-git
|
51c3a753a9
|
Organization
|
3 years ago |
|
skiffer-git
|
c28c592c80
|
OrganizationChangedNotification
|
3 years ago |
|
skiffer-git
|
ab4a5e6719
|
OrganizationChangedNotification
|
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
|
3854c7bba2
|
workMoments
|
3 years ago |
|
wangchuxiao
|
6c4acbad68
|
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
|
bd6e8d093a
|
add operationID when ws connecting
|
3 years ago |
|
skiffer-git
|
f7b5a86a09
|
add operationID when ws connecting
|
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
|
3a8a0a541e
|
organization
|
3 years ago |
|
skiffer-git
|
650495306f
|
organization
|
3 years ago |
|
skiffer-git
|
5664c34790
|
organization
|
3 years ago |
|
skiffer-git
|
b1c66997ca
|
organization
|
3 years ago |
|
skiffer-git
|
114ffd4667
|
organization
|
3 years ago |
|
skiffer-git
|
5f22402761
|
organization
|
3 years ago |
|
skiffer-git
|
6873bf384e
|
organization
|
3 years ago |
|
skiffer-git
|
42242daf9b
|
organization
|
3 years ago |
|
skiffer-git
|
1f96b960ab
|
organization
|
3 years ago |
|
skiffer-git
|
f6b30ed0c6
|
organization
|
3 years ago |
|
skiffer-git
|
c59dc129a8
|
/user/get_users_online_status
|
3 years ago |
|
skiffer-git
|
472c1a9e3e
|
set group member nickname
|
3 years ago |
|
skiffer-git
|
248de7f1f2
|
set groupmember nickname
|
3 years ago |
|
skiffer-git
|
3bbf84861e
|
organization
|
3 years ago |
|
skiffer-git
|
0dac9044a5
|
organization
|
3 years ago |
|
skiffer-git
|
a981d1082a
|
organization
|
3 years ago |
|
skiffer-git
|
803d0c2ae2
|
organization
|
3 years ago |
|
skiffer-git
|
fd01e5c263
|
organization
|
3 years ago |
|
skiffer-git
|
ecc47dcfbb
|
organization
|
3 years ago |
|
skiffer-git
|
b6e06dfdc2
|
organization
|
3 years ago |
|
skiffer-git
|
eb630b23ae
|
organization
|
3 years ago |
|
skiffer-git
|
eae7a48991
|
organization
|
3 years ago |
|
skiffer-git
|
9436c836e6
|
organization
|
3 years ago |
|
skiffer-git
|
7c64239b36
|
organization
|
3 years ago |
|
skiffer-git
|
9def85f9ba
|
organization
|
3 years ago |
|
skiffer-git
|
1902c37924
|
organization
|
3 years ago |
|
skiffer-git
|
02b5ff38a4
|
organization
|
3 years ago |
|
skiffer-git
|
f076a927c9
|
organization
|
3 years ago |
|
skiffer-git
|
6184eaa30e
|
organization
|
3 years ago |
|
skiffer-git
|
a42b72e9ce
|
organization
|
3 years ago |
|
skiffer-git
|
f4dcae722c
|
organization
|
3 years ago |
|
skiffer-git
|
bbcb3e9403
|
organization
|
3 years ago |
|
skiffer-git
|
b4ab2c69ae
|
organization
|
3 years ago |
|
skiffer-git
|
4a7f406edb
|
organization
|
3 years ago |
|
skiffer-git
|
9abfe233bc
|
organization
|
3 years ago |
|
skiffer-git
|
3267958541
|
organization
|
3 years ago |
|
skiffer-git
|
af5ee45206
|
organization
|
3 years ago |
|
skiffer-git
|
300b72b9b8
|
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
|
9976b8132f
|
getui
|
3 years ago |
|
wangchuxiao
|
dbc5bd96f3
|
getui
|
3 years ago |
|
wangchuxiao
|
9489ab862b
|
getui
|
3 years ago |
|
wangchuxiao
|
1bb634bc6f
|
merge code
|
3 years ago |
|
Gordon
|
426ef5cb88
|
push update
|
3 years ago |
|
Gordon
|
5b86412407
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
4f8fcd2d3d
|
push update
|
3 years ago |
|
wangchuxiao
|
16c40aa51c
|
getui
|
3 years ago |
|
Gordon
|
6449c4a53d
|
push update
|
3 years ago |
|
wangchuxiao
|
fb4c8549dc
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
42dc5c1f0f
|
getui
|
3 years ago |
|
skiffer-git
|
1d2d2b1c9c
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
bc06ba54b9
|
organization && department
|
3 years ago |
|
wangchuxiao
|
9e4a2168c0
|
getui
|
3 years ago |
|
wangchuxiao
|
4d01aa3006
|
getui
|
3 years ago |
|
wangchuxiao
|
2c308af615
|
getui
|
3 years ago |
|
wangchuxiao
|
caf4ab60cd
|
minio add inner ip
|
3 years ago |
|
wangchuxiao
|
4a8d37bde1
|
getui
|
3 years ago |
|
wangchuxiao
|
13473eeb4d
|
getui
|
3 years ago |
|
wangchuxiao
|
edcc215774
|
getui
|
3 years ago |
|
wangchuxiao
|
81a6e4b46c
|
getui
|
3 years ago |
|
wangchuxiao
|
e0d612c92f
|
getui
|
3 years ago |
|
wangchuxiao
|
fadbb91287
|
getui
|
3 years ago |
|
wangchuxiao
|
72146c08ae
|
getui
|
3 years ago |
|
wangchuxiao
|
a879bbce59
|
getui
|
3 years ago |
|
wangchuxiao
|
f11f8b3e0e
|
getui
|
3 years ago |
|
wangchuxiao
|
4ae3ad7abd
|
getui
|
3 years ago |
|
wangchuxiao
|
a16025ca95
|
getui
|
3 years ago |
|
wangchuxiao
|
fdefe09187
|
getui
|
3 years ago |
|
wangchuxiao
|
691e2580e5
|
getui
|
3 years ago |
|
wangchuxiao
|
f40369d061
|
getui
|
3 years ago |
|
wangchuxiao
|
046c523880
|
getui
|
3 years ago |
|
wangchuxiao
|
b3b7ae26cf
|
getui
|
3 years ago |
|
wangchuxiao
|
49424b8b56
|
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 |
|
Gordon
|
69aba02c9a
|
send tag modify
|
3 years ago |
|
Gordon
|
f64c40e91f
|
tag msg
|
3 years ago |
|
wenxu12345
|
b0c518a0d6
|
log
|
3 years ago |
|
wenxu12345
|
aa673a3a5c
|
log
|
3 years ago |
|
wenxu12345
|
40d58f6bc2
|
log
|
3 years ago |
|
wenxu12345
|
7604b24ffc
|
log
|
3 years ago |
|
wenxu12345
|
a47c0c91a3
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
0232f52281
|
log
|
3 years ago |
|
Gordon
|
577a9249d1
|
test
|
3 years ago |
|
Gordon
|
f58c94146a
|
test
|
3 years ago |
|
wangchuxiao
|
6ba51fb338
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
e7bc82d152
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
26f8172b1a
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
634584400a
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
7d6be79ba8
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
cef208f6ef
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
f4921d1317
|
tag and set private tips
|
3 years ago |
|
Gordon
|
7f1a74b576
|
panic fix
|
3 years ago |
|
wangchuxiao
|
2b03b57b5c
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
77c6120014
|
null to empty slice
|
3 years ago |
|
wangchuxiao
|
a16a75230c
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
c369ab9b1c
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
bb267ccae7
|
tag and set private tips
|
3 years ago |
|
Gordon
|
efe24658a4
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
5cdf9e7551
|
OA tag fields modify
|
3 years ago |
|
wangchuxiao
|
4390302384
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
dab00e7fb2
|
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
|
170392f0bc
|
oa notification add
|
3 years ago |
|
Gordon
|
6744745152
|
token add operationID
|
3 years ago |
|
skiffer-git
|
bf5f72c00b
|
mute group
|
3 years ago |
|
skiffer-git
|
6164266870
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
cc9df9c586
|
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
|
de55c14a16
|
mute group
|
3 years ago |
|
skiffer-git
|
85cf7f26ce
|
mute group
|
3 years ago |
|
skiffer-git
|
11eaaab72d
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
475e64fc5b
|
mute group
|
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 |
|
skiffer-git
|
1aeff25316
|
mute group
|
3 years ago |
|
Gordon
|
fef33795d0
|
group add
|
3 years ago |
|
Gordon
|
d2c04b761d
|
ali cloud oss
|
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
|
a11c4fcb58
|
tag
|
3 years ago |
|
wangchuxiao
|
c67a937d40
|
tag
|
3 years ago |
|
wangchuxiao
|
03fa7137b9
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
e95400988e
|
tag
|
3 years ago |
|
Gordon
|
942c9c6a63
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
6c45665fde
|
add tag message conversation update
|
3 years ago |
|
wangchuxiao
|
169665da32
|
tag
|
3 years ago |
|
wangchuxiao
|
5e78697a69
|
tag
|
3 years ago |
|
wangchuxiao
|
a0e6a78496
|
tag
|
3 years ago |
|
wangchuxiao
|
af99a93536
|
tag
|
3 years ago |
|
Gordon
|
679c913f3a
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
03fb7947c3
|
add oa notification
|
3 years ago |
|
wangchuxiao
|
c39f5a27b2
|
tag
|
3 years ago |
|
wangchuxiao
|
dbdb516f3c
|
tag
|
3 years ago |
|
wangchuxiao
|
574c7600e0
|
tag
|
3 years ago |
|
wangchuxiao
|
13c29d2c1e
|
tag
|
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
|
4cdcdee8e4
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
e6c36411cb
|
mongo
|
3 years ago |
|
Gordon
|
b5de638c0b
|
ws remove log
|
3 years ago |
|
Gordon
|
1d09ffa529
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
eef9d15aaa
|
ws remove log
|
3 years ago |
|
wangchuxiao
|
8034ddc413
|
mongo
|
3 years ago |
|
wangchuxiao
|
e75adb165a
|
mongo
|
3 years ago |
|
wangchuxiao
|
09ce0d5285
|
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 |
|
Gordon
|
a2b65f52f6
|
fix group create bug
|
3 years ago |
jaonzyx
|
c16d8da784
|
管理员创建群组bug fix (#168)
|
3 years ago |
goubo
|
a55582a018
|
方便测试导入数据 (#148)
|
3 years ago |
|
Gordon
|
ea6d472002
|
pr modify and update
|
3 years ago |
|
Gordon
|
3dc4290f2a
|
pr modify and update
|
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 |
|
Gordon
|
25adfe5b28
|
check shell update
|
3 years ago |
|
Gordon
|
6b3d984ca6
|
log update
|
3 years ago |
|
Gordon
|
da5bfe32af
|
log update
|
3 years ago |
