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 |
|
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 |
|
wangchuxiao
|
cc3f53d572
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
a2ddf3567c
|
callback kickoff
|
2 years ago |
|
wangchuxiao
|
aa7ba6d659
|
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
|
06729c4e84
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
5c5f80691a
|
fix delete
|
2 years ago |
|
skiffer-git
|
5a0340e927
|
Multiple gateways
|
2 years ago |
|
skiffer-git
|
eb7e6a566b
|
Multiple gateways
|
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 |
|
Gordon
|
e33af2a316
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
ffc4da1589
|
callback add seq
|
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 |
|
skiffer-git
|
ae8acc6eba
|
GetGroupAbstractInfoResp
|
2 years ago |
|
wangchuxiao
|
12cbb1f6f9
|
group hash
|
2 years ago |
|
wangchuxiao
|
11f29280b1
|
group hash
|
2 years ago |
|
wangchuxiao
|
faae01cb8a
|
fix bug
|
2 years ago |
|
wangchuxiao
|
00bddd5e57
|
fix bug
|
2 years ago |
|
wangchuxiao
|
d1ffa9b330
|
callback fix
|
2 years ago |
|
Gordon
|
ba5edabb2c
|
del conversation bug fix
|
2 years ago |
|
skiffer-git
|
68eed69221
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
# pkg/base_info/group_api_struct.go
|
2 years ago |
|
skiffer-git
|
5db5bf17cb
|
add GetGroupAbstractInfo api
|
2 years ago |
|
Gordon
|
319631b5c4
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
0489c35417
|
unread bug fix
|
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
|
b294a8138c
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
a99dbf634b
|
callback fix
|
2 years ago |
|
skiffer-git
|
cda0fb6a10
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
a1392a7677
|
GetGroupAllMemberListBySplit
|
2 years ago |
|
Gordon
|
7057d7fffb
|
pb add fields
|
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 |
