Skip to content

Commit 03f3e45

Browse files
livehighlivehigh
committed
upd：支持ci demo
1 parent cff7937 commit 03f3e45

File tree

5 files changed

+80
-144
lines changed

5 files changed

+80
-144
lines changed

‎demo/demo.js

Lines changed: 41 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1687,14 +1687,21 @@ function CIExample4(){
16871687
* 查询已经开通数据万象功能的存储桶
16881688
*/
16891689
function DescribeCIBuckets() {
1690-
cos.describeMediaBuckets({
1690+
var host = 'ci.' + config.Region + '.myqcloud.com';
1691+
var url = 'https://' + host + '/mediabucket';
1692+
cos.request({
16911693
Bucket: config.Bucket,
16921694
Region: config.Region,
1693-
Regions: 'ap-chengdu',
1694-
// BucketNames: 'blog-1300555317,wx-sdk-1300555317',
1695-
BucketName: 'blog',
1696-
// PageNumber: '1',
1697-
// PageSize: '10',
1695+
Method: 'GET',
1696+
Key: 'mediabucket', /** 固定值，必须 */
1697+
Url: url,
1698+
Query: {
1699+
pageNumber: '1', /** 第几页，非必须 */
1700+
pageSize: '10', /** 每页个数，非必须 */
1701+
// regions: 'ap-chengdu', /** 地域信息，例如'ap-beijing'，支持多个值用逗号分隔如'ap-shanghai,ap-beijing'，非必须 */
1702+
// bucketNames: 'test-1250000000', /** 存储桶名称，精确搜索，例如'test-1250000000'，支持多个值用逗号分隔如'test1-1250000000,test2-1250000000'，非必须 */
1703+
// bucketName: 'test', /** 存储桶名称前缀，前缀搜索，例如'test'，支持多个值用逗号分隔如'test1,test2'，非必须 */
1704+
}
16981705
},
16991706
function(err, data){
17001707
// var CIStatus = data.CIStatus;
@@ -1707,25 +1714,41 @@ function DescribeCIBuckets() {
17071714
* 获取媒体文件信息
17081715
*/
17091716
function GetMediaInfo() {
1710-
cos.getMediaInfo({
1717+
cos.request({
17111718
Bucket: config.Bucket,
17121719
Region: config.Region,
1713-
Key: '1.mp4',
1714-
}, function (err, data) {
1715-
console.log(err || data);
1716-
});
1720+
Method: 'GET',
1721+
Key: 'test.mp4',
1722+
Query: {
1723+
'ci-process': 'videoinfo' /** 固定值，必须 */
1724+
}
1725+
},
1726+
function (err, data) {
1727+
console.log(err || data);
1728+
});
17171729
}
17181730

17191731
/**
17201732
* 获取媒体文件某个时间的截图
17211733
*/
1722-
function GetSnapshot() {
1723-
cos.getSnapshot({
1724-
Bucket: config.Bucket,
1725-
Region: config.Region,
1726-
Key: '1.mp4',
1727-
Time: 5,
1728-
}, function (err, data) {
1734+
function GetSnapshot() {
1735+
cos.request({
1736+
Bucket: config.Bucket,
1737+
Region: config.Region,
1738+
Method: 'GET',
1739+
Key: 'test.mp4',
1740+
Query: {
1741+
'ci-process': 'snapshot', /** 固定值，必须 */
1742+
time: 1, /** 截图的时间点，单位为秒，必须 */
1743+
// width: 0, /** 截图的宽，非必须 */
1744+
// height: 0, /** 截图的高，非必须 */
1745+
// format: 'jpg', /** 截图的格式，支持 jpg 和 png，默认 jpg，非必须 */
1746+
// rotate: 'auto', /** 图片旋转方式，默认为'auto'，非必须 */
1747+
// mode: 'exactframe', /** 截帧方式，默认为'exactframe'，非必须 */
1748+
},
1749+
RawBody: true,
1750+
},
1751+
function (err, data) {
17291752
// var Body = data.Body;
17301753
console.log(err || data);
17311754
});

‎index.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1863,6 +1863,8 @@ Bulk：批量模式，恢复时间为24 - 48小时。 */
18631863
Action?: Action,
18641864
/** 请求url */
18651865
Url?: string,
1866+
/** 返回值body是否不需要解析 */
1867+
RawBody?: boolean,
18661868
}
18671869
/** Request 接口返回值 */
18681870
interface RequestResult extends GeneralResult {

‎sdk/ci.js

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎sdk/cos.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ var event = require('./event');
55
var task = require('./task');
66
var base = require('./base');
77
var advance = require('./advance');
8-
var ci = require('./ci');
98
var pkg = require('../package.json');
109

1110
var defaultOptions = {
@@ -70,7 +69,6 @@ var COS = function (options) {
7069

7170
base.init(COS, task);
7271
advance.init(COS, task);
73-
ci.init(COS);
7472

7573
COS.util = {
7674
md5: util.md5,

‎test/test.js

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3396,7 +3396,7 @@ group('BucketReplication', function () {
33963396
Bucket: config.Bucket, // Bucket 格式：test-1250000000
33973397
Region: config.Region,
33983398
ReplicationConfiguration: {
3399-
Role: "qcs::cam::uin/10001:uin/10001",
3399+
Role: "qcs::cam::uin/" + config.Uin + ":uin/" + config.Uin,
34003400
Rules: [{
34013401
ID: ruleId,
34023402
Status: "Enabled",
@@ -3797,31 +3797,58 @@ group('appendObject', function () {
37973797

37983798
group('数据万象', function () {
37993799
test('describeMediaBuckets()', function (done, assert) {
3800-
cos.describeMediaBuckets({
3801-
Bucket: config.Bucket,
3802-
Region: config.Region,
3800+
var host = 'ci.' + config.Region + '.myqcloud.com';
3801+
var url = 'https://' + host + '/mediabucket';
3802+
cos.request({
3803+
Bucket: config.Bucket,
3804+
Region: config.Region,
3805+
Method: 'GET',
3806+
Key: 'mediabucket', /** 固定值，必须 */
3807+
Url: url,
3808+
Query: {
3809+
pageNumber: '1', /** 第几页，非必须 */
3810+
pageSize: '10', /** 每页个数，非必须 */
3811+
// regions: 'ap-chengdu', /** 地域信息，例如'ap-beijing'，支持多个值用逗号分隔如'ap-shanghai,ap-beijing'，非必须 */
3812+
// bucketNames: 'test-1250000000', /** 存储桶名称，精确搜索，例如'test-1250000000'，支持多个值用逗号分隔如'test1-1250000000,test2-1250000000'，非必须 */
3813+
// bucketName: 'test', /** 存储桶名称前缀，前缀搜索，例如'test'，支持多个值用逗号分隔如'test1,test2'，非必须 */
3814+
}
38033815
},
38043816
function(err, data){
38053817
assert.ok(!err);
38063818
done();
38073819
});
38083820
});
38093821
test('getMediaInfo()', function (done, assert) {
3810-
cos.getMediaInfo({
3811-
Bucket: config.Bucket,
3812-
Region: config.Region,
3813-
Key: 'test.mp4',
3822+
cos.request({
3823+
Bucket: config.Bucket,
3824+
Region: config.Region,
3825+
Method: 'GET',
3826+
Key: 'test.mp4',
3827+
Query: {
3828+
'ci-process': 'videoinfo' /** 固定值，必须 */
3829+
}
38143830
},
38153831
function(err, data){
38163832
assert.ok(!err);
38173833
done();
38183834
});
38193835
});
3820-
test('describeMediaBuckets()', function (done, assert) {
3821-
cos.getSnapshot({
3836+
test('GetSnapshot()', function (done, assert) {
3837+
cos.request({
38223838
Bucket: config.Bucket,
38233839
Region: config.Region,
3840+
Method: 'GET',
38243841
Key: 'test.mp4',
3842+
Query: {
3843+
'ci-process': 'snapshot', /** 固定值，必须 */
3844+
time: 1, /** 截图的时间点，单位为秒，必须 */
3845+
// width: 0, /** 截图的宽，非必须 */
3846+
// height: 0, /** 截图的高，非必须 */
3847+
// format: 'jpg', /** 截图的格式，支持 jpg 和 png，默认 jpg，非必须 */
3848+
// rotate: 'auto', /** 图片旋转方式，默认为'auto'，非必须 */
3849+
// mode: 'exactframe', /** 截帧方式，默认为'exactframe'，非必须 */
3850+
},
3851+
RawBody: true,
38253852
},
38263853
function(err, data){
38273854
assert.ok(!err);

0 commit comments

Comments
 (0)