Refator RequestContext and Extensions and Sample

Author: cnblogs-dudu

src/Cuiliang.AliyunOssSdk.csproj

@@ -14,5 +14,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
   </ItemGroup>  
 </Project>

src/Entites/OssCredential.cs

@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Extensions.Options;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -8,7 +9,7 @@ namespace Cuiliang.AliyunOssSdk.Entites
     /// <summary>
     /// Oss访问安全凭据
     /// </summary>
-    public class OssCredential
+    public class OssCredential : IOptions<OssCredential>
     {
         public string AccessKeyId { get; set; }
         public string AccessKeySecret { get; set; }
@@ -24,5 +25,6 @@ public bool UseToken {
         /// 令牌
         /// </summary>
         public string SecurityToken { get; set; }
+        public OssCredential Value => this;
     }
 }

src/OssClientServiceCollectionExtensions.cs

@@ -1,27 +1,39 @@
 using System;
+using System.Net.Http;
 using Cuiliang.AliyunOssSdk;
 using Cuiliang.AliyunOssSdk.Api.Bucket.List;
 using Cuiliang.AliyunOssSdk.Entites;
 using Cuiliang.AliyunOssSdk.Request;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Cuiliang.AliyunOssSdk
+namespace Microsoft.Extensions.DependencyInjection
 {
     public static class OssClientServiceCollectionExtensions
     {
         public static IServiceCollection AddOssClient(
             this IServiceCollection services,
-            IConfigurationSection ossClientConf, 
-            ClientConfiguration config = null)
+            IConfiguration configuration, 
+            string sectionName = "ossClient",
+            Action<ClientConfiguration> setupClientConfiguration = null,
+            Action<HttpClient> configureHttpClient = null)
         {
-            var credential = new OssCredential();
-            ossClientConf.Bind(credential);
+            services.Configure<OssCredential>(configuration.GetSection("ossClient"));
 
-            var requestContext = new RequestContext(credential, config ?? ClientConfiguration.Default);
+            var clientConfiguration = new ClientConfiguration();
+            setupClientConfiguration?.Invoke(clientConfiguration);
+            services.AddSingleton(clientConfiguration);
 
-            services.AddSingleton<RequestContext>(requestContext);
-            services.AddHttpClient<OssClient>();
+            services.AddTransient<RequestContext>();
+
+            if (configureHttpClient == null)
+            {
+                services.AddHttpClient<OssClient>();
+            }
+            else
+            {
+                services.AddHttpClient<OssClient>(configureHttpClient);
+            }
 
             return services;
         }

src/Request/RequestContext.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Cuiliang.AliyunOssSdk.Entites;
+using Microsoft.Extensions.Options;
 
 namespace Cuiliang.AliyunOssSdk.Request
 {
@@ -11,9 +12,9 @@ namespace Cuiliang.AliyunOssSdk.Request
     /// </summary>
     public class RequestContext
     {
-        public RequestContext(OssCredential credential, ClientConfiguration config)
+        public RequestContext(IOptions<OssCredential> credentialOptions, ClientConfiguration config)
         {
-            OssCredential = credential;
+            OssCredential = credentialOptions.Value;
             ClientConfiguration = config;
         }
         /// <summary>

tests/Sample/NewSdkTester.cs

@@ -1,28 +1,57 @@
 using System;
+using System.IO;
 using System.Threading.Tasks;
-using Sample;
+using Cuiliang.AliyunOssSdk;
+using Cuiliang.AliyunOssSdk.Entites;
+using Cuiliang.AliyunOssSdk.Request;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 
 class Program
 {
-    public static void Main(string[] args)
+    public static async Task Main(string[] args)
     {
-        MainAsync(args).GetAwaiter().GetResult();
-
-        Console.ReadKey();
-    }
-
-    public static async Task MainAsync(string[] args)
-    {
-        try
-        {
-            await NewSdkTester.RunAsync();
-        }
-        catch (Exception ex)
+        if (args.Length < 2)
         {
-            Console.WriteLine("Ex:" + ex.Message);
-            throw;
+            Console.WriteLine("Please run with bucket name and file path");
+            return;
         }
 
+        var bucketName = args[0];
+        var filePath = args[1];
 
+        var conf = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json", true, true)
+                .AddJsonFile("appsettings.Development.json", true, true)
+                .Build();
+
+        IServiceCollection services = new ServiceCollection();
+        services.AddOssClient(conf);
+        var sp = services.BuildServiceProvider();
+        var client = sp.GetService<OssClient>();
+
+        var bucket = BucketInfo.CreateByRegion(OssRegions.HangZhou, bucketName, false, false);
+        var remoteFilePaht = $"test/{DateTime.Now.ToString("yyyyMMddHHmmss")}.png";
+        using (var fs = new FileStream(filePath, FileMode.Open))
+        {
+            var file = new RequestContent()
+            {
+                MimeType = "images/png",
+                ContentType = RequestContentType.Stream,
+                StreamContent = fs,
+            };
+
+            var result = await client.PutObjectAsync(bucket, remoteFilePaht, file);
+            if(result.IsSuccess)
+            {
+                Console.WriteLine("Succeeded!");                
+            }
+            else
+            {
+                Console.WriteLine("Failed!");
+                Console.WriteLine(result.ErrorMessage);
+            }
+        }
     }
 }

tests/Sample/Program.cs

@@ -3,6 +3,9 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Cuiliang.AliyunOssSdk.csproj" />
   </ItemGroup>