图床调整

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

@@ -26,7 +26,7 @@ namespace Masuit.MyBlogs.Core.Common
         /// <summary>
         /// 图床客户端
         /// </summary>
-        /// <param name="httpClient"></param>
+        /// <param name="httpClientFactory"></param>
         public ImagebedClient(IHttpClientFactory httpClientFactory)
         {
             _httpClient = httpClientFactory.CreateClient();
@@ -43,19 +43,30 @@ namespace Masuit.MyBlogs.Core.Common
         /// <param name="stream"></param>
         /// <param name="file"></param>
         /// <returns></returns>
-        public async Task<(string url, bool success)> UploadImage(Stream stream, string file)
+        public (string url, bool success) UploadImage(Stream stream, string file)
         {
-            if (AppConfig.GitlabConfigs.Any())
-            {
-                return await UploadGitlab(stream, file);
-            }
+            return UploadOss(stream, file);
+        }
 
-            if (AppConfig.AliOssConfig.Enabled)
+        /// <summary>
+        /// 阿里云Oss图床
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="file"></param>
+        /// <returns></returns>
+        private (string url, bool success) UploadOss(Stream stream, string file)
+        {
+            var objectName = DateTime.Now.ToString("yyyyMMdd") + "/" + SnowFlake.NewId + Path.GetExtension(file);
+            return Policy.Handle<Exception>().Retry(5, (e, i) =>
             {
-                return await UploadOss(stream, file);
-            }
-
-            return await UploadSmms(stream, file);
+                Console.ForegroundColor = ConsoleColor.Red;
+                Console.WriteLine(e.Message);
+                Console.ResetColor();
+            }).Wrap(Policy<(string url, bool success)>.Handle<Exception>().Fallback(() => UploadGitlab(stream, file).Result)).Execute(() =>
+            {
+                var result = OssClient.PutObject(AppConfig.AliOssConfig.BucketName, objectName, stream);
+                return result.HttpStatusCode == HttpStatusCode.OK ? (AppConfig.AliOssConfig.BucketDomain + "/" + objectName, true) : UploadGitlab(stream, file).Result;
+            });
         }
 
         /// <summary>
@@ -64,39 +75,41 @@ namespace Masuit.MyBlogs.Core.Common
         /// <param name="stream"></param>
         /// <param name="file"></param>
         /// <returns></returns>
-        public async Task<(string url, bool success)> UploadGitlab(Stream stream, string file)
+        private async Task<(string url, bool success)> UploadGitlab(Stream stream, string file)
         {
-            var gitlab = AppConfig.GitlabConfigs.OrderBy(c => Guid.NewGuid()).FirstOrDefault() ?? throw new Exception("没有可用的gitlab相关配置，请先在appsettings.json中的Imgbed:Gitlabs节点下配置gitlab");
-            if (stream.Length > gitlab.FileLimitSize)
+            if (AppConfig.GitlabConfigs.Any())
             {
-                return AppConfig.AliOssConfig.Enabled ? await UploadOss(stream, file) : await UploadSmms(stream, file);
-            }
+                var gitlab = AppConfig.GitlabConfigs.OrderBy(c => Guid.NewGuid()).FirstOrDefault() ?? throw new Exception("没有可用的gitlab相关配置，请先在appsettings.json中的Imgbed:Gitlabs节点下配置gitlab");
+                if (stream.Length > gitlab.FileLimitSize)
+                {
+                    return AppConfig.AliOssConfig.Enabled ? UploadOss(stream, file) : ("", false);
+                }
 
-            if (gitlab.ApiUrl.Contains("gitee.com"))
-            {
-                return await UploadGitee(gitlab, stream, file);
-            }
+                if (gitlab.ApiUrl.Contains("gitee.com"))
+                {
+                    return await UploadGitee(gitlab, stream, file);
+                }
 
-            string base64String = Convert.ToBase64String(stream.ToByteArray());
-            string path = $"{DateTime.Now:yyyy/MM/dd}/{SnowFlake.NewId + Path.GetExtension(file)}";
-            _httpClient.DefaultRequestHeaders.Add("PRIVATE-TOKEN", gitlab.AccessToken);
-            using var resp = await _httpClient.PostAsJsonAsync(gitlab.ApiUrl.Contains("/v3/") ? gitlab.ApiUrl : gitlab.ApiUrl + HttpUtility.UrlEncode(path), new
-            {
-                file_path = path,
-                branch_name = gitlab.Branch,
-                branch = gitlab.Branch,
-                author_email = CommonHelper.SystemSettings["ReceiveEmail"],
-                author_name = SnowFlake.NewId,
-                encoding = "base64",
-                content = base64String,
-                commit_message = "上传一张图片"
-            });
-            if (resp.IsSuccessStatusCode || (await resp.Content.ReadAsStringAsync()).Contains("already exists"))
-            {
-                return (gitlab.RawUrl + path, true);
+                string path = $"{DateTime.Now:yyyy/MM/dd}/{SnowFlake.NewId + Path.GetExtension(file)}";
+                _httpClient.DefaultRequestHeaders.Add("PRIVATE-TOKEN", gitlab.AccessToken);
+                using var resp = await _httpClient.PostAsJsonAsync(gitlab.ApiUrl.Contains("/v3/") ? gitlab.ApiUrl : gitlab.ApiUrl + HttpUtility.UrlEncode(path), new
+                {
+                    file_path = path,
+                    branch_name = gitlab.Branch,
+                    branch = gitlab.Branch,
+                    author_email = CommonHelper.SystemSettings["ReceiveEmail"],
+                    author_name = SnowFlake.NewId,
+                    encoding = "base64",
+                    content = Convert.ToBase64String(stream.ToByteArray()),
+                    commit_message = "上传一张图片"
+                });
+                if (resp.IsSuccessStatusCode || (await resp.Content.ReadAsStringAsync()).Contains("already exists"))
+                {
+                    return (gitlab.RawUrl + path, true);
+                }
             }
 
-            return AppConfig.AliOssConfig.Enabled ? await UploadOss(stream, file) : await UploadSmms(stream, file);
+            return await UploadSmms(stream, file);
         }
 
         /// <summary>
