491 Commits

Author SHA1 Message Date
wangchuxiao
a317ebd8e7 cms 2022-09-02 11:26:25 +08:00
wangchuxiao
8d4e5ad3f1 cms 2022-08-30 01:38:23 +08:00
wangchuxiao
da9918b655 cms 2022-08-29 17:16:54 +08:00
wangchuxiao
c41464b974 cms 2022-08-29 16:34:13 +08:00
wangchuxiao
7f5b12d4d2 cms 2022-08-29 15:52:39 +08:00
wangchuxiao
3886d49b0a admin cms 2022-08-26 17:51:01 +08:00
wangchuxiao
3d5876a8c0 Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-22 15:48:05 +08:00
wangchuxiao
7d04f06f7d conversation fix 2022-08-22 15:47:50 +08:00
Gordon
2c21bf3e0e Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-21 23:32:00 +08:00
Gordon
c1a2dee0e9 pb update 2022-08-21 23:25:39 +08:00
wangchuxiao
782ad07940 fix bug 2022-08-21 22:28:10 +08:00
wangchuxiao
1f8c2ba8c5 fix bug 2022-08-21 22:18:50 +08:00
wangchuxiao
066eeb6ba6 fix bug 2022-08-21 21:57:46 +08:00
wangchuxiao
402b3f5535 fix bug 2022-08-21 21:56:55 +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
dd001ab0e7 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-18 10:50:39 +08:00
skiffer-git
30b55ce25e GetSelfUserInfo: Handle the case where the user does not exist 2022-08-18 10:50:09 +08:00
Gordon
eee98c5175 revoke super group message and push message modify 2022-08-17 20:18:56 +08:00
wangchuxiao
d0a200f652 etcd 2022-08-17 14:57:57 +08:00
wangchuxiao
6f2451edd3 etcd 2022-08-17 12:12:54 +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
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
wangchuxiao
429bee7e6c
Merge pull request #261 from ouyangshi/v2.3.0release
增加注册IP 登陆IP+用户IP限制策略
2022-08-11 11:07:56 +08:00
wangchuxiao
911614673b fix delete 2022-08-10 19:42:38 +08:00
wangchuxiao
e80d3e7dac fix delete 2022-08-10 19:40:10 +08:00
wangchuxiao
6bfa8643d6 fix delete 2022-08-10 19:31:57 +08:00
Gordon
bcc0c7c2df delete conversation update 2022-08-09 17:29:41 +08:00
skiffer-git
5cbea2cab5 Set token kicked status first in forceKickOff 2022-08-09 13:52:20 +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
Gordon
c304de9288 userinfo get 2022-08-08 20:03:08 +08:00
skiffer-git
ae8acc6eba GetGroupAbstractInfoResp 2022-08-08 13:16:58 +08:00
skiffer-git
1e1381df8e log 2022-08-08 13:10:34 +08:00
wangchuxiao
2ba7fcd628 group hash 2022-08-08 12:22:10 +08:00
wangchuxiao
1f8e161001 group hash 2022-08-08 12:14:46 +08:00
wangchuxiao
e2ff7ef113 group hash 2022-08-08 12:07:41 +08:00
wangchuxiao
11f29280b1 group hash 2022-08-08 11:30:10 +08:00
Gordon
e77b4f334d Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-05 14:43:03 +08:00
Gordon
87c64bdb2b del conversation bug fix 2022-08-05 14:42:39 +08:00
skiffer-git
68eed69221 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
#	pkg/base_info/group_api_struct.go
2022-08-05 13:40:57 +08:00
skiffer-git
5db5bf17cb add GetGroupAbstractInfo api 2022-08-05 13:40:20 +08:00
wangchuxiao
91a767b4fb callback fix 2022-08-04 19:18:31 +08:00
skiffer-git
cda0fb6a10 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-04 14:05:05 +08:00
skiffer-git
a1392a7677 GetGroupAllMemberListBySplit 2022-08-04 14:04:29 +08:00
wangchuxiao
f202d5f54a fix bug 2022-08-01 17:44:40 +08:00
wangchuxiao
8e445caf26 fix bug 2022-08-01 16:37:40 +08:00
wangchuxiao
d99375a536 fix bug 2022-08-01 15:27:51 +08:00
wangchuxiao
4c610abd44 fix bug 2022-08-01 14:56:20 +08:00