Skip to content

Commit 39b416f

Browse files
livehighlivehigh
committed
fix: 优化代码
1 parent 2cf8072 commit 39b416f

File tree

8 files changed

+53
-39
lines changed

8 files changed

+53
-39
lines changed

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5909,7 +5909,7 @@ module.exports = function(module) {
59095909
/*! exports provided: name, version, description, main, scripts, repository, author, license, dependencies, devDependencies, default */
59105910
/***/ (function(module) {
59115911

5912-
module.exports = JSON.parse("{\"name\":\"cos-wx-sdk-v5\",\"version\":\"1.8.0\",\"description\":\"小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)\",\"main\":\"dist/cos-wx-sdk-v5.min.js\",\"scripts\":{\"prettier\":\"prettier --write src demo/demo-sdk.js demo/test.js demo/ciDemo\",\"dev\":\"cross-env NODE_ENV=development node build.js --mode=development\",\"build\":\"cross-env NODE_ENV=production node build.js --mode=production\",\"sts.js\":\"node server/sts.js\",\"postinstall\":\"patch-package\"},\"repository\":{\"type\":\"git\",\"url\":\"http://github.com/tencentyun/cos-wx-sdk-v5.git\"},\"author\":\"carsonxu\",\"license\":\"ISC\",\"dependencies\":{\"fast-xml-parser\":\"4.5.0\",\"mime\":\"^2.4.6\"},\"devDependencies\":{\"@babel/core\":\"7.17.9\",\"@babel/preset-env\":\"7.16.11\",\"babel-loader\":\"8.2.5\",\"body-parser\":\"^1.18.3\",\"cross-env\":\"^7.0.3\",\"express\":\"^4.17.1\",\"patch-package\":\"^8.0.0\",\"prettier\":\"^3.0.1\",\"qcloud-cos-sts\":\"^3.0.2\",\"terser-webpack-plugin\":\"4.2.3\",\"webpack\":\"4.46.0\",\"webpack-cli\":\"4.10.0\"}}");
5912+
module.exports = JSON.parse("{\"name\":\"cos-wx-sdk-v5\",\"version\":\"1.8.0-beta.1\",\"description\":\"小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)\",\"main\":\"dist/cos-wx-sdk-v5.min.js\",\"scripts\":{\"prettier\":\"prettier --write src demo/demo-sdk.js demo/test.js demo/ciDemo\",\"dev\":\"cross-env NODE_ENV=development node build.js --mode=development\",\"build\":\"cross-env NODE_ENV=production node build.js --mode=production\",\"sts.js\":\"node server/sts.js\",\"postinstall\":\"patch-package\"},\"repository\":{\"type\":\"git\",\"url\":\"http://github.com/tencentyun/cos-wx-sdk-v5.git\"},\"author\":\"carsonxu\",\"license\":\"ISC\",\"dependencies\":{\"fast-xml-parser\":\"4.5.0\",\"mime\":\"^2.4.6\"},\"devDependencies\":{\"@babel/core\":\"7.17.9\",\"@babel/preset-env\":\"7.16.11\",\"babel-loader\":\"8.2.5\",\"body-parser\":\"^1.18.3\",\"cross-env\":\"^7.0.3\",\"express\":\"^4.17.1\",\"patch-package\":\"^8.0.0\",\"prettier\":\"^3.0.1\",\"qcloud-cos-sts\":\"^3.0.2\",\"terser-webpack-plugin\":\"4.2.3\",\"webpack\":\"4.46.0\",\"webpack-cli\":\"4.10.0\"}}");
59135913

59145914
/***/ }),
59155915

@@ -9395,7 +9395,9 @@ function putObject(params, callback) {
93959395
// 特殊处理 Cache-Control、Content-Type，避免代理更改这两个字段导致写入到 Object 属性里
93969396
var headers = params.Headers;
93979397
if (!headers['Cache-Control'] && !headers['cache-control']) headers['Cache-Control'] = '';
9398-
if (!headers['Content-Type'] && !headers['content-type']) headers['Content-Type'] = mime.getType(params.Key) || 'application/octet-stream';
9398+
if (!headers['Content-Type'] && !headers['content-type']) {
9399+
headers['Content-Type'] = mime.getType(params.Key) || '';
9400+
}
93999401
var needCalcMd5 = params.UploadAddMetaMd5 || self.options.UploadAddMetaMd5 || self.options.UploadCheckContentMd5;
94009402
var tracker = params.tracker;
94019403
needCalcMd5 && tracker && tracker.setParams({
@@ -10092,7 +10094,9 @@ function multipartInit(params, callback) {
1009210094

1009310095
// 特殊处理 Cache-Control、Content-Type
1009410096
if (!headers['Cache-Control'] && !headers['cache-control']) headers['Cache-Control'] = '';
10095-
if (!headers['Content-Type'] && !headers['content-type']) headers['Content-Type'] = mime.getType(params.Key) || 'application/octet-stream';
10097+
if (!headers['Content-Type'] && !headers['content-type']) {
10098+
headers['Content-Type'] = mime.getType(params.Key) || '';
10099+
}
1009610100
submitRequest.call(self, {
1009710101
Action: 'name/cos:InitiateMultipartUpload',
1009810102
method: 'POST',
@@ -11036,8 +11040,8 @@ function submitRequest(params, callback) {
1103611040
params.qs && (params.qs = util.clearKey(params.qs));
1103711041
var Query = util.clone(params.qs);
1103811042
params.action && (Query[params.action] = '');
11039-
var contentType = '';
11040-
var contentLength = '';
11043+
var contentType;
11044+
var contentLength = 0;
1104111045
// 指定一个默认的 content-type，如不指定小程序默认会指定 application/json
1104211046
var defaultContentType = 'application/json';
1104311047
util.each(params.headers, function (value, key) {
@@ -11064,8 +11068,8 @@ function submitRequest(params, callback) {
1106411068
params.headers['Content-Length'] = 0;
1106511069
}
1106611070
}
11067-
// 补充默认 content-type
11068-
if (!contentType) {
11071+
// 补充默认 content-type，(putObject/multipartInit 不需要补充)
11072+
if (contentType === undefined) {
1106911073
params.headers['Content-Type'] = defaultContentType;
1107011074
}
1107111075
var paramsUrl = params.url || params.Url;

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

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5909,7 +5909,7 @@ module.exports = function(module) {
59095909
/*! exports provided: name, version, description, main, scripts, repository, author, license, dependencies, devDependencies, default */
59105910
/***/ (function(module) {
59115911

5912-
module.exports = JSON.parse("{\"name\":\"cos-wx-sdk-v5\",\"version\":\"1.8.0\",\"description\":\"小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)\",\"main\":\"dist/cos-wx-sdk-v5.min.js\",\"scripts\":{\"prettier\":\"prettier --write src demo/demo-sdk.js demo/test.js demo/ciDemo\",\"dev\":\"cross-env NODE_ENV=development node build.js --mode=development\",\"build\":\"cross-env NODE_ENV=production node build.js --mode=production\",\"sts.js\":\"node server/sts.js\",\"postinstall\":\"patch-package\"},\"repository\":{\"type\":\"git\",\"url\":\"http://github.com/tencentyun/cos-wx-sdk-v5.git\"},\"author\":\"carsonxu\",\"license\":\"ISC\",\"dependencies\":{\"fast-xml-parser\":\"4.5.0\",\"mime\":\"^2.4.6\"},\"devDependencies\":{\"@babel/core\":\"7.17.9\",\"@babel/preset-env\":\"7.16.11\",\"babel-loader\":\"8.2.5\",\"body-parser\":\"^1.18.3\",\"cross-env\":\"^7.0.3\",\"express\":\"^4.17.1\",\"patch-package\":\"^8.0.0\",\"prettier\":\"^3.0.1\",\"qcloud-cos-sts\":\"^3.0.2\",\"terser-webpack-plugin\":\"4.2.3\",\"webpack\":\"4.46.0\",\"webpack-cli\":\"4.10.0\"}}");
5912+
module.exports = JSON.parse("{\"name\":\"cos-wx-sdk-v5\",\"version\":\"1.8.0-beta.1\",\"description\":\"小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)\",\"main\":\"dist/cos-wx-sdk-v5.min.js\",\"scripts\":{\"prettier\":\"prettier --write src demo/demo-sdk.js demo/test.js demo/ciDemo\",\"dev\":\"cross-env NODE_ENV=development node build.js --mode=development\",\"build\":\"cross-env NODE_ENV=production node build.js --mode=production\",\"sts.js\":\"node server/sts.js\",\"postinstall\":\"patch-package\"},\"repository\":{\"type\":\"git\",\"url\":\"http://github.com/tencentyun/cos-wx-sdk-v5.git\"},\"author\":\"carsonxu\",\"license\":\"ISC\",\"dependencies\":{\"fast-xml-parser\":\"4.5.0\",\"mime\":\"^2.4.6\"},\"devDependencies\":{\"@babel/core\":\"7.17.9\",\"@babel/preset-env\":\"7.16.11\",\"babel-loader\":\"8.2.5\",\"body-parser\":\"^1.18.3\",\"cross-env\":\"^7.0.3\",\"express\":\"^4.17.1\",\"patch-package\":\"^8.0.0\",\"prettier\":\"^3.0.1\",\"qcloud-cos-sts\":\"^3.0.2\",\"terser-webpack-plugin\":\"4.2.3\",\"webpack\":\"4.46.0\",\"webpack-cli\":\"4.10.0\"}}");
59135913

59145914
/***/ }),
59155915

@@ -9395,7 +9395,9 @@ function putObject(params, callback) {
93959395
// 特殊处理 Cache-Control、Content-Type，避免代理更改这两个字段导致写入到 Object 属性里
93969396
var headers = params.Headers;
93979397
if (!headers['Cache-Control'] && !headers['cache-control']) headers['Cache-Control'] = '';
9398-
if (!headers['Content-Type'] && !headers['content-type']) headers['Content-Type'] = mime.getType(params.Key) || 'application/octet-stream';
9398+
if (!headers['Content-Type'] && !headers['content-type']) {
9399+
headers['Content-Type'] = mime.getType(params.Key) || '';
9400+
}
93999401
var needCalcMd5 = params.UploadAddMetaMd5 || self.options.UploadAddMetaMd5 || self.options.UploadCheckContentMd5;
94009402
var tracker = params.tracker;
94019403
needCalcMd5 && tracker && tracker.setParams({
@@ -10092,7 +10094,9 @@ function multipartInit(params, callback) {
1009210094

1009310095
// 特殊处理 Cache-Control、Content-Type
1009410096
if (!headers['Cache-Control'] && !headers['cache-control']) headers['Cache-Control'] = '';
10095-
if (!headers['Content-Type'] && !headers['content-type']) headers['Content-Type'] = mime.getType(params.Key) || 'application/octet-stream';
10097+
if (!headers['Content-Type'] && !headers['content-type']) {
10098+
headers['Content-Type'] = mime.getType(params.Key) || '';
10099+
}
1009610100
submitRequest.call(self, {
1009710101
Action: 'name/cos:InitiateMultipartUpload',
1009810102
method: 'POST',
@@ -11036,8 +11040,8 @@ function submitRequest(params, callback) {
1103611040
params.qs && (params.qs = util.clearKey(params.qs));
1103711041
var Query = util.clone(params.qs);
1103811042
params.action && (Query[params.action] = '');
11039-
var contentType = '';
11040-
var contentLength = '';
11043+
var contentType;
11044+
var contentLength = 0;
1104111045
// 指定一个默认的 content-type，如不指定小程序默认会指定 application/json
1104211046
var defaultContentType = 'application/json';
1104311047
util.each(params.headers, function (value, key) {
@@ -11064,8 +11068,8 @@ function submitRequest(params, callback) {
1106411068
params.headers['Content-Length'] = 0;
1106511069
}
1106611070
}
11067-
// 补充默认 content-type
11068-
if (!contentType) {
11071+
// 补充默认 content-type，(putObject/multipartInit 不需要补充)
11072+
if (contentType === undefined) {
1106911073
params.headers['Content-Type'] = defaultContentType;
1107011074
}
1107111075
var paramsUrl = params.url || params.Url;

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

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/cos-wx-sdk-v5.js‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5909,7 +5909,7 @@ module.exports = function(module) {
59095909
/*! exports provided: name, version, description, main, scripts, repository, author, license, dependencies, devDependencies, default */
59105910
/***/ (function(module) {
59115911

5912-
module.exports = JSON.parse("{\"name\":\"cos-wx-sdk-v5\",\"version\":\"1.8.0\",\"description\":\"小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)\",\"main\":\"dist/cos-wx-sdk-v5.min.js\",\"scripts\":{\"prettier\":\"prettier --write src demo/demo-sdk.js demo/test.js demo/ciDemo\",\"dev\":\"cross-env NODE_ENV=development node build.js --mode=development\",\"build\":\"cross-env NODE_ENV=production node build.js --mode=production\",\"sts.js\":\"node server/sts.js\",\"postinstall\":\"patch-package\"},\"repository\":{\"type\":\"git\",\"url\":\"http://github.com/tencentyun/cos-wx-sdk-v5.git\"},\"author\":\"carsonxu\",\"license\":\"ISC\",\"dependencies\":{\"fast-xml-parser\":\"4.5.0\",\"mime\":\"^2.4.6\"},\"devDependencies\":{\"@babel/core\":\"7.17.9\",\"@babel/preset-env\":\"7.16.11\",\"babel-loader\":\"8.2.5\",\"body-parser\":\"^1.18.3\",\"cross-env\":\"^7.0.3\",\"express\":\"^4.17.1\",\"patch-package\":\"^8.0.0\",\"prettier\":\"^3.0.1\",\"qcloud-cos-sts\":\"^3.0.2\",\"terser-webpack-plugin\":\"4.2.3\",\"webpack\":\"4.46.0\",\"webpack-cli\":\"4.10.0\"}}");
5912+
module.exports = JSON.parse("{\"name\":\"cos-wx-sdk-v5\",\"version\":\"1.8.0-beta.1\",\"description\":\"小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)\",\"main\":\"dist/cos-wx-sdk-v5.min.js\",\"scripts\":{\"prettier\":\"prettier --write src demo/demo-sdk.js demo/test.js demo/ciDemo\",\"dev\":\"cross-env NODE_ENV=development node build.js --mode=development\",\"build\":\"cross-env NODE_ENV=production node build.js --mode=production\",\"sts.js\":\"node server/sts.js\",\"postinstall\":\"patch-package\"},\"repository\":{\"type\":\"git\",\"url\":\"http://github.com/tencentyun/cos-wx-sdk-v5.git\"},\"author\":\"carsonxu\",\"license\":\"ISC\",\"dependencies\":{\"fast-xml-parser\":\"4.5.0\",\"mime\":\"^2.4.6\"},\"devDependencies\":{\"@babel/core\":\"7.17.9\",\"@babel/preset-env\":\"7.16.11\",\"babel-loader\":\"8.2.5\",\"body-parser\":\"^1.18.3\",\"cross-env\":\"^7.0.3\",\"express\":\"^4.17.1\",\"patch-package\":\"^8.0.0\",\"prettier\":\"^3.0.1\",\"qcloud-cos-sts\":\"^3.0.2\",\"terser-webpack-plugin\":\"4.2.3\",\"webpack\":\"4.46.0\",\"webpack-cli\":\"4.10.0\"}}");
59135913

59145914
/***/ }),
59155915

@@ -9395,7 +9395,9 @@ function putObject(params, callback) {
93959395
// 特殊处理 Cache-Control、Content-Type，避免代理更改这两个字段导致写入到 Object 属性里
93969396
var headers = params.Headers;
93979397
if (!headers['Cache-Control'] && !headers['cache-control']) headers['Cache-Control'] = '';
9398-
if (!headers['Content-Type'] && !headers['content-type']) headers['Content-Type'] = mime.getType(params.Key) || 'application/octet-stream';
9398+
if (!headers['Content-Type'] && !headers['content-type']) {
9399+
headers['Content-Type'] = mime.getType(params.Key) || '';
9400+
}
93999401
var needCalcMd5 = params.UploadAddMetaMd5 || self.options.UploadAddMetaMd5 || self.options.UploadCheckContentMd5;
94009402
var tracker = params.tracker;
94019403
needCalcMd5 && tracker && tracker.setParams({
@@ -10092,7 +10094,9 @@ function multipartInit(params, callback) {
1009210094

1009310095
// 特殊处理 Cache-Control、Content-Type
1009410096
if (!headers['Cache-Control'] && !headers['cache-control']) headers['Cache-Control'] = '';
10095-
if (!headers['Content-Type'] && !headers['content-type']) headers['Content-Type'] = mime.getType(params.Key) || 'application/octet-stream';
10097+
if (!headers['Content-Type'] && !headers['content-type']) {
10098+
headers['Content-Type'] = mime.getType(params.Key) || '';
10099+
}
1009610100
submitRequest.call(self, {
1009710101
Action: 'name/cos:InitiateMultipartUpload',
1009810102
method: 'POST',
@@ -11036,8 +11040,8 @@ function submitRequest(params, callback) {
1103611040
params.qs && (params.qs = util.clearKey(params.qs));
1103711041
var Query = util.clone(params.qs);
1103811042
params.action && (Query[params.action] = '');
11039-
var contentType = '';
11040-
var contentLength = '';
11043+
var contentType;
11044+
var contentLength = 0;
1104111045
// 指定一个默认的 content-type，如不指定小程序默认会指定 application/json
1104211046
var defaultContentType = 'application/json';
1104311047
util.each(params.headers, function (value, key) {
@@ -11064,8 +11068,8 @@ function submitRequest(params, callback) {
1106411068
params.headers['Content-Length'] = 0;
1106511069
}
1106611070
}
11067-
// 补充默认 content-type
11068-
if (!contentType) {
11071+
// 补充默认 content-type，(putObject/multipartInit 不需要补充)
11072+
if (contentType === undefined) {
1106911073
params.headers['Content-Type'] = defaultContentType;
1107011074
}
1107111075
var paramsUrl = params.url || params.Url;

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

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cos-wx-sdk-v5",
3-
"version": "1.8.0",
3+
"version": "1.8.0-beta.1",
44
"description": "小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)",
55
"main": "dist/cos-wx-sdk-v5.min.js",
66
"scripts": {

‎src/base.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2111,8 +2111,9 @@ function putObject(params, callback) {
21112111
// 特殊处理 Cache-Control、Content-Type，避免代理更改这两个字段导致写入到 Object 属性里
21122112
var headers = params.Headers;
21132113
if (!headers['Cache-Control'] && !headers['cache-control']) headers['Cache-Control'] = '';
2114-
if (!headers['Content-Type'] && !headers['content-type'])
2115-
headers['Content-Type'] = mime.getType(params.Key) || 'application/octet-stream';
2114+
if (!headers['Content-Type'] && !headers['content-type']) {
2115+
headers['Content-Type'] = mime.getType(params.Key) || '';
2116+
}
21162117

21172118
var needCalcMd5 = params.UploadAddMetaMd5 || self.options.UploadAddMetaMd5 || self.options.UploadCheckContentMd5;
21182119
var tracker = params.tracker;
@@ -2858,8 +2859,9 @@ function multipartInit(params, callback) {
28582859

28592860
// 特殊处理 Cache-Control、Content-Type
28602861
if (!headers['Cache-Control'] && !headers['cache-control']) headers['Cache-Control'] = '';
2861-
if (!headers['Content-Type'] && !headers['content-type'])
2862-
headers['Content-Type'] = mime.getType(params.Key) || 'application/octet-stream';
2862+
if (!headers['Content-Type'] && !headers['content-type']) {
2863+
headers['Content-Type'] = mime.getType(params.Key) || '';
2864+
}
28632865

28642866
submitRequest.call(
28652867
self,
@@ -3892,8 +3894,8 @@ function submitRequest(params, callback) {
38923894
var Query = util.clone(params.qs);
38933895
params.action && (Query[params.action] = '');
38943896

3895-
var contentType = '';
3896-
var contentLength = '';
3897+
var contentType;
3898+
var contentLength = 0;
38973899
// 指定一个默认的 content-type，如不指定小程序默认会指定 application/json
38983900
var defaultContentType = 'application/json';
38993901
util.each(params.headers, function (value, key) {
@@ -3921,8 +3923,8 @@ function submitRequest(params, callback) {
39213923
params.headers['Content-Length'] = 0;
39223924
}
39233925
}
3924-
// 补充默认 content-type
3925-
if (!contentType) {
3926+
// 补充默认 content-type，(putObject/multipartInit 不需要补充)
3927+
if (contentType === undefined) {
39263928
params.headers['Content-Type'] = defaultContentType;
39273929
}
39283930

0 commit comments

Comments
 (0)