Merge pull request #6 from cnblogs/v0.3.2

Refacotry BucketInfo.CreateByRegion
cnblogs · Jan 12, 2019 · ea1c0bd · ea1c0bd
2 parents 2692567 + b17dd8b
commit ea1c0bd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/src/Cuiliang.AliyunOssSdk.csproj b/src/Cuiliang.AliyunOssSdk.csproj
@@ -6,6 +6,7 @@
     <PackageTags>Aliyun</PackageTags>
     <Authors>Cuiliang</Authors>
     <PackageProjectUrl>https://github.com/cnblogs/Cuiliang.AliyunOssSdk</PackageProjectUrl>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="Properties\" />

diff --git a/src/Entites/BucketInfo.cs b/src/Entites/BucketInfo.cs
@@ -69,20 +69,27 @@ public static BucketInfo CreateByCname(Uri uri, string bucket)
         /// <returns></returns>
         public static BucketInfo CreateByRegion(string region, string bucketName, bool useHttps = false, bool useInternal = false)
         {
-            var  baseDomain = useInternal? "-internal.aliyuncs.com" : ".aliyuncs.com";
-            var method = useHttps ? "https://" : "http://";
+            var uriBuilder = new UriBuilder();
+            uriBuilder.Scheme = useHttps ? "https" : "http";
+            uriBuilder.Host = region + (useInternal ? "-internal.aliyuncs.com" : ".aliyuncs.com");
 
             var bucket = new BucketInfo()
             {
                 IsCname = false,
                 BucketName = bucketName,
-                IsHttps = useHttps
+                IsHttps = useHttps,
+                EndpointUri = uriBuilder.Uri
             };
 
-            bucket.EndpointUri = new Uri(method + region + baseDomain);
-
-            // bucket名称为空的情况，直接访问oss
-            bucket.BucketUri = String.IsNullOrEmpty(bucketName)? bucket.EndpointUri : new Uri(method + bucketName + "." + region + baseDomain);
+            if(string.IsNullOrEmpty(bucketName))
+            {
+                bucket.BucketUri = bucket.EndpointUri;
+            }
+            else
+            {
+                uriBuilder.Host = bucketName + "." + uriBuilder.Host;
+                bucket.BucketUri = uriBuilder.Uri;
+            }
 
             return bucket;
         }

diff --git a/tests/Sample/Sample.csproj b/tests/Sample/Sample.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>    
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+  <PropertyGroup>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>