Merge pull request #4 from cnblogs/refactor

Refactor

Author: cnblogs-dudu

src/Cuiliang.AliyunOssSdk.csproj

@@ -1,18 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <Version>0.2.0</Version>
+    <PackageId>aliyun.sdk.oss</PackageId>
     <TargetFramework>netstandard2.0</TargetFramework>    
-    <Authors>cuiliang.bj@gmail.com</Authors>
-    <Description>Aliyun oss sdk for dotnet core.</Description>
+    <Description>Aliyun OSS SDK for .NET Core</Description>
     <PackageTags>Aliyun</PackageTags>
-    <RepositoryUrl>https://github.com/cuiliang/Cuiliang.AliyunOssSdk</RepositoryUrl>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Authors>Cuiliang</Authors>
+    <PackageProjectUrl>https://github.com/cnblogs/Cuiliang.AliyunOssSdk</PackageProjectUrl>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="2.1.0" />
+    <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/BucketInfo.cs

@@ -19,9 +19,7 @@ public class BucketInfo
         /// <summary>
         /// 是否https访问方式
         /// </summary>
-        public bool IsHttps { get; private set; }
-
-      
+        public bool IsHttps { get; private set; }      
 
         /// <summary>
         /// Bucket名称
@@ -36,13 +34,10 @@ public class BucketInfo
         /// <summary>
         /// 带有bucket网址的uri
         /// </summary>
-        public Uri BucketUri { get; private set; }
-
-       
+        public Uri BucketUri { get; private set; }       
 
         private BucketInfo()
-        {
-        }
+        { }
 
         /// <summary>
         /// 使用自定义域名创建地址信息

src/Entites/ClientConfiguration.cs

@@ -15,9 +15,7 @@ namespace Cuiliang.AliyunOssSdk.Entites
     public class ClientConfiguration 
     {
         private const string UserAgentPrefix = "aliyun-sdk-dotnet/";
-        private static readonly string _userAgent = GetDefaultUserAgent();
-
-        
+        private static readonly string _userAgent = GetDefaultUserAgent();        
 
         /// <summary>
         /// HttpWebRequest最大的并发连接数目。
@@ -67,9 +65,7 @@ public string UserAgent
         /// <summary>
         /// 获取或设置请求发生错误时最大的重试次数。
         /// </summary>
-        public int MaxErrorRetry { get; set; } = 3;
-
-        
+        public int MaxErrorRetry { get; set; } = 3;        
 
         /// <summary>
         /// <para>设置自定义基准时间。</para>
@@ -93,7 +89,6 @@ public void SetCustomEpochTicks(long epochTicks)
         /// </summary>
         public long TickOffset { get; internal set; }
 
-
         /// <summary>
         /// 默认配置
         /// </summary>
@@ -103,7 +98,6 @@ public static ClientConfiguration Default {
                 return new ClientConfiguration();
             }
         }
-
 
         /// <summary>
         /// 获取User-Agent信息。

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/Entites/OssRegions.cs

@@ -24,7 +24,6 @@ public class OssRegions
         public const string HuHeHaoTe = "oss-cn-huhehaote";
 
 
-
         // 华南 1
         public const string ShenZhen = "oss-cn-shenzhen";
 

src/OssClient.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Cuiliang.AliyunOssSdk.Api;

src/OssClientExtensions.cs

@@ -0,0 +1,41 @@
+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 Microsoft.Extensions.DependencyInjection
+{
+    public static class OssClientServiceCollectionExtensions
+    {
+        public static IServiceCollection AddOssClient(
+            this IServiceCollection services,
+            IConfiguration configuration, 
+            string sectionName = "ossClient",
+            Action<ClientConfiguration> setupClientConfiguration = null,
+            Action<HttpClient> configureHttpClient = null)
+        {
+            services.Configure<OssCredential>(configuration.GetSection("ossClient"));
+
+            var clientConfiguration = new ClientConfiguration();
+            setupClientConfiguration?.Invoke(clientConfiguration);
+            services.AddSingleton(clientConfiguration);
+
+            services.AddTransient<RequestContext>();
+
+            if (configureHttpClient == null)
+            {
+                services.AddHttpClient<OssClient>();
+            }
+            else
+            {
+                services.AddHttpClient<OssClient>(configureHttpClient);
+            }
+
+            return services;
+        }
+    }
+}

src/OssClientServiceCollectionExtensions.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>

src/Request/RequestContext.cs

@@ -16,7 +16,6 @@ namespace Cuiliang.AliyunOssSdk.Request
     /// </summary>
     public class ServiceCaller
     {
-        private readonly static HttpClient _client = new HttpClient();
         private RequestContext _requestContext;
         private readonly HttpClient _client;