236 Commits

Author SHA1 Message Date
wangchuxiao
a372ef3faa cms 2022-09-02 11:35:20 +08:00
wangchuxiao
a317ebd8e7 cms 2022-09-02 11:26:25 +08:00
wangchuxiao
6774a8594f cms 2022-09-02 02:01:42 +08:00
wangchuxiao
c2831e6676 cms 2022-08-31 00:43:06 +08:00
wangchuxiao
a4b95cb7cf cms 2022-08-30 23:23:53 +08:00
wangchuxiao
5134faeefd cms 2022-08-30 17:33:20 +08:00
wangchuxiao
77327f59b9 cms 2022-08-30 16:53:15 +08:00
wangchuxiao
8d4e5ad3f1 cms 2022-08-30 01:38:23 +08:00
wangchuxiao
5657f617e7 merge 2022-08-29 16:16:33 +08:00
wangchuxiao
3886d49b0a admin cms 2022-08-26 17:51:01 +08:00
Gordon
ec0cd9a348 conversation update 2022-08-23 12:06:44 +08:00
wangchuxiao
92fc43cb3d conversation 2022-08-22 16:14:31 +08:00
wangchuxiao
782ad07940 fix bug 2022-08-21 22:28:10 +08:00
wangchuxiao
d57729d3d7 fix bug 2022-08-21 22:22:59 +08:00
wangchuxiao
6553ada66f add set client init 2022-08-21 21:54:32 +08:00
wangchuxiao
d20c89ba21 merge shichuang 2 v2.3.0release 2022-08-21 17:57:44 +08:00
wangchuxiao
ee577cae4c add conversationCache 2022-08-21 17:33:40 +08:00
skiffer-git
5d661f2fc6 add user register IP 2022-08-19 21:37:39 +08:00
wangchuxiao
761b8c40d6 conversation cache function 2022-08-19 12:09:05 +08:00
wangchuxiao
ad1015c8b0 fix code 2022-08-15 20:41:46 +08:00
wangchuxiao
d666f0245d
Merge pull request #267 from ouyangshi/del
封禁用户列表
2022-08-15 20:37:36 +08:00
wangchuxiao
7f252909fc fix code 2022-08-15 20:36:16 +08:00
欧阳氏
7b9d0b4f1f 封禁用户列表 2022-08-15 20:33:09 +08:00
wangchuxiao
1747ae8984 fix code 2022-08-15 20:21:06 +08:00
wangchuxiao
dfee8891d3 fix code 2022-08-15 20:16:15 +08:00
wangchuxiao
cb10df7c9f fix code 2022-08-15 20:11:08 +08:00
wangchuxiao
919e2543ca fix code 2022-08-15 19:50:13 +08:00
wangchuxiao
b705ac24fa fix code 2022-08-15 19:27:23 +08:00
wangchuxiao
4ec255917d Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del 2022-08-15 18:59:52 +08:00
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
2022-08-15 18:58:48 +08:00
skiffer-git
630fef29a2 Restrict user login with IP 2022-08-15 18:43:12 +08:00
wangchuxiao
05d45c94d5 ip limit 2022-08-15 18:39:34 +08:00
skiffer-git
8b857f9980 Restrict user login with IP 2022-08-15 17:52:45 +08:00
wangchuxiao
7d1707ca7c fix log 2022-08-15 16:51:41 +08:00
欧阳氏
ac7f905248 完善 用户注册 用户更新 2022-08-14 22:53:41 +08:00
欧阳氏
39606248a1 邀请码功能
1、新增邀请码功能
  needInvitationCode: false 改成 true 后生效
2、完善后台用户注册 修改相关
2022-08-13 10:41:10 +08:00
wangchuxiao
a48b2e9edb cms 2022-08-12 18:37:51 +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
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
a6cf407a8f fix bug 2022-07-21 17:46:51 +08:00
wangchuxiao
1e6a93b4b6 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	internal/rpc/group/group.go
#	internal/rpc/user/user.go
#	pkg/common/db/mysql_model/im_mysql_model/group_model.go
2022-07-14 14:06:30 +08:00
wangchuxiao
b064244907 rocks cache 2022-07-14 12:08:28 +08:00
skiffer-git
a01156feb6 fix bug 2022-07-14 11:50:58 +08:00
skiffer-git
af1d8fa834 fix bug 2022-07-14 11:43:01 +08:00
wangchuxiao
3ad3b30d97 demo 2022-07-05 14:30:53 +08:00
wangchuxiao
d0e7147911 demo 2022-07-05 11:01:10 +08:00
wangchuxiao
99062805ec add swagger demo 2022-06-24 17:45:33 +08:00
wangchuxiao
c5eb8a3f9b 入职流程 2022-06-17 12:09:42 +08:00
wangchuxiao
52ae2c3655 fix bug 2022-06-17 10:44:23 +08:00