用户管理优化

src/Masuit.MyBlogs.Core.sln

@@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masuit.Tools.Core", "..\..\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masuit.MyBlogs.Core", "Masuit.MyBlogs.Core\Masuit.MyBlogs.Core.csproj", "{2F8270E4-5E57-4CE4-AB5F-8008F9FC8C7C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masuit.Tools.Abstractions", "..\..\Masuit.Tools\Masuit.Tools.Abstractions\Masuit.Tools.Abstractions.csproj", "{B0E2C560-BF4F-4A3B-9FEB-714026399F21}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -29,10 +27,6 @@ Global
 		{2F8270E4-5E57-4CE4-AB5F-8008F9FC8C7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2F8270E4-5E57-4CE4-AB5F-8008F9FC8C7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2F8270E4-5E57-4CE4-AB5F-8008F9FC8C7C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B0E2C560-BF4F-4A3B-9FEB-714026399F21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0E2C560-BF4F-4A3B-9FEB-714026399F21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0E2C560-BF4F-4A3B-9FEB-714026399F21}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0E2C560-BF4F-4A3B-9FEB-714026399F21}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Masuit.MyBlogs.Core/Common/ImagebedClient.cs

@@ -28,12 +28,12 @@ namespace Masuit.MyBlogs.Core.Common
         /// <summary>
         /// 图床客户端
         /// </summary>
-        /// <param name="httpClientFactory"></param>
+        /// <param name="httpClient"></param>
         /// <param name="config"></param>
-        public ImagebedClient(IHttpClientFactory httpClientFactory, IConfiguration config)
+        public ImagebedClient(HttpClient httpClient, IConfiguration config)
         {
             _config = config;
-            _httpClient = httpClientFactory.CreateClient();
+            _httpClient = httpClient;
         }
 
         /// <summary>

src/Masuit.MyBlogs.Core/Common/MailgunSender.cs

@@ -12,10 +12,10 @@ namespace Masuit.MyBlogs.Core.Common
         private readonly HttpClient _httpClient;
         private readonly IConfiguration _configuration;
 
-        public MailgunSender(IHttpClientFactory httpClient, IConfiguration configuration)
+        public MailgunSender(HttpClient httpClient, IConfiguration configuration)
         {
             _configuration = configuration;
-            _httpClient = httpClient.CreateClient();
+            _httpClient = httpClient;
         }
 
         public void Send(string title, string content, string tos)

src/Masuit.MyBlogs.Core/Configs/MappingProfile.cs

@@ -64,7 +64,7 @@ namespace Masuit.MyBlogs.Core.Configs
 
             CreateMap<UserInfo, UserInfoCommand>().ReverseMap();
             CreateMap<UserInfo, UserInfoDto>();
-            CreateMap<UserInfoDto, UserInfo>().ForMember(u => u.Id, e => e.Ignore());
+            CreateMap<UserInfoDto, UserInfo>().ForMember(u => u.Id, e => e.Ignore()).ForMember(u => u.Password, e => e.Ignore()).ForMember(u => u.SaltKey, e => e.Ignore());
             CreateMap<UserInfoCommand, UserInfoDto>().ReverseMap();
 
             CreateMap<LoginRecord, LoginRecordViewModel>().ReverseMap();

src/Masuit.MyBlogs.Core/Extensions/Hangfire/HangfireBackJob.cs

@@ -231,7 +231,7 @@ namespace Masuit.MyBlogs.Core.Extensions.Hangfire
             {
                 nameof(DataContext.Post),
             });
-            var list = _searchEngine.Context.Post.Where(i => i.Status != Status.Published).ToList();
+            var list = _postService.GetQuery(i => i.Status != Status.Published).ToList();
             _searchEngine.LuceneIndexer.Delete(list);
         }
 

src/Masuit.MyBlogs.Core/Hubs/MyHub.cs

@@ -173,7 +173,6 @@ namespace Masuit.MyBlogs.Core.Hubs
         {
             double time = DateTime.Now.GetTotalMilliseconds(); // - 28800000;
             float load = SystemInfo.CpuLoad;
-            double temperature = SystemInfo.GetCPUTemperature();
             double mem = (1 - SystemInfo.MemoryAvailable.To<double>() / SystemInfo.PhysicalMemory.To<double>()) * 100;
 
             var read = SystemInfo.GetDiskData(DiskData.Read) / 1024;

src/Masuit.MyBlogs.Core/Infrastructure/Services/UserInfoService.cs

@@ -20,7 +20,7 @@ namespace Masuit.MyBlogs.Core.Infrastructure.Services
         /// <returns></returns>
         public UserInfo GetByUsername(string name)
         {
-            return Get(u => u.Username.Equals(name));
+            return Get(u => u.Username.Equals(name) || u.Email.Equals(name));
         }
 
         /// <summary>

src/Masuit.MyBlogs.Core/Startup.cs

@@ -129,7 +129,7 @@ namespace Masuit.MyBlogs.Core
             {
                 ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
             }); //注入HttpClient
-            services.AddTransient<ImagebedClient>();
+            services.AddHttpClient<ImagebedClient>();
             services.AddHttpContextAccessor(); //注入静态HttpContext
             services.AddMiniProfiler(options =>
             {
@@ -146,7 +146,7 @@ namespace Masuit.MyBlogs.Core
             switch (Configuration["MailSender"])
             {
                 case "Mailgun":
-                    services.AddSingleton<IMailSender, MailgunSender>();
+                    services.AddHttpClient<IMailSender, MailgunSender>();
                     break;
                 default:
                     services.AddSingleton<IMailSender, SmtpSender>();