843 Commits

Author SHA1 Message Date
wangchuxiao
9b130ae56c fix log 2022-08-12 19:13:08 +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
wangchuxiao
f3e71fec91 callback kickoff 2022-08-11 20:25:33 +08:00
wangchuxiao
c2bd1d0d83 callback kickoff 2022-08-11 19:47:59 +08:00
skiffer-git
c53bcd990d Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-11 16:06:54 +08:00
skiffer-git
78c807a514 add Invitation Code 2022-08-11 16:06:35 +08:00
wangchuxiao
c4084cbcec callback kickoff 2022-08-11 15:55:33 +08:00
wangchuxiao
5c5f80691a fix delete 2022-08-11 12:09:44 +08:00
wangchuxiao
429bee7e6c
Merge pull request #261 from ouyangshi/v2.3.0release
增加注册IP 登陆IP+用户IP限制策略
2022-08-11 11:07:56 +08:00
wangchuxiao
6bfa8643d6 fix delete 2022-08-10 19:31:57 +08:00
skiffer-git
281f4b38d2 add log 2022-08-10 14:15:45 +08:00
skiffer-git
7b590e4bd6 add log 2022-08-10 14:01:26 +08:00
skiffer-git
923a035e6e Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-10 13:29:34 +08:00
skiffer-git
a2a56980d9 add log 2022-08-10 13:29:12 +08:00
wangchuxiao
a74168d1e1 fix delete 2022-08-10 12:02:50 +08:00
wangchuxiao
6c0922a6d8 fix delete 2022-08-09 19:44:27 +08:00
wangchuxiao
706f6c6747 getui debug 2022-08-09 18:48:11 +08:00
wangchuxiao
2c0a2d7877 getui debug 2022-08-09 16:38:33 +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
wangchuxiao
4cfa8d880f getui debug 2022-08-08 17:14:59 +08:00
skiffer-git
bba5e7db0c fix bug 2022-08-08 13:44:43 +08:00
skiffer-git
eb960f2606 fix bug 2022-08-08 13:43:57 +08:00
skiffer-git
92a68108a6 fix bug 2022-08-08 13:21:06 +08:00
wangchuxiao
11f29280b1 group hash 2022-08-08 11:30:10 +08:00
wangchuxiao
faae01cb8a fix bug 2022-08-05 18:38:25 +08:00
wangchuxiao
d1ffa9b330 callback fix 2022-08-05 15:54:00 +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
576348b1f2 callback fix 2022-08-04 18:55:38 +08:00
wangchuxiao
db547d60df callback fix 2022-08-04 18:24:17 +08:00
wangchuxiao
0f655e9292 callback fix 2022-08-04 17:23:21 +08:00
wangchuxiao
3d0827a6da callback fix 2022-08-04 17:20:33 +08:00
Gordon
0117e96d5b callback msg content 2022-08-04 16:27:39 +08:00
Gordon
ca7bba33e6 docker-compose file update 2022-08-04 14:46:30 +08:00
wangchuxiao
a99dbf634b callback fix 2022-08-04 14:21:03 +08:00
wangchuxiao
b32463df53 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-01 17:45:09 +08:00
wangchuxiao
f202d5f54a fix bug 2022-08-01 17:44:40 +08:00
Gordon
22a39ed4d3 config file update 2022-08-01 16:56:06 +08:00
Gordon
4003befc2a Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-01 16:42:25 +08:00
Gordon
c17ca47e7d config file update 2022-08-01 16:42:07 +08:00
wangchuxiao
e2e5ab656f Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-01 16:39:52 +08:00
wangchuxiao
b4d82579b7 fix bug 2022-08-01 16:36:23 +08:00
Gordon
6734c714d7 config file update 2022-08-01 16:23:52 +08:00
Gordon
526aa15ff6 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-01 16:09:42 +08:00
Gordon
bc0e9eb74e config file update 2022-08-01 16:09:03 +08:00
wangchuxiao
9136838b63 fix bug 2022-08-01 14:33:01 +08:00
wangchuxiao
0a8a248349 fix bug 2022-07-29 21:53:53 +08:00