425 Commits

Author	SHA1	Message	Date
ltf	f22a07fb29	Merge remote-tracking branch 'upstream/tuoyun' into tuoyun	2022-02-23 10:47:39 +08:00
wangchuxiao	d22935703d	forget pwd	2022-02-22 19:05:12 +08:00
Gordon	eddcac2343	send msg time modify	2022-02-22 16:01:32 +08:00
Gordon	861dfc43a8	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-02-22 14:13:14 +08:00
Gordon	a1cbf8724f	log	2022-02-22 14:13:04 +08:00
wangchuxiao	952ad0e162	fix deploy	2022-02-22 12:27:39 +08:00
wangchuxiao	aad27f40cf	verrify	2022-02-21 21:07:50 +08:00
wangchuxiao	55d7c6e672	add log	2022-02-21 21:02:37 +08:00
wenxu12345	75590eb765	VerificationCodeForRegisterSuffix	2022-02-21 20:09:26 +08:00
wangchuxiao	dfdb952e2b	fix reset password api	2022-02-21 19:12:51 +08:00
wangchuxiao	c09ebc146b	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-02-21 18:50:25 +08:00
wangchuxiao	139ef08af3	fix bug	2022-02-21 18:50:11 +08:00
Gordon	2d13a5fd35	msg judge	2022-02-21 18:18:53 +08:00
wangchuxiao	a3fb32dfc6	fix bug and add reset pwd api	2022-02-21 16:41:56 +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	9a35af9fb2	replace mongo driver	2022-02-21 15:17:55 +08:00
wenxu12345	db116f39fd	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-02-21 15:03:49 +08:00
wenxu12345	c962a19eb7	replace mongo driver	2022-02-21 15:03:29 +08:00
Gordon	344bafff45	push modify	2022-02-21 12:20:05 +08:00
Gordon	3ee12221a4	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-02-21 10:10:22 +08:00
Gordon	8915848a52	login modify	2022-02-21 10:10:11 +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	7a46389da8	fix origin error	2022-02-19 10:01:05 +08:00
wangchuxiao	6e9b9341d4	mini cr	2022-02-18 17:06:27 +08:00
wangchuxiao	737ce2c2e7	fix bug	2022-02-17 19:35:17 +08:00
wangchuxiao	8a7442648c	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-02-17 14:37:54 +08:00
wangchuxiao	f1616461f7	add log	2022-02-17 14:36:34 +08:00
Gordon	ed2a5af5ed	Merge remote-tracking branch 'origin/tuoyun' into tuoyun ... # Conflicts: # internal/api/third/tencent_cloud_storage_credential.go	2022-02-17 11:14:27 +08:00
Gordon	3b73a4c69a	send msg modify	2022-02-17 11:13:51 +08:00
wenxu12345	17954dfdc9	Refactoring code	2022-02-16 19:41:44 +08:00
wenxu12345	5e65e394a6	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-02-16 18:30:36 +08:00
wenxu12345	8c357ec213	Refactoring code	2022-02-16 18:30:24 +08:00
wangchuxiao	caa915b31d	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-02-15 18:29:46 +08:00
wangchuxiao	65be1263b9	make file	2022-02-15 18:28:54 +08:00
wenxu12345	d81ae835aa	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-02-15 14:34:20 +08:00
wenxu12345	c405cedc41	Refactoring code	2022-02-15 14:34:03 +08:00
Gordon	2a7f366cbf	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-02-15 14:32:40 +08:00
Gordon	ea580e4c64	send message	2022-02-15 14:31:55 +08:00
wangchuxiao	445100f32d	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-02-15 14:11:30 +08:00
wangchuxiao	648a852ba7	conversation opt	2022-02-15 14:11:20 +08:00
Gordon	9f136fb150	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-02-15 13:16:41 +08:00
Gordon	6d5b38fc8a	send message	2022-02-15 13:16:31 +08:00
skiffer-git	2e7fd5fe93	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-02-14 17:50:38 +08:00
skiffer-git	1ca8d2b2db	log	2022-02-14 16:59:52 +08:00
Gordon	aa57f25b2c	tes log	2022-02-14 16:59:26 +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
Gordon	6bfbf37749	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-02-14 09:44:18 +08:00