Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refacotry BucketInfo.CreateByRegion #6

Merged
merged 3 commits into from
Jan 12, 2019
Merged

Refacotry BucketInfo.CreateByRegion #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3d3461
Refacotry BucketInfo.CreateByRegion()
cnblogs-dudu Aug 19, 2018
ef07c87
Fix build error
cnblogs-dudu Aug 21, 2018
b17dd8b
Fix dotnet pack not working
cnblogs-dudu Aug 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Cuiliang.AliyunOssSdk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\" />
Expand Down
21 changes: 14 additions & 7 deletions src/Entites/BucketInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions tests/Sample/Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down