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 |
|
Gordon
|
b5deceaa3b
|
put client msg id to offline callback
|
2 years ago |
|
Gordon
|
22099d82be
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
07e1de2f62
|
put client msg id to offline callback
|
2 years ago |
|
wangchuxiao
|
2203638fc5
|
promethues
|
2 years ago |
|
wangchuxiao
|
f41cebe776
|
prometheus
|
2 years ago |
|
wangchuxiao
|
dd47dbffe8
|
docker-compose
|
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
|
6871c7e665
|
fix bug
|
2 years ago |
|
wangchuxiao
|
a508dd2c0f
|
fix bug
|
2 years ago |
|
wangchuxiao
|
5469bb6508
|
fix bug
|
2 years ago |
|
wangchuxiao
|
099461dbbf
|
cms
|
2 years ago |
|
wangchuxiao
|
5233e4c097
|
fix bug
|
2 years ago |
|
wangchuxiao
|
7208dd6b2a
|
cms
|
2 years ago |
|
wangchuxiao
|
a5cacaceda
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
821e704b5b
|
cms
|
2 years ago |
|
Gordon
|
82c79bd91c
|
conversation unread modify
|
2 years ago |
|
Gordon
|
bde0adfbd0
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
# pkg/proto/sdk_ws/ws.pb.go
|
2 years ago |
|
Gordon
|
6c8b115479
|
conversation unread modify
|
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 |
|
skiffer-git
|
3fcc2c2678
|
cache for GetDefaultGatewayConn4Unique
|
2 years ago |
|
wangchuxiao
|
6dfbb90b80
|
fix signal
|
2 years ago |
|
Gordon
|
72aff32024
|
fcm ios push badge
|
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
|
714dd597f1
|
fcm ios push badge
|
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
|
87dfdb2ddc
|
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
|
9b5e1465c3
|
add
|
2 years ago |
|
wangchuxiao
|
7f5b12d4d2
|
cms
|
2 years ago |
|
wangchuxiao
|
c3d3f0986e
|
join groups
|
2 years ago |
|
skiffer-git
|
39720d401f
|
fix bug: msg_gateway/gate/ws_server.go:138
|
2 years ago |
|
wangchuxiao
|
3886d49b0a
|
admin cms
|
2 years ago |
|
Gordon
|
27dd574c4d
|
err log
|
2 years ago |
|
Gordon
|
1f4eeaa269
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
aa2d07ca8d
|
callback add ex field and sdk server shell update
|
2 years ago |
|
wangchuxiao
|
3739127044
|
conversation
|
2 years ago |
|
wangchuxiao
|
2dab179166
|
conversation
|
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
|
3d5876a8c0
|
Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
7d04f06f7d
|
conversation fix
|
2 years ago |
|
Gordon
|
2c21bf3e0e
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
c1a2dee0e9
|
pb update
|
2 years ago |
|
wangchuxiao
|
782ad07940
|
fix bug
|
2 years ago |
|
wangchuxiao
|
d57729d3d7
|
fix bug
|
2 years ago |
|
wangchuxiao
|
d4d9e08ae2
|
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 |
|
Gordon
|
9a82dd356c
|
callback add offline info
|
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
|
5a995a8624
|
rtc pb
|
2 years ago |
|
wangchuxiao
|
4614107b2b
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
d6dd99bb4a
|
add
|
2 years ago |
|
wangchuxiao
|
d0a200f652
|
etcd
|
2 years ago |
|
wangchuxiao
|
9138f90843
|
etcd
|
2 years ago |
|
wangchuxiao
|
766a8fa4dd
|
Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang
|
2 years ago |
|
wangchuxiao
|
6f2451edd3
|
etcd
|
2 years ago |
|
skiffer-git
|
864fccbdb2
|
get grpc conn from config
|
2 years ago |
|
wangchuxiao
|
8956df9599
|
etcd
|
2 years ago |
|
skiffer-git
|
a3daaa55b5
|
get grpc conn from config
|
2 years ago |
|
skiffer-git
|
85a52f5d6b
|
get grpc conn from config
|
2 years ago |
|
skiffer-git
|
cdf09aa1bd
|
get grpc conn from config
|
2 years ago |
|
wangchuxiao
|
b5166acada
|
update orgnization after update user
|
2 years ago |
|
skiffer-git
|
5b06791a6c
|
set max PlatformID = 9
|
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 |
|
Gordon
|
1f8a965b7a
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
8b491f4c94
|
retry function
|
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 |
|
Gordon
|
652d560a21
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
be69ee8b1d
|
fcm update
|
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 |
