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 |
