diff --git a/go.mod b/go.mod index d92ea495..c63c34b7 100644 --- a/go.mod +++ b/go.mod @@ -24,10 +24,10 @@ require ( github.com/saracen/go7z v0.0.0-20191010121135-9c09b6bd7fda github.com/shirou/gopsutil v3.21.11+incompatible github.com/sirupsen/logrus v1.9.3 - github.com/tencentyun/cos-go-sdk-v5 v0.7.42 + github.com/tencentyun/cos-go-sdk-v5 v0.7.43 go.mongodb.org/mongo-driver v1.12.1 go.uber.org/zap v1.25.0 - golang.org/x/crypto v0.12.0 + golang.org/x/crypto v0.13.0 golang.org/x/text v0.13.0 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df gopkg.in/natefinch/lumberjack.v2 v2.2.1 @@ -84,11 +84,11 @@ require ( go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.5.0 // indirect golang.org/x/mod v0.12.0 // indirect - golang.org/x/net v0.14.0 // indirect + golang.org/x/net v0.15.0 // indirect golang.org/x/sync v0.3.0 // indirect golang.org/x/sys v0.12.0 // indirect golang.org/x/time v0.3.0 // indirect - golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect + golang.org/x/tools v0.13.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index db4b7b7b..845b7a16 100644 --- a/go.sum +++ b/go.sum @@ -177,8 +177,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.563/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.563/go.mod h1:uom4Nvi9W+Qkom0exYiJ9VWJjXwyxtPYTkKkaLMlfE0= -github.com/tencentyun/cos-go-sdk-v5 v0.7.42 h1:Up1704BJjI5orycXKjpVpvuOInt9GC5pqY4knyE9Uds= -github.com/tencentyun/cos-go-sdk-v5 v0.7.42/go.mod h1:LUFnaqRmGk6pEHOaRmdn2dCZR2j0cSsM5xowWFPTPao= +github.com/tencentyun/cos-go-sdk-v5 v0.7.43 h1:aPCPWy85T3C3Ga3hn7va2DC4c0hAf8Dx0kpKj/uB/vw= +github.com/tencentyun/cos-go-sdk-v5 v0.7.43/go.mod h1:LUFnaqRmGk6pEHOaRmdn2dCZR2j0cSsM5xowWFPTPao= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= @@ -217,8 +217,8 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= +golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= @@ -228,8 +228,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= @@ -254,7 +254,7 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= +golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -270,8 +270,8 @@ golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 h1:Vve/L0v7CXXuxUmaMGIEK/dEeq7uiqb5qBgQrZzIE7E= -golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= +golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= diff --git a/vendor/github.com/tencentyun/cos-go-sdk-v5/CHANGELOG.md b/vendor/github.com/tencentyun/cos-go-sdk-v5/CHANGELOG.md index ee6aeed5..37d4f8b3 100644 --- a/vendor/github.com/tencentyun/cos-go-sdk-v5/CHANGELOG.md +++ b/vendor/github.com/tencentyun/cos-go-sdk-v5/CHANGELOG.md @@ -7,6 +7,55 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +## [v0.7.42](https://github.com/tencentyun/cos-go-sdk-v5/compare/v0.7.41...v0.7.42) - 2023-06-29 + +1、增加UT测试，更新tencentcloud-sdk-go 版本到 v1.0.563。 +2、增加PostInventory接口，增加object lock，增加DeleteBatchJob。 +3、CI 文件处理接口、文档浏览、视频质量打分任务、审核等参数变更。 +4、CI支持倍速转码、AI人体检测接口、海报合成任务、地图拼接、内容识别、闲时转码标记位等。 + +### Merged + +- Feature jojoliang 6a39e426 [`#201`](https://github.com/tencentyun/cos-go-sdk-v5/pull/201) +- Feature jojoliang 985bbfa3 [`#200`](https://github.com/tencentyun/cos-go-sdk-v5/pull/200) +- Feature jojoliang 51a2f385 [`#199`](https://github.com/tencentyun/cos-go-sdk-v5/pull/199) +- Feature lilang d8d6b147 [`#198`](https://github.com/tencentyun/cos-go-sdk-v5/pull/198) +- update getservice [`#197`](https://github.com/tencentyun/cos-go-sdk-v5/pull/197) +- Feature jojoliang d0d7edf5 [`#195`](https://github.com/tencentyun/cos-go-sdk-v5/pull/195) +- add GetService params [`#194`](https://github.com/tencentyun/cos-go-sdk-v5/pull/194) +- add restore versionid [`#193`](https://github.com/tencentyun/cos-go-sdk-v5/pull/193) +- add object lock [`#192`](https://github.com/tencentyun/cos-go-sdk-v5/pull/192) +- Feature jojoliang 64cbd1f5 [`#191`](https://github.com/tencentyun/cos-go-sdk-v5/pull/191) +- 支持原图下载 [`#189`](https://github.com/tencentyun/cos-go-sdk-v5/pull/189) +- Feature jojoliang 3e3dda77 [`#188`](https://github.com/tencentyun/cos-go-sdk-v5/pull/188) +- Feature jojoliang 3762ef4f [`#187`](https://github.com/tencentyun/cos-go-sdk-v5/pull/187) +- Feature jojoliang aa6c7cad [`#185`](https://github.com/tencentyun/cos-go-sdk-v5/pull/185) +- update ut [`#184`](https://github.com/tencentyun/cos-go-sdk-v5/pull/184) +- update ut [`#183`](https://github.com/tencentyun/cos-go-sdk-v5/pull/183) + +### Commits + +- demo优化 [`4d341bb`](https://github.com/tencentyun/cos-go-sdk-v5/commit/4d341bbaf14bec3b9f12d3f35188deea603cf65d) +- 修改demo [`b40dd06`](https://github.com/tencentyun/cos-go-sdk-v5/commit/b40dd06977d9344df521437462515939c72c0559) +- 单元测试补充 [`e6c9884`](https://github.com/tencentyun/cos-go-sdk-v5/commit/e6c98845f37d1ae3d75d171c8324948a1d764583) +- 补充单元测试 [`a7288cd`](https://github.com/tencentyun/cos-go-sdk-v5/commit/a7288cdc4f21cab561d8acdab9b00fa2ea34d6f5) +- 单元测试补充 [`87de5ef`](https://github.com/tencentyun/cos-go-sdk-v5/commit/87de5efc42fb939898ef6dfe5b6291009cd5becc) +- 内容识别 [`7bdcb1d`](https://github.com/tencentyun/cos-go-sdk-v5/commit/7bdcb1d2629fe0ff8d8491b8123fc0eb85ff54b2) +- 万象sdk 补充 [`200e93b`](https://github.com/tencentyun/cos-go-sdk-v5/commit/200e93b73f8095347133897213f2655e28002feb) +- 内容识别&ut [`7a45ecb`](https://github.com/tencentyun/cos-go-sdk-v5/commit/7a45ecbfc547a90ecf5760d90108b86409d3442a) +- 万象15期需求 [`c3b96c0`](https://github.com/tencentyun/cos-go-sdk-v5/commit/c3b96c0ac52fe51689bef854adb9115625e1530f) +- 海报合成任务 [`dbc50da`](https://github.com/tencentyun/cos-go-sdk-v5/commit/dbc50daa74594217c69d4ecd11af1a8c47a3d2a9) +- ut [`a994d4a`](https://github.com/tencentyun/cos-go-sdk-v5/commit/a994d4a2cc7e2cec4ad6cb16a42f3c5616401deb) +- 补充单元测试 [`9b90a6b`](https://github.com/tencentyun/cos-go-sdk-v5/commit/9b90a6bb75b827790cc96bc50576e108074718d0) +- 单元测试补充 [`b528bb6`](https://github.com/tencentyun/cos-go-sdk-v5/commit/b528bb6faf4fe9ba0ff11675999d61a2911b1213) +- add post bucket inventory [`492db1b`](https://github.com/tencentyun/cos-go-sdk-v5/commit/492db1bb1490f32188c757504fa7221be99a63ed) +- 地图拼接需求 [`6ac0209`](https://github.com/tencentyun/cos-go-sdk-v5/commit/6ac02098fd4d25c165b17030988316ed3036bfed) +- ai人体检测接口 [`544f5ad`](https://github.com/tencentyun/cos-go-sdk-v5/commit/544f5adf6b66433c9d85d35be8e520695c93dc52) +- TDCRefresh [`af06387`](https://github.com/tencentyun/cos-go-sdk-v5/commit/af06387eb0e16c83175ec7a18625ea5b341128fc) +- ut [`dbe46a4`](https://github.com/tencentyun/cos-go-sdk-v5/commit/dbe46a4056417d7daba2cb03aea34d1d8d6b1477) +- 文件处理1.1 [`3292425`](https://github.com/tencentyun/cos-go-sdk-v5/commit/329242519c53bc7c71cd98d47ea79f868d9f62ac) +- add delete batch job [`6a05212`](https://github.com/tencentyun/cos-go-sdk-v5/commit/6a052122fda04ed5c65c7a72d98b4b1ac27bb8f5) + ## [v0.7.41](https://github.com/tencentyun/cos-go-sdk-v5/compare/v0.7.40...v0.7.41) - 2023-01-09 1、CI 质量评分新增参数、质量评分新增参数、新增审核冻结参数、直播审核转存参数 @@ -561,8 +610,6 @@ update presignedurl && copy ## [v0.7.11](https://github.com/tencentyun/cos-go-sdk-v5/compare/v0.7.10...v0.7.11) - 2020-11-15 -断点续传、select、CI内容审核、CI云上处理、单链接限制 - ### Merged - Cos v4 dev [`#90`](https://github.com/tencentyun/cos-go-sdk-v5/pull/90) diff --git a/vendor/github.com/tencentyun/cos-go-sdk-v5/bucket_acl.go b/vendor/github.com/tencentyun/cos-go-sdk-v5/bucket_acl.go index d0575c85..6f1bba14 100644 --- a/vendor/github.com/tencentyun/cos-go-sdk-v5/bucket_acl.go +++ b/vendor/github.com/tencentyun/cos-go-sdk-v5/bucket_acl.go @@ -50,9 +50,6 @@ type BucketPutACLOptions struct { func (s *BucketService) PutACL(ctx context.Context, opt *BucketPutACLOptions) (*Response, error) { header := opt.Header body := opt.Body - if body != nil { - header = nil - } sendOpt := sendOptions{ baseURL: s.client.BaseURL.BucketURL, uri: "/?acl", diff --git a/vendor/github.com/tencentyun/cos-go-sdk-v5/bucket_object_lock.go b/vendor/github.com/tencentyun/cos-go-sdk-v5/bucket_object_lock.go index 29d25cfe..66218119 100644 --- a/vendor/github.com/tencentyun/cos-go-sdk-v5/bucket_object_lock.go +++ b/vendor/github.com/tencentyun/cos-go-sdk-v5/bucket_object_lock.go @@ -48,6 +48,7 @@ type ObjectGetRetentionOptions struct { type ObjectGetRetentionResult struct { XMLName xml.Name `xml:"Retention"` RetainUntilDate string `xml:"RetainUntilDate,omitempty"` + Mode string `xml:"Mode,omitempty"` } func (s *ObjectService) GetRetention(ctx context.Context, key string, opt *ObjectGetRetentionOptions) (*ObjectGetRetentionResult, *Response, error) { @@ -62,3 +63,20 @@ func (s *ObjectService) GetRetention(ctx context.Context, key string, opt *Objec resp, err := s.client.doRetry(ctx, &sendOpt) return &res, resp, err } + +type ObjectPutRetentionOptions struct { + XMLName xml.Name `xml:"Retention"` + RetainUntilDate string `xml:"RetainUntilDate,omitempty"` + Mode string `xml:"Mode,omitempty"` +} + +func (s *ObjectService) PutRetention(ctx context.Context, key string, opt *ObjectPutRetentionOptions) (*Response, error) { + sendOpt := sendOptions{ + baseURL: s.client.BaseURL.BucketURL, + uri: "/" + encodeURIComponent(key) + "?retention", + method: http.MethodPut, + body: opt, + } + resp, err := s.client.doRetry(ctx, &sendOpt) + return resp, err +} diff --git a/vendor/github.com/tencentyun/cos-go-sdk-v5/bucket_website.go b/vendor/github.com/tencentyun/cos-go-sdk-v5/bucket_website.go index f97f4d64..9a97e9c7 100644 --- a/vendor/github.com/tencentyun/cos-go-sdk-v5/bucket_website.go +++ b/vendor/github.com/tencentyun/cos-go-sdk-v5/bucket_website.go @@ -19,8 +19,13 @@ type WebsiteRoutingRules struct { Rules []WebsiteRoutingRule `xml:"RoutingRule,omitempty"` } +type AutoAddressing struct { + Status string `xml:"Status,omitempty"` +} + type ErrorDocument struct { - Key string `xml:"Key,omitempty"` + Key string `xml:"Key,omitempty"` + OriginalHttpStatus string `xml:"OriginalHttpStatus,omitempty"` } type RedirectRequestsProtocol struct { @@ -31,6 +36,7 @@ type BucketPutWebsiteOptions struct { XMLName xml.Name `xml:"WebsiteConfiguration"` Index string `xml:"IndexDocument>Suffix"` RedirectProtocol *RedirectRequestsProtocol `xml:"RedirectAllRequestsTo,omitempty"` + AutoAddressing *AutoAddressing `xml:"AutoAddressing,omitempty"` Error *ErrorDocument `xml:"ErrorDocument,omitempty"` RoutingRules *WebsiteRoutingRules `xml:"RoutingRules,omitempty"` } diff --git a/vendor/github.com/tencentyun/cos-go-sdk-v5/ci_media.go b/vendor/github.com/tencentyun/cos-go-sdk-v5/ci_media.go index 13ace1ec..9a636595 100644 --- a/vendor/github.com/tencentyun/cos-go-sdk-v5/ci_media.go +++ b/vendor/github.com/tencentyun/cos-go-sdk-v5/ci_media.go @@ -23,6 +23,7 @@ type JobInput struct { Key string `xml:"Key"` Value string `xml:"Value"` } `xml:"CosHeaders"` + Url string `xml:"Url,omitempty"` } // StreamExtract TODO @@ -38,6 +39,8 @@ type JobOutput struct { Object string `xml:"Object,omitempty"` SpriteObject string `xml:"SpriteObject,omitempty"` AuObject string `xml:"AuObject,omitempty"` + BassObject string `xml:"BassObject,omitempty"` + DrumObject string `xml:"DrumObject,omitempty"` StreamExtract []StreamExtract `xml:"StreamExtract,omitempty"` } @@ -339,9 +342,12 @@ type HlsEncrypt struct { // Segment TODO type Segment struct { - Format string `xml:"Format,omitempty"` - Duration string `xml:"Duration,omitempty"` - HlsEncrypt *HlsEncrypt `xml:"HlsEncrypt,omitempty"` + Format string `xml:"Format,omitempty"` + Duration string `xml:"Duration,omitempty"` + TranscodeIndex string `xml:"TranscodeIndex,omitempty"` + HlsEncrypt *HlsEncrypt `xml:"HlsEncrypt,omitempty"` + StartTime string `xml:"StartTime,omitempty"` + EndTime string `xml:"EndTime,omitempty"` } // VideoMontageVideo TODO @@ -731,6 +737,12 @@ type MediaProcessJobOperation struct { SoundHoundResult *SoundHoundResult `xml:"SoundHoundResult,omitempty"` FillConcat *FillConcat `xml:"FillConcat,omitempty"` VideoSynthesis *VideoSynthesis `xml:"VideoSynthesis,omitempty"` + DnaConfig *DnaConfig `xml:"DnaConfig,omitempty"` + DnaResult *DnaResult `xml:"DnaResult,omitempty"` + VocalScore *VocalScore `xml:"VocalScore,omitempty"` + VocalScoreResult *VocalScoreResult `xml:"VocalScoreResult,omitempty"` + ImageInspect *ImageInspect `xml:"ImageInspect,omitempty"` + ImageInspectResult *ImageInspectResult `xml:"ImageInspectResult,omitempty"` } // CreatePicJobsOptions TODO @@ -1587,11 +1599,14 @@ type NodeInput struct { // NodeOutput TODO type NodeOutput struct { - Region string `xml:"Region,omitempty"` - Bucket string `xml:"Bucket,omitempty"` - Object string `xml:"Object,omitempty"` - AuObject string `xml:"AuObject,omitempty"` - SpriteObject string `xml:"SpriteObject,omitempty"` + Region string `xml:"Region,omitempty"` + Bucket string `xml:"Bucket,omitempty"` + Object string `xml:"Object,omitempty"` + AuObject string `xml:"AuObject,omitempty"` + SpriteObject string `xml:"SpriteObject,omitempty"` + BassObject string `xml:"BassObject,omitempty"` + DrumObject string `xml:"DrumObject,omitempty"` + StreamExtract []StreamExtract `xml:"StreamExtract,omitempty"` } // DelogoParam TODO @@ -1639,6 +1654,10 @@ type SegmentVideoBody struct { BackgroundRed string `xml:"BackgroundRed,omitempty"` BackgroundGreen string `xml:"BackgroundGreen,omitempty"` BackgroundLogoUrl string `xml:"BackgroundLogoUrl,omitempty"` + BinaryThreshold string `xml:"BinaryThreshold,omitempty"` + RemoveRed string `xml:"RemoveRed,omitempty"` + RemoveGreen string `xml:"RemoveGreen,omitempty"` + RemoveBlue string `xml:"RemoveBlue,omitempty"` } // NodeSmartCover TODO @@ -1680,6 +1699,7 @@ type NodeOperation struct { StreamPackInfo *NodeHlsPackInfo `xml:"StreamPackInfo,omitempty" json:"StreamPackInfo,omitempty"` Condition *WorkflowNodeCondition `xml:"Condition,omitempty" json:"Condition,omitempty"` SegmentVideoBody *SegmentVideoBody `xml:"SegmentVideoBody,omitempty" json:"SegmentVideoBody,omitempty"` + ImageInspect *ImageInspect `xml:"ImageInspect,omitempty" json:"ImageInspect,omitempty"` } // Node TODO @@ -3053,6 +3073,12 @@ type InventoryTriggerJobOperationJobParam struct { WordsGeneralize *WordsGeneralize `xml:"WordsGeneralize,omitempty"` WordsGeneralizeResult *WordsGeneralizeResult `xml:"WordsGeneralizeResult,omitempty"` NoiseReduction *NoiseReduction `xml:"NoiseReduction,omitempty"` + DnaConfig *DnaConfig `xml:"DnaConfig,omitempty"` + DnaResult *DnaResult `xml:"DnaResult,omitempty"` + VocalScore *VocalScore `xml:"VocalScore,omitempty"` + VocalScoreResult *VocalScoreResult `xml:"VocalScoreResult,omitempty"` + ImageInspect *ImageInspect `xml:"ImageInspect,omitempty"` + ImageInspectResult *ImageInspectResult `xml:"ImageInspectResult,omitempty"` } // InventoryTriggerJob TODO @@ -3429,3 +3455,189 @@ type VideoSynthesisSpliceInfo struct { Width string `xml:"Width,omitempty"` Height string `xml:"Height,omitempty"` } + +// DnaConfig DNA任务配置 +type DnaConfig struct { + RuleType string `xml:"RuleType,omitempty"` + DnaDbId string `xml:"DnaDbId,omitempty"` + VideoId string `xml:"VideoId,omitempty"` +} + +// DnaResult DNA任务结果 +type DnaResult struct { + VideoId string `xml:"VideoId,omitempty"` + Duration int `xml:"Duration,omitempty"` + Detection *DnaResultDetection `xml:"Detection,omitempty"` +} + +// DnaResultDetection DNA任务结果 +type DnaResultDetection struct { + VideoId string `xml:"VideoId,omitempty"` + Similar int `xml:"Similar,omitempty"` + SimilarDuration int `xml:"SimilarDuration,omitempty"` + Duration int `xml:"Duration,omitempty"` + MatchDetail []DnaResultMatchDetail `xml:"MatchDetail,omitempty"` + Audio DnaResultAudio `xml:"Audio,omitempty"` +} + +// DnaResultDetection DNA任务结果 +type DnaResultMatchDetail struct { + MatchStartTime int `xml:"MatchStartTime,omitempty"` + MatchEndTime int `xml:"MatchEndTime,omitempty"` + SrcStartTime int `xml:"SrcStartTime,omitempty"` + SrcEndTime int `xml:"SrcEndTime,omitempty"` +} + +// DnaResultAudio DNA任务结果 +type DnaResultAudio struct { + Similar int `xml:"Similar,omitempty"` +} + +// GetDnaDbOptions 查询 DNA 库列表参数 +type GetDnaDbOptions struct { + Ids string `url:"ids,omitempty"` + PageNumber string `url:"pageNumber,omitempty"` + PageSize string `url:"pageSize,omitempty"` +} + +// GetDnaDbResult 查询 DNA 库列表结果 +type GetDnaDbResult struct { + XMLName xml.Name `xml:"Response"` + RequestId string `xml:"RequestId,omitempty"` + TotalCount int `xml:"TotalCount,omitempty"` + PageNumber int `xml:"PageNumber,omitempty"` + PageSize int `xml:"PageSize,omitempty"` + DNADbConfig []DNADbConfig `xml:"DNADbConfig,omitempty"` + NonExistIDs []string `xml:"NonExistIDs,omitempty"` +} + +// DNADbConfig DNA 库详情 +type DNADbConfig struct { + BucketId string `xml:"BucketId,omitempty"` + Region string `xml:"Region,omitempty"` + DNADbId string `xml:"DNADbId,omitempty"` + DNADbName string `xml:"DNADbName,omitempty"` + Capacity int `xml:"Capacity,omitempty"` + Description string `xml:"Description,omitempty"` + UpdateTime string `xml:"UpdateTime,omitempty"` + CreateTime string `xml:"CreateTime,omitempty"` +} + +// GetDnaDb 查询 DNA 库列表 +func (s *CIService) GetDnaDb(ctx context.Context, opt *GetDnaDbOptions) (*GetDnaDbResult, *Response, error) { + var res GetDnaDbResult + sendOpt := sendOptions{ + baseURL: s.client.BaseURL.CIURL, + uri: "/dnadb", + optQuery: opt, + method: http.MethodGet, + result: &res, + } + resp, err := s.client.send(ctx, &sendOpt) + return &res, resp, err +} + +// GetDnaDbFilesOptions 获取 DNA 库中文件列表参数 +type GetDnaDbFilesOptions struct { + object string `url:"object,omitempty"` + DnaDbId string `url:"dnaDbId,omitempty"` + PageNumber string `url:"pageNumber,omitempty"` + PageSize string `url:"pageSize,omitempty"` +} + +// GetDnaDbFilesResult 查询 DNA 库列表结果 +type GetDnaDbFilesResult struct { + XMLName xml.Name `xml:"Response"` + RequestId string `xml:"RequestId,omitempty"` + TotalCount int `xml:"TotalCount,omitempty"` + PageNumber int `xml:"PageNumber,omitempty"` + PageSize int `xml:"PageSize,omitempty"` + DNADbFiles []DNADbFiles `xml:"DNADbFiles,omitempty"` +} + +// DNADbFiles DNA 文件详情 +type DNADbFiles struct { + BucketId string `xml:"BucketId,omitempty"` + Region string `xml:"Region,omitempty"` + DNADbId string `xml:"DNADbId,omitempty"` + VideoId string `xml:"VideoId,omitempty"` + Object int `xml:"Object,omitempty"` + ETag string `xml:"ETag,omitempty"` + UpdateTime string `xml:"UpdateTime,omitempty"` + CreateTime string `xml:"CreateTime,omitempty"` +} + +// GetDnaDb 查询 DNA 库列表 +func (s *CIService) GetDnaDbFiles(ctx context.Context, opt *GetDnaDbFilesOptions) (*GetDnaDbFilesResult, *Response, error) { + var res GetDnaDbFilesResult + sendOpt := sendOptions{ + baseURL: s.client.BaseURL.CIURL, + uri: "/dnadb_files", + optQuery: opt, + method: http.MethodGet, + result: &res, + } + resp, err := s.client.send(ctx, &sendOpt) + return &res, resp, err +} + +// VocalScore 音乐评分 +type VocalScore struct { + StandardObject string `xml:"StandardObject,omitempty"` +} + +// VocalScore 音乐评分结果 +type VocalScoreResult struct { + PitchScore *VocalScoreResultPitchScore `xml:"PitchScore,omitempty"` + RhythemScore *VocalScoreResultRhythemScore `xml:"RhythemScore,omitempty"` +} + +type VocalScoreResultPitchScore struct { + TotalScore float64 `xml:"TotalScore,omitempty"` + SentenceScores []VocalScoreResultSentenceScores `xml:"SentenceScores,omitempty"` +} + +type VocalScoreResultSentenceScores struct { + StartTime float64 `xml:"StartTime,omitempty"` + EndTime float64 `xml:"EndTime,omitempty"` + Score float64 `xml:"Score,omitempty"` +} + +type VocalScoreResultRhythemScore struct { + TotalScore float64 `xml:"TotalScore,omitempty"` + SentenceScores []VocalScoreResultSentenceScores `xml:"SentenceScores,omitempty"` +} + +// ImageInspect 黑产检测 +type ImageInspect struct { + AutoProcess string `xml:"AutoProcess,omitempty"` + ProcessType string `xml:"ProcessType,omitempty"` +} + +// ImageInspectResult 黑产检测结果 +type ImageInspectResult struct { + State string `xml:"State,omitempty"` + Code string `xml:"Code,omitempty"` + Message string `xml:"Message,omitempty"` + InputObjectName string `xml:"InputObjectName,omitempty"` + InputObjectUrl string `xml:"InputObjectUrl,omitempty"` + ProcessResult *ImageInspectProcessResult `xml:"ProcessResult,omitempty"` +} + +// ImageInspectProcessResult 黑产检测结果 +type ImageInspectProcessResult struct { + PicSize int `xml:"PicSize,omitempty"` + PicType string `xml:"PicType,omitempty"` + Suspicious string `xml:"Suspicious,omitempty"` + SuspiciousBeginByte int `xml:"SuspiciousBeginByte,omitempty"` + SuspiciousEndByte int `xml:"SuspiciousEndByte,omitempty"` + SuspiciousSize int `xml:"SuspiciousSize,omitempty"` + SuspiciousType string `xml:"SuspiciousType,omitempty"` + AutoProcessResult *ImageInspectAutoProcessResult `xml:"AutoProcessResult,omitempty"` +} + +// ImageInspectResult 黑产检测结果 +type ImageInspectAutoProcessResult struct { + Code string `xml:"Code,omitempty"` + Message string `xml:"Message,omitempty"` +} diff --git a/vendor/github.com/tencentyun/cos-go-sdk-v5/cos.go b/vendor/github.com/tencentyun/cos-go-sdk-v5/cos.go index 84ceb125..32de2e8d 100644 --- a/vendor/github.com/tencentyun/cos-go-sdk-v5/cos.go +++ b/vendor/github.com/tencentyun/cos-go-sdk-v5/cos.go @@ -24,7 +24,7 @@ import ( const ( // Version current go sdk version - Version = "0.7.42" + Version = "0.7.43" UserAgent = "cos-go-sdk-v5/" + Version contentTypeXML = "application/xml" defaultServiceBaseURL = "http://service.cos.myqcloud.com" diff --git a/vendor/golang.org/x/net/http2/Dockerfile b/vendor/golang.org/x/net/http2/Dockerfile deleted file mode 100644 index 85122459..00000000 --- a/vendor/golang.org/x/net/http2/Dockerfile +++ /dev/null @@ -1,51 +0,0 @@ -# -# This Dockerfile builds a recent curl with HTTP/2 client support, using -# a recent nghttp2 build. -# -# See the Makefile for how to tag it. If Docker and that image is found, the -# Go tests use this curl binary for integration tests. -# - -FROM ubuntu:trusty - -RUN apt-get update && \ - apt-get upgrade -y && \ - apt-get install -y git-core build-essential wget - -RUN apt-get install -y --no-install-recommends \ - autotools-dev libtool pkg-config zlib1g-dev \ - libcunit1-dev libssl-dev libxml2-dev libevent-dev \ - automake autoconf - -# The list of packages nghttp2 recommends for h2load: -RUN apt-get install -y --no-install-recommends make binutils \ - autoconf automake autotools-dev \ - libtool pkg-config zlib1g-dev libcunit1-dev libssl-dev libxml2-dev \ - libev-dev libevent-dev libjansson-dev libjemalloc-dev \ - cython python3.4-dev python-setuptools - -# Note: setting NGHTTP2_VER before the git clone, so an old git clone isn't cached: -ENV NGHTTP2_VER 895da9a -RUN cd /root && git clone https://github.com/tatsuhiro-t/nghttp2.git - -WORKDIR /root/nghttp2 -RUN git reset --hard $NGHTTP2_VER -RUN autoreconf -i -RUN automake -RUN autoconf -RUN ./configure -RUN make -RUN make install - -WORKDIR /root -RUN wget https://curl.se/download/curl-7.45.0.tar.gz -RUN tar -zxvf curl-7.45.0.tar.gz -WORKDIR /root/curl-7.45.0 -RUN ./configure --with-ssl --with-nghttp2=/usr/local -RUN make -RUN make install -RUN ldconfig - -CMD ["-h"] -ENTRYPOINT ["/usr/local/bin/curl"] - diff --git a/vendor/golang.org/x/net/http2/Makefile b/vendor/golang.org/x/net/http2/Makefile deleted file mode 100644 index 55fd826f..00000000 --- a/vendor/golang.org/x/net/http2/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -curlimage: - docker build -t gohttp2/curl . - diff --git a/vendor/golang.org/x/net/http2/server.go b/vendor/golang.org/x/net/http2/server.go index 033b6e6d..6d5e0088 100644 --- a/vendor/golang.org/x/net/http2/server.go +++ b/vendor/golang.org/x/net/http2/server.go @@ -1012,14 +1012,6 @@ func (sc *serverConn) serve() { } } -func (sc *serverConn) awaitGracefulShutdown(sharedCh <-chan struct{}, privateCh chan struct{}) { - select { - case <-sc.doneServing: - case <-sharedCh: - close(privateCh) - } -} - type serverMessage int // Message values sent to serveMsgCh. diff --git a/vendor/golang.org/x/net/http2/transport.go b/vendor/golang.org/x/net/http2/transport.go index b0d482f9..4515b22c 100644 --- a/vendor/golang.org/x/net/http2/transport.go +++ b/vendor/golang.org/x/net/http2/transport.go @@ -291,8 +291,7 @@ func (t *Transport) initConnPool() { // HTTP/2 server. type ClientConn struct { t *Transport - tconn net.Conn // usually *tls.Conn, except specialized impls - tconnClosed bool + tconn net.Conn // usually *tls.Conn, except specialized impls tlsState *tls.ConnectionState // nil only for specialized impls reused uint32 // whether conn is being reused; atomic singleUse bool // whether being used for a single http.Request diff --git a/vendor/golang.org/x/tools/internal/typeparams/coretype.go b/vendor/golang.org/x/tools/internal/typeparams/coretype.go index 993135ec..71248209 100644 --- a/vendor/golang.org/x/tools/internal/typeparams/coretype.go +++ b/vendor/golang.org/x/tools/internal/typeparams/coretype.go @@ -81,13 +81,13 @@ func CoreType(T types.Type) types.Type { // restrictions may be arbitrarily complex. For example, consider the // following: // -// type A interface{ ~string|~[]byte } +// type A interface{ ~string|~[]byte } // -// type B interface{ int|string } +// type B interface{ int|string } // -// type C interface { ~string|~int } +// type C interface { ~string|~int } // -// type T[P interface{ A|B; C }] int +// type T[P interface{ A|B; C }] int // // In this example, the structural type restriction of P is ~string|int: A|B // expands to ~string|~[]byte|int|string, which reduces to ~string|~[]byte|int, diff --git a/vendor/golang.org/x/tools/internal/typeparams/termlist.go b/vendor/golang.org/x/tools/internal/typeparams/termlist.go index 933106a2..cbd12f80 100644 --- a/vendor/golang.org/x/tools/internal/typeparams/termlist.go +++ b/vendor/golang.org/x/tools/internal/typeparams/termlist.go @@ -30,7 +30,7 @@ func (xl termlist) String() string { var buf bytes.Buffer for i, x := range xl { if i > 0 { - buf.WriteString(" ∪ ") + buf.WriteString(" | ") } buf.WriteString(x.String()) } diff --git a/vendor/golang.org/x/tools/internal/typeparams/typeterm.go b/vendor/golang.org/x/tools/internal/typeparams/typeterm.go index 7ddee28d..7350bb70 100644 --- a/vendor/golang.org/x/tools/internal/typeparams/typeterm.go +++ b/vendor/golang.org/x/tools/internal/typeparams/typeterm.go @@ -10,11 +10,10 @@ import "go/types" // A term describes elementary type sets: // -// ∅: (*term)(nil) == ∅ // set of no types (empty set) -// 𝓤: &term{} == 𝓤 // set of all types (𝓤niverse) -// T: &term{false, T} == {T} // set of type T -// ~t: &term{true, t} == {t' | under(t') == t} // set of types with underlying type t -// +// ∅: (*term)(nil) == ∅ // set of no types (empty set) +// 𝓤: &term{} == 𝓤 // set of all types (𝓤niverse) +// T: &term{false, T} == {T} // set of type T +// ~t: &term{true, t} == {t' | under(t') == t} // set of types with underlying type t type term struct { tilde bool // valid if typ != nil typ types.Type diff --git a/vendor/modules.txt b/vendor/modules.txt index 050b3850..6e111465 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -248,7 +248,7 @@ github.com/shirou/gopsutil/process # github.com/sirupsen/logrus v1.9.3 ## explicit; go 1.13 github.com/sirupsen/logrus -# github.com/tencentyun/cos-go-sdk-v5 v0.7.42 +# github.com/tencentyun/cos-go-sdk-v5 v0.7.43 ## explicit; go 1.12 github.com/tencentyun/cos-go-sdk-v5 # github.com/tklauser/go-sysconf v0.3.12 @@ -357,7 +357,7 @@ go.uber.org/zap/zapcore # golang.org/x/arch v0.5.0 ## explicit; go 1.17 golang.org/x/arch/x86/x86asm -# golang.org/x/crypto v0.12.0 +# golang.org/x/crypto v0.13.0 ## explicit; go 1.17 golang.org/x/crypto/blowfish golang.org/x/crypto/chacha20 @@ -377,7 +377,7 @@ golang.org/x/crypto/ssh/internal/bcrypt_pbkdf golang.org/x/mod/internal/lazyregexp golang.org/x/mod/module golang.org/x/mod/semver -# golang.org/x/net v0.14.0 +# golang.org/x/net v0.15.0 ## explicit; go 1.17 golang.org/x/net/html golang.org/x/net/html/atom @@ -427,7 +427,7 @@ golang.org/x/text/width # golang.org/x/time v0.3.0 ## explicit golang.org/x/time/rate -# golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 +# golang.org/x/tools v0.13.0 ## explicit; go 1.18 golang.org/x/tools/go/ast/astutil golang.org/x/tools/go/gcexportdata