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

Jump to bottom

Fix/v1.2.9 #104

Merged
merged 3 commits into from
Apr 27, 2021
Merged

Fix/v1.2.9 #104

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e823bb
fix: getAuthorization 出错时能把日志打印在输入框中
Apr 27, 2021
b0f12c1
fix: 修复 getAuth 里代码逻辑报错
Apr 27, 2021
bce7d0e
fix: 优化 demo.js
Apr 27, 2021
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
29 changes: 17 additions & 12 deletions demo/demo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ var getAuthorization = function (options, callback) {
var credentials = data.credentials;
} catch (e) {
}
if (!data || !credentials) return console.error('credentials invalid');
if (!data || !credentials) {
return logger.error('credentials invalid:\n' + JSON.stringify(data, null, 2))
};
var authorization = COS.getAuthorization({
SecretId: credentials.tmpSecretId, // 可传固定密钥或者临时密钥
SecretKey: credentials.tmpSecretKey, // 可传固定密钥或者临时密钥
Expand Down Expand Up @@ -89,7 +91,9 @@ var getAuthorization = function (options, callback) {
// var credentials = data.credentials;
// } catch (e) {
// }
// if (!data || !credentials) return console.error('credentials invalid');
// if (!data || !credentials) {
// return logger.error('credentials invalid:\n' + JSON.stringify(data, null, 2))
// };
// callback({
// TmpSecretId: credentials.tmpSecretId,
// TmpSecretKey: credentials.tmpSecretKey,
Expand Down Expand Up @@ -216,7 +220,7 @@ function getAuth() {
Key: key
}, function (AuthData) {
if (typeof AuthData === 'string') {
AuthData = {Authorization: AuthData.Authorization};
AuthData = {Authorization: AuthData};
}
var url = 'http://' + config.Bucket + '.cos.' + config.Region + '.myqcloud.com' + '/' +
camSafeUrlEncode(key).replace(/%2F/g, '/') +
Expand Down Expand Up @@ -935,8 +939,9 @@ function getObject() {
cos.getObject({
Bucket: config.Bucket, // Bucket 格式：test-1250000000
Region: config.Region,
Key: '1mb.zip',
onProgress: function (progressData) {
console.log(JSON.stringify(progressData));
logger.log(JSON.stringify(progressData));
}
}, function (err, data) {
logger.log(err || data);
Expand Down Expand Up @@ -1390,15 +1395,15 @@ function request() {
cos.request({
Bucket: config.Bucket,
Region: config.Region,
Key: '1.txt',
Method: 'GET',
Action: 'acl',
Headers: {},
Query: {},
Body: '',
Key: '1.png',
Method: 'POST',
Action: 'image_process',
Headers: {
// 通过 imageMogr2 接口使用图片缩放功能：指定图片宽度为 200，宽度等比压缩
'Pic-Operations': '{"is_pic_info": 1, "rules": [{"fileid": "desample_photo.jpg", "rule": "imageMogr2/thumbnail/200x/"}]}'
},
}, function (err, data) {
console.log('err:', err);
console.log('data:', data);
logger.log(err || data);
});
}

Expand Down