wangchuxiao
|
943a5b36e3
|
Merge branch 'del' into v2.3.0release
|
2 years ago |
Gordon
|
eee98c5175
|
revoke super group message and push message modify
|
2 years ago |
|
wangchuxiao
|
d0a200f652
|
etcd
|
2 years ago |
|
wangchuxiao
|
6f2451edd3
|
etcd
|
2 years ago |
|
Gordon
|
a38291fc17
|
notification
|
2 years ago |
|
wangchuxiao
|
bda96a2175
|
fix
|
2 years ago |
|
wangchuxiao
|
64e1361ef5
|
fix signal bug
|
2 years ago |
skiffer-git
|
2f6eb5969e
|
getui
|
2 years ago |
|
skiffer-git
|
125b6fa779
|
Merge remote-tracking branch 'origin/del' into del
|
2 years ago |
|
skiffer-git
|
5e78871c00
|
getui
|
2 years ago |
|
Gordon
|
487d9a6449
|
notification
|
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
|
e8fdc454db
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
69da4410dc
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
5fc6f78555
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
15e0a7aa38
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
a37d82e2dd
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
0a14c8b3e6
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
e779280428
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
753cd95a18
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
5bd34f19fe
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
0e5b17adcc
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
b23f10ecde
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
08d6e142c3
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
2016a1656b
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
5a44618289
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
338d7f0df6
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
6d19af02c9
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
5a6f96f84b
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
3f74022142
|
Merge branch 'main' into del
|
2 years ago |
|
wangchuxiao
|
da8755fcb7
|
fix code
|
2 years ago |
|
wangchuxiao
|
3be284c129
|
fix code
|
2 years ago |
|
wangchuxiao
|
15e2d172a4
|
fix code
|
2 years ago |
|
wangchuxiao
|
4e54cb56e5
|
fix code
|
2 years ago |
|
wangchuxiao
|
1dbe80afc4
|
Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del
|
2 years ago |
|
wangchuxiao
|
0683352c4b
|
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
|
37193c48d9
|
fix code
|
2 years ago |
|
wangchuxiao
|
1747ae8984
|
fix code
|
2 years ago |
|
wangchuxiao
|
dfee8891d3
|
fix code
|
2 years ago |
|
wangchuxiao
|
c6b669eb9d
|
fix code
|
2 years ago |
|
wangchuxiao
|
919e2543ca
|
fix code
|
2 years ago |
|
wangchuxiao
|
9aa7ba77f5
|
fix code
|
2 years ago |
|
wangchuxiao
|
d5b873b70b
|
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 |
|
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
|
44e4c59493
|
Restrict user login with IP
|
2 years ago |
|
skiffer-git
|
24e7076423
|
Restrict user login with IP
|
2 years ago |
|
skiffer-git
|
8b857f9980
|
Restrict user login with IP
|
2 years ago |
|
wangchuxiao
|
7d1707ca7c
|
fix log
|
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 |
|
欧阳氏
|
ac7f905248
|
完善 用户注册 用户更新
|
2 years ago |
|
wangchuxiao
|
1a2ea05361
|
fix bug
|
2 years ago |
|
欧阳氏
|
39606248a1
|
邀请码功能
1、新增邀请码功能
needInvitationCode: false 改成 true 后生效
2、完善后台用户注册 修改相关
|
2 years ago |
|
skiffer-git
|
4e5c1606f3
|
log
|
2 years ago |
|
Gordon
|
b8aa54a159
|
mark message
|
2 years ago |
|
wangchuxiao
|
7caccce907
|
fix log
|
2 years ago |
|
wangchuxiao
|
82777d641c
|
fix log
|
2 years ago |
|
wangchuxiao
|
5b248c82f5
|
fix log
|
2 years ago |
|
Gordon
|
9c7ae3b0ef
|
mark message
|
2 years ago |
|
wangchuxiao
|
9b130ae56c
|
fix log
|
2 years ago |
|
wangchuxiao
|
a48b2e9edb
|
cms
|
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 |
|
Gordon
|
54cdb24cec
|
user add delete cache
|
2 years ago |
|
wangchuxiao
|
c2bd1d0d83
|
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 |
|
skiffer-git
|
c9d7b63ef7
|
Multiple gateways
|
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
|
079fe089de
|
Multiple gateways
|
2 years ago |
|
skiffer-git
|
5f83acf3ad
|
Multiple gateways
|
2 years ago |
|
skiffer-git
|
0d16fbe4ab
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
c1184fd7d2
|
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
|
911614673b
|
fix delete
|
2 years ago |
|
wangchuxiao
|
e80d3e7dac
|
fix delete
|
2 years ago |
|
wangchuxiao
|
7b820ebb94
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
6bfa8643d6
|
fix delete
|
2 years ago |
|
Gordon
|
25de6b58c3
|
conversation update
|
2 years ago |
|
wangchuxiao
|
cdc60ef5f0
|
fix delete
|
2 years ago |
|
wangchuxiao
|
edeb228315
|
fix delete
|
2 years ago |
|
wangchuxiao
|
f6c6d58045
|
fix delete
|
2 years ago |
|
wangchuxiao
|
b1d0ca76c9
|
fix delete
|
2 years ago |
|
wangchuxiao
|
5a058d9b97
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
2892add766
|
fix delete
|
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
|
2ee0943115
|
fix delete
|
2 years ago |
|
wangchuxiao
|
cfe218b8a4
|
fix delete
|
2 years ago |
|
wangchuxiao
|
a74168d1e1
|
fix delete
|
2 years ago |
|
wangchuxiao
|
f279b9173e
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
706f6c6747
|
getui debug
|
2 years ago |
|
Gordon
|
dd6c2df5d2
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
bcc0c7c2df
|
delete conversation update
|
2 years ago |
|
wangchuxiao
|
2c0a2d7877
|
getui debug
|
2 years ago |
|
Gordon
|
7bd7edfec9
|
send options bug fix
|
2 years ago |
|
Gordon
|
db8c4f369c
|
send options bug fix
|
2 years ago |
|
Gordon
|
569d5d2d89
|
super group add after callback
|
2 years ago |
|
skiffer-git
|
5cbea2cab5
|
Set token kicked status first in forceKickOff
|
2 years ago |
|
skiffer-git
|
57a21ab8e6
|
forceKickOff work
|
2 years ago |
|
skiffer-git
|
c52bdce621
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
# internal/api/user/user.go
|
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
|
c304de9288
|
userinfo get
|
2 years ago |
|
skiffer-git
|
52e57cf547
|
fix bug
|
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
|
cd65d42004
|
getui debug
|
2 years ago |
|
skiffer-git
|
ae8acc6eba
|
GetGroupAbstractInfoResp
|
2 years ago |
|
skiffer-git
|
1e1381df8e
|
log
|
2 years ago |
|
wangchuxiao
|
2ba7fcd628
|
group hash
|
2 years ago |
|
wangchuxiao
|
1f8e161001
|
group hash
|
2 years ago |
|
wangchuxiao
|
b4b215a3f8
|
group hash
|
2 years ago |
|
wangchuxiao
|
e2ff7ef113
|
group hash
|
2 years ago |
|
wangchuxiao
|
73c998f510
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
11f29280b1
|
group hash
|
2 years ago |
|
Gordon
|
2cf10fce38
|
del conversation bug fix
|
2 years ago |
|
Gordon
|
2436ea6ff9
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
403489865c
|
del conversation bug fix
|
2 years ago |
|
wangchuxiao
|
c8590b9e9c
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
d1ffa9b330
|
callback fix
|
2 years ago |
|
Gordon
|
37799ca0be
|
del conversation bug fix
|
2 years ago |
|
Gordon
|
ba5edabb2c
|
del conversation bug fix
|
2 years ago |
|
Gordon
|
e77b4f334d
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
87c64bdb2b
|
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
|
10c0f3075a
|
unread bug fix
|
2 years ago |
|
wangchuxiao
|
91a767b4fb
|
callback fix
|
2 years ago |
|
wangchuxiao
|
4e69ff196a
|
cache get group
|
2 years ago |
|
wangchuxiao
|
db547d60df
|
callback fix
|
2 years ago |
|
wangchuxiao
|
3d0827a6da
|
callback fix
|
2 years ago |
|
Gordon
|
231d4db71d
|
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 |
