Merge pull request #157 from tencentyun/feature_huberyxxiao_b3b34cad

Feature huberyxxiao b3b34cad

Author: hubeytenctent

include/op/base_op.h

@@ -121,7 +121,7 @@ class BaseOp {
       std::istream& is, BaseResp* resp, const SharedTransferHandler& handler = nullptr);
 
   std::string GetRealUrl(const std::string& host, const std::string& path,
-                         bool is_https);
+                         bool is_https, bool is_generate_presigned_url = false);
 
  protected:
   bool CheckConfigValidation() const;

src/op/base_op.cpp

@@ -350,7 +350,7 @@ CosResult BaseOp::UploadAction(
 
 // 1. host优先级，私有ip > 自定义域名 > DNS cache > 默认域名
 std::string BaseOp::GetRealUrl(const std::string& host, const std::string& path,
-                               bool is_https) {
+                               bool is_https, bool is_generate_presigned_url) {
   std::string dest_uri;
   std::string dest_host = host;
   std::string dest_path = path;
@@ -366,17 +366,17 @@ std::string BaseOp::GetRealUrl(const std::string& host, const std::string& path,
   if (m_config &&
       m_config->GetSetIntranetOnce() &&
       m_config->IsUseIntranet() &&
-      !m_config->GetIntranetAddr().empty()) {
+      !m_config->GetIntranetAddr().empty() && !is_generate_presigned_url) {
     dest_host = m_config->GetIntranetAddr();
   } else if (CosSysConfig::IsUseIntranet() &&
-      !CosSysConfig::GetIntranetAddr().empty()) {
+      !CosSysConfig::GetIntranetAddr().empty() && !is_generate_presigned_url) {
     dest_host = CosSysConfig::GetIntranetAddr();
   } else if (m_config &&
              (!m_config->GetDestDomain().empty())) {
     dest_host = m_config->GetDestDomain();
   } else if (!CosSysConfig::GetDestDomain().empty()) {
     dest_host = CosSysConfig::GetDestDomain();
-  } else if (CosSysConfig::GetUseDnsCache()) {
+  } else if (CosSysConfig::GetUseDnsCache() && !is_generate_presigned_url) {
     dest_host = GetGlobalDnsCacheInstance().Resolve(host);
   }
 

src/op/object_op.cpp

@@ -1811,7 +1811,7 @@ std::string ObjectOp::GeneratePresignedUrl(const GeneratePresignedUrlReq& req) {
     return "";
   }
 
-  std::string signed_url = GetRealUrl(host, req.GetPath(), req.UseHttps());
+  std::string signed_url = GetRealUrl(host, req.GetPath(), req.UseHttps(), true);
   signed_url += "?sign=" + CodecUtil::EncodeKey(auth_str);
 
   const std::map<std::string, std::string>& req_params = req.GetParams();