1271 Commits

Author SHA1 Message Date
skiffer-git
6362500741 Statistics 2022-03-01 15:14:56 +08:00
skiffer-git
9b3d1f5734 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-28 19:10:44 +08:00
skiffer-git
123aad2707 statistics log 2022-02-28 19:10:32 +08:00
wangchuxiao
0bed7ee669 merge code 2022-02-28 17:57:03 +08:00
wangchuxiao
7d8d314962 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-28 17:52:25 +08:00
wangchuxiao
f01a6e82dc fix minio bug 2022-02-28 17:52:13 +08:00
wangchuxiao
67d7ee2751 fix bug 2022-02-28 17:47:53 +08:00
skiffer-git
04f8a7247d replace find with take 2022-02-28 17:28:00 +08:00
skiffer-git
7b6ef76d54 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-28 17:24:21 +08:00
skiffer-git
ed65ad842f Replace find with take 2022-02-28 17:20:40 +08:00
Gordon
a33fe330f7 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-28 17:03:41 +08:00
Gordon
b30da3eea4 database judge modify 2022-02-28 17:03:29 +08:00
skiffer-git
05fbbfcf39 grpc-etcd log 2022-02-28 15:28:13 +08:00
wenxu12345
09aec06790 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-25 20:01:11 +08:00
wenxu12345
00a52475de statistics 2022-02-25 20:01:02 +08:00
Gordon
6c03211ac4 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-25 19:56:15 +08:00
Gordon
ca18958669 test config 2022-02-25 19:56:00 +08:00
wenxu12345
e1f58f07fe 2.0.1 2022-02-25 19:55:58 +08:00
wenxu12345
9d28736849 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-25 19:50:40 +08:00
wenxu12345
739096a9c0 statistics performance 2022-02-25 19:50:18 +08:00
Gordon
2775d9b78a test 2022-02-25 19:49:38 +08:00
Gordon
4f01b0b2ad remove mysql for test 2022-02-25 19:39:42 +08:00
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