921 Commits

Author SHA1 Message Date
欧阳氏
39606248a1 邀请码功能
1、新增邀请码功能
  needInvitationCode: false 改成 true 后生效
2、完善后台用户注册 修改相关
2022-08-13 10:41:10 +08:00
wangchuxiao
5b248c82f5 fix log 2022-08-12 19:37:45 +08:00
wangchuxiao
a48b2e9edb cms 2022-08-12 18:37:51 +08:00
wangchuxiao
69008e08be cms api rpc 2022-08-12 11:24:21 +08:00
wangchuxiao
60029fc618 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-11 20:25:48 +08:00
Gordon
54cdb24cec user add delete cache 2022-08-11 20:04:15 +08:00
wangchuxiao
c2bd1d0d83 callback kickoff 2022-08-11 19:47:59 +08:00
wangchuxiao
429bee7e6c
Merge pull request #261 from ouyangshi/v2.3.0release
增加注册IP 登陆IP+用户IP限制策略
2022-08-11 11:07:56 +08:00
Smile
547ad7a2c7
kafka topic优化及解释,删除废弃topic的冗余代码 (#255) 2022-08-11 10:24:37 +08:00
Gordon
25de6b58c3 conversation update 2022-08-10 18:29:49 +08:00
wangchuxiao
2c0a2d7877 getui debug 2022-08-09 16:38:33 +08:00
Gordon
7bd7edfec9 send options bug fix 2022-08-09 15:54:16 +08:00
Gordon
db8c4f369c send options bug fix 2022-08-09 15:41:16 +08:00
Gordon
569d5d2d89 super group add after callback 2022-08-09 15:12:13 +08:00
skiffer-git
5cbea2cab5 Set token kicked status first in forceKickOff 2022-08-09 13:52:20 +08:00
skiffer-git
57a21ab8e6 forceKickOff work 2022-08-09 13:18:02 +08:00
skiffer-git
c52bdce621 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
#	internal/api/user/user.go
2022-08-09 13:02:02 +08:00
欧阳氏
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表 限制用户在限制时间不能登陆
2022-08-09 10:42:19 +08:00
skiffer-git
52e57cf547 fix bug 2022-08-08 20:01:29 +08:00
Gordon
e33af2a316 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-08 17:42:39 +08:00
Gordon
ffc4da1589 callback add seq 2022-08-08 17:42:06 +08:00
wangchuxiao
b4b215a3f8 group hash 2022-08-08 12:10:28 +08:00
wangchuxiao
73c998f510 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-08 11:58:30 +08:00
wangchuxiao
11f29280b1 group hash 2022-08-08 11:30:10 +08:00
Gordon
2cf10fce38 del conversation bug fix 2022-08-05 19:10:08 +08:00
Gordon
403489865c del conversation bug fix 2022-08-05 16:43:23 +08:00
Gordon
37799ca0be del conversation bug fix 2022-08-05 15:51:34 +08:00
Gordon
ba5edabb2c del conversation bug fix 2022-08-05 15:16:43 +08:00
Gordon
319631b5c4 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-05 12:08:49 +08:00
Gordon
10c0f3075a unread bug fix 2022-08-05 12:08:00 +08:00
wangchuxiao
4e69ff196a cache get group 2022-08-04 19:08:08 +08:00
wangchuxiao
db547d60df callback fix 2022-08-04 18:24:17 +08:00
wangchuxiao
3d0827a6da callback fix 2022-08-04 17:20:33 +08:00
wangchuxiao
b294a8138c Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-04 14:22:27 +08:00
wangchuxiao
a99dbf634b callback fix 2022-08-04 14:21:03 +08:00
Gordon
e9da7f28cc Merge branch 'main' into v2.3.0release
# Conflicts:
#	pkg/common/config/config.go
2022-08-04 10:01:45 +08:00
Gordon
c4ee293388 docker-compose file update 2022-08-04 10:00:32 +08:00
wangchuxiao
d99b0893df fix bug 2022-08-01 19:13:26 +08:00
wangchuxiao
f202d5f54a fix bug 2022-08-01 17:44:40 +08:00
wangchuxiao
ef9c291d9a fix bug 2022-08-01 11:52:43 +08:00
wangchuxiao
c25352b660 fix bug 2022-07-29 20:49:27 +08:00
wangchuxiao
151fec445e fix bug 2022-07-29 17:50:00 +08:00
wangchuxiao
6e826cf369 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-07-29 14:36:33 +08:00
wangchuxiao
8f12fa52b4 mongodb superGroup to cache 2022-07-29 14:36:07 +08:00
Gordon
6d15e5b5a1 msg 2022-07-29 13:05:51 +08:00
Gordon
51679b47a6 delete super group message 2022-07-29 12:24:54 +08:00
Gordon
787cef54f5 manger send msg modify 2022-07-28 18:14:58 +08:00
Gordon
5a626e9dab add update conversation unread count 2022-07-26 21:02:11 +08:00
wangchuxiao
f84cc0554f superGroupMaxSeq 2022-07-26 15:26:39 +08:00
wangchuxiao
2d20c4ee4c superGroupMaxSeq 2022-07-26 15:23:33 +08:00