IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-01 07:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,272 Commits 35 Branches 142 Tags
a2fe6ffc7ac02c7f0d3f40d9f6d46fae538db2b5
Commit Graph

129 Commits

Author SHA1 Message Date
wangchuxiao ea5039d2ae Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 
# Conflicts:
#	internal/rpc/user/user.go
 2023-01-16 14:53:29 +08:00
wangchuxiao 8f2e9f5261 sg recv opt 2023-01-16 14:52:12 +08:00
Gordon e1147aff9e user update 2023-01-16 13:26:14 +08:00
wangchuxiao 4bf73b0a47 sg recv opt 2023-01-13 19:47:32 +08:00
skiffer-git 5d4600a080 Separate the notification 2022-12-07 10:00:53 +08:00
Gordon 9fddf6819b user notification 2022-11-20 17:45:49 +08:00
wangchuxiao 2610a27894 add birthStr field 2022-10-28 15:42:37 +08:00
wangchuxiao 78ce5c3f69 prometheus 2022-09-15 16:39:49 +08:00
wangchuxiao 02fa9142fe prometheus 2022-09-15 16:27:36 +08:00
wangchuxiao 144cf279f9 prome 2022-09-15 08:45:10 +08:00
wangchuxiao aa6b439e8c prome 2022-09-15 01:35:08 +08:00
wangchuxiao a1f79f4508 prome 2022-09-15 01:22:20 +08:00
wangchuxiao 4682abf4c1 cms 2022-09-06 20:35:32 +08:00
wangchuxiao 5233e4c097 fix bug 2022-09-06 16:08:28 +08:00
wangchuxiao bdae1f10d4 merge cms into v2.3.0release 2022-09-05 18:11:03 +08:00
wangchuxiao 6774a8594f cms 2022-09-02 02:01:42 +08:00
wangchuxiao c7e1302377 add 2022-08-31 15:06:59 +08:00
wangchuxiao 77327f59b9 cms 2022-08-30 16:53:15 +08:00
wangchuxiao 54c56037e7 cms 2022-08-30 14:17:40 +08:00
wangchuxiao a4767bc7e3 cms 2022-08-30 01:40:54 +08:00
wangchuxiao 5657f617e7 merge 2022-08-29 16:16:33 +08:00
skiffer-git 8c21d0360f log 2022-08-29 12:04:58 +08:00
wangchuxiao 650141a498 fix org 2022-08-29 11:36:58 +08:00
wangchuxiao 3886d49b0a admin cms 2022-08-26 17:51:01 +08:00
Gordon 93f8ed223e group file update 2022-08-26 17:41:58 +08:00
Gordon ec0cd9a348 conversation update 2022-08-23 12:06:44 +08:00
Gordon c1a2dee0e9 pb update 2022-08-21 23:25:39 +08:00
wangchuxiao 7dd6869cd1 fix bug 2022-08-21 22:07:46 +08:00
wangchuxiao 33886f106c fix bug 2022-08-21 22:04:33 +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 6f2451edd3 etcd 2022-08-17 12:12:54 +08:00
wangchuxiao 5fc6f78555 Merge branch 'v2.3.0release' into del 2022-08-16 14:17:19 +08:00
wangchuxiao 15e0a7aa38 update orgnization after update user 2022-08-16 14:15:51 +08:00
wangchuxiao 5bd34f19fe Merge branch 'v2.3.0release' into del 2022-08-16 13:01:42 +08:00
wangchuxiao 0e5b17adcc update orgnization after update user 2022-08-16 13:01:14 +08:00
wangchuxiao b23f10ecde Merge branch 'v2.3.0release' into del 2022-08-16 12:57:28 +08:00
wangchuxiao 08d6e142c3 update orgnization after update user 2022-08-16 12:57:20 +08:00
wangchuxiao 6d19af02c9 Merge branch 'v2.3.0release' into del 2022-08-16 12:01:04 +08:00
wangchuxiao 5a6f96f84b update orgnization after update user 2022-08-16 11:49:20 +08:00
欧阳氏 7b9d0b4f1f 封禁用户列表 2022-08-15 20:33:09 +08:00
欧阳氏 ac7f905248 完善 用户注册 用户更新 2022-08-14 22:53:41 +08:00
Gordon 54cdb24cec user add delete cache 2022-08-11 20:04:15 +08:00
wangchuxiao 429bee7e6c Merge pull request #261 from ouyangshi/v2.3.0release 
增加注册IP 登陆IP+用户IP限制策略
 2022-08-11 11:07:56 +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
wangchuxiao 3d0827a6da callback fix 2022-08-04 17:20:33 +08:00
wangchuxiao eb1aeefc8c Merge branch 'dtm' into v2.3.0release 
# Conflicts:
#	internal/rpc/group/group.go
 2022-07-21 10:41:48 +08:00
skiffer-git f383d6c636 rename 2022-07-20 21:26:52 +08:00