Skip to content

Commit 86d4144

Browse files
carsonxucarsonxu
committed
v1.0.4 putObject、sliceUploadFile 支持 Query
1 parent 9615899 commit 86d4144

File tree

7 files changed

+38
-14
lines changed

7 files changed

+38
-14
lines changed

‎demo-album/lib/cos-wx-sdk-v5.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2333,7 +2333,7 @@ base.init(COS, task);
23332333
advance.init(COS, task);
23342334

23352335
COS.getAuthorization = util.getAuth;
2336-
COS.version = '1.0.3';
2336+
COS.version = '1.0.4';
23372337

23382338
module.exports = COS;
23392339

@@ -7077,7 +7077,7 @@ function listObjectVersions(params, callback) {
70777077
* @param {Object} data 为对应的 object 数据，包括 body 和 headers
70787078
*/
70797079
function getObject(params, callback) {
7080-
var reqParams = {};
7080+
var reqParams = params.Query || {};
70817081

70827082
reqParams['response-content-type'] = params['ResponseContentType'];
70837083
reqParams['response-content-language'] = params['ResponseContentLanguage'];
@@ -7165,6 +7165,7 @@ function putObject(params, callback) {
71657165
Region: params.Region,
71667166
Key: params.Key,
71677167
headers: params.Headers,
7168+
qs: params.Query,
71687169
body: params.Body,
71697170
onProgress: onProgress,
71707171
}, function (err, data) {
@@ -7248,6 +7249,7 @@ function postObject(params, callback) {
72487249
Region: params.Region,
72497250
Key: params.Key,
72507251
headers: headers,
7252+
qs: params.Query,
72517253
filePath: filePath,
72527254
onProgress: onProgress,
72537255
}, function (err, data) {
@@ -7821,6 +7823,7 @@ function multipartInit(params, callback) {
78217823
Key: params.Key,
78227824
action: 'uploads',
78237825
headers: params.Headers,
7826+
qs: params.Query,
78247827
}, function (err, data) {
78257828
if (err) return callback(err);
78267829
data = util.clone(data || {});
@@ -9303,6 +9306,7 @@ function getUploadIdAndPartList(params, callback) {
93039306
Region: Region,
93049307
Key: Key,
93059308
Headers: util.clone(params.Headers),
9309+
Query: util.clone(params.Query),
93069310
StorageClass: StorageClass,
93079311
}, params);
93089312
self.multipartInit(_params, function (err, data) {

‎demo/demo-sdk.js‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ var getAuthorization = function(options, callback) {
9595
};
9696

9797
var cos = new COS({
98-
// path style 指正式请求时，Bucket 是在 path 里，这样用途相同园区多个 bucket 只需要配置一个园区域名
98+
// path style 指正式请求时，Bucket 是在 path 里，这样用相同园区多个 bucket 只需要配置一个园区域名
9999
// ForcePathStyle: true,
100100
getAuthorization: getAuthorization,
101101
});
@@ -143,6 +143,12 @@ var dao = {
143143
FilePath: file.path,
144144
FileSize: file.size,
145145
CacheControl: 'max-age=7200',
146+
Headers: {
147+
aa: 123,
148+
},
149+
Query: {
150+
bb: 123,
151+
},
146152
onTaskReady: function(taskId) {
147153
TaskId = taskId
148154
},
@@ -192,7 +198,10 @@ var dao = {
192198
Key: '1.png',
193199
FilePath: file.path,
194200
Headers: {
195-
test: 123,
201+
aa: 123,
202+
},
203+
Query: {
204+
bb: 123,
196205
},
197206
onTaskReady: function(taskId) {
198207
TaskId = taskId
@@ -231,7 +240,13 @@ var dao = {
231240
Bucket: config.Bucket,
232241
Region: config.Region,
233242
Key: '1.txt',
234-
Body: 'hello world' // 在小程序里，putObject 接口只允许传字符串的内容，不支持 TaskReady 和 onProgress，上传请使用 cos.postObject 接口
243+
Body: 'hello world', // 在小程序里，putObject 接口只允许传字符串的内容，不支持 TaskReady 和 onProgress，上传请使用 cos.postObject 接口
244+
Headers: {
245+
aa: 123,
246+
},
247+
Query: {
248+
bb: 123,
249+
},
235250
}, requestCallback);
236251
},
237252
// 上传文件

‎demo/lib/cos-wx-sdk-v5.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2333,7 +2333,7 @@ base.init(COS, task);
23332333
advance.init(COS, task);
23342334

23352335
COS.getAuthorization = util.getAuth;
2336-
COS.version = '1.0.3';
2336+
COS.version = '1.0.4';
23372337

23382338
module.exports = COS;
23392339

@@ -7077,7 +7077,7 @@ function listObjectVersions(params, callback) {
70777077
* @param {Object} data 为对应的 object 数据，包括 body 和 headers
70787078
*/
70797079
function getObject(params, callback) {
7080-
var reqParams = {};
7080+
var reqParams = params.Query || {};
70817081

70827082
reqParams['response-content-type'] = params['ResponseContentType'];
70837083
reqParams['response-content-language'] = params['ResponseContentLanguage'];
@@ -7165,6 +7165,7 @@ function putObject(params, callback) {
71657165
Region: params.Region,
71667166
Key: params.Key,
71677167
headers: params.Headers,
7168+
qs: params.Query,
71687169
body: params.Body,
71697170
onProgress: onProgress,
71707171
}, function (err, data) {
@@ -7248,6 +7249,7 @@ function postObject(params, callback) {
72487249
Region: params.Region,
72497250
Key: params.Key,
72507251
headers: headers,
7252+
qs: params.Query,
72517253
filePath: filePath,
72527254
onProgress: onProgress,
72537255
}, function (err, data) {
@@ -7821,6 +7823,7 @@ function multipartInit(params, callback) {
78217823
Key: params.Key,
78227824
action: 'uploads',
78237825
headers: params.Headers,
7826+
qs: params.Query,
78247827
}, function (err, data) {
78257828
if (err) return callback(err);
78267829
data = util.clone(data || {});
@@ -9303,6 +9306,7 @@ function getUploadIdAndPartList(params, callback) {
93039306
Region: Region,
93049307
Key: Key,
93059308
Headers: util.clone(params.Headers),
9309+
Query: util.clone(params.Query),
93069310
StorageClass: StorageClass,
93079311
}, params);
93089312
self.multipartInit(_params, function (err, data) {

‎demo/project.config.json‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"uploadWithSourceMap": true,
2020
"compileHotReLoad": false,
2121
"useMultiFrameRuntime": false,
22-
"useApiHook": false,
22+
"useApiHook": true,
2323
"babelSetting": {
2424
"ignore": [],
2525
"disablePlugins": [],
@@ -33,21 +33,18 @@
3333
},
3434
"compileType": "miniprogram",
3535
"libVersion": "1.6.0",
36-
"appid": "wx0000000000000000",
36+
"appid": "wx824a4317ff5271ed",
3737
"projectname": "demo",
3838
"simulatorType": "wechat",
3939
"simulatorPluginLibVersion": {},
4040
"condition": {
4141
"search": {
42-
"current": -1,
4342
"list": []
4443
},
4544
"conversation": {
46-
"current": -1,
4745
"list": []
4846
},
4947
"miniprogram": {
50-
"current": -1,
5148
"list": []
5249
}
5350
}

‎src/advance.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,7 @@ function getUploadIdAndPartList(params, callback) {
286286
Region: Region,
287287
Key: Key,
288288
Headers: util.clone(params.Headers),
289+
Query: util.clone(params.Query),
289290
StorageClass: StorageClass,
290291
}, params);
291292
self.multipartInit(_params, function (err, data) {

‎src/base.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1787,7 +1787,7 @@ function listObjectVersions(params, callback) {
17871787
* @param {Object} data 为对应的 object 数据，包括 body 和 headers
17881788
*/
17891789
function getObject(params, callback) {
1790-
var reqParams = {};
1790+
var reqParams = params.Query || {};
17911791

17921792
reqParams['response-content-type'] = params['ResponseContentType'];
17931793
reqParams['response-content-language'] = params['ResponseContentLanguage'];
@@ -1875,6 +1875,7 @@ function putObject(params, callback) {
18751875
Region: params.Region,
18761876
Key: params.Key,
18771877
headers: params.Headers,
1878+
qs: params.Query,
18781879
body: params.Body,
18791880
onProgress: onProgress,
18801881
}, function (err, data) {
@@ -1958,6 +1959,7 @@ function postObject(params, callback) {
19581959
Region: params.Region,
19591960
Key: params.Key,
19601961
headers: headers,
1962+
qs: params.Query,
19611963
filePath: filePath,
19621964
onProgress: onProgress,
19631965
}, function (err, data) {
@@ -2531,6 +2533,7 @@ function multipartInit(params, callback) {
25312533
Key: params.Key,
25322534
action: 'uploads',
25332535
headers: params.Headers,
2536+
qs: params.Query,
25342537
}, function (err, data) {
25352538
if (err) return callback(err);
25362539
data = util.clone(data || {});

‎src/cos.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ base.init(COS, task);
5656
advance.init(COS, task);
5757

5858
COS.getAuthorization = util.getAuth;
59-
COS.version = '1.0.3';
59+
COS.version = '1.0.4';
6060

6161
module.exports = COS;

0 commit comments

Comments
 (0)