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 |
