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

修复新增区域的上传问题 #83

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

修复新增区域的上传问题 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions sdk/qiniuUploader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(function () {
// 请参考demo的index.js中的initQiniu()方法，若在使用处对options进行了赋值，则此处config不需要赋默认值。init(options) 即updateConfigWithOptions(options)，会对config进行赋值
var config = {
// bucket 所在区域。ECN, SCN, NCN, NA, ASG，分别对应七牛云的：华东，华南，华北，北美，新加坡 5 个区域
// bucket 所在区域。ECN, ECN-2 SCN, NCN, NA, ASG，分别对应七牛云的：华东-浙江，华东-浙江2，华南-广东，华北-河北，北美-洛杉矶，亚太-新加坡（原东南亚） ,6 个区域
qiniuRegion: '',
// 七牛云bucket 外链前缀，外链在下载资源时用到
qiniuBucketURLPrefix: '',
Expand Down Expand Up @@ -164,16 +164,17 @@
})
}

// 选择七牛云文件上传接口，文件向匹配的接口中传输。ECN, SCN, NCN, NA, ASG，分别对应七牛云的：华东，华南，华北，北美，新加坡 5 个区域
// 选择七牛云文件上传接口，文件向匹配的接口中传输。ECN, ECN-2, SCN, NCN, NA, ASG，分别对应七牛云的：华东，华南，华北，北美，新加坡 5 个区域
function uploadURLFromRegionCode(code) {
var uploadURL = null;
switch (code) {
case 'ECN': uploadURL = 'https://up.qiniup.com'; break;
case 'ECN-2': uploadURL = 'https://up-cn-east-2.qiniup.com'; break;
case 'NCN': uploadURL = 'https://up-z1.qiniup.com'; break;
case 'SCN': uploadURL = 'https://up-z2.qiniup.com'; break;
case 'NA': uploadURL = 'https://up-na0.qiniup.com'; break;
case 'ASG': uploadURL = 'https://up-as0.qiniup.com'; break;
default: console.error('please make the region is with one of [ECN, SCN, NCN, NA, ASG]');
default: console.error('please make the region is with one of [ECN, ECN-2, SCN, NCN, NA, ASG]');
}
return uploadURL;
}
Expand Down
9 changes: 6 additions & 3 deletions sdk/qiniuUploader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
type TokenFunction = () => string;
type AnyFunction = (...args: any[]) => any;

export type RegionCode = 'ECN' | 'NCN' | 'SCN' | 'NA' | 'ASG' | '';
export type RegionCode = 'ECN' | 'ECN-2' | 'NCN' | 'SCN' | 'NA' | 'ASG' | '';


interface QiniuConfig {
Expand Down Expand Up @@ -43,7 +43,7 @@ export interface QiniuUploadOptions {


const config: QiniuConfig = {
// bucket 所在区域。ECN, SCN, NCN, NA, ASG，分别对应七牛云的：华东，华南，华北，北美，新加坡 5 个区域
// bucket 所在区域。ECN, ECN-2 SCN, NCN, NA, ASG，分别对应七牛云的：华东-浙江，华东-浙江2，华南-广东，华北-河北，北美-洛杉矶，亚太-新加坡（原东南亚） ,6 个区域
qiniuRegion: '',
// 七牛云bucket 外链前缀，外链在下载资源时用到
qiniuBucketURLPrefix: '',
Expand Down Expand Up @@ -225,6 +225,9 @@ function uploadURLFromRegionCode(code: RegionCode): string | null {
case 'ECN':
uploadURL = 'https://up.qiniup.com';
break;
case 'ECN-2':
uploadURL = 'https://up-cn-east-2.qiniup.com';
break;
case 'NCN':
uploadURL = 'https://up-z1.qiniup.com';
break;
Expand All @@ -239,7 +242,7 @@ function uploadURLFromRegionCode(code: RegionCode): string | null {
break;
default:
console.error(
'please make the region is with one of [ECN, SCN, NCN, NA, ASG]'
'please make the region is with one of [ECN, ECN-2, SCN, NCN, NA, ASG]'
);
}
return uploadURL;
Expand Down