Skip to content

Commit 1bedb79

Browse files
committed
支持自定义 Protocol
1 parent ee1626e commit 1bedb79

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

dist/cos-js-sdk-v5.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,8 @@ var defaultOptions = {
592592
ProgressInterval: 1000,
593593
Domain: '',
594594
ServiceDomain: '',
595-
SliceSize: 1024 * 1024 * 20
595+
SliceSize: 1024 * 1024 * 20,
596+
Protocol: ''
596597
};
597598

598599
// 对外暴露的类
@@ -2577,6 +2578,7 @@ function putObject(params, callback) {
25772578
}
25782579
if (data && data.headers && data.headers['etag']) {
25792580
var url = getUrl({
2581+
protocol: self.options.Protocol,
25802582
domain: self.options.Domain,
25812583
bucket: params.Bucket,
25822584
region: params.Region,
@@ -3041,6 +3043,7 @@ function multipartComplete(params, callback) {
30413043
return callback(err);
30423044
}
30433045
var url = getUrl({
3046+
protocol: self.options.Protocol,
30443047
domain: self.options.Domain,
30453048
bucket: params.Bucket,
30463049
region: params.Region,
@@ -3230,6 +3233,7 @@ function getAuth(params) {
32303233
function getObjectUrl(params, callback) {
32313234
var self = this;
32323235
var url = getUrl({
3236+
protocol: self.options.Protocol,
32333237
domain: self.options.Domain,
32343238
bucket: params.Bucket,
32353239
region: params.Region,
@@ -3315,7 +3319,7 @@ function getUrl(params) {
33153319
var region = params.region;
33163320
var object = params.object;
33173321
var action = params.action;
3318-
var protocol = util.isBrowser && location.protocol === 'http:' ? 'http:' : 'https:';
3322+
var protocol = params.protocol || (util.isBrowser && location.protocol === 'http:' ? 'http:' : 'https:');
33193323
if (!domain) {
33203324
if (['cn-south', 'cn-south-2', 'cn-north', 'cn-east', 'cn-southwest', 'sg'].indexOf(region) > -1) {
33213325
domain = '{{Bucket}}-{{AppId}}.{{Region}}.myqcloud.com';
@@ -3442,6 +3446,7 @@ function _submitRequest(params, callback) {
34423446

34433447
var opt = {
34443448
url: url || getUrl({
3449+
protocol: self.options.Protocol,
34453450
domain: self.options.Domain,
34463451
bucket: bucket,
34473452
region: region,

dist/cos-js-sdk-v5.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/base.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -962,6 +962,7 @@ function putObject(params, callback) {
962962
}
963963
if (data && data.headers && data.headers['etag']) {
964964
var url = getUrl({
965+
protocol: self.options.Protocol,
965966
domain: self.options.Domain,
966967
bucket: params.Bucket,
967968
region: params.Region,
@@ -1428,6 +1429,7 @@ function multipartComplete(params, callback) {
14281429
return callback(err);
14291430
}
14301431
var url = getUrl({
1432+
protocol: self.options.Protocol,
14311433
domain: self.options.Domain,
14321434
bucket: params.Bucket,
14331435
region: params.Region,
@@ -1618,6 +1620,7 @@ function getAuth(params) {
16181620
function getObjectUrl(params, callback) {
16191621
var self = this;
16201622
var url = getUrl({
1623+
protocol: self.options.Protocol,
16211624
domain: self.options.Domain,
16221625
bucket: params.Bucket,
16231626
region: params.Region,
@@ -1704,7 +1707,7 @@ function getUrl(params) {
17041707
var region = params.region;
17051708
var object = params.object;
17061709
var action = params.action;
1707-
var protocol = util.isBrowser && location.protocol === 'http:' ? 'http:' : 'https:';
1710+
var protocol = params.protocol || (util.isBrowser && location.protocol === 'http:' ? 'http:' : 'https:');
17081711
if (!domain) {
17091712
if (['cn-south', 'cn-south-2', 'cn-north', 'cn-east', 'cn-southwest', 'sg'].indexOf(region) > -1) {
17101713
domain = '{{Bucket}}-{{AppId}}.{{Region}}.myqcloud.com';
@@ -1829,6 +1832,7 @@ function _submitRequest(params, callback) {
18291832

18301833
var opt = {
18311834
url: url || getUrl({
1835+
protocol: self.options.Protocol,
18321836
domain: self.options.Domain,
18331837
bucket: bucket,
18341838
region: region,

src/cos.js

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ var defaultOptions = {
1717
Domain: '',
1818
ServiceDomain: '',
1919
SliceSize: 1024 * 1024 * 20,
20+
Protocol: '',
2021
};
2122

2223
// 对外暴露的类

0 commit comments

Comments
 (0)