wangchuxiao
|
1075754458
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
internal/api/group/group.go
internal/api/group/super_group.go
pkg/common/db/controller/user.go
|
2 years ago |
|
wangchuxiao
|
414915eb3b
|
errcode
|
2 years ago |
skiffer-git
|
772a46e041
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
22f4d8f66d
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
96ef753c77
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
ca6b704377
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
8c6c7ee21f
|
errcode
|
2 years ago |
|
skiffer-git
|
ac284b696a
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# go.mod
# pkg/common/db/controller/user.go
|
2 years ago |
|
skiffer-git
|
9a7ed2d24d
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
62f0d1043d
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
internal/rpc/group/group.go
pkg/common/db/cache/conversation.go
pkg/common/db/cache/group.go
pkg/common/db/controller/group.go
|
2 years ago |
|
wangchuxiao
|
4826810c2a
|
errcode
|
2 years ago |
withchao
|
41d62937ff
|
group rpc
|
2 years ago |
|
withchao
|
f20e9e71b7
|
group complete
|
2 years ago |
|
withchao
|
b3ae69ce94
|
conversation.go
|
2 years ago |
|
withchao
|
ec43f2847e
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
324a0ae0ae
|
super group rpc
|
2 years ago |
|
wangchuxiao
|
db51bc87e2
|
errcode
|
2 years ago |
|
wangchuxiao
|
6d700765d2
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
2193d380ca
|
errcode
|
2 years ago |
|
withchao
|
f5adb7a17e
|
group database
|
2 years ago |
|
withchao
|
3423b224fd
|
group db
|
2 years ago |
|
withchao
|
77edbe1edd
|
group controller
|
2 years ago |
|
skiffer-git
|
0565474732
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# go.mod
# go.sum
|
2 years ago |
|
skiffer-git
|
0a2e55311c
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
84c59cecfb
|
errcode
|
2 years ago |
|
wangchuxiao
|
8fc54a7379
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/cache/conversation.go
|
2 years ago |
|
wangchuxiao
|
f4baf847ca
|
errcode
|
2 years ago |
|
withchao
|
66b6d5fc2f
|
group db
|
2 years ago |
|
withchao
|
cfa5420d9d
|
group func name
|
2 years ago |
|
withchao
|
1716de808f
|
realization group rpc
|
2 years ago |
|
withchao
|
26794503c3
|
realization group rpc
|
2 years ago |
|
withchao
|
4645eec8b6
|
realization group rpc
|
2 years ago |
|
withchao
|
4f96cc9b1b
|
group rpc
|
2 years ago |
|
withchao
|
210d04d488
|
rpc GroupApplicationResponse
|
2 years ago |
|
withchao
|
d91039c99d
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
bec4a89f7b
|
1
|
2 years ago |
|
skiffer-git
|
d59c4367fb
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
22c63ecdbd
|
Error code standardization
|
2 years ago |
Gordon
|
99504eec2e
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/cache/conversation.go
|
2 years ago |
|
skiffer-git
|
795a90a194
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
1aa3ac9399
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/controller/friend.go
# pkg/common/db/relation/friend_model_k.go
# pkg/common/db/relation/friend_request_model.go
|
2 years ago |
|
withchao
|
a2c4bccdb6
|
1
|
2 years ago |
|
skiffer-git
|
3320f81c8f
|
Error code standardization
|
2 years ago |
|
Gordon
|
3b4c227519
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/cache/conversation.go
# pkg/common/db/relation/conversation_model.go
|
2 years ago |
|
withchao
|
4d4a451926
|
1
|
2 years ago |
|
withchao
|
adfcfac711
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/table/relation.go
|
2 years ago |
|
withchao
|
8e49d7e567
|
1
|
2 years ago |
|
wangchuxiao
|
b637a29348
|
errcode
|
2 years ago |
|
Gordon
|
e167d80469
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/cache/conversation.go
# pkg/common/db/relation/conversation_model.go
|
2 years ago |
|
Gordon
|
730be9db47
|
conversation update
|
2 years ago |
|
wangchuxiao
|
01f7262d3a
|
errcode
|
2 years ago |
|
wangchuxiao
|
83eba5a9ea
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
47b725ac69
|
errcode
|
2 years ago |
|
skiffer-git
|
5402d33519
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
174c3e5fae
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
f6cc91d7db
|
errcode
|
2 years ago |
|
withchao
|
c55785783d
|
1
|
2 years ago |
|
wangchuxiao
|
803ecd3f92
|
errcode
|
2 years ago |
|
wangchuxiao
|
5bb731f884
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/relation/black.go
|
2 years ago |
|
skiffer-git
|
6658566144
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
2e19e3109e
|
Error code standardization
|
2 years ago |
|
withchao
|
2b1868f558
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
3651274d68
|
1
|
2 years ago |
|
skiffer-git
|
1d42c220af
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/table/table.go
|
2 years ago |
|
skiffer-git
|
cbe68507f3
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
c2fbcd1f22
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/relation/friend_model_k.go
|
2 years ago |
|
withchao
|
d67515f53f
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/table/table.go
|
2 years ago |
|
wangchuxiao
|
d4952ebc16
|
errcode
|
2 years ago |
|
withchao
|
0f3691893e
|
1
|
2 years ago |
|
skiffer-git
|
fb436e7713
|
Error code standardization
|
2 years ago |
|
Gordon
|
aafe17a0f3
|
friend update
|
2 years ago |
|
Gordon
|
80bde864c1
|
friend update
|
2 years ago |
|
Gordon
|
7c92de7899
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
Gordon
|
e550c9a874
|
friend update
|
2 years ago |
|
withchao
|
4bea4252ff
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
39463e68e3
|
Error code standardization
|
2 years ago |
|
withchao
|
26e130122c
|
1
|
2 years ago |
|
wangchuxiao
|
4ad6b74d75
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/relation/friend_model_k.go
|
2 years ago |
|
wangchuxiao
|
40470bc320
|
errcode
|
2 years ago |
|
skiffer-git
|
d44c286ff3
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
bac9ba000e
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
00bd22041b
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
b3e141a3ce
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
e0d05e1fa8
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
4c931fba5c
|
errcode
|
2 years ago |
|
skiffer-git
|
954e01c951
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
4e580cb848
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
618ff03cbe
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
b18fb5cd31
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
6aa4974e29
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
026649f875
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
d50248ffd2
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
b881924144
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
1693359010
|
errcode
|
2 years ago |
|
wangchuxiao
|
1e3e243a7f
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
c1d6f5809b
|
errcode
|
2 years ago |
|
wangchuxiao
|
1ba5cde076
|
errcode
|
2 years ago |
|
withchao
|
5c99bdf14f
|
1
|
2 years ago |
|
wangchuxiao
|
79b5d4b8bd
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
internal/rpc/friend/friend.go
|
2 years ago |
|
wangchuxiao
|
67c082ab7b
|
errcode
|
2 years ago |
|
skiffer-git
|
ec23d22d6d
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
d9eb55d9df
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
f38dc3b1f1
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
26ed14d1d3
|
errcode
|
2 years ago |
|
wangchuxiao
|
5b8f66404c
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
internal/rpc/group/group.go
pkg/common/db/relation/user_model_k.go
|
2 years ago |
|
wangchuxiao
|
21a1e7dff2
|
errcode
|
2 years ago |
|
skiffer-git
|
0bec6eeb57
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
d49022c16a
|
Error code standardization
|
2 years ago |
|
withchao
|
4c6e02f805
|
1
|
2 years ago |
|
withchao
|
b83260ca30
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
0a81dd040f
|
1
|
2 years ago |
|
skiffer-git
|
c7237a64bb
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
1d25a5e53f
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
d6edb4aa8c
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/controller/group.go
|
2 years ago |
|
wangchuxiao
|
704b18d900
|
errcode
|
2 years ago |
|
skiffer-git
|
00b4538b0a
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
b162909147
|
Error code standardization
|
2 years ago |
|
withchao
|
cf4499e958
|
1
|
2 years ago |
|
withchao
|
399e1520d6
|
1
|
2 years ago |
|
withchao
|
56a89ad33b
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
f65cd2aefc
|
1
|
2 years ago |
|
skiffer-git
|
7b0eeb3049
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# internal/utils/convert.go
|
2 years ago |
|
skiffer-git
|
39fc655b1a
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
069b978b23
|
errcode
|
2 years ago |
|
wangchuxiao
|
15166f53b0
|
errcode
|
2 years ago |
|
wangchuxiao
|
b021089360
|
errcode
|
2 years ago |
|
wangchuxiao
|
52ceb7682d
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
internal/rpc/group/group.go
pkg/common/db/controller/group.go
pkg/common/db/relation/group_member_model_k.go
|
2 years ago |
|
withchao
|
4e10b361ed
|
1
|
2 years ago |
|
wangchuxiao
|
eebf7ca893
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
945449108d
|
errcode
|
2 years ago |
|
withchao
|
ebd329558c
|
1
|
2 years ago |
|
wangchuxiao
|
5e4e960524
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/controller/group.go
pkg/common/db/relation/group_model_k.go
|
2 years ago |
|
wangchuxiao
|
68d595b558
|
errcode
|
2 years ago |
|
withchao
|
5bf8f6728e
|
1
|
2 years ago |
|
withchao
|
c760b520ff
|
1
|
2 years ago |
|
withchao
|
601fac7a04
|
1
|
2 years ago |
|
withchao
|
891e631b91
|
1
|
2 years ago |
|
wangchuxiao
|
87e61046cb
|
errcode
|
2 years ago |
|
wangchuxiao
|
7fc279a329
|
errcode
|
2 years ago |
|
wangchuxiao
|
c90d4330df
|
errcode
|
2 years ago |
|
wangchuxiao
|
19ae659e44
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
870cc25beb
|
errcode
|
2 years ago |
|
Gordon
|
0b2854ddda
|
group update
|
2 years ago |
|
wangchuxiao
|
36e82d0a6d
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# internal/rpc/group/group.go
# pkg/common/db/model/group.go
|
2 years ago |
|
wangchuxiao
|
d9becad8e9
|
errCode
|
2 years ago |
|
Gordon
|
5af01e4da1
|
group update
|
2 years ago |
|
Gordon
|
0d3984233b
|
db update
|
2 years ago |
|
Gordon
|
640960a87b
|
db update
|
2 years ago |
|
Gordon
|
6e26c0d986
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
Gordon
|
f83e8659be
|
db update
|
2 years ago |
|
skiffer-git
|
8b821ce32e
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
9067172424
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
f528535cfd
|
groupModel
|
2 years ago |
|
wangchuxiao
|
adccfff581
|
model
|
2 years ago |
|
Gordon
|
65cfb5c898
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
Gordon
|
0a57d5a426
|
db update
|
2 years ago |
|
withchao
|
8e47b55ab4
|
1
|
2 years ago |
|
withchao
|
142b9386fc
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
6ab9cff3c3
|
1
|
2 years ago |
|
Gordon
|
f538a86e10
|
remove notification limit
|
2 years ago |
|
wangchuxiao
|
0f17f52c2c
|
model
|
2 years ago |
|
wangchuxiao
|
3e0c6f94ed
|
model
|
2 years ago |
|
wangchuxiao
|
727bf623b3
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/db/model/group.go
|
2 years ago |
|
wangchuxiao
|
eea7adb1b8
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/db/model/group.go
|
2 years ago |
|
wangchuxiao
|
3751e633e4
|
groupdb
|
2 years ago |
|
skiffer-git
|
e31d162870
|
Error code standardization
|
2 years ago |
|
withchao
|
58866c1b41
|
1
|
2 years ago |
|
withchao
|
1d428785d1
|
1
|
2 years ago |
|
wangchuxiao
|
df6bd5719d
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
a55e27c581
|
groupdb
|
2 years ago |
|
wangchuxiao
|
d21b1e6e78
|
groupdb
|
2 years ago |
|
wangchuxiao
|
86157b4f7a
|
groupdb
|
2 years ago |
|
skiffer-git
|
46c6f532dc
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
65a4c39ab8
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
beeb0f3e00
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
3c4051c5fc
|
groupdb
|
2 years ago |
|
wangchuxiao
|
4854db030f
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
822db2a63e
|
groupdb
|
2 years ago |
|
withchao
|
21ea555183
|
1
|
2 years ago |
|
withchao
|
b14863aea6
|
1
|
2 years ago |
|
withchao
|
62a67905af
|
1
|
2 years ago |
|
skiffer-git
|
a30162df52
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
87ce1895e3
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
80b22e0e0e
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
40438f529a
|
del files
|
2 years ago |
|
withchao
|
50d6b4053a
|
1
|
2 years ago |
|
withchao
|
176c65ebaf
|
1
|
2 years ago |
|
wangchuxiao
|
51529eece3
|
del files
|
2 years ago |
|
skiffer-git
|
8e8ee2b968
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
29c1bb86d8
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
1797267a6b
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
a35bb0ddc0
|
Error code standardization
|
2 years ago |
|
withchao
|
55cbc26742
|
1
|
2 years ago |
|
wangchuxiao
|
cc1a9e1d4a
|
log
|
2 years ago |
|
wangchuxiao
|
fcb7639833
|
log
|
2 years ago |
|
wangchuxiao
|
6416127e39
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
82c32d24a1
|
log
|
2 years ago |
|
withchao
|
6641637f12
|
1
|
2 years ago |
|
withchao
|
fd8dd47d2a
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
5e48231d51
|
1
|
2 years ago |
|
wangchuxiao
|
31ff1cb673
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
022da8bdbd
|
log
|
2 years ago |
|
withchao
|
6bd62610dd
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
a657fd8d51
|
1
|
2 years ago |
|
skiffer-git
|
ba81f0e4b9
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
fb1e10f32c
|
Error code standardization
|
2 years ago |
|
withchao
|
44e6a5570e
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
231e0adea1
|
1
|
2 years ago |
|
wangchuxiao
|
57928f900e
|
log
|
2 years ago |
|
wangchuxiao
|
8be1ee90f6
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
35774878db
|
log
|
2 years ago |
|
withchao
|
56d4064b90
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
979f617209
|
1
|
2 years ago |
|
wangchuxiao
|
da637d1ec2
|
log
|
2 years ago |
|
wangchuxiao
|
653fce11da
|
log
|
2 years ago |
|
withchao
|
a5dbcad87c
|
1
|
2 years ago |
|
skiffer-git
|
f8372c2744
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
4e9f4ecaff
|
Error code standardization
|
2 years ago |
|
withchao
|
92ee864b45
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
b0834ae437
|
1
|
2 years ago |
|
skiffer-git
|
425ba5946f
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/constant/errors.go
|
2 years ago |
|
skiffer-git
|
3720134fbd
|
Error code standardization
|
2 years ago |
|
withchao
|
4e96e77d26
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
5ddc08e4fd
|
1
|
2 years ago |
|
wangchuxiao
|
21e44518cb
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
fd7b0da269
|
log
|
2 years ago |
|
withchao
|
f51ff6fa19
|
1
|
2 years ago |
|
skiffer-git
|
ec9ad4a06d
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
wangchuxiao
|
e67dc28e82
|
log
|
2 years ago |
|
skiffer-git
|
007f9912eb
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
8286fdc4d0
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
6c7b80f853
|
log
|
2 years ago |
|
withchao
|
b6fc96aa31
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
d06dc3e4b5
|
1
|
2 years ago |
|
withchao
|
16864dab7d
|
1
|
2 years ago |
|
wangchuxiao
|
8becaf07c7
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
fbffd9ea26
|
log
|
2 years ago |
|
withchao
|
03dd50e25c
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
8431b40c16
|
1
|
2 years ago |
|
withchao
|
be39542832
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# internal/api_to_rpc/api.go
|
2 years ago |
|
wangchuxiao
|
09244e757f
|
log
|
2 years ago |
|
withchao
|
69e94c25f4
|
1
|
2 years ago |
|
wangchuxiao
|
ff524b0ee7
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# internal/api_to_rpc/api.go
|
2 years ago |
|
wangchuxiao
|
1a32b49662
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# internal/api_to_rpc/api.go
|
2 years ago |
|
wangchuxiao
|
6205c67b70
|
log
|
2 years ago |
|
withchao
|
3b82fbe4ca
|
1
|
2 years ago |
|
wangchuxiao
|
47766a2c2c
|
db
|
2 years ago |
|
wangchuxiao
|
6ee06ded3f
|
db
|
2 years ago |
|
wangchuxiao
|
9bc659e8f0
|
db
|
2 years ago |
|
wangchuxiao
|
db51b597da
|
db
|
2 years ago |
|
wangchuxiao
|
6fd6c29ea4
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
6808d734b4
|
db
|
2 years ago |
|
withchao
|
5e020bb514
|
1
|
2 years ago |
|
withchao
|
7bc32e67bc
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
dfb91b3fc0
|
1
|
2 years ago |
|
wangchuxiao
|
4649eb11e6
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
cb713db9d2
|
db
|
2 years ago |
|
withchao
|
59c477424c
|
1
|
2 years ago |
|
withchao
|
2841109f31
|
1
|
2 years ago |
|
withchao
|
35c0e8303c
|
1
|
2 years ago |
|
withchao
|
6dafbf2165
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
4f2d9c548e
|
1
|
2 years ago |
|
wangchuxiao
|
31a264f411
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
e466faa20d
|
db
|
2 years ago |
|
withchao
|
6c0175540b
|
1
|
2 years ago |
|
wangchuxiao
|
9b962a0368
|
db
|
2 years ago |
|
wangchuxiao
|
88d6fc663a
|
db
|
2 years ago |
|
wangchuxiao
|
dff32dd7ef
|
db
|
2 years ago |
|
withchao
|
53c278234d
|
friend
|
2 years ago |
|
wangchuxiao
|
d3c9ef6992
|
fix Pb2String
|
2 years ago |
|
wangchuxiao
|
edced72be9
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
internal/api_to_rpc/api.go
internal/rpc/group/group.go
|
2 years ago |
|
wangchuxiao
|
c96ccfc7f5
|
fix Pb2String
|
2 years ago |
|
withchao
|
920fcc14f1
|
api to rpc
|
2 years ago |
|
withchao
|
e8de74f76d
|
group rpc
|
2 years ago |
|
withchao
|
1fc7c4434c
|
group
|
2 years ago |
|
wangchuxiao
|
07a6439082
|
fix Pb2String
|
2 years ago |
|
withchao
|
9341a5f57f
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# internal/rpc/group/group.go
|
2 years ago |
|
wangchuxiao
|
6e8a2232a9
|
group rpc
|
2 years ago |
|
wangchuxiao
|
5cbfe7c73f
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
internal/rpc/group/group.go
|
2 years ago |
|
wangchuxiao
|
69787064e9
|
group rpc
|
2 years ago |
|
withchao
|
aa2b43293d
|
group
|
2 years ago |
|
withchao
|
36be1f4be8
|
group
|
2 years ago |
|
withchao
|
4a098a4a0e
|
group
|
2 years ago |
|
wangchuxiao
|
ac74d01d35
|
groupCallback
|
2 years ago |
|
withchao
|
90fddd34d2
|
CreateGroup
|
2 years ago |
|
wangchuxiao
|
463f08546e
|
groupCallback
|
2 years ago |
|
skiffer-git
|
6518473436
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
31cb75b024
|
Error code standardization
|
2 years ago |
|
withchao
|
18c4212aa0
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
028c2ac364
|
CheckAccess
|
2 years ago |
|
skiffer-git
|
8d42184ff0
|
Error code standardization
|
2 years ago |
|
withchao
|
08bffa60f4
|
CreateGroup rpc
|
2 years ago |
|
wangchuxiao
|
fb1b3687f4
|
groupCallback
|
2 years ago |
|
wangchuxiao
|
2d67f95413
|
groupCallback
|
2 years ago |
|
wangchuxiao
|
4aa7abf94b
|
groupCallback
|
2 years ago |
|
wangchuxiao
|
99fc84aaea
|
groupCallback
|
2 years ago |
|
wangchuxiao
|
cf82d3495e
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/constant/error.go
|
2 years ago |
|
wangchuxiao
|
297f3c16a8
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/db/mysql_model/im_mysql_model/group_model_k.go
|
2 years ago |
|
skiffer-git
|
b81513e9bb
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
4147c68f6d
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
847860a0c7
|
Error code standardization
|
2 years ago |
|
withchao
|
c092c0e72d
|
group member db
|
2 years ago |
|
wangchuxiao
|
633aefad56
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/db/mysql_model/im_mysql_model/group_model_k.go
|
2 years ago |
|
wangchuxiao
|
b9a11e4ca1
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/db/mysql_model/im_mysql_model/group_model_k.go
|
2 years ago |
|
wangchuxiao
|
bd8536b9eb
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/db/mysql_model/im_mysql_model/group_model_k.go
|
2 years ago |
|
wangchuxiao
|
6bd9b3d82f
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
# pkg/common/db/mysql_model/im_mysql_model/group_model_k.go
|
2 years ago |
|
wangchuxiao
|
7743801795
|
errCode
|
2 years ago |
|
skiffer-git
|
bedba8d8f5
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
4aad2c86ec
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
b041cb6cbf
|
Error code standardization
|
2 years ago |
|
withchao
|
99de72d723
|
1
|
2 years ago |
|
wangchuxiao
|
f2cade3251
|
errCode
|
2 years ago |
|
wangchuxiao
|
9d433fb248
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
94d087b1bc
|
errCode
|
2 years ago |
|
skiffer-git
|
64b4e5570c
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# internal/rpc/friend/friend.go
# pkg/common/db/mysql_model/im_mysql_model/user_black_list_model.go
|
2 years ago |
|
skiffer-git
|
86bf207e02
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
b13ab0f0ba
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
2d8a538798
|
errCode
|
2 years ago |
|
withchao
|
e9446d0360
|
1
|
2 years ago |
|
skiffer-git
|
5a2a57c706
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
c076f16793
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
58bb3fe3f1
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
cbe7dcebea
|
errCode
|
2 years ago |
|
skiffer-git
|
4acde81cc4
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
1d5e4a0f8a
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
89a4fe96b5
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
efd5da9e87
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
5e5d238e82
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
c77868bfae
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
bf747e538b
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
a2cd47f79f
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
32d7846139
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
e588091bf6
|
mongodb
|
2 years ago |
|
Gordon
|
1026a6b2b6
|
Merge remote-tracking branch 'origin/modify' into v2.3.0release
# Conflicts:
# config/config.yaml
# pkg/common/constant/constant.go
# pkg/proto/sdk_ws/ws.pb.go
# pkg/proto/sdk_ws/ws.proto
|
2 years ago |
|
Gordon
|
86fc0e4101
|
reaction message update
|
2 years ago |
|
wangchuxiao
|
e80afa610d
|
getui
|
2 years ago |
|
Gordon
|
20a2cb3d3c
|
reaction message update
|
2 years ago |
|
wangchuxiao
|
920a7cfdac
|
set groupMemberInfo callback
|
2 years ago |
|
skiffer-git
|
a78e43bfe3
|
Simplify logs
|
2 years ago |
|
skiffer-git
|
7b57b924ee
|
Simplify logs
|
2 years ago |
|
skiffer-git
|
46ee4e41a1
|
simplify init logging
|
2 years ago |
|
Gordon
|
915118140f
|
reaction message add expiration
|
2 years ago |
|
wangchuxiao
|
112ce9b450
|
Merge branch 'modify' of github.com:OpenIMSDK/Open-IM-Server into modify
# Conflicts:
# pkg/proto/msg/msg.pb.go
|
2 years ago |
|
wangchuxiao
|
0f1208dba9
|
mongo operation
|
2 years ago |
|
Gordon
|
25871aea49
|
reaction message add expiration
|
2 years ago |
|
Gordon
|
b3f5c2f185
|
reaction message add expiration
|
2 years ago |
|
Gordon
|
ac55951c74
|
message reaction
|
2 years ago |
|
Gordon
|
6f20cdd905
|
reaction message
|
2 years ago |
|
wangchuxiao
|
6d45f0730c
|
mongo operation
|
2 years ago |
|
wangchuxiao
|
24288aa597
|
modify msg
|
2 years ago |
|
Gordon
|
9cb30e0ec6
|
reaction message
|
2 years ago |
|
wangchuxiao
|
a4e2e23fbe
|
modify
|
2 years ago |
|
wangchuxiao
|
0e726a20ba
|
modify
|
2 years ago |
|
wangchuxiao
|
be01c4da0c
|
dek jinzhu
|
2 years ago |
|
skiffer-git
|
5d4600a080
|
Separate the notification
|
2 years ago |
|
skiffer-git
|
01b1116017
|
log
|
2 years ago |
|
skiffer-git
|
d3af2e6547
|
log
|
2 years ago |
|
skiffer-git
|
b5a031be9f
|
log
|
2 years ago |
|
wangchuxiao
|
d5e7d3298a
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
837efc90b6
|
ws connID
|
2 years ago |
|
skiffer-git
|
9394d340a2
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
be820e8401
|
set MaxNotificationNum = 500
|
2 years ago |
|
wangchuxiao
|
71c836ae1a
|
ws
|
2 years ago |
|
wangchuxiao
|
df78d87ec5
|
ex msg
|
2 years ago |
|
wangchuxiao
|
b75507396b
|
EX MSG
|
2 years ago |
|
wangchuxiao
|
8d66128009
|
mongo
|
2 years ago |
|
wangchuxiao
|
d9ecfddecd
|
error log
|
2 years ago |
|
wangchuxiao
|
271934ef4b
|
fix groupMuted send msg
|
2 years ago |
|
wangchuxiao
|
1be16380da
|
conn
|
2 years ago |
|
wangchuxiao
|
8ac36526a8
|
get chat log do not need time
|
2 years ago |
|
skiffer-git
|
56436adf4d
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
1a8197aef1
|
add admin platform id
|
2 years ago |
|
wangchuxiao
|
819ebf0ede
|
add callback and fix cache
|
2 years ago |
|
wangchuxiao
|
4b0a95fc1b
|
fix bug
|
2 years ago |
|
wangchuxiao
|
9aaee04a69
|
read after burn time
|
2 years ago |
|
wangchuxiao
|
3f5dd5bad8
|
read after burn time
|
2 years ago |
|
wangchuxiao
|
405a60c4f8
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
# config/usualConfig.yaml
|
2 years ago |
|
wangchuxiao
|
ccad06b7b6
|
conf script
|
2 years ago |
|
wangchuxiao
|
08a4b92f3a
|
mute member cant send msg
|
2 years ago |
|
wangchuxiao
|
d6e14eafef
|
k8s version update
|
2 years ago |
|
wangchuxiao
|
08f3a79e6e
|
add usualConfig
|
2 years ago |
|
wangchuxiao
|
9a9d6ac524
|
config
|
2 years ago |
|
wangchuxiao
|
bb1babad11
|
config
|
2 years ago |
|
wangchuxiao
|
1a93592253
|
Merge branch 'main' into v2.3.0release
# Conflicts:
# .env
# install_im_server.sh
|
2 years ago |
|
skiffer-git
|
9f4a8952a4
|
remove log
|
2 years ago |
|
skiffer-git
|
029c020fe0
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
1f0040ceb6
|
Specify the relative path for the configuration file
|
2 years ago |
|
wangchuxiao
|
1b3fbf56d0
|
test cron
|
2 years ago |
|
skiffer-git
|
d33e15a2bb
|
log
|
2 years ago |
|
skiffer-git
|
a9b60b8052
|
encryption
|
2 years ago |
|
wangchuxiao
|
741cfec1ec
|
test cron
|
2 years ago |
|
wangchuxiao
|
9326b10d3a
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
6d90cd59f2
|
test cron
|
2 years ago |
|
Gordon
|
5c503e71ed
|
message update
|
2 years ago |
|
wangchuxiao
|
cdf851d196
|
test cron
|
2 years ago |
|
wangchuxiao
|
bf09e49164
|
test cron
|
2 years ago |
|
wangchuxiao
|
d391a4d023
|
test cron
|
2 years ago |
|
wangchuxiao
|
9182f15ee0
|
test cron
|
2 years ago |
|
wangchuxiao
|
be6811ddbd
|
test cron
|
2 years ago |
|
wangchuxiao
|
10d299d1b3
|
test cron
|
2 years ago |
|
wangchuxiao
|
4989bb07f6
|
test cron
|
2 years ago |
|
wangchuxiao
|
0d46349386
|
test cron
|
2 years ago |
|
wangchuxiao
|
267e7c3b08
|
test cron
|
2 years ago |
|
wangchuxiao
|
cad689b337
|
test cron
|
2 years ago |
|
wangchuxiao
|
e54d5a13e8
|
test cron
|
2 years ago |
|
wangchuxiao
|
ac7619de55
|
test cron
|
2 years ago |
|
wangchuxiao
|
c75e258f81
|
test cron
|
2 years ago |
|
wangchuxiao
|
e4ed6dde0c
|
test cron
|
2 years ago |
|
wangchuxiao
|
9025d8bd90
|
test cron
|
2 years ago |
|
wangchuxiao
|
2433e27eb5
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
2610a27894
|
add birthStr field
|
2 years ago |
|
Gordon
|
eba25f1bb8
|
ws add logout remove push token
|
2 years ago |
|
Gordon
|
59b625b7c0
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
0eeb2f6752
|
log
|
2 years ago |
|
Gordon
|
cd7b484fc2
|
message pull
|
2 years ago |
|
wangchuxiao
|
16b3ea8b7e
|
callback update
|
2 years ago |
|
wangchuxiao
|
942afd7fec
|
callback update
|
2 years ago |
|
wangchuxiao
|
de271d5b76
|
callback update
|
2 years ago |
|
wangchuxiao
|
162478563c
|
add friend callback
|
2 years ago |
|
wangchuxiao
|
6b30097bde
|
index fix
|
2 years ago |
|
wangchuxiao
|
7dc1f9b81b
|
index fix
|
2 years ago |
|
wangchuxiao
|
9964650014
|
Merge branch 'main' into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
b18813689d
|
workmoment
|
2 years ago |
|
wangchuxiao
|
79999edcea
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
764b34d947
|
workmoment
|
2 years ago |
liu ming
|
e000dc18aa
|
添加袤博推送 (#284)
Co-authored-by: liuming <liuming@example.com>
|
2 years ago |
|
Gordon
|
0a28bcfbe9
|
mongo index modify
|
2 years ago |
|
skiffer-git
|
6ad50e4e04
|
jwt import update
|
2 years ago |
|
skiffer-git
|
0a83470019
|
update proto
|
2 years ago |
|
wangchuxiao
|
31c18bf856
|
organization
|
2 years ago |
|
wangchuxiao
|
168dd1d01f
|
orgization
|
2 years ago |
|
skiffer-git
|
2ad71fc4ac
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
29380b93ef
|
update version
|
2 years ago |
|
wangchuxiao
|
7137320f1a
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
376c9bbdc7
|
cms add api
|
2 years ago |
|
skiffer-git
|
49d57f46ae
|
prometheus for statistics
|
2 years ago |
|
skiffer-git
|
a4fe45d58c
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
db8763b610
|
fix bug :KickUserOffline panic: runtime error: invalid memory address or nil pointer dereference
|
2 years ago |
|
wangchuxiao
|
d971397c8b
|
v2.3.3
|
2 years ago |
|
wangchuxiao
|
4c0b96d81a
|
check login
|
2 years ago |
|
wangchuxiao
|
af2baba1e3
|
merge shichuang
|
2 years ago |
|
wangchuxiao
|
dc401c784a
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
bb0f5e97a2
|
kafka
|
2 years ago |
|
skiffer-git
|
82cd3fd9f1
|
Support mongodb cluster
|
2 years ago |
|
skiffer-git
|
06117c98b1
|
Support mongodb cluster
|
2 years ago |
|
skiffer-git
|
aa41dc3650
|
Support mongodb cluster
|
2 years ago |
|
skiffer-git
|
98fe00a171
|
Support mongodb cluster
|
2 years ago |
|
skiffer-git
|
5d78fa9519
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
eb2a9d540e
|
Support mongodb cluster
|
2 years ago |
|
wangchuxiao
|
665e2e3e83
|
add mysql
|
2 years ago |
|
wangchuxiao
|
c025d0d030
|
add mysql
|
2 years ago |
|
wangchuxiao
|
1ce0a3b5d3
|
add mysql
|
2 years ago |
|
wangchuxiao
|
7c79d10f5d
|
add mysql
|
2 years ago |
|
wangchuxiao
|
1cfa55817a
|
prometheus
|
2 years ago |
|
skiffer-git
|
d26076c0e4
|
prometheus for statistics
|
2 years ago |
|
skiffer-git
|
1b31de18e4
|
Remove duplicate messageVerification call in sendMsg
|
2 years ago |
|
skiffer-git
|
ccc65c846f
|
prometheus for statistics
|
2 years ago |
|
skiffer-git
|
d6abbacbf7
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
# internal/rpc/msg/rpcChat.go
# pkg/common/prometheus/gather.go
|
2 years ago |
|
skiffer-git
|
979100850c
|
prometheus for statistics
|
2 years ago |
|
wangchuxiao
|
07170135e6
|
prome
|
2 years ago |
|
wangchuxiao
|
024ee6e602
|
prome
|
2 years ago |
|
wangchuxiao
|
a1f79f4508
|
prome
|
2 years ago |
|
skiffer-git
|
6a6009827c
|
prometheus for statistics
|
2 years ago |
|
skiffer-git
|
375fc0c89e
|
prometheus for statistics
|
2 years ago |
|
skiffer-git
|
a110b4c26b
|
prometheus for statistics
|
2 years ago |
|
skiffer-git
|
ebdb875c56
|
prometheus for statistics
|
2 years ago |
|
wangchuxiao
|
266a2b4c76
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
7e5b62377f
|
add
|
2 years ago |
|
skiffer-git
|
8dce5396b0
|
prometheus for statistics
|
2 years ago |
|
skiffer-git
|
e78f7a2a37
|
prometheus for statistics
|
2 years ago |
|
wangchuxiao
|
5ce0cf1aad
|
prome
|
2 years ago |
|
wangchuxiao
|
88bcb35a14
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
d534f026b0
|
promethues
|
2 years ago |
|
skiffer-git
|
939eb95cdc
|
log
|
2 years ago |
|
skiffer-git
|
46d3dd409a
|
log
|
2 years ago |
|
skiffer-git
|
e7ab59a932
|
log
|
2 years ago |
|
skiffer-git
|
1f36d970f9
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
60f0c80c36
|
log
|
2 years ago |
|
wangchuxiao
|
c018d63117
|
add log
|
2 years ago |
|
wangchuxiao
|
88af048e90
|
add log
|
2 years ago |
|
wangchuxiao
|
4ac9d0410c
|
Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang
|
2 years ago |
|
wangchuxiao
|
1c53c90ab5
|
hash
|
2 years ago |
|
wangchuxiao
|
d491c482a5
|
hash
|
2 years ago |
|
wangchuxiao
|
82f2ec24fb
|
group
|
2 years ago |
|
wangchuxiao
|
d59f699937
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
ef66b10501
|
prome
|
2 years ago |
|
Gordon
|
765e8d4f79
|
log test
|
2 years ago |
|
Gordon
|
8e7e496b44
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
cf14b19bf6
|
log test
|
2 years ago |
|
skiffer-git
|
34eedd7955
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
98d7c7bb86
|
Limit the number of group members for kick/create/invite
|
2 years ago |
|
wangchuxiao
|
2203638fc5
|
promethues
|
2 years ago |
|
wangchuxiao
|
f41cebe776
|
prometheus
|
2 years ago |
|
wangchuxiao
|
aebcd1db2e
|
docker-compose
|
2 years ago |
|
wangchuxiao
|
3d184c95ba
|
Merge branch 'shichuang' of https://github.com/OpenIMSDK/Open-IM-Server into shichuang
|
2 years ago |
|
wangchuxiao
|
6754fdb580
|
getui
|
2 years ago |
|
Gordon
|
4a2a9eb997
|
fcm push modify
|
2 years ago |
|
wangchuxiao
|
4682abf4c1
|
cms
|
2 years ago |
|
wangchuxiao
|
a508dd2c0f
|
fix bug
|
2 years ago |
|
wangchuxiao
|
5469bb6508
|
fix bug
|
2 years ago |
|
wangchuxiao
|
5233e4c097
|
fix bug
|
2 years ago |
|
wangchuxiao
|
7208dd6b2a
|
cms
|
2 years ago |
|
wangchuxiao
|
821e704b5b
|
cms
|
2 years ago |
|
wangchuxiao
|
82a8f18e88
|
merge cms into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
bdae1f10d4
|
merge cms into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
05b5a0ada3
|
add
|
2 years ago |
|
wangchuxiao
|
6dfbb90b80
|
fix signal
|
2 years ago |
|
wangchuxiao
|
9f4c367249
|
cms
|
2 years ago |
|
wangchuxiao
|
49f05d334d
|
cms
|
2 years ago |
|
wangchuxiao
|
a372ef3faa
|
cms
|
2 years ago |
|
wangchuxiao
|
a317ebd8e7
|
cms
|
2 years ago |
|
wangchuxiao
|
6774a8594f
|
cms
|
2 years ago |
|
wangchuxiao
|
56fb579da2
|
Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang
|
2 years ago |
|
wangchuxiao
|
b401917c19
|
cache
|
2 years ago |
|
skiffer-git
|
e990118475
|
fix bug :pushMsg.MsgData.OfflinePushInfo==nil
|
2 years ago |
|
wangchuxiao
|
ac2cc154b4
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
99ec0ed8df
|
del key
|
2 years ago |
|
skiffer-git
|
32daea25de
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
946dbc5efc
|
change log file mode
|
2 years ago |
|
Gordon
|
c36dfd9eea
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
67e5e3b56b
|
fcm ios push badge
|
2 years ago |
|
skiffer-git
|
988824f3f1
|
change log file mode
|
2 years ago |
|
wangchuxiao
|
af110f75d6
|
add
|
2 years ago |
|
wangchuxiao
|
1da5ad8830
|
add
|
2 years ago |
|
wangchuxiao
|
8e063f6e59
|
cms
|
2 years ago |
|
wangchuxiao
|
d16ceac149
|
cms
|
2 years ago |
|
wangchuxiao
|
c2831e6676
|
cms
|
2 years ago |
|
wangchuxiao
|
a4b95cb7cf
|
cms
|
2 years ago |
|
wangchuxiao
|
5134faeefd
|
cms
|
2 years ago |
|
wangchuxiao
|
77327f59b9
|
cms
|
2 years ago |
|
wangchuxiao
|
2c2d3e4641
|
cms
|
2 years ago |
|
wangchuxiao
|
42f7af3d52
|
cms
|
2 years ago |
|
wangchuxiao
|
8d4e5ad3f1
|
cms
|
2 years ago |
|
skiffer-git
|
49a127d97d
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
8cfb604a0d
|
set mysql connection
|
2 years ago |
|
wangchuxiao
|
5657f617e7
|
merge
|
2 years ago |
|
wangchuxiao
|
12e6cbb9e5
|
add
|
2 years ago |
|
wangchuxiao
|
7f5b12d4d2
|
cms
|
2 years ago |
|
wangchuxiao
|
c3d3f0986e
|
join groups
|
2 years ago |
|
wangchuxiao
|
3886d49b0a
|
admin cms
|
2 years ago |
|
Gordon
|
27dd574c4d
|
err log
|
2 years ago |
|
wangchuxiao
|
d542cdd898
|
conversation
|
2 years ago |
|
wangchuxiao
|
9f15f50f9d
|
fix conversation
|
2 years ago |
|
Gordon
|
ec0cd9a348
|
conversation update
|
2 years ago |
|
wangchuxiao
|
92fc43cb3d
|
conversation
|
2 years ago |
|
wangchuxiao
|
73a73b7bc7
|
conversation
|
2 years ago |
|
wangchuxiao
|
3391bd8322
|
conversation
|
2 years ago |
|
wangchuxiao
|
7d04f06f7d
|
conversation fix
|
2 years ago |
|
wangchuxiao
|
782ad07940
|
fix bug
|
2 years ago |
|
wangchuxiao
|
d57729d3d7
|
fix bug
|
2 years ago |
|
wangchuxiao
|
6553ada66f
|
add set client init
|
2 years ago |
|
Gordon
|
c0b49ff219
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
d20c89ba21
|
merge shichuang 2 v2.3.0release
|
2 years ago |
|
wangchuxiao
|
ee577cae4c
|
add conversationCache
|
2 years ago |
|
Gordon
|
ed5b215bbb
|
pc terminal can login at same time
|
2 years ago |
|
skiffer-git
|
9f002172db
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
5d661f2fc6
|
add user register IP
|
2 years ago |
|
wangchuxiao
|
840e08fc8a
|
Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang
|
2 years ago |
|
wangchuxiao
|
761b8c40d6
|
conversation cache function
|
2 years ago |
|
Gordon
|
40b7314f6d
|
model add update time
|
2 years ago |
|
wangchuxiao
|
5c3a43f602
|
fix bug
|
2 years ago |
|
skiffer-git
|
85a52f5d6b
|
get grpc conn from config
|
2 years ago |
|
Gordon
|
97b1a774fb
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
12a4c12753
|
notification
|
2 years ago |
|
wangchuxiao
|
2016a1656b
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
3f74022142
|
Merge branch 'main' into del
|
2 years ago |
|
wangchuxiao
|
ad1015c8b0
|
fix code
|
2 years ago |
|
wangchuxiao
|
d666f0245d
|
Merge pull request #267 from ouyangshi/del
封禁用户列表
|
2 years ago |
|
wangchuxiao
|
7f252909fc
|
fix code
|
2 years ago |
欧阳氏
|
7b9d0b4f1f
|
封禁用户列表
|
2 years ago |
|
wangchuxiao
|
1747ae8984
|
fix code
|
2 years ago |
|
wangchuxiao
|
dfee8891d3
|
fix code
|
2 years ago |
|
wangchuxiao
|
cb10df7c9f
|
fix code
|
2 years ago |
|
wangchuxiao
|
919e2543ca
|
fix code
|
2 years ago |
|
wangchuxiao
|
b705ac24fa
|
fix code
|
2 years ago |
|
wangchuxiao
|
4ec255917d
|
Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del
|
2 years ago |
|
wangchuxiao
|
9b86a18752
|
Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del
# Conflicts:
# pkg/common/db/mysql_model/im_mysql_model/ip_model.go
|
2 years ago |
|
skiffer-git
|
630fef29a2
|
Restrict user login with IP
|
2 years ago |
|
wangchuxiao
|
05d45c94d5
|
ip limit
|
2 years ago |
|
skiffer-git
|
8b857f9980
|
Restrict user login with IP
|
2 years ago |
|
wangchuxiao
|
7d1707ca7c
|
fix log
|
2 years ago |
|
skiffer-git
|
5e3a3c61f3
|
Set the token activity time to five minutes ago
|
2 years ago |
|
skiffer-git
|
073b6d200a
|
Set the token activity time to five minutes ago
|
2 years ago |
|
wangchuxiao
|
d5239365be
|
hide jwt not active yet
|
2 years ago |
|
欧阳氏
|
ac7f905248
|
完善 用户注册 用户更新
|
2 years ago |
|
欧阳氏
|
39606248a1
|
邀请码功能
1、新增邀请码功能
needInvitationCode: false 改成 true 后生效
2、完善后台用户注册 修改相关
|
2 years ago |
|
skiffer-git
|
4e5c1606f3
|
log
|
2 years ago |
|
wangchuxiao
|
9b130ae56c
|
fix log
|
2 years ago |
|
wangchuxiao
|
a48b2e9edb
|
cms
|
2 years ago |
|
wangchuxiao
|
e4bbd57c41
|
fix log
|
2 years ago |
|
wangchuxiao
|
69008e08be
|
cms api rpc
|
2 years ago |
|
wangchuxiao
|
60029fc618
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
f3e71fec91
|
callback kickoff
|
2 years ago |
|
wangchuxiao
|
c2bd1d0d83
|
callback kickoff
|
2 years ago |
|
skiffer-git
|
c53bcd990d
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
78c807a514
|
add Invitation Code
|
2 years ago |
|
wangchuxiao
|
c4084cbcec
|
callback kickoff
|
2 years ago |
|
wangchuxiao
|
062c4b53b6
|
Merge pull request #258 from ouyangshi/main
增加 AWS S3 存储
|
2 years ago |
|
wangchuxiao
|
5c5f80691a
|
fix delete
|
2 years ago |
|
wangchuxiao
|
429bee7e6c
|
Merge pull request #261 from ouyangshi/v2.3.0release
增加注册IP 登陆IP+用户IP限制策略
|
2 years ago |
Smile
|
547ad7a2c7
|
kafka topic优化及解释，删除废弃topic的冗余代码 (#255)
|
2 years ago |
|
wangchuxiao
|
6bfa8643d6
|
fix delete
|
2 years ago |
|
skiffer-git
|
281f4b38d2
|
add log
|
2 years ago |
|
skiffer-git
|
7b590e4bd6
|
add log
|
2 years ago |
|
skiffer-git
|
923a035e6e
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
a2a56980d9
|
add log
|
2 years ago |
|
wangchuxiao
|
a74168d1e1
|
fix delete
|
2 years ago |
|
wangchuxiao
|
6c0922a6d8
|
fix delete
|
2 years ago |
|
wangchuxiao
|
706f6c6747
|
getui debug
|
2 years ago |
|
wangchuxiao
|
2c0a2d7877
|
getui debug
|
2 years ago |
|
欧阳氏
|
9358aa1bd8
|
用户表增加注册IP 登陆IP
1、用户表增加注册IP 登陆IP
2、新增ip_limit表、user_ip_limit表
3、用户创建需要增加createIp参数同步
用户登录需要增加loginIp参数同步
login_limit 限制说明
0:读取ip_limits表 限制用户注册+用户登陆IP
1:读取user_ip_limits表 限制用户在指定IP登陆
2:读取black_lists表 限制用户在限制时间不能登陆
|
2 years ago |
|
wangchuxiao
|
4cfa8d880f
|
getui debug
|
2 years ago |
|
skiffer-git
|
bba5e7db0c
|
fix bug
|
2 years ago |
|
skiffer-git
|
eb960f2606
|
fix bug
|
2 years ago |
|
skiffer-git
|
92a68108a6
|
fix bug
|
2 years ago |
|
wangchuxiao
|
11f29280b1
|
group hash
|
2 years ago |
|
wangchuxiao
|
faae01cb8a
|
fix bug
|
2 years ago |
|
wangchuxiao
|
d1ffa9b330
|
callback fix
|
2 years ago |
|
Gordon
|
ba5edabb2c
|
del conversation bug fix
|
2 years ago |
|
Gordon
|
319631b5c4
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
10c0f3075a
|
unread bug fix
|
2 years ago |
|
wangchuxiao
|
576348b1f2
|
callback fix
|
2 years ago |
|
wangchuxiao
|
db547d60df
|
callback fix
|
2 years ago |
|
wangchuxiao
|
0f655e9292
|
callback fix
|
2 years ago |
|
wangchuxiao
|
3d0827a6da
|
callback fix
|
2 years ago |
|
Gordon
|
0117e96d5b
|
callback msg content
|
2 years ago |
|
Gordon
|
ca7bba33e6
|
docker-compose file update
|
2 years ago |
|
wangchuxiao
|
a99dbf634b
|
callback fix
|
2 years ago |
|
wangchuxiao
|
b32463df53
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
f202d5f54a
|
fix bug
|
2 years ago |
|
Gordon
|
22a39ed4d3
|
config file update
|
2 years ago |
|
Gordon
|
4003befc2a
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
c17ca47e7d
|
config file update
|
2 years ago |
|
wangchuxiao
|
e2e5ab656f
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
b4d82579b7
|
fix bug
|
2 years ago |
|
Gordon
|
6734c714d7
|
config file update
|
2 years ago |
|
Gordon
|
526aa15ff6
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
bc0e9eb74e
|
config file update
|
2 years ago |
|
Gordon
|
a425c62156
|
config file update
|
2 years ago |
|
wangchuxiao
|
9136838b63
|
fix bug
|
2 years ago |
|
欧阳氏
|
cfa9f2d13f
|
增加 AWS S3 存储
|
2 years ago |
|
wangchuxiao
|
0a8a248349
|
fix bug
|
2 years ago |
|
Gordon
|
6def5bd3cf
|
add test file
|
2 years ago |
|
Gordon
|
c43290338d
|
add test file
|
2 years ago |
|
Gordon
|
783a982ca8
|
remove _:
|
2 years ago |
|
wangchuxiao
|
6e826cf369
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
8f12fa52b4
|
mongodb superGroup to cache
|
2 years ago |
|
Gordon
|
6d15e5b5a1
|
msg
|
2 years ago |
|
Gordon
|
787cef54f5
|
manger send msg modify
|
2 years ago |
|
Gordon
|
4b6332dbfa
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
