445 Commits

Author SHA1 Message Date
wangchuxiao
60e29cc894 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-02 19:07:28 +08:00
wangchuxiao
dcfd802757 callback add 2022-03-02 19:07:17 +08:00
Gordon
72ed38156a test code 2022-03-01 17:48:53 +08:00
Gordon
0e9e02de0b statistics code 2022-03-01 15:53:33 +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
Gordon
b30da3eea4 database judge modify 2022-02-28 17:03:29 +08:00
wenxu12345
00a52475de statistics 2022-02-25 20:01:02 +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
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
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
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
wangchuxiao
566c05bcef mongodriver test 2022-02-23 12:00:02 +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
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