From 95633fd4086ca0ba90b3c8abae9f1764adfd2b2a Mon Sep 17 00:00:00 2001 From: MistEO Date: Fri, 19 Aug 2022 00:19:49 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=85=AC=E6=8B=9B=E4=B8=8A=E4=BC=A0=E7=9A=84=E5=B0=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/AutoRecruitTask.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/MeoAssistant/AutoRecruitTask.cpp b/src/MeoAssistant/AutoRecruitTask.cpp index 0bd68b0092..f165541d9f 100644 --- a/src/MeoAssistant/AutoRecruitTask.cpp +++ b/src/MeoAssistant/AutoRecruitTask.cpp @@ -632,14 +632,16 @@ void asst::AutoRecruitTask::upload_to_penguin(const json::value& details) body["source"] = "MeoAssistant"; body["version"] = Version; - std::string body_escape = utils::string_replace_all(body.to_string(), "\"", "\\\""); - std::string cmd_line = utils::string_replace_all(opt.penguin_report.cmd_format, "[body]", body_escape); + std::string body_escape = utils::string_replace_all_batch(body.to_string(), { + {"\"", "\\\""} }); std::string extra_param; if (!m_penguin_id.empty()) { extra_param = "-H \"authorization: PenguinID " + m_penguin_id + "\""; } - cmd_line = utils::string_replace_all(cmd_line, "[extra]", extra_param); + std::string cmd_line = utils::string_replace_all_batch(opt.penguin_report.cmd_format, { + { "[body]", body_escape }, + { "[extra]", extra_param} }); Log.trace("request_penguin |", cmd_line); @@ -674,11 +676,12 @@ void asst::AutoRecruitTask::upload_to_yituliu(const json::value& details) body["source"] = "MeoAssistant"; body["version"] = Version; - std::string body_escape = utils::string_replace_all(body.to_string(), "\"", "\\\""); - std::string cmd_line = utils::string_replace_all(opt.yituliu_report.cmd_format, "[body]", body_escape); + std::string body_escape = utils::string_replace_all_batch(body.to_string(), { + {"\"", "\\\""} }); - std::string extra_param; - cmd_line = utils::string_replace_all(cmd_line, "[extra]", extra_param); + std::string cmd_line = utils::string_replace_all_batch(opt.yituliu_report.cmd_format, { + { "[body]", body_escape }, + { "[extra]", ""} }); Log.trace("request_yituliu |", cmd_line);