From 2cf69b4bbe56fc379c7f433037e043d0dba42493 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期五, 15 二月 2019 15:58:59 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ into ywv1.2
---
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