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 |
withchao
|
5c99bdf14f
|
1
|
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 |
|
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
|
62a67905af
|
1
|
2 years ago |
|
wangchuxiao
|
80b22e0e0e
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
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 |
|
withchao
|
6641637f12
|
1
|
2 years ago |
|
wangchuxiao
|
6205c67b70
|
log
|
2 years ago |
|
wangchuxiao
|
e466faa20d
|
db
|
2 years ago |
|
wangchuxiao
|
88d6fc663a
|
db
|
2 years ago |
|
wangchuxiao
|
dff32dd7ef
|
db
|
2 years ago |
|
wangchuxiao
|
d3c9ef6992
|
fix Pb2String
|
2 years ago |
|
wangchuxiao
|
c96ccfc7f5
|
fix Pb2String
|
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
|
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 |
|
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
|
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
|
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
|
c076f16793
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
89a4fe96b5
|
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 |
|
wangchuxiao
|
e80afa610d
|
getui
|
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
|
6f20cdd905
|
reaction message
|
2 years ago |
|
wangchuxiao
|
6d45f0730c
|
mongo operation
|
2 years ago |
|
wangchuxiao
|
24288aa597
|
modify msg
|
2 years ago |
|
wangchuxiao
|
a4e2e23fbe
|
modify
|
2 years ago |
|
wangchuxiao
|
0e726a20ba
|
modify
|
2 years ago |
|
wangchuxiao
|
be01c4da0c
|
dek jinzhu
|
2 years ago |
|
wangchuxiao
|
837efc90b6
|
ws connID
|
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
|
8ac36526a8
|
get chat log do not need time
|
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 |
|
skiffer-git
|
029c020fe0
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
1b3fbf56d0
|
test cron
|
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
|
cd7b484fc2
|
message pull
|
2 years ago |
|
wangchuxiao
|
6b30097bde
|
index fix
|
2 years ago |
|
wangchuxiao
|
7dc1f9b81b
|
index fix
|
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 |
|
Gordon
|
0a28bcfbe9
|
mongo index modify
|
2 years ago |
|
wangchuxiao
|
31c18bf856
|
organization
|
2 years ago |
|
wangchuxiao
|
168dd1d01f
|
orgization
|
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
|
4c0b96d81a
|
check login
|
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
|
c025d0d030
|
add mysql
|
2 years ago |
|
wangchuxiao
|
1ce0a3b5d3
|
add mysql
|
2 years ago |
|
wangchuxiao
|
7c79d10f5d
|
add mysql
|
2 years ago |
|
skiffer-git
|
d26076c0e4
|
prometheus for statistics
|
2 years ago |
|
skiffer-git
|
979100850c
|
prometheus for statistics
|
2 years ago |
|
skiffer-git
|
375fc0c89e
|
prometheus for statistics
|
2 years ago |
|
skiffer-git
|
ebdb875c56
|
prometheus for statistics
|
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
|
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
|
d491c482a5
|
hash
|
2 years ago |
|
wangchuxiao
|
82f2ec24fb
|
group
|
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 |
|
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 |
|
Gordon
|
67e5e3b56b
|
fcm ios push badge
|
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
|
8cfb604a0d
|
set mysql connection
|
2 years ago |
|
wangchuxiao
|
5657f617e7
|
merge
|
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 |
|
wangchuxiao
|
d20c89ba21
|
merge shichuang 2 v2.3.0release
|
2 years ago |
|
wangchuxiao
|
ee577cae4c
|
add conversationCache
|
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 |
|
wangchuxiao
|
2016a1656b
|
Merge branch 'v2.3.0release' 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 |
|
欧阳氏
|
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
|
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 |
|
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
|
5c5f80691a
|
fix delete
|
2 years ago |
|
wangchuxiao
|
429bee7e6c
|
Merge pull request #261 from ouyangshi/v2.3.0release
增加注册IP 登陆IP+用户IP限制策略
|
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
|
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 |
|
Gordon
|
ba5edabb2c
|
del conversation 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 |
|
wangchuxiao
|
f202d5f54a
|
fix bug
|
2 years ago |
|
wangchuxiao
|
b4d82579b7
|
fix bug
|
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
|
4b6332dbfa
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
bbc62ef907
|
remove cache message from redis
|
2 years ago |
|
wenxu12345
|
0ddf5eadb6
|
Push message to client through message queue
|
2 years ago |
|
wangchuxiao
|
192c764c8c
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
041a35e3c8
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
cf205c2480
|
superGroupMaxSeq
|
2 years ago |
|
Gordon
|
a3530be7b4
|
firebase update
|
2 years ago |
|
Gordon
|
e61434347e
|
Merge branch 'superGroup' into v2.3.0release
# Conflicts:
# go.sum
# pkg/common/db/RedisModel.go
# pkg/common/db/model.go
|
2 years ago |
|
欧阳氏
|
84c068783d
|
新增 firebase cloud message 消息推送 (#236)
* 新增 firebase cloud message 消息推送
新增 api接口 /third/fcm_update_token 用于更新客户端获取到 FCM token 同步到服务器
* mongodb授权缺少授权数据库
windows下面的编译+启动
|
2 years ago |
|
wangchuxiao
|
a3f62e2246
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
a5ef78fd1e
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
a937a94e43
|
fix bug
|
2 years ago |
|
wangchuxiao
|
a6cf407a8f
|
fix bug
|
2 years ago |
|
wangchuxiao
|
eec8eb4766
|
dtm
|
2 years ago |
|
wangchuxiao
|
52c71e3843
|
dtm
|
2 years ago |
|
wangchuxiao
|
960e3d34eb
|
dtm
|
2 years ago |
|
wangchuxiao
|
cbb127ff38
|
Merge branch 'dtm' into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
db1a043261
|
dtm
|
2 years ago |
|
wangchuxiao
|
f9eee19cbe
|
dtm
|
2 years ago |
|
wangchuxiao
|
eb1aeefc8c
|
Merge branch 'dtm' into v2.3.0release
# Conflicts:
# internal/rpc/group/group.go
|
2 years ago |
|
skiffer-git
|
f383d6c636
|
rename
|
2 years ago |
|
skiffer-git
|
53eebb0638
|
rename
|
2 years ago |
|
skiffer-git
|
4546e77d5b
|
rename
|
2 years ago |
|
skiffer-git
|
7d2eb31f05
|
rename
|
2 years ago |
|
wangchuxiao
|
1531db0a35
|
departmentcache
|
2 years ago |
|
wangchuxiao
|
6d91f766e7
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
bf5bce9e64
|
rocks cache
|
2 years ago |
|
wangchuxiao
|
5afa3380a6
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
85f5c59781
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
8ee4ca0357
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
656241c23f
|
docker-compose fix
|
2 years ago |
|
skiffer-git
|
5936492f76
|
Filter out disbanded groups
|
2 years ago |
|
wangchuxiao
|
abe06b8753
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
1b4b2b9bb1
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
1e6a93b4b6
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
# internal/rpc/group/group.go
# internal/rpc/user/user.go
# pkg/common/db/mysql_model/im_mysql_model/group_model.go
|
2 years ago |
|
skiffer-git
|
8ad22f8148
|
fix bug
|
2 years ago |
|
wangchuxiao
|
b064244907
|
rocks cache
|
2 years ago |
|
skiffer-git
|
a01156feb6
|
fix bug
|
2 years ago |
|
skiffer-git
|
af1d8fa834
|
fix bug
|
2 years ago |
|
skiffer-git
|
2d110deb09
|
Show group notification editor
|
2 years ago |
|
skiffer-git
|
fb4cef7ccb
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
3b6b88fd62
|
Source of joining the group
|
2 years ago |
|
Gordon
|
adb7da7aaf
|
group add field
|
2 years ago |
|
wangchuxiao
|
9e0e2fe124
|
fix bug
|
2 years ago |
|
Gordon
|
9cfbd8107e
|
add redis username
|
2 years ago |
|
Gordon
|
b70a4070f2
|
add redis username
|
2 years ago |
|
Gordon
|
d3b302ce66
|
add redis username
|
2 years ago |
|
Gordon
|
5a423f88dd
|
add redis username
|
2 years ago |
|
Gordon
|
f89c1edadf
|
add redis username
|
2 years ago |
|
wangchuxiao
|
4035f037d2
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
Gordon
|
2b6f861f3b
|
test group file
|
2 years ago |
|
Gordon
|
9a813030a3
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
04b7dd719c
|
test group
|
2 years ago |
|
wangchuxiao
|
3ad3b30d97
|
demo
|
2 years ago |
|
wangchuxiao
|
d0e7147911
|
demo
|
2 years ago |
|
wangchuxiao
|
99062805ec
|
add swagger demo
|
2 years ago |
|
wenxu12345
|
db7ef3ac4b
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
wenxu12345
|
5b8ef3a17c
|
verification gor joining group chat
|
2 years ago |
|
Gordon
|
ddddbf6987
|
remove old redis module
|
2 years ago |
|
Gordon
|
2f2f72fe4b
|
test
|
2 years ago |
|
Gordon
|
34fe9596a9
|
test
|
2 years ago |
|
Gordon
|
af7dde61d6
|
model update
|
2 years ago |
|
wangchuxiao
|
59a53c7c73
|
fix bug
|
2 years ago |
|
wangchuxiao
|
c5eb8a3f9b
|
入职流程
|
2 years ago |
|
Gordon
|
04136d5b9d
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
fd256a6c28
|
config file update
|
2 years ago |
|
wangchuxiao
|
52ae2c3655
|
fix bug
|
2 years ago |
|
wangchuxiao
|
d1049b8022
|
fix bug
|
2 years ago |
|
Gordon
|
57d96b85f1
|
add global recv opt
|
2 years ago |
|
wangchuxiao
|
b3dcff2d76
|
redis interface
|
2 years ago |
|
wangchuxiao
|
96d3ae86cc
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
Gordon
|
7e6e214f08
|
add global recv opt
|
2 years ago |
|
Gordon
|
5e51eebe8a
|
msg handle
|
2 years ago |
|
wangchuxiao
|
f9a26e9195
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
ea76f20825
|
GlobalRecvMsgOpt
|
2 years ago |
|
Gordon
|
2e7e278ba4
|
redis restore
|
2 years ago |
|
Gordon
|
d74bea25aa
|
redis replace to go_redis
|
2 years ago |
|
Gordon
|
f96e12a8b3
|
redis replace to go_redis
|
2 years ago |
|
Gordon
|
eef47017a3
|
redis replace to go_redis
|
2 years ago |
|
Gordon
|
4315d9dfbb
|
redis replace to go_redis
|
2 years ago |
|
Gordon
|
d7961bf226
|
redis replace to go_redis
|
2 years ago |
|
wangchuxiao
|
1aee41e7e7
|
go-redis
|
2 years ago |
|
wangchuxiao
|
f4cdbe985e
|
alter rtc timeout
|
2 years ago |
|
Gordon
|
d3279694b7
|
add global msg recv opt
|
2 years ago |
|
Gordon
|
8fe6231ebc
|
add global msg recv opt
|
2 years ago |
|
Gordon
|
6f0860d954
|
add global msg recv opt
|
2 years ago |
|
Gordon
|
ccc69ac2d0
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
# Conflicts:
# pkg/proto/sdk_ws/ws.pb.go
|
2 years ago |
|
wangchuxiao
|
a0581618a4
|
Merge branch 'tuoyun' into superGroup
# Conflicts:
# config/config.yaml
# internal/msg_gateway/gate/logic.go
# internal/msg_gateway/gate/ws_server.go
# internal/push/logic/push_to_client.go
# internal/rpc/group/group.go
# internal/rpc/msg/send_msg.go
# pkg/common/config/config.go
# pkg/proto/sdk_ws/ws.pb.go
|
2 years ago |
|
Gordon
|
cfcccd0240
|
user add global set message recv opt
|
2 years ago |
|
wangchuxiao
|
d190616d34
|
rtc
|
2 years ago |
|
wangchuxiao
|
d7884f89f5
|
rtc
|
2 years ago |
|
Gordon
|
d8ce122254
|
redis model update
|
2 years ago |
|
wangchuxiao
|
257e98edb2
|
group
|
2 years ago |
|
Gordon
|
034201a45b
|
redis model update
|
2 years ago |
|
Gordon
|
d43b9fc6c1
|
redis model update
|
2 years ago |
|
wangchuxiao
|
52d8ab5389
|
singal
|
2 years ago |
|
wangchuxiao
|
dbc055efb4
|
org
|
2 years ago |
|
wangchuxiao
|
1687b70bde
|
fix signal
|
2 years ago |
|
wangchuxiao
|
ceca0f095b
|
demo
|
2 years ago |
|
wangchuxiao
|
ab76d46007
|
demo
|
2 years ago |
|
wangchuxiao
|
9b4890a99f
|
fix bug
|
2 years ago |
|
wangchuxiao
|
c8bf95578c
|
fix bug
|
2 years ago |
|
wangchuxiao
|
7b08d98647
|
fix bug
|
2 years ago |
|
wangchuxiao
|
6525d63459
|
fix bug
|
2 years ago |
|
wangchuxiao
|
ae684d6d39
|
fix bug
|
2 years ago |
|
wangchuxiao
|
d9710ac244
|
fix bug
|
2 years ago |
|
wangchuxiao
|
dff7a28094
|
fix bug
|
2 years ago |
|
wangchuxiao
|
da18950b3d
|
fix bug
|
2 years ago |
|
wangchuxiao
|
f650e73d5c
|
fix bug
|
2 years ago |
|
wangchuxiao
|
a4f69351ce
|
fix bug
|
2 years ago |
