Merge pull request #105 from wqingzhang/hotfix-ci-pic

图片上传时处理兼容覆盖原图，不检查Etag

Author: jackyding2679

include/cos_api.h

@@ -773,7 +773,7 @@ class CosAPI {
   /** 图片持久化处理 **/
 
   /*** 上传时处理 ***/
-  CosResult PutImage(const PutImageByFileReq& req, PutImageByFileResp* resp);
+  CosResult PutImage(PutImageByFileReq& req, PutImageByFileResp* resp);
 
   /*** 云上数据处理 ***/
   CosResult CloudImageProcess(const CloudImageProcessReq& req,

include/request/data_process_req.h

@@ -277,6 +277,8 @@ class PicOperation {
   PicOperation() : is_pic_info(true) {}
   virtual ~PicOperation() {}
 
+  std::vector<PicRules> GetRules() const { return rules; }
+
   void AddRule(const PicRules& rule) { rules.push_back(rule); }
 
   void TurnOffPicInfo() { is_pic_info = false; }
@@ -605,11 +607,16 @@ class PutImageByFileReq : public PutObjectByFileReq {
 
   virtual ~PutImageByFileReq() {}
 
+  PicOperation GetPictureOperation() const { return m_pic_operation; }
+
   void SetPicOperation(const PicOperation& pic_operation) {
     m_pic_operation = pic_operation;
     AddHeader("Pic-Operations", m_pic_operation.GenerateJsonString());
   }
 
+  // 检查图片处理的效果图文件是否覆盖了原图
+  void CheckCoverOriginImage();  
+
  private:
   PicOperation m_pic_operation;
 };

src/cos_api.cpp

@@ -582,8 +582,9 @@ CosResult CosAPI::MoveObject(const MoveObjectReq& req) {
   return m_object_op.MoveObject(req);
 }
 
-CosResult CosAPI::PutImage(const PutImageByFileReq& req,
+CosResult CosAPI::PutImage(PutImageByFileReq& req,
                            PutImageByFileResp* resp) {
+  req.CheckCoverOriginImage();
   return m_object_op.PutImage(req, resp);
 }
 

src/request/data_process_req.cpp

@@ -7,6 +7,31 @@
 
 namespace qcloud_cos {
 
+void PutImageByFileReq:: CheckCoverOriginImage() {
+  std::vector<PicRules> pic_rules = m_pic_operation.GetRules();
+  std::string object_name = GetObjectName();
+  std::string object_dir = object_name.substr(0, object_name.find_last_of("/") + 1);
+  for (std::vector<PicRules>::const_iterator c_itr = pic_rules.begin();
+       c_itr != pic_rules.end(); ++c_itr) {
+    const PicRules& pic_rule = *c_itr;
+    std::string pic_absolute_key;
+    if (StringUtil::StringStartsWith(pic_rule.fileid, "/")) {
+      // fileid 以“/”开头为绝对路径
+      pic_absolute_key = StringUtil::StringRemovePrefix(pic_rule.fileid, "/");
+    } else {
+      // fileid 不以“/”开头为相对路径
+      pic_absolute_key = object_dir + pic_rule.fileid;
+    }
+    // 如果图片处理的效果图存放路径与上传文件路径相同，则会覆盖上传的原文件
+    // 覆盖上传原文件后Etag与本地文件不相同，此时不比较Etag
+    if (pic_absolute_key == object_name) {
+      TurnOffCheckETag();
+      TurnOffComputeConentMd5();
+      break;
+    }
+  }
+}
+
 bool CreateDocProcessJobsReq::GenerateRequestBody(std::string* body) const {
   rapidxml::xml_document<> doc;
   rapidxml::xml_node<>* root_node = doc.allocate_node(