1399 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
wenxu12345	2427671093	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-02-25 19:29:54 +08:00
wenxu12345	8c9d1b7dec	statistics	2022-02-25 19:29:39 +08:00
Gordon	55c8399084	remove mysql for test	2022-02-25 19:19:23 +08:00
Gordon	a1067492b7	server msg id update	2022-02-25 18:35:04 +08:00
Gordon	961beb3e85	Merge remote-tracking branch 'origin/main'	2022-02-25 16:00:15 +08:00
Gordon	23e86f1067	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-02-25 15:59:42 +08:00
Gordon	a1333dcace	config update	2022-02-25 15:59:33 +08:00
wenxu12345	82690b5f2f	Merge branch 'tuoyun'	2022-02-25 15:36:45 +08:00
wenxu12345	70b97aa856	version: "3"	2022-02-25 15:36:29 +08:00
wenxu12345	05210e2a8b	Merge branch 'tuoyun'	2022-02-25 15:31:44 +08:00
wenxu12345	751c278052	version: "2"	2022-02-25 15:31:18 +08:00
wenxu12345	9a1620d51f	Merge branch 'tuoyun'	2022-02-25 15:28:19 +08:00
wenxu12345	157cd9a035	2.0.1	2022-02-25 15:27:37 +08:00
wenxu12345	010736839a	2.0.1	2022-02-25 15:26:55 +08:00
Gordon	2c26efb5a9	log remove v2.0.1	2022-02-25 15:02:02 +08:00
Gordon	fe9e2aa287	config update	2022-02-25 11:49:52 +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
wangchuxiao	b0a8c0a35a	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-02-23 19:55:49 +08:00
wenxu12345	0fca91ca37	config description v2.0.0	2022-02-23 18:22:44 +08:00
wangchuxiao	65ba2d2e27	Merge branch 'main' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-02-23 17:19:30 +08:00
wangchuxiao	188ca8fc58	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-02-23 15:46:21 +08:00
wangchuxiao	3b80b74730	test mongo driver	2022-02-23 15:46:02 +08:00
Gordon	d9f5f960a5	test	2022-02-23 15:33:22 +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
wenxu12345	effb21bc6c	dbMysqlDatabaseName: openIM_v2	2022-02-23 10:35:16 +08:00
wenxu12345	4c92ee4a8a	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-02-23 10:31:26 +08:00
wenxu12345	8f5b5ab0f9	openIM_v2	2022-02-23 10:31:11 +08:00
wangchuxiao	5dacbfc17e	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-02-23 10:18:57 +08:00
wangchuxiao	5defc18a64	alter cfg codettl	2022-02-23 10:18:43 +08:00
Gordon	d2ba299f42	shell update	2022-02-23 10:10:28 +08:00
Gordon	e78e5d6f32	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-02-23 09:49:11 +08:00
Gordon	ebbdcbe5a5	shell update	2022-02-23 09:49:02 +08:00
wangchuxiao	1d0ca5f11e	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-02-22 19:05:33 +08:00
wangchuxiao	d22935703d	forget pwd	2022-02-22 19:05:12 +08:00
Gordon	d66a567b8f	shell update	2022-02-22 19:02:39 +08:00
wenxu12345	34695f2aa3	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-02-22 18:02:11 +08:00
wenxu12345	dcacd88f11	UserNotificationBegin = 1301	2022-02-22 18:02:00 +08:00
wangchuxiao	2bbf794501	alter cfg	2022-02-22 17:19:56 +08:00
wangchuxiao	e3937c5ef2	alter yaml	2022-02-22 17:14:29 +08:00
Gordon	a93775bb64	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-02-22 16:02:46 +08:00
Gordon	eddcac2343	send msg time modify	2022-02-22 16:01:32 +08:00
wenxu12345	95c125a5af	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-02-22 14:23:16 +08:00