Commit Graph

1086 Commits

Author SHA1 Message Date
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 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 9a35af9fb2 replace mongo driver 2022-02-21 15:17:55 +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 bf948789ea replace mongo driver 2022-02-21 15:07:50 +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
wenxu12345 571c83314a Refactoring code 2022-02-21 15:01:06 +08:00
Gordon d906d49930 model modify 2022-02-21 14:11:51 +08:00
Gordon 344bafff45 push modify 2022-02-21 12:20:05 +08:00
wenxu12345 4858390346 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	config/config.yaml
2022-02-21 11:06:34 +08:00
wenxu12345 f16f0e3069 Refactoring code 2022-02-21 11:06:06 +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
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 3913d9e48e Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-17 16:18:47 +08:00
Gordon 84d4645efa close console log 2022-02-17 16:18:37 +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 3aadf61fde Refactoring code 2022-02-16 18:58:02 +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 a599a334a3 alter cfg 2022-02-16 14:11:47 +08:00
wangchuxiao 36d39669e4 alter deploy 2022-02-16 12:23:08 +08:00
wangchuxiao 028171a91a yaml cfg alter 2022-02-16 11:13:13 +08:00
wangchuxiao 2647e1cdac alter yaml cfg 2022-02-16 11:06:35 +08:00
wangchuxiao 994cebea82 makefile 2022-02-15 18:57:41 +08:00
wangchuxiao a533a3e0ef makefile 2022-02-15 18:43:03 +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 2996d8537d add makefile 2022-02-15 18:29:38 +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