1274 Commits

Author	SHA1	Message	Date
skiffer-git	39720d401f	fix bug: msg_gateway/gate/ws_server.go:138	2022-08-27 12:24:06 +08:00
wangchuxiao	3739127044	conversation	2022-08-23 19:17:52 +08:00
wangchuxiao	d542cdd898	conversation	2022-08-23 17:32:21 +08:00
wangchuxiao	9f15f50f9d	fix conversation	2022-08-23 15:42:05 +08:00
wangchuxiao	ee577cae4c	add conversationCache	2022-08-21 17:33:40 +08:00
wangchuxiao	840e08fc8a	Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang	2022-08-19 12:09:21 +08:00
wangchuxiao	761b8c40d6	conversation cache function	2022-08-19 12:09:05 +08:00
wangchuxiao	5c3a43f602	fix bug	2022-08-18 11:14:38 +08:00
wangchuxiao	d6dd99bb4a	add	2022-08-17 15:34:07 +08:00
wangchuxiao	d0a200f652	etcd	2022-08-17 14:57:57 +08:00
wangchuxiao	9138f90843	etcd	2022-08-17 12:58:51 +08:00
wangchuxiao	766a8fa4dd	Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang	2022-08-17 12:24:49 +08:00
wangchuxiao	6f2451edd3	etcd	2022-08-17 12:12:54 +08:00
skiffer-git	864fccbdb2	get grpc conn from config	2022-08-17 11:58:23 +08:00
wangchuxiao	8956df9599	etcd	2022-08-17 11:51:37 +08:00
skiffer-git	a3daaa55b5	get grpc conn from config	2022-08-17 11:46:11 +08:00
skiffer-git	85a52f5d6b	get grpc conn from config	2022-08-17 11:42:12 +08:00
skiffer-git	cdf09aa1bd	get grpc conn from config	2022-08-17 11:35:33 +08:00
skiffer-git	5b06791a6c	set max PlatformID = 9	2022-08-16 23:26:13 +08:00
wangchuxiao	e4bbd57c41	fix log	2022-08-12 15:03:36 +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
wangchuxiao	cc3f53d572	Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release	2022-08-11 16:51:37 +08:00
wangchuxiao	a2ddf3567c	callback kickoff	2022-08-11 16:51:21 +08:00
wangchuxiao	aa7ba6d659	callback kickoff	2022-08-11 16:48:03 +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	06729c4e84	Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release	2022-08-11 12:10:00 +08:00
wangchuxiao	5c5f80691a	fix delete	2022-08-11 12:09:44 +08:00
skiffer-git	5a0340e927	Multiple gateways	2022-08-11 11:48:22 +08:00
skiffer-git	eb7e6a566b	Multiple gateways	2022-08-11 11:44:14 +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
Gordon	e33af2a316	Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release	2022-08-08 17:42:39 +08:00
Gordon	ffc4da1589	callback add seq	2022-08-08 17:42:06 +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