754 Commits

Author	SHA1	Message	Date
wangchuxiao	b176701e51	fix bug	2022-08-21 22:09:00 +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	d0a200f652	etcd	2022-08-17 14:57:57 +08:00
wangchuxiao	6f2451edd3	etcd	2022-08-17 12:12:54 +08:00
Gordon	a38291fc17	notification	2022-08-17 10:18:01 +08:00
wangchuxiao	bda96a2175	fix	2022-08-16 23:45:32 +08:00
Gordon	487d9a6449	notification	2022-08-16 19:54:04 +08:00
Gordon	97b1a774fb	Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release	2022-08-16 19:16:20 +08:00
Gordon	12a4c12753	notification	2022-08-16 19:15:54 +08:00
wangchuxiao	e8fdc454db	update orgnization after update user	2022-08-16 15:08:12 +08:00
wangchuxiao	69da4410dc	update orgnization after update user	2022-08-16 15:07:19 +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	a37d82e2dd	update orgnization after update user	2022-08-16 13:12:21 +08:00
wangchuxiao	0a14c8b3e6	update orgnization after update user	2022-08-16 13:11:59 +08:00
wangchuxiao	e779280428	Merge branch 'v2.3.0release' into del	2022-08-16 13:06:08 +08:00
wangchuxiao	753cd95a18	update orgnization after update user	2022-08-16 13:05:47 +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	2016a1656b	Merge branch 'v2.3.0release' into del	2022-08-16 12:17:07 +08:00
wangchuxiao	338d7f0df6	update orgnization after update user	2022-08-16 12:16:16 +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
wangchuxiao	3f74022142	Merge branch 'main' into del	2022-08-15 21:51:12 +08:00
欧阳氏	7b9d0b4f1f	封禁用户列表	2022-08-15 20:33:09 +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	5b248c82f5	fix log	2022-08-12 19:37:45 +08:00
wangchuxiao	a48b2e9edb	cms	2022-08-12 18:37:51 +08:00
wangchuxiao	69008e08be	cms api rpc	2022-08-12 11:24:21 +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
Gordon	54cdb24cec	user add delete cache	2022-08-11 20:04:15 +08:00
wangchuxiao	c2bd1d0d83	callback kickoff	2022-08-11 19:47:59 +08:00
wangchuxiao	429bee7e6c	Merge pull request #261 from ouyangshi/v2.3.0release ... 增加注册IP 登陆IP+用户IP限制策略	2022-08-11 11:07:56 +08:00
Smile	547ad7a2c7	kafka topic优化及解释，删除废弃topic的冗余代码 (#255)	2022-08-11 10:24:37 +08:00
Gordon	25de6b58c3	conversation update	2022-08-10 18:29:49 +08:00
wangchuxiao	2c0a2d7877	getui debug	2022-08-09 16:38:33 +08:00
Gordon	7bd7edfec9	send options bug fix	2022-08-09 15:54:16 +08:00
Gordon	db8c4f369c	send options bug fix	2022-08-09 15:41:16 +08:00
Gordon	569d5d2d89	super group add after callback	2022-08-09 15:12:13 +08:00
skiffer-git	5cbea2cab5	Set token kicked status first in forceKickOff	2022-08-09 13:52:20 +08:00
skiffer-git	57a21ab8e6	forceKickOff work	2022-08-09 13:18:02 +08:00
skiffer-git	c52bdce621	Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release ... # Conflicts: # internal/api/user/user.go	2022-08-09 13:02:02 +08:00