From b5413f1f00fcf13104b07807e2046372764ef8dc Mon Sep 17 00:00:00 2001 From: miyanhui <dennismi1024@gmail.com> Date: 星期一, 18 二月 2019 10:12:41 +0800 Subject: [PATCH] 合并代码解决冲突 --- QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp index 54a887b..c9f86a9 100644 --- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp +++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp @@ -2078,6 +2078,12 @@ img_str.append(fdfsClient.fastFds->getIp() + "/").append(img_tmp); img_url.swap(img_str); } + } else { + std::string img_str = "http://"; + if (fdfsClient.fastFds != nullptr) { + img_str.append(fdfsClient.fastFds->getIp() + "/").append(img_url); + img_url.swap(img_str); + } } auto t_results = m_curlDownloadImg.download_jpeg(const_cast<char *>(img_url.c_str())); -- Gitblit v1.8.0