429 Commits

Author	SHA1	Message	Date
ltf	48c3975ab1	Merge remote-tracking branch 'upstream/tuoyun' into tuoyun	2022-02-25 09:25:56 +08:00
Gordon	2585014ace	Merge remote-tracking branch 'origin/tuoyun' into tuoyun ... # Conflicts: # config/config.yaml	2022-02-24 18:14:25 +08:00
Gordon	0410003ceb	api update	2022-02-24 18:08:53 +08:00
wangchuxiao	e1a0c2fc48	fix bug	2022-02-24 14:47:21 +08:00
Gordon	e31da8bbd0	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-02-23 15:27:31 +08:00
Gordon	1e602975f3	test	2022-02-23 15:27:23 +08:00
wangchuxiao	541ccda754	test mongo driver	2022-02-23 14:30:21 +08:00
wangchuxiao	1b68363b80	test mongo driver	2022-02-23 12:30:47 +08:00
wangchuxiao	fc11b3c463	test mongo driver	2022-02-23 12:30:18 +08:00
wangchuxiao	f9f36cd1d6	test mongo driver	2022-02-23 12:27:01 +08:00
wangchuxiao	566c05bcef	mongodriver test	2022-02-23 12:00:02 +08:00
ltf	f22a07fb29	Merge remote-tracking branch 'upstream/tuoyun' into tuoyun	2022-02-23 10:47:39 +08:00
wenxu12345	dcacd88f11	UserNotificationBegin = 1301	2022-02-22 18:02:00 +08:00
wangchuxiao	cae88e7946	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-02-22 12:27:46 +08:00
wangchuxiao	952ad0e162	fix deploy	2022-02-22 12:27:39 +08:00
Gordon	b751156b5c	redis ttl	2022-02-21 21:19:06 +08:00
wangchuxiao	55d7c6e672	add log	2022-02-21 21:02:37 +08:00
wangchuxiao	dfdb952e2b	fix reset password api	2022-02-21 19:12:51 +08:00
wangchuxiao	079efe5de6	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-02-21 16:25:36 +08:00
wangchuxiao	4d28ccebad	add reset pwd	2022-02-21 16:24:25 +08:00
wenxu12345	2171acc909	replace mongo driver	2022-02-21 15:23:04 +08:00
wenxu12345	1e05811c13	replace mongo driver	2022-02-21 15:22:40 +08:00
wenxu12345	ec023ec13e	replace mongo driver	2022-02-21 15:22:12 +08:00
wenxu12345	996570cc57	replace mongo driver	2022-02-21 15:21:45 +08:00
wenxu12345	7cf712daff	replace mongo driver	2022-02-21 15:20:39 +08:00
wenxu12345	ede3b07963	replace mongo driver	2022-02-21 15:14:24 +08:00
wenxu12345	53a4b90d96	replace mongo driver	2022-02-21 15:12:48 +08:00
wenxu12345	db116f39fd	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-02-21 15:03:49 +08:00
wenxu12345	571c83314a	Refactoring code	2022-02-21 15:01:06 +08:00
Gordon	d906d49930	model modify	2022-02-21 14:11:51 +08:00
wangchuxiao	a2cd7c8007	add minio	2022-02-19 18:48:15 +08:00
ltf	cc4f1f1f07	fix 单容器单进程模式中etcd注册的服务和单容器多进程时冲突问题	2022-02-19 11:46:44 +08:00
ltf	01b7fa4fa0	feat 单容器单进程模式部署新增sdk部署	2022-02-19 11:05:34 +08:00
wangchuxiao	6e9b9341d4	mini cr	2022-02-18 17:06:27 +08:00
Gordon	e90d8a87ee	config	2022-02-18 15:16:33 +08:00
Gordon	45c43888e7	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-02-18 12:56:53 +08:00
Gordon	68e7dfb1cc	conversation add	2022-02-18 12:56:43 +08:00
wangchuxiao	f086f33097	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-02-17 19:41:03 +08:00
wangchuxiao	737ce2c2e7	fix bug	2022-02-17 19:35:17 +08:00
Gordon	3c7c7cde3c	close console log	2022-02-17 16:28:59 +08:00
Gordon	84d4645efa	close console log	2022-02-17 16:18:37 +08:00
wenxu12345	17954dfdc9	Refactoring code	2022-02-16 19:41:44 +08:00
wenxu12345	3aadf61fde	Refactoring code	2022-02-16 18:58:02 +08:00
wangchuxiao	65be1263b9	make file	2022-02-15 18:28:54 +08:00
wangchuxiao	648a852ba7	conversation opt	2022-02-15 14:11:20 +08:00
wangchuxiao	8cdea2bfeb	cms dev	2022-02-14 15:16:59 +08:00
wangchuxiao	22bfb6be4b	merge code	2022-02-14 10:46:32 +08:00
wangchuxiao	7797e47561	add	2022-02-14 00:02:15 +08:00
wangchuxiao	52579c5fab	add	2022-02-12 17:13:31 +08:00
wenxu12345	a5ed6d897c	Refactor code	2022-02-11 20:32:51 +08:00