合并pr：#1025

server/WebApi.h

@@ -79,16 +79,117 @@ public:
     ~SuccessException() = default;
 };
 
-using ApiArgsType = map<string, variant, StrCaseCompare>;
+using ApiArgsType = map<string, string, StrCaseCompare>;
 
-#define API_ARGS_MAP SockInfo &sender, HttpSession::KeyValue &headerIn, HttpSession::KeyValue &headerOut, ApiArgsType &allArgs, Json::Value &val
+template<typename Args, typename First>
+string getValue(Args &args, const First &first) {
+    return args[first];
+}
+
+template<typename First>
+string getValue(Json::Value &args, const First &first) {
+    return args[first].asString();
+}
+
+template<typename First>
+string getValue(string &args, const First &first) {
+    return "";
+}
+
+template<typename First>
+string getValue(const Parser &parser, const First &first) {
+    auto ret = parser.getUrlArgs()[first];
+    if (!ret.empty()) {
+        return ret;
+    }
+    return parser.getHeader()[first];
+}
+
+template<typename First>
+string getValue(Parser &parser, const First &first) {
+    return getValue((const Parser &) parser, first);
+}
+
+template<typename Args, typename First>
+string getValue(const Parser &parser, Args &args, const First &first) {
+    auto ret = getValue(args, first);
+    if (!ret.empty()) {
+        return ret;
+    }
+    return getValue(parser, first);
+}
+
+template<typename Args>
+class HttpAllArgs {
+public:
+    HttpAllArgs(const Parser &parser, Args &args) {
+        _get_args = [&args]() {
+            return (void *) &args;
+        };
+        _get_parser = [&parser]() -> const Parser & {
+            return parser;
+        };
+        _get_value = [](HttpAllArgs &that, const string &key) {
+            return getValue(that.getParser(), that.getArgs(), key);
+        };
+        _clone = [&](HttpAllArgs &that) {
+            that._get_args = [args]() {
+                return (void *) &args;
+            };
+            that._get_parser = [parser]() -> const Parser & {
+                return parser;
+            };
+            that._get_value = [](HttpAllArgs &that, const string &key) {
+                return getValue(that.getParser(), that.getArgs(), key);
+            };
+            that._cache_able = true;
+        };
+    }
+
+    HttpAllArgs(const HttpAllArgs &that) {
+        if (that._cache_able) {
+            _get_args = that._get_args;
+            _get_parser = that._get_parser;
+            _get_value = that._get_value;
+        } else {
+            that._clone(*this);
+        }
+    }
+
+    ~HttpAllArgs() = default;
+
+    template<typename Key>
+    variant operator[](const Key &key) const {
+        return (variant)_get_value(*(HttpAllArgs*)this, key);
+    }
+
+    const Parser &getParser() const {
+        return _get_parser();
+    }
+
+    Args &getArgs() {
+        return *((Args *) _get_args());
+    }
+
+    const Args &getArgs() const {
+        return *((Args *) _get_args());
+    }
+
+private:
+    bool _cache_able = false;
+    function<void *() > _get_args;
+    function<const Parser &() > _get_parser;
+    function<string(HttpAllArgs &that, const string &key)> _get_value;
+    function<void(HttpAllArgs &that) > _clone;
+};
+
+#define API_ARGS_MAP SockInfo &sender, HttpSession::KeyValue &headerOut, const HttpAllArgs<ApiArgsType> &allArgs, Json::Value &val
 #define API_ARGS_MAP_ASYNC API_ARGS_MAP, const HttpSession::HttpResponseInvoker &invoker
-#define API_ARGS_JSON SockInfo &sender, HttpSession::KeyValue &headerIn, HttpSession::KeyValue &headerOut, Json::Value &bodyArgs, ApiArgsType &allArgs, Json::Value &val
+#define API_ARGS_JSON SockInfo &sender, HttpSession::KeyValue &headerOut, const HttpAllArgs<Json::Value> &allArgs, Json::Value &val
 #define API_ARGS_JSON_ASYNC API_ARGS_JSON, const HttpSession::HttpResponseInvoker &invoker
-#define API_ARGS_STRING SockInfo &sender, HttpSession::KeyValue &headerIn, HttpSession::KeyValue &headerOut, const Parser &allArgs, Json::Value &val
+#define API_ARGS_STRING SockInfo &sender, HttpSession::KeyValue &headerOut, const HttpAllArgs<string> &allArgs, Json::Value &val
 #define API_ARGS_STRING_ASYNC API_ARGS_STRING, const HttpSession::HttpResponseInvoker &invoker
-#define API_ARGS_VALUE sender, headerIn, headerOut, allArgs, val
-#define API_ARGS_JSON_VALUE sender, headerIn, headerOut, bodyArgs, allArgs, val
+#define API_ARGS_VALUE sender, headerOut, allArgs, val
 
 //注册http请求参数是map<string, variant, StrCaseCompare>类型的http api
 void api_regist(const string &api_path, const function<void(API_ARGS_MAP)> &func);
@@ -106,26 +207,16 @@ void api_regist(const string &api_path, const function<void(API_ARGS_STRING)> &f
 void api_regist(const string &api_path, const function<void(API_ARGS_STRING_ASYNC)> &func);
 
 template<typename Args, typename First>
-bool checkArgs(Args &&args, First &&first) {
+bool checkArgs(Args &args, const First &first) {
     return !args[first].empty();
 }
 
 template<typename Args, typename First, typename ...KeyTypes>
-bool checkArgs(Args &&args, First &&first, KeyTypes &&...keys) {
-    return !args[first].empty() && checkArgs(std::forward<Args>(args), std::forward<KeyTypes>(keys)...);
+bool checkArgs(Args &args, const First &first, const KeyTypes &...keys) {
+    return checkArgs(args, first) && checkArgs(args, keys...);
 }
 
-template<typename First>
-bool checkArgs(const Parser &args, First &&first) {
-    return !args.getUrlArgs()[first].empty();
-}
-
-template<typename First, typename ...KeyTypes>
-bool checkArgs(const Parser &args, First &&first, KeyTypes &&...keys) {
-    return !args.getUrlArgs()[first].empty() && checkArgs(args, std::forward<KeyTypes>(keys)...);
-}
-
-//检查http参数是否为空的宏
+//检查http url中或body中或http header参数是否为空的宏
 #define CHECK_ARGS(...)  \
     if(!checkArgs(allArgs,##__VA_ARGS__)){ \
         throw InvalidArgsException("缺少必要参数:" #__VA_ARGS__); \