From 386b5d9e5cc6130d285c09a91856fb0312b7b8f3 Mon Sep 17 00:00:00 2001 From: luoliangyi <87842688@qq.com> Date: Mon, 23 Oct 2023 16:22:47 +0800 Subject: [PATCH] =?UTF-8?q?websdk=E5=8E=8B=E7=BC=A9=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=AE=BE=E7=BD=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/webservice/新版websdk接口说明.doc | Bin 355145 -> 355669 bytes sdk/webservice/ManagerV2.cpp | 4 +++- sdk/webservice/ManagerV2.h | 2 +- sdk/webservice/WSUser.cpp | 4 +++- test/webservice/demo.html | 3 ++- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/doc/webservice/新版websdk接口说明.doc b/doc/webservice/新版websdk接口说明.doc index 6d43922c56302d2cfc432dcdbfe041dc0ebe4409..6e9c45fc17395d1690df533c97b3c786ff3516a2 100644 GIT binary patch delta 36688 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 diff --git a/sdk/webservice/ManagerV2.cpp b/sdk/webservice/ManagerV2.cpp index 408f6431..b88fd30d 100644 --- a/sdk/webservice/ManagerV2.cpp +++ b/sdk/webservice/ManagerV2.cpp @@ -746,7 +746,7 @@ namespace ver_2 } int ManagerV2::LocalMakeZipFile(const std::vector& filePathList, const std::vector& nameList, - bool temp, std::string& outZipPath, std::string& errInfo) + const std::string &zipPath, bool temp, std::string& outZipPath, std::string& errInfo) { outZipPath.clear(); errInfo = "错误"; @@ -766,6 +766,8 @@ namespace ver_2 } std::string outZipPath2 = GetFilePath(temp, "zip"); + if (!zipPath.empty()) + outZipPath2 = zipPath; int error = 0; zip* z = zip_open(StdStringToUtf8(outZipPath2).c_str(), ZIP_CREATE | ZIP_TRUNCATE, &error); diff --git a/sdk/webservice/ManagerV2.h b/sdk/webservice/ManagerV2.h index af014d9c..0cbfa402 100644 --- a/sdk/webservice/ManagerV2.h +++ b/sdk/webservice/ManagerV2.h @@ -160,7 +160,7 @@ namespace ver_2 std::vector& outImagePathList, std::string& errInfo); // 本地生成压缩文件 int LocalMakeZipFile(const std::vector& filePathList, const std::vector& nameList, - bool temp, std::string& outZipPath, std::string& errInfo); + const std::string &zipPath, bool temp, std::string& outZipPath, std::string& errInfo); // 本地图像纠偏 int LocalImageDeskew(const std::string& imagePath, bool autoCrop, bool deskew, bool fillBlank, int width, int height, bool temp, std::string& outImagePath, std::string& errInfo); diff --git a/sdk/webservice/WSUser.cpp b/sdk/webservice/WSUser.cpp index eb5c7fdc..648eb50a 100644 --- a/sdk/webservice/WSUser.cpp +++ b/sdk/webservice/WSUser.cpp @@ -1732,9 +1732,11 @@ namespace ver_2 } } + std::string zipPath = GetJsonStringValue(json, "zip_path"); + std::string outZipPath; std::string errInfo; - int ret = GetManager()->LocalMakeZipFile(filePathList, nameList, !localSave, outZipPath, errInfo); + int ret = GetManager()->LocalMakeZipFile(filePathList, nameList, zipPath, !localSave, outZipPath, errInfo); if ("make_zip_file" == func || "base64_make_zip_file" == func) { diff --git a/test/webservice/demo.html b/test/webservice/demo.html index 05f88bf2..a50c168b 100644 --- a/test/webservice/demo.html +++ b/test/webservice/demo.html @@ -444,7 +444,8 @@ socket.send(JSON.stringify({ 'func':'local_make_zip_file', 'file_path_list':['D:\\1.jpg','D:\\2.jpg'], - 'local_save':false, + 'local_save':true, + 'zip_path':'D:\\1.zip', 'get_base64':true })); }