Merge branch 'master' into feature_huberyxxiao_ae9ba00c

Author: hubeytenctent

CHANGELOG.md

@@ -7,6 +7,173 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+## [v5.5.15](https://github.com/tencentyun/cos-cpp-sdk-v5/compare/v5.5.14...v5.5.15) - 2024-12-09
+
+## What's Changed
+* 双向认证 by @Huberyxiao in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/169
+* demo 优化 by @Huberyxiao in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/170
+
+
+**Full Changelog**: https://github.com/tencentyun/cos-cpp-sdk-v5/compare/v5.5.14...v5.5.15
+
+### Merged
+
+- demo 优化 [`#170`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/170)
+- Feature huberyxxiao 42e1ad74 [`#169`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/169)
+
+### Commits
+
+- demofix [`e3b547d`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/e3b547d0552765fa157d4fe7b8b39f7e3a7dabee)
+- 双向认证 [`4299cc4`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/4299cc42c077f98e858e464085f21ac8317e09ed)
+- fix [`9432469`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/94324697633c0047f80f7c6594503c6effb4b214)
+- Updated CHANGELOG.md [`b8266fa`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/b8266fa3e5c7559e191e79372f5379e0de417154)
+- test [`24730f1`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/24730f1a2b4c7258b9ad075a07d80caa453d827f)
+- demo fix [`c991e09`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/c991e099d082bbdc5169ed2e2e764e164b8e6bd2)
+- fix [`802f4a9`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/802f4a91d1a9f04c85579937a12382a3e001af07)
+
+## [v5.5.14](https://github.com/tencentyun/cos-cpp-sdk-v5/compare/v5.5.13...v5.5.14) - 2024-09-23
+
+demo 优化；
+优化 chunk 类接口响应解析 body；
+
+## What's Changed
+* 优化 demo；优化 chunk 类接口响应解析 body by @Huberyxiao in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/166
+* Feature huberyxxiao 9134bc9d by @Huberyxiao in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/167
+
+
+**Full Changelog**: https://github.com/tencentyun/cos-cpp-sdk-v5/compare/v5.5.13...v5.5.14
+
+### Merged
+
+- demo 优化 [`#167`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/167)
+- 优化 demo；优化 chunk 类接口响应解析 body [`#166`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/166)
+
+### Commits
+
+- object 相关 demo 优化；Complete&Copy 增加body 解析etag 判断请求正常逻辑 [`ef18673`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/ef18673dc1506a0e83bef3f767a6e3a5aa647a22)
+- 安全优化 [`46c61c2`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/46c61c2c46c7f436501c7161527b6ea7a16897de)
+- add demo [`255f97f`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/255f97f488b3729484fb66cfbc2bf3d3f66b523b)
+- Updated CHANGELOG.md [`4ed035c`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/4ed035c042a838642daea5a289dc51a8e80795b5)
+
+## [v5.5.13](https://github.com/tencentyun/cos-cpp-sdk-v5/compare/v5.5.12...v5.5.13) - 2024-07-16
+
+## What's Changed
+* 修复qt环境下encode问题 by @Huberyxiao in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/165
+
+
+**Full Changelog**: https://github.com/tencentyun/cos-cpp-sdk-v5/compare/v5.5.12...v5.5.13
+
+### Merged
+
+- 修复qt环境下encode问题 [`#165`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/165)
+- 提交 [`#164`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/164)
+
+### Commits
+
+- fix demo [`acdf5c3`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/acdf5c33a60ecbb56ffe8faa4a6c9ced9abe17db)
+- 单测补充 [`7cfdb27`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/7cfdb27f2b504ec1c263bee8a1d71ed807df4a0b)
+- 代码规范 [`acc53fa`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/acc53fa98c19eb2fafa24aee35c0089d75b333e3)
+- 安全问题修复 [`58bb1a6`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/58bb1a62fa99fac327f12ea37babbde023f2e374)
+- ut [`1ef653b`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/1ef653b4cfa8271bf5f10494089dc9da0d5d2f43)
+- ut [`1b54654`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/1b54654a6f22c088f65f7ba3350489b1dbd51b17)
+- ut [`d2e6d13`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/d2e6d13031e9341a770b342d49543d870221ef62)
+- ut [`9e2fe3f`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/9e2fe3f2346763558dfa46935fa367fc8922e0a2)
+- 单测补充 [`9f0802a`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/9f0802af8d12c2b7284ed5ee5b53269f436b6bea)
+- 万象单测 [`37dd168`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/37dd16811fe299c6bc78984ab3fd169f7351fd29)
+- ut [`17d4ba8`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/17d4ba8597b90a05619a6c289053d49ee87b4630)
+- ut [`e7cbd69`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/e7cbd699722dfafa76f3ab28b8084da6fc4f5fd1)
+- 单测补充 [`11227ee`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/11227eec0bd0a8853fca8676827c71cbc34e6317)
+- ut [`bc1db72`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/bc1db7274851ee9226d687daad42fcb28b7d17dd)
+- ut [`2d7d4bb`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/2d7d4bbf99bb99b8bfd7ccb5901f1b3a92a7bf28)
+- ut [`fce627f`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/fce627f2d57c9faf2d6a9c75fa4287b3567b01ee)
+- 单测补充 [`2f4db4b`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/2f4db4b47f9be883cc1fa25575fc403033ade8a9)
+- Updated CHANGELOG.md [`8fc05d4`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/8fc05d40f64cff3c296092ba633fd52185ba1f32)
+- ut [`bda2b42`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/bda2b428dcc0932977a31f6e8f3cc8bc091e8d98)
+- ut [`241adae`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/241adaee10ae7987fbc41b40dacc7540c88e7673)
+
+## [v5.5.12](https://github.com/tencentyun/cos-cpp-sdk-v5/compare/v5.5.11...v5.5.12) - 2024-07-08
+
+## What's Changed
+* 批量图片审核增加 timeout 参数&图片处理参数头部签名 by @wqingzhang in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/160
+* 安全优化 by @Huberyxiao in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/161
+* 修复安全问题 by @Huberyxiao in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/163
+
+
+**Full Changelog**: https://github.com/tencentyun/cos-cpp-sdk-v5/compare/v5.5.11...v5.5.12
+
+### Merged
+
+- 修复安全问题 [`#163`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/163)
+- 安全优化 [`#161`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/161)
+- 批量图片审核增加 timeout 参数&图片处理参数头部签名 [`#160`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/160)
+
+### Commits
+
+- Updated CHANGELOG.md [`e178f03`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/e178f030ecc413381a77997986cad05cc5710084)
+
+## [v5.5.11](https://github.com/tencentyun/cos-cpp-sdk-v5/compare/v5.5.10...v5.5.11) - 2024-04-12
+
+## What's Changed
+* Feature huberyxxiao by @tencentyuncos in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/136
+* Feature huberyxxiao 73b21a23 by @chen-honggang in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/137
+* Feature wqingzhang 07b4400f by @wqingzhang in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/139
+* input增加url参数&Jobdetails部分参数补齐 by @wqingzhang in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/140
+* 数据万象媒体处理&内容审核相关功能补齐 by @wqingzhang in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/142
+* Feature huberyxxiao dbbe8ae4 by @Huberyxiao in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/146
+* Feature huberyxxiao 29593a27 by @Huberyxiao in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/147
+* 图片处理Pic-Operations头签入签名 by @wqingzhang in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/149
+* Feature huberyxxiao 144d3000 by @Huberyxiao in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/151
+* 复合上传复用https支持 by @Huberyxiao in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/153
+* Feature huberyxxiao 58acd2e4 by @Huberyxiao in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/154
+* fix by @Huberyxiao in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/156
+* Feature huberyxxiao b3b34cad by @Huberyxiao in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/157
+* Feature huberyxxiao 024bd8e2 by @Huberyxiao in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/158
+
+## New Contributors
+* @tencentyuncos made their first contribution in https://github.com/tencentyun/cos-cpp-sdk-v5/pull/136
+
+**Full Changelog**: https://github.com/tencentyun/cos-cpp-sdk-v5/compare/v5.5.10...v5.5.11
+
+### Merged
+
+- Feature huberyxxiao 024bd8e2 [`#158`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/158)
+- Feature huberyxxiao b3b34cad [`#157`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/157)
+- fix [`#156`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/156)
+- Feature huberyxxiao 58acd2e4 [`#154`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/154)
+- 复合上传复用https支持 [`#153`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/153)
+- Feature huberyxxiao 144d3000 [`#151`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/151)
+- 图片处理Pic-Operations头签入签名 [`#149`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/149)
+- Feature huberyxxiao 29593a27 [`#147`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/147)
+- Feature huberyxxiao dbbe8ae4 [`#146`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/146)
+- 数据万象媒体处理&内容审核相关功能补齐 [`#142`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/142)
+- input增加url参数&Jobdetails部分参数补齐 [`#140`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/140)
+- Feature wqingzhang 07b4400f [`#139`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/139)
+- Feature huberyxxiao 73b21a23 [`#137`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/137)
+- Feature huberyxxiao [`#136`](https://github.com/tencentyun/cos-cpp-sdk-v5/pull/136)
+
+### Commits
+
+- 媒体处理任务补充&审核字段更新 [`a8f6e0e`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/a8f6e0e945e7788265864bba6454e5a5f0f72597)
+- add ut [`248546b`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/248546b9c2cb1929f20a493d9401dab1fc33aff6)
+- upload [`36e5ffd`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/36e5ffd161e763ecc449b8898a9de970aac56aca)
+- add ut [`c0fac35`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/c0fac35cac5329f9eadf35179fcbe68f966eb54b)
+- 媒体处理 截图任务 [`7846c94`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/7846c94339063a6ae2ed225487c82596246c204c)
+- 单元测试 [`9975c2b`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/9975c2b88ace3abc21cb4a19a8c143c817053cce)
+- add ut [`cf3ab93`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/cf3ab93d4ff49cffdb9e5c199bccb58cef9c41b0)
+- 文件压缩任务 [`61d9ecf`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/61d9ecf923a03e54e7d9c7c4afc3e62624e5e0c2)
+- add object tagging interface [`60a7f40`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/60a7f401a9263449d8ca53d2bd1b41cbf8badda4)
+- add ut;fix test_utils [`fc7b40b`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/fc7b40b98f90e44d76fd4df8d0457370b972e9ca)
+- 万象单元测试 [`6ab7321`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/6ab73211eaa44d98ac5968b542dcd53e47b4e018)
+- 支持异步断点下载;支持多AZ存储桶创建;支持存储桶策略接口;优化签名列表 [`1603c0c`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/1603c0c142a301e894b5755216cdde1d24c04a4f)
+- 万象ut覆盖率补充 [`5f19f0c`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/5f19f0cdba470ebece5c17074178b85ea623e368)
+- 媒体处理&内容审核参数补齐 [`8772d33`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/8772d337abe0910d2d160f717873c9965b64db65)
+- 万象单元测试覆盖 [`662d8e9`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/662d8e9c446fd7509d2644048b3cbe378b1b0db2)
+- Async [`0a9a3b5`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/0a9a3b511f62ac72f3482c83e3ba6fc6a7997ce9)
+- 单元测试 [`8972b59`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/8972b591939baa5a815fc552e0d9edb0cc4b828d)
+- 单元测试 [`e36f1cc`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/e36f1cce020114cca6cb2baf119e3e6769f2d4d9)
+- 文件压缩接口 [`fd9f95b`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/fd9f95bb18835e51397b578c3124f89664e9a812)
+- add ut [`ff68eb6`](https://github.com/tencentyun/cos-cpp-sdk-v5/commit/ff68eb6c888f023c4bb0a60a1ec9319f2c58eb8d)
+
 ## [v5.5.10](https://github.com/tencentyun/cos-cpp-sdk-v5/compare/v5.5.9...v5.5.10) - 2023-03-07
 
 ## What's Changed

demo/object_op_demo/multi_put_object_demo.cpp

@@ -8,7 +8,7 @@
 #include "cos_api.h"
 #include "cos_sys_config.h"
 #include "util/auth_tool.h"
-#include <openssl/ssl.h>
+// #include <openssl/ssl.h>  // 双向认证引用头
 
 /**
  * 本样例演示了如何使用 COS C++ SDK 进行对象的高级上传
@@ -48,12 +48,27 @@ void PrintResult(const qcloud_cos::CosResult& result, const qcloud_cos::BaseResp
 qcloud_cos::CosAPI InitCosAPI() {
     qcloud_cos::CosConfig config(appid, tmp_secret_id, tmp_secret_key, region);
     config.SetTmpToken(tmp_token);  // 推荐使用临时密钥初始化 CosAPI 对象, 如果您使用永久密钥初始化 CosAPI 对象，请注释
-    config.SetDestDomain("xxxxx.xxxxx.com");
-    config.SetDomainSameToHost(true);
+    // config.SetDestDomain("xxx.xxxx.com"); // 配置自定义域名
+    // config.SetDomainSameToHost(true); // 配置自定义域名签名
     qcloud_cos::CosAPI cos_tmp(config);
     return cos_tmp;
 }
 
+/**
+ * 本方法为 SSL_CTX 的回调方法，用户可以在此方法中配置 SSL_CTX 信息
+ */
+// int SslCtxCallback(void *ssl_ctx, void *data) {
+//   std::cout << "ssl_ctx: " << ssl_ctx << " data: " << data << std::endl;
+
+//   SSL_CTX *ctx = (SSL_CTX *)ssl_ctx;
+//   std::cout << "ssl_ctx in" << std::endl;
+//   SSL_CTX_use_PrivateKey_file(ctx, "/data/cert/client.key", SSL_FILETYPE_PEM);
+//   SSL_CTX_use_certificate_chain_file(ctx, "/data/cert/client.crt");
+//   std::cout << "ssl_ctx out" << std::endl;
+
+//   return 0;
+// }
+
 /*
  * 该 Demo 示范如何使用高级上传接口进行对象上传
  * 仅支持文件上传，不支持流式上传，封装了分块上传的各接口
@@ -67,6 +82,8 @@ void MultiUploadObjectDemo(qcloud_cos::CosAPI& cos) {
     CosSysConfig::SetUploadPartSize(10 * 1024 * 1024);  // 上传分块大小 默认10M
 
     qcloud_cos::MultiPutObjectReq req(bucket_name, object_name, local_file);
+    // req.SetHttps(); // 设置 https 请求
+    // req.SetSSLCtxCallback(SslCtxCallback, nullptr); //双向认证回调
     qcloud_cos::MultiPutObjectResp resp;
     qcloud_cos::CosResult result = cos.MultiPutObject(req, &resp);
 
@@ -264,19 +281,6 @@ void AsyncPutObjectDemo(qcloud_cos::CosAPI& cos) {
  * 本 Demo 中的上传分块接口 UploadPartData 仅支持传入流，最多支持10000分块，每个分块大小为1MB - 5GB，最后一个分块可以小于1MB
  */
 
-int SslCtxCallback(void *ssl_ctx, void *data) {
-    std::cout << "ssl_ctx: " << ssl_ctx << " data: " << data << std::endl;
-
-    SSL_CTX *ctx = (SSL_CTX *)ssl_ctx;
-    std::cout << "ssl_ctx in" << std::endl;
-    SSL_CTX_use_PrivateKey_file(ctx, "/data/cert/client_key.key", SSL_FILETYPE_PEM);
-    SSL_CTX_use_certificate_chain_file(ctx, "/data/cert/client_cert.cer");
-    std::cout << "ssl_ctx out" << std::endl;
-
-    return 0;
-}
-
-
 void PutPartDemo(qcloud_cos::CosAPI& cos) {
     std::string object_name = "big_file.txt";
 
@@ -392,15 +396,14 @@ void PutObjectResumableSingleThreadSyncDemo(qcloud_cos::CosAPI& cos) {
     std::string object_name = "SingleThreadSync.txt";
 
     qcloud_cos::PutObjectResumableSingleSyncReq req(bucket_name, object_name, local_file);
-    req.SetHttps();
     req.AddHeader("x-cos-meta-ssss1","1xxxxxxx");
     req.AddHeader("x-cos-meta-ssss2","2xxxxxxx");
     req.AddHeader("x-cos-meta-ssss3","3xxxxxxx");
     req.AddHeader("x-cos-meta-ssss4","4xxxxxxx");
     uint64_t traffic_limit = 8192 * 1024;//1MB
     req.SetTrafficLimit(traffic_limit);
-    req.SetCheckCRC64(true);
-    req.SetSSLCtxCallback(SslCtxCallback, nullptr);
+    //req.SetHttps();
+    //req.SetSSLCtxCallback(SslCtxCallback, nullptr);
     qcloud_cos::PutObjectResumableSingleSyncResp resp;
     qcloud_cos::CosResult result = cos.PutObjectResumableSingleThreadSync(req, &resp);
     if (result.IsSucc()) {