Skip to content

Commit

Permalink
remove debugger
Browse files Browse the repository at this point in the history
  • Loading branch information
@carsonxu
carsonxu committed Oct 19, 2018
1 parent 4051ac9 commit e4d3d11
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 32 deletions.
76 changes: 48 additions & 28 deletions demo/demo.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,9 @@ function getAuth() {
function getBucket() {
cos.getBucket({
Bucket: config.Bucket, // Bucket 格式：test-1250000000
Region: config.Region
Region: config.Region,
// Prefix: ''
// Delimiter: '/'
}, function (err, data) {
logger.log(err || data);
});
Expand Down Expand Up @@ -195,7 +197,7 @@ function putBucketAcl() {
ACL: 'private',
// AccessControlPolicy: {
// "Owner": { // AccessControlPolicy 里必须有 owner
// "ID": 'qcs::cam::uin/459000000:uin/459000000' // 459000000 是 Bucket 所属用户的 QQ 号
// "ID": 'qcs::cam::uin/10001:uin/10001' // 10001 是 Bucket 所属用户的 QQ 号
// },
// "Grants": [{
// "Grantee": {
Expand Down Expand Up @@ -312,20 +314,16 @@ function putBucketPolicy() {
"effect": "allow",
"principal": {"qcs": ["qcs::cam::uin/10001:uin/10001"]}, // 这里的 10001 是 QQ 号
"action": [
"name/cos:GetBucket",
"name/cos:PutObject",
"name/cos:PostObject",
"name/cos:PutObjectCopy",
"name/cos:InitiateMultipartUpload",
"name/cos:ListMultipartUploads",
"name/cos:ListParts",
"name/cos:UploadPart",
"name/cos:UploadPartCopy",
"name/cos:CompleteMultipartUpload",
"name/cos:AbortMultipartUpload",
"name/cos:AppendObject"
"name/cos:CompleteMultipartUpload"
],
// "resource": ["qcs::cos:ap-guangzhou:uid/1250000000:test-1250000000/*"] // 1250000000 是 appid
"resource": ["qcs::cos:" + config.Region + ":uid/" + AppId + ":" + config.Bucket + "/*"] // 1250000000 是 appid
}]
}],
},
Bucket: config.Bucket, // Bucket 格式：test-1250000000
Region: config.Region
Expand Down Expand Up @@ -366,17 +364,39 @@ function putBucketLifecycle() {
Bucket: config.Bucket, // Bucket 格式：test-1250000000
Region: config.Region,
LifecycleConfiguration: {
"Rules": [{
'ID': 1,
'Filter': {
'Prefix': 'test123',
Rules: [{
"ID": "1",
"Status": "Enabled",
"Filter": {},
"Transition": {
"Days": "30",
"StorageClass": "STANDARD_IA"
}
}, {
"ID": "2",
"Status": "Enabled",
"Filter": {
"Prefix": "dir/"
},
'Status': 'Enabled',
'Transition': {
'Date': '2016-10-31T00:00:00+08:00',
'StorageClass': 'STANDARD_IA'
"Transition": {
"Days": "90",
"StorageClass": "ARCHIVE"
}
}]
}, {
"ID": "3",
"Status": "Enabled",
"Filter": {},
"Expiration": {
"Days": "180"
}
}, {
"ID": "4",
"Status": "Enabled",
"Filter": {},
"AbortIncompleteMultipartUpload": {
"DaysAfterInitiation": "30"
}
}],
}
}, function (err, data) {
logger.log(err || data);
Expand Down Expand Up @@ -426,9 +446,10 @@ function listObjectVersions() {
cos.listObjectVersions({
Bucket: config.Bucket, // Bucket 格式：test-1250000000
Region: config.Region,
Prefix: "1mb.zip"
// Prefix: "",
// Delimiter: '/'
}, function (err, data) {
logger.log(err || JSON.stringify(data.Versions, null, ' '));
logger.log(err || JSON.stringify(data, null, ' '));
});
}

Expand All @@ -438,15 +459,15 @@ function putBucketReplication() {
Bucket: config.Bucket, // Bucket 格式：test-1250000000
Region: config.Region,
ReplicationConfiguration: {
Role: "qcs::cam::uin/459000000:uin/459000000",
Role: "qcs::cam::uin/10001:uin/10001",
Rules: [{
ID: "1",
Status: "Enabled",
Prefix: "sync/",
Destination: {
Bucket: "qcs:id/0:cos:ap-chengdu:appid/" + AppId + ":backup",
StorageClass: "Standard",
},
// StorageClass: "Standard",
}
}]
}
}, function (err, data) {
Expand Down Expand Up @@ -547,7 +568,7 @@ function putObjectAcl() {
ACL: 'default', // 继承上一级目录权限
// AccessControlPolicy: {
// "Owner": { // AccessControlPolicy 里必须有 owner
// "ID": 'qcs::cam::uin/459000000:uin/459000000' // 459000000 是 Bucket 所属用户的 QQ 号
// "ID": 'qcs::cam::uin/10001:uin/10001' // 10001 是 Bucket 所属用户的 QQ 号
// },
// "Grants": [{
// "Grantee": {
Expand Down Expand Up @@ -586,8 +607,7 @@ function deleteMultipleObject() {
Bucket: config.Bucket, // Bucket 格式：test-1250000000
Region: config.Region,
Objects: [
{Key: '中文/中文.txt'},
{Key: '中文/中文.zip'},
{Key: '1mb.zip',VersionId: 'MTg0NDY3NDI1MzM4NzM0ODA2MTI'},
]
}, function (err, data) {
logger.log(err || data);
Expand Down Expand Up @@ -794,9 +814,9 @@ function sliceCopyFile() {
'getBucketLifecycle',
'putBucketLifecycle',
'deleteBucketLifecycle',
'deleteBucketLifecycle',
'putBucketVersioning',
'getBucketVersioning',
'listObjectVersions',
'putBucketReplication',
'getBucketReplication',
'deleteBucketReplication',
Expand Down
6 changes: 5 additions & 1 deletion dist/cos-js-sdk-v5.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1938,7 +1938,7 @@ util.extend(COS.prototype, base);
util.extend(COS.prototype, advance);

COS.getAuthorization = util.getAuth;
COS.version = '0.4.20';
COS.version = '0.4.21';

module.exports = COS;

Expand Down Expand Up @@ -4619,6 +4619,10 @@ function getBucketReplication(params, callback) {
if (!err) {
!data.ReplicationConfiguration && (data.ReplicationConfiguration = {});
}
if (data.ReplicationConfiguration.Rule) {
data.ReplicationConfiguration.Rules = data.ReplicationConfiguration.Rule;
delete data.ReplicationConfiguration.Rule;
}
callback(err, data);
});
}
Expand Down
2 changes: 1 addition & 1 deletion dist/cos-js-sdk-v5.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cos-js-sdk-v5",
"version": "0.4.20",
"version": "0.4.21",
"description": "cos js sdk v5",
"main": "index.js",
"scripts": {
Expand Down
4 changes: 4 additions & 0 deletions src/base.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -768,6 +768,10 @@ function getBucketReplication(params, callback) {
if (!err) {
!data.ReplicationConfiguration && (data.ReplicationConfiguration = {});
}
if (data.ReplicationConfiguration.Rule) {
data.ReplicationConfiguration.Rules = data.ReplicationConfiguration.Rule;
delete data.ReplicationConfiguration.Rule;
}
callback(err, data);
});
}
Expand Down
2 changes: 1 addition & 1 deletion src/cos.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ util.extend(COS.prototype, base);
util.extend(COS.prototype, advance);

COS.getAuthorization = util.getAuth;
COS.version = '0.4.20';
COS.version = '0.4.21';

module.exports = COS;

0 comments on commit e4d3d11

Please sign in to comment.