@@ -108,12 +121,11 @@ namespace Masuit.MyBlogs.Core.Common
         /// <returns></returns>
         private async Task<(string url, bool success)> UploadGitee(GitlabConfig config, Stream stream, string file)
         {
-            string base64String = Convert.ToBase64String(stream.ToByteArray());
             string path = $"{DateTime.Now:yyyy/MM/dd}/{Path.GetFileName(file)}";
             using var resp = await _httpClient.PostAsJsonAsync(config.ApiUrl + HttpUtility.UrlEncode(path), new
             {
                 access_token = config.AccessToken,
-                content = base64String,
+                content = Convert.ToBase64String(stream.ToByteArray()),
                 message = "上传一张图片"
             });
             if (resp.IsSuccessStatusCode || (await resp.Content.ReadAsStringAsync()).Contains("already exists"))
@@ -121,25 +133,7 @@ namespace Masuit.MyBlogs.Core.Common
                 return (config.RawUrl + path, true);
             }
 
-            return AppConfig.AliOssConfig.Enabled ? await UploadOss(stream, file) : await UploadSmms(stream, file);
-        }
-
-        /// <summary>
-        /// 阿里云Oss图床
-        /// </summary>
-        /// <param name="stream"></param>
-        /// <param name="file"></param>
-        /// <returns></returns>
-        public async Task<(string url, bool success)> UploadOss(Stream stream, string file)
-        {
-            var objectName = DateTime.Now.ToString("yyyyMMdd") + "/" + SnowFlake.NewId + Path.GetExtension(file);
-            var policy = Policy.Handle<Exception>().Retry(5, (e, i) =>
-            {
-                Console.ForegroundColor = ConsoleColor.Red;
-                Console.WriteLine(e.Message);
-                Console.ResetColor();
-            });
-            return policy.Wrap(Policy<(string url, bool success)>.Handle<Exception>().Fallback(() => UploadSmms(stream, file).Result)).Execute(() => OssClient.PutObject(AppConfig.AliOssConfig.BucketName, objectName, stream).HttpStatusCode == HttpStatusCode.OK ? (AppConfig.AliOssConfig.BucketDomain + "/" + objectName, true) : UploadSmms(stream, file).Result);
+            return await UploadSmms(stream, file);
         }
 
         /// <summary>
@@ -149,7 +143,6 @@ namespace Masuit.MyBlogs.Core.Common
         public async Task<(string url, bool success)> UploadSmms(Stream stream, string file)
         {
             string url = string.Empty;
-            bool success = false;
             _httpClient.DefaultRequestHeaders.UserAgent.Add(ProductInfoHeaderValue.Parse("Mozilla/5.0"));
             using var bc = new StreamContent(stream);
             bc.Headers.ContentDisposition = new ContentDispositionHeaderValue("attachment")
@@ -158,75 +151,27 @@ namespace Masuit.MyBlogs.Core.Common
                 Name = "smfile"
             };
             using var content = new MultipartFormDataContent { bc };
-            var code = await _httpClient.PostAsync("https://sm.ms/api/upload?inajax=1&ssl=1", content).ContinueWith(t =>
+            var success = await _httpClient.PostAsync("https://sm.ms/api/upload?inajax=1&ssl=1", content).ContinueWith(t =>
             {
-                if (t.IsCanceled || t.IsFaulted)
-                {
-                    return 0;
-                }
-
-                var res = t.Result;
-                if (!res.IsSuccessStatusCode)
+                if (t.IsCanceled || t.IsFaulted || !t.Result.IsSuccessStatusCode)
                 {
-                    return 2;
+                    return false;
                 }
 
                 try
                 {
-                    string s = res.Content.ReadAsStringAsync().Result;
+                    var s = t.Result.Content.ReadAsStringAsync().Result;
                     var token = JObject.Parse(s);
                     url = (string)token["data"]["url"];
-                    return 1;
+                    return true;
                 }
                 catch
                 {
-                    return 2;
+                    return false;
                 }
             });
-            if (code == 1)
-            {
-                success = true;
-            }
-
-            return success ? (url, true) : await UploadPeople(stream, file);
-        }
-
-        /// <summary>
-        /// 上传图片到人民网图床
-        /// </summary>
-        /// <param name="stream"></param>
-        /// <param name="file"></param>
-        /// <returns></returns>
-        public async Task<(string url, bool success)> UploadPeople(Stream stream, string file)
-        {
-            bool success = false;
-            _httpClient.DefaultRequestHeaders.UserAgent.Add(ProductInfoHeaderValue.Parse("Chrome/72.0.3626.96"));
-            using var sc = new StreamContent(stream);
-            using var mc = new MultipartFormDataContent
-            {
-                { sc, "Filedata", Path.GetFileName(file) },
-                {new StringContent("."+Path.GetExtension(file)),"filetype"}
-            };
-            var str = await _httpClient.PostAsync("http://bbs1.people.com.cn/postImageUpload.do", mc).ContinueWith(t =>
-            {
-                if (t.IsCompletedSuccessfully)
-                {
-                    var res = t.Result;
-                    if (res.IsSuccessStatusCode)
-                    {
-                        string result = res.Content.ReadAsStringAsync().Result;
-                        string url = "http://bbs1.people.com.cn" + (string)JObject.Parse(result)["imageUrl"];
-                        if (url.EndsWith(Path.GetExtension(file)))
-                        {
-                            success = true;
-                            return url;
-                        }
-                    }
-                }
 
-                return "";
-            });
-            return (str, success);
+            return (url, success);
         }
 
         /// <summary>
@@ -251,7 +196,7 @@ namespace Masuit.MyBlogs.Core.Common
                 }
 
                 await using var stream = File.OpenRead(path);
-                var (url, success) = await UploadImage(stream, path);
+                var (url, success) = UploadImage(stream, path);
                 if (success)
                 {
                     content = content.Replace(src, url);

src/Masuit.MyBlogs.Core/Controllers/UploadController.cs

@@ -112,7 +112,7 @@ namespace Masuit.MyBlogs.Core.Controllers
                     var ext = strs[0].Split(";")[0].Split("/")[1];
                     await using var image = new MemoryStream(bytes);
                     var imgFile = $"{SnowFlake.NewId}.{ext}";
-                    var (url, success) = await ImagebedClient.UploadImage(image, imgFile);
+                    var (url, success) = ImagebedClient.UploadImage(image, imgFile);
                     if (success)
                     {
                         img.Attributes["src"].Value = url;
@@ -249,7 +249,7 @@ namespace Masuit.MyBlogs.Core.Controllers
             switch (file.ContentType)
             {
                 case var _ when file.ContentType.StartsWith("image"):
-                    var (url, success) = await ImagebedClient.UploadImage(file.OpenReadStream(), file.FileName);
+                    var (url, success) = ImagebedClient.UploadImage(file.OpenReadStream(), file.FileName);
                     if (success)
                     {
                         return ResultData(url);

src/Masuit.MyBlogs.Core/Extensions/UEditor/CrawlerHandler.cs

@@ -75,7 +75,7 @@ namespace Masuit.MyBlogs.Core.Extensions.UEditor
             {
                 using var stream = response.Content.ReadAsStreamAsync().Result;
                 var savePath = AppContext.BaseDirectory + "wwwroot" + ServerUrl;
-                var (url, success) = Startup.ServiceProvider.GetRequiredService<ImagebedClient>().UploadImage(stream, savePath).Result;
+                var (url, success) = Startup.ServiceProvider.GetRequiredService<ImagebedClient>().UploadImage(stream, savePath);
                 if (success)
                 {
                     ServerUrl = url;

src/Masuit.MyBlogs.Core/Extensions/UEditor/UploadHandler.cs

@@ -48,7 +48,7 @@ namespace Masuit.MyBlogs.Core.Extensions.UEditor
                 if (UploadConfig.AllowExtensions.Contains(Path.GetExtension(uploadFileName)))
                 {
                     using var stream = file.OpenReadStream();
-                    var (url, success) = Startup.ServiceProvider.GetRequiredService<ImagebedClient>().UploadImage(stream, localPath).Result;
+                    var (url, success) = Startup.ServiceProvider.GetRequiredService<ImagebedClient>().UploadImage(stream, localPath);
                     if (success)
                     {
                         Result.Url = url;

src/Masuit.MyBlogs.Core/Masuit.MyBlogs.Core.csproj

@@ -70,7 +70,7 @@
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.0.0-rc2.final" />
     <PackageReference Include="WilderMinds.RssSyndication" Version="1.6.0" />
     <PackageReference Include="WinInsider.System.Net.Http.Formatting" Version="1.0.10" />
-    <PackageReference Include="Z.EntityFramework.Extensions.EFCore" Version="3.0.15" />
+    <PackageReference Include="Z.EntityFramework.Extensions.EFCore" Version="3.0.16" />
     <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="3.0.22" />
     <PackageReference Include="Z.ExtensionMethods" Version="2.1.1" />
   </ItemGroup>

src/Masuit.MyBlogs.Core/Masuit.MyBlogs.Core.xml

@@ -134,7 +134,7 @@
             <summary>
             图床客户端
             </summary>
-            <param name="httpClient"></param>
+            <param name="httpClientFactory"></param>
         </member>
         <member name="P:Masuit.MyBlogs.Core.Common.ImagebedClient.OssClient">
             <summary>
@@ -149,27 +149,27 @@
             <param name="file"></param>
             <returns></returns>
         </member>
-        <member name="M:Masuit.MyBlogs.Core.Common.ImagebedClient.UploadGitlab(System.IO.Stream,System.String)">
+        <member name="M:Masuit.MyBlogs.Core.Common.ImagebedClient.UploadOss(System.IO.Stream,System.String)">
             <summary>
-            gitlab图床
+            阿里云Oss图床
             </summary>
             <param name="stream"></param>
             <param name="file"></param>
             <returns></returns>
         </member>
-        <member name="M:Masuit.MyBlogs.Core.Common.ImagebedClient.UploadGitee(Masuit.MyBlogs.Core.Configs.GitlabConfig,System.IO.Stream,System.String)">
+        <member name="M:Masuit.MyBlogs.Core.Common.ImagebedClient.UploadGitlab(System.IO.Stream,System.String)">
             <summary>
-            码云图床
+            gitlab图床
             </summary>
-            <param name="config"></param>
             <param name="stream"></param>
             <param name="file"></param>
             <returns></returns>
         </member>
-        <member name="M:Masuit.MyBlogs.Core.Common.ImagebedClient.UploadOss(System.IO.Stream,System.String)">
+        <member name="M:Masuit.MyBlogs.Core.Common.ImagebedClient.UploadGitee(Masuit.MyBlogs.Core.Configs.GitlabConfig,System.IO.Stream,System.String)">
             <summary>
-            阿里云Oss图床
+            码云图床
             </summary>
+            <param name="config"></param>
             <param name="stream"></param>
             <param name="file"></param>
             <returns></returns>
@@ -180,14 +180,6 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Masuit.MyBlogs.Core.Common.ImagebedClient.UploadPeople(System.IO.Stream,System.String)">
-            <summary>
-            上传图片到人民网图床
-            </summary>
-            <param name="stream"></param>
-            <param name="file"></param>
-            <returns></returns>
-        </member>
         <member name="M:Masuit.MyBlogs.Core.Common.ImagebedClient.ReplaceImgSrc(System.String)">
             <summary>
             替换img标签的src属性

src/Masuit.MyBlogs.Core/Startup.cs

@@ -20,7 +20,6 @@ using Masuit.Tools.Core.AspNetCore;
 using Masuit.Tools.Core.Net;
 using Masuit.Tools.Systems;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Rewrite;