From 38821b295a5604356009c28b9c4bc29235be8fd9 Mon Sep 17 00:00:00 2001
From: xia-chu <771730766@qq.com>
Date: Sun, 29 Jun 2025 17:48:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96http=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/WebApi.h | 57 ++++++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/server/WebApi.h b/server/WebApi.h
index cc0e95fd..79fea18f 100755
--- a/server/WebApi.h
+++ b/server/WebApi.h
@@ -78,42 +78,45 @@ public:
 
 using ApiArgsType = std::map<std::string, std::string, mediakit::StrCaseCompare>;
 
-template<typename Args, typename First>
-std::string getValue(Args &args, const First &first) {
-    return args[first];
+template<typename Args, typename Key>
+std::string getValue(Args &args, const Key &key) {
+    auto it = args.find(key);
+    if (it == args.end()) {
+        return "";
+    }
+    return it->second;
 }
 
-template<typename First>
-std::string getValue(Json::Value &args, const First &first) {
-    return args[first].asString();
+template<typename Key>
+std::string getValue(Json::Value &args, const Key &key) {
+    auto it = args.find(key);
+    if (it == args.end()) {
+        return "";
+    }
+    return it->second.asString();
 }
 
-template<typename First>
-std::string getValue(std::string &args, const First &first) {
+template<typename Key>
+std::string getValue(std::string &args, const Key &key) {
     return "";
 }
 
-template<typename First>
-std::string getValue(const mediakit::Parser &parser, const First &first) {
-    auto ret = parser.getUrlArgs()[first];
+template <typename Key>
+std::string getValue(const mediakit::Parser &parser, const Key &key) {
+    auto ret = getValue(parser.getUrlArgs(), key);
     if (!ret.empty()) {
         return ret;
     }
-    return parser.getHeader()[first];
+    return getValue(parser.getHeader(), key);
 }
 
-template<typename First>
-std::string getValue(mediakit::Parser &parser, const First &first) {
-    return getValue((const mediakit::Parser &) parser, first);
-}
-
-template<typename Args, typename First>
-std::string getValue(const mediakit::Parser &parser, Args &args, const First &first) {
-    auto ret = getValue(args, first);
+template<typename Args, typename Key>
+std::string getValue(const mediakit::Parser &parser, Args &args, const Key &key) {
+    auto ret = getValue(args, key);
     if (!ret.empty()) {
         return ret;
     }
-    return getValue(parser, first);
+    return getValue(parser, key);
 }
 
 template<typename Args>
@@ -177,14 +180,14 @@ void api_regist(const std::string &api_path, const std::function<void(API_ARGS_S
 // Register http request parameters as http original request information asynchronous reply http api
 void api_regist(const std::string &api_path, const std::function<void(API_ARGS_STRING_ASYNC)> &func);
 
-template<typename Args, typename First>
-bool checkArgs(Args &args, const First &first) {
-    return !args[first].empty();
+template<typename Args, typename Key>
+bool checkArgs(Args &args, const Key &key) {
+    return !args[key].empty();
 }
 
-template<typename Args, typename First, typename ...KeyTypes>
-bool checkArgs(Args &args, const First &first, const KeyTypes &...keys) {
-    return checkArgs(args, first) && checkArgs(args, keys...);
+template<typename Args, typename Key, typename ...KeyTypes>
+bool checkArgs(Args &args, const Key &key, const KeyTypes &...keys) {
+    return checkArgs(args, key) && checkArgs(args, keys...);
 }
 
 // 检查http url中或body中或http header参数是否为空的宏  [AUTO-TRANSLATED:9de001a4]