Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ into ...

miyanhui

2019-02-15 2cf69b4bbe56fc379c7f433037e043d0dba42493

Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ into ywv1.2

 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()));