256 Commits

Author SHA1 Message Date
Gordon
955bfe3f40 callback update 2022-12-30 11:44:17 +08:00
Gordon
a7f44b6ce7 callback update 2022-12-23 16:05:51 +08:00
wangchuxiao
a662414b7f Merge branch 'modify' of github.com:OpenIMSDK/Open-IM-Server into modify
# Conflicts:
#	pkg/proto/msg/msg.pb.go
2022-12-12 19:53:04 +08:00
wangchuxiao
112ce9b450 Merge branch 'modify' of github.com:OpenIMSDK/Open-IM-Server into modify
# Conflicts:
#	pkg/proto/msg/msg.pb.go
2022-12-12 19:24:53 +08:00
wangchuxiao
0f1208dba9 mongo operation 2022-12-12 19:22:50 +08:00
Gordon
25871aea49 reaction message add expiration 2022-12-12 19:15:31 +08:00
Gordon
63d75bb68b reaction message add expiration 2022-12-12 17:36:12 +08:00
Gordon
2b0a997573 reaction message add expiration 2022-12-12 16:52:36 +08:00
Gordon
84df956293 reaction message add expiration 2022-12-12 15:39:40 +08:00
Gordon
acee47e861 reaction message add expiration 2022-12-12 15:34:49 +08:00
wangchuxiao
24288aa597 modify msg 2022-12-09 18:03:40 +08:00
wangchuxiao
0fbf882059 modify 2022-12-09 12:18:38 +08:00
wangchuxiao
4d56dfdfa2 modify 2022-12-09 12:13:14 +08:00
wangchuxiao
3f5dd5bad8 read after burn time 2022-11-16 11:54:24 +08:00
wangchuxiao
2610a27894 add birthStr field 2022-10-28 15:42:37 +08:00
wangchuxiao
9964650014 Merge branch 'main' into v2.3.0release 2022-09-30 17:59:46 +08:00
wangchuxiao
9fed812872 fix bug 2022-09-29 15:53:54 +08:00
Gordon
52a4577b4c del msg test 2022-09-28 17:29:08 +08:00
wangchuxiao
7843d81c18 orgization 2022-09-20 11:11:33 +08:00
wangchuxiao
168dd1d01f orgization 2022-09-20 11:08:46 +08:00
skiffer-git
6759e0c25b fix bug: invited/kick failed due to json tag validation 2022-09-15 15:52:48 +08:00
wangchuxiao
46e233ccbb fix bug 2022-09-15 15:40:26 +08:00
skiffer-git
98d7c7bb86 Limit the number of group members for kick/create/invite 2022-09-09 15:52:47 +08:00
wangchuxiao
4682abf4c1 cms 2022-09-06 20:35:32 +08:00
wangchuxiao
bdae1f10d4 merge cms into v2.3.0release 2022-09-05 18:11:03 +08:00
Gordon
72aff32024 fcm ios push badge 2022-09-02 16:36:47 +08:00
wangchuxiao
a317ebd8e7 cms 2022-09-02 11:26:25 +08:00
Gordon
67e5e3b56b fcm ios push badge 2022-09-01 21:05:16 +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
wangchuxiao
2dab179166 conversation 2022-08-23 19:13:56 +08:00
Gordon
c1a2dee0e9 pb update 2022-08-21 23:25:39 +08:00
wangchuxiao
d4d9e08ae2 fix bug 2022-08-21 21:55:46 +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
skiffer-git
5b06791a6c set max PlatformID = 9 2022-08-16 23:26:13 +08:00
wangchuxiao
2016a1656b Merge branch 'v2.3.0release' into del 2022-08-16 12:17:07 +08:00
wangchuxiao
3f74022142 Merge branch 'main' into del 2022-08-15 21:51:12 +08:00
wangchuxiao
7d1707ca7c fix log 2022-08-15 16:51:41 +08:00
Gordon
652d560a21 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-15 11:17:12 +08:00
Gordon
be69ee8b1d fcm update 2022-08-15 11:16:37 +08:00
欧阳氏
39606248a1 邀请码功能
1、新增邀请码功能
  needInvitationCode: false 改成 true 后生效
2、完善后台用户注册 修改相关
2022-08-13 10:41:10 +08:00
skiffer-git
4e5c1606f3 log 2022-08-12 21:48:13 +08:00
wangchuxiao
a2ddf3567c callback kickoff 2022-08-11 16:51:21 +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
ae8acc6eba GetGroupAbstractInfoResp 2022-08-08 13:16:58 +08:00
wangchuxiao
12cbb1f6f9 group hash 2022-08-08 12:19:23 +08:00
wangchuxiao
11f29280b1 group hash 2022-08-08 11:30:10 +08:00
wangchuxiao
00bddd5e57 fix bug 2022-08-05 17:01:08 +08:00