agApi适配vst协议

rebar.config

@@ -1,8 +1,7 @@
 {erl_opts, [{i, "include"}]}.
 
 {deps, [
-   {eVPack, {git, "http://192.168.0.88:53000/SisMaker/eVPack.git", {branch, master}}},
-   {jiffy, {git, "http://192.168.0.88:53000/SisMaker/jiffy.git", {branch, master}}},
-   {jsx, {git, "https://github.com/talentdeficit/jsx.git", {tag, "v3.0.0"}}}
+   {eVPack, {git, "http://192.168.0.88:53000/SisMaker/eVPack.git", {branch, master}}}
+   %%{jiffy, {git, "http://192.168.0.88:53000/SisMaker/jiffy.git", {branch, master}}}
 ]}.
 

src/agApi/agAdminMonitor.erl

@@ -37,7 +37,7 @@ getAdminLog(PoolNameOrSocket) ->
    agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/log">>).
 
 getAdminLog(PoolNameOrSocket, QueryPars) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/log">>, QueryPars, ?AgDefHeader, ?AgDefBody).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/log">>, QueryPars).
 
 % 返回当前的日志级别设置
 % GET /_admin/log/level

src/agApi/agAnalyzers.erl

@@ -78,4 +78,4 @@ delAnalyzer(PoolNameOrSocket, AnalyzerName) ->
 
 delAnalyzer(PoolNameOrSocket, AnalyzerName, QueryPars) ->
    Path = <<"/_api/analyzer/", AnalyzerName/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars, ?AgDefHeader, ?AgDefBody).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars).

src/agApi/agAqls.erl

@@ -385,7 +385,7 @@ delUserFun(PoolNameOrSocket, UserFunName) ->
 
 delUserFun(PoolNameOrSocket, UserFunName, QueryPars) ->
    Path = <<"/_api/aqlfunction/", (agMiscUtils:toBinary(UserFunName))/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars, ?AgDefHeader, ?AgDefBody).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars).
 
 % 返回注册的AQL用户功能
 % GET /_api/aqlfunction
@@ -409,7 +409,7 @@ getUserFuns(PoolNameOrSocket) ->
    agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/aqlfunction">>).
 
 getUserFuns(PoolNameOrSocket, QueryPars) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/aqlfunction">>, QueryPars, ?AgDefHeader, ?AgDefBody).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/aqlfunction">>, QueryPars).
 
 
 

src/agApi/agAsyncResultHandling.erl

@@ -104,7 +104,7 @@ delAsyncJobRet(PoolNameOrSocket, TypeOrJodId) ->
 
 delAsyncJobRet(PoolNameOrSocket, TypeOrJodId, QueryPars) ->
    Path = <<"/_api/job/", (agMiscUtils:toBinary(TypeOrJodId))/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars, ?AgDefHeader, ?AgDefBody).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars).
 
 % 返回特定作业的状态
 % GET /_api/job/{job-id}

src/agApi/agBulkImportExport.erl

@@ -58,9 +58,8 @@
 %    409：如果导入会触发唯一键冲突，complete则返回，并将 其设置为true。
 %    500：如果服务器无法为没有用户定义密钥的文档自动生成文档密钥（密钥错误），则返回500。
 docImport(PoolNameOrSocket, ListOfList, QueryPars) ->
-   Path = <<"/_api/import">>,
-   BodyStr = <<<<(eVPack:encodeBin(OneList))/binary, "\n">> || OneList <- ListOfList>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, BodyStr).
+   BodyStr = <<<<(jiffy:encode(OneList))/binary, "\n">> || OneList <- ListOfList>>,
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/import">>, QueryPars, ?AgDefHeader, BodyStr).
 
 % 从JSON导入文档
 % POST /_api/import#json
@@ -100,17 +99,15 @@ docImport(PoolNameOrSocket, ListOfList, QueryPars) ->
 %    409：如果导入会触发唯一键冲突，complete则返回，并将 其设置为true。
 %    500：如果服务器无法为没有用户定义密钥的文档自动生成文档密钥（密钥错误），则返回500。
 jsonImport(PoolNameOrSocket, MapDataList, QueryPars) ->
-   case lists:keyfind(type, 1, QueryPars) of
-      {type, list} ->
-         BodyStr = eVPack:encodeBin(MapDataList);
-      {type, documents} ->
-         BodyStr = <<<<(eVPack:encodeBin(OneList))/binary, "\n">> || OneList <- MapDataList>>;
+   case QueryPars of
+      #{type := list} ->
+         BodyStr = jiffy:encode(MapDataList);
+      #{type := documents} ->
+         BodyStr = <<<<(jiffy:encode(OneList))/binary, "\n">> || OneList <- MapDataList>>;
       _ ->
          BodyStr = MapDataList
    end,
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/import", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/import">>, QueryPars, ?AgDefHeader, BodyStr).
 
 % 说明------->
 % 导入自包含的JSON文档
@@ -231,4 +228,4 @@ jsonImport(PoolNameOrSocket, MapDataList, QueryPars) ->
 docExport(PoolNameOrSocket, CollName, MapData) ->
    Path = <<"/_api/export?collection=", CollName/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).

src/agApi/agCluster.erl

@@ -54,7 +54,7 @@ serverRole(PoolNameOrSocket) ->
 %    400：数据库服务器的ID
 %    403：
 clusterStats(PoolNameOrSocket, QueryPars) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/clusterStatistics">>, QueryPars, ?AgDefHeader, ?AgDefBody).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/clusterStatistics">>, QueryPars).
 
 % 返回监督（机构）评估的集群的运行状况
 % GET /_admin/cluster/health

src/agApi/agCollections.erl

@@ -119,7 +119,7 @@ delColl(PoolNameOrSocket, CollName) ->
 
 delColl(PoolNameOrSocket, CollName, QueryPars) ->
    Path = <<"/_api/collection/", CollName/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars, ?AgDefHeader, ?AgDefBody).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars).
 
 % 清除集合
 % PUT /_api/collection/{collection-name}/truncate
@@ -246,7 +246,7 @@ collShards(PoolNameOrSocket, CollName) ->
 
 collShards(PoolNameOrSocket, CollName, QueryPars) ->
    Path = <<"/_api/collection/", CollName/binary, "/shards">>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, QueryPars, ?AgDefHeader, ?AgDefBody).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, QueryPars).
 
 % 返回集合修订版ID
 % GET /_api/collection/{collection-name}/revision
@@ -288,7 +288,7 @@ collChecksum(PoolNameOrSocket, CollName) ->
 
 collChecksum(PoolNameOrSocket, CollName, QueryPars) ->
    Path = <<"/_api/collection/", CollName/binary, "/checksum">>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, QueryPars, ?AgDefHeader, ?AgDefBody).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, QueryPars).
 
 % 返回所有集合列表
 % GET /_api/collection
@@ -303,7 +303,7 @@ collList(PoolNameOrSocket) ->
    agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/collection">>).
 
 collList(PoolNameOrSocket, QueryPars) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/collection">>, QueryPars, ?AgDefHeader, ?AgDefBody).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/collection">>, QueryPars).
 
 % 加载集合
 % PUT /_api/collection/{collection-name}/load

src/agApi/agDbMgr.erl

@@ -55,7 +55,7 @@ visitDbs(PoolNameOrSocket) ->
 % 400：如果请求无效，则返回。
 % 403：如果请求未在_system数据库中执行，则返回。
 allDbs(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/database">>, ?AgDefQuery, ?AgDefHeader, ?AgDefBody, true).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/database">>, ?AgDefQuery, true).
 
 % 创建一个新的数据库
 % POST /_api/database
@@ -95,4 +95,4 @@ newDb(PoolNameOrSocket, MapData) ->
 % 404：如果找不到数据库，则返回。
 delDb(PoolNameOrSocket, Name) ->
    Path = <<"/_api/database/", Name/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, ?AgDefQuery, ?AgDefHeader, ?AgDefBody, true).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, ?AgDefQuery, true).

src/agApi/agDocuments.erl

@@ -296,17 +296,15 @@ updateDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars, Headers) ->
 % 412：如果“如果-match”标头或返回转，并给出找到的文件有不同的版本。响应还将在_rev属性中包含找到的文档的当前修订。此外，将返回属性_id和_key。
 delDoc(PoolNameOrSocket, CollName, Key) ->
    Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path).
 
 delDoc(PoolNameOrSocket, CollName, Key, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary, QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>,
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars).
 
 delDoc(PoolNameOrSocket, CollName, Key, QueryPars, Headers) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary, QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, Headers, undefined).
+   Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>,
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars, Headers, ?AgDefBody).
 
 % 批量文件操作
 % ArangoDB支持批量处理文档。批量操作影响 单个集合。使用此API变体可使客户端分摊整批文档中的单个请求的开销。不能保证批量操作可以串行执行，ArangoDB 可以并行执行这些操作。这可以转化为大幅的性能提升，尤其是在集群部署中。
@@ -330,23 +328,15 @@ delDoc(PoolNameOrSocket, CollName, Key, QueryPars, Headers) ->
 % 404：如果找不到集合，则返回。
 % 对于该操作的返回 列表 如果文档不存在 或者_rev条件不满足 则返回列表的中包含相关的错误 可能需要在使用的时候过滤正确和非正确的返回文档
 getDocs(PoolNameOrSocket, CollName, KeyOrMapDataList) ->
-   QueryBinary = agMiscUtils:spellQueryPars([{onlyget, true}]),
-   Path = <<"/_api/document/", CollName/binary, QueryBinary/binary>>,
+   Path = <<"/_api/document/", CollName/binary>>,
    BodyStr = eVPack:encodeBin(KeyOrMapDataList),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, #{<<"onlyget">> => <<"true">>}, ?AgDefHeader, BodyStr).
 
 getDocs(PoolNameOrSocket, CollName, KeyOrMapDataList, QueryPars) ->
-   LastQueryPars =
-      case lists:keyfind(onlyget, 1, QueryPars) of
-         {onlyget, true} ->
-            QueryPars;
-         _ ->
-            lists:keystore(onlyget, 1, QueryPars, {onlyget, true})
-      end,
-   QueryBinary = agMiscUtils:spellQueryPars(LastQueryPars),
-   Path = <<"/_api/document/", CollName/binary, QueryBinary/binary>>,
+   LastQueryPars = QueryPars#{<<"onlyget">> => <<"true">>},
+   Path = <<"/_api/document/", CollName/binary>>,
    BodyStr = eVPack:encodeBin(KeyOrMapDataList),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, LastQueryPars, ?AgDefHeader, BodyStr).
 
 % 创建多个文档
 % POST /_api/document/{collection}#multiple
@@ -381,13 +371,12 @@ getDocs(PoolNameOrSocket, CollName, KeyOrMapDataList, QueryPars) ->
 newDocs(PoolNameOrSocket, CollName, MapDataList) ->
    Path = <<"/_api/document/", CollName/binary>>,
    BodyStr = eVPack:encodeBin(MapDataList),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 newDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/document/", CollName/binary, QueryBinary/binary>>,
+   Path = <<"/_api/document/", CollName/binary>>,
    BodyStr = eVPack:encodeBin(MapDataList),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, BodyStr).
 
 % 替换多个文件
 % PUT /_api/document/{collection}
@@ -417,13 +406,12 @@ newDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) ->
 replaceDocs(PoolNameOrSocket, CollName, MapDataList) ->
    Path = <<"/_api/document/", CollName/binary>>,
    BodyStr = eVPack:encodeBin(MapDataList),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 replaceDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/document/", CollName/binary, QueryBinary/binary>>,
+   Path = <<"/_api/document/", CollName/binary>>,
    BodyStr = eVPack:encodeBin(MapDataList),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, BodyStr).
 
 % 更新多个文件
 % PATCH /_api/document/{collection}
@@ -456,13 +444,12 @@ replaceDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) ->
 updateDocs(PoolNameOrSocket, CollName, MapDataList) ->
    Path = <<"/_api/document/", CollName/binary>>,
    BodyStr = eVPack:encodeBin(MapDataList),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 updateDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/document/", CollName/binary, QueryBinary/binary>>,
+   Path = <<"/_api/document/", CollName/binary>>,
    BodyStr = eVPack:encodeBin(MapDataList),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, ?AgDefHeader, BodyStr).
 
 % 删除多个文件
 % DELETE /_api/document/{collection}
@@ -486,10 +473,9 @@ updateDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) ->
 delDocs(PoolNameOrSocket, CollName, KeyOrMapDataList) ->
    Path = <<"/_api/document/", CollName/binary, "/">>,
    BodyStr = eVPack:encodeBin(KeyOrMapDataList),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, ?AgDefQuery, ?AgDefQuery, BodyStr).
 
 delDocs(PoolNameOrSocket, CollName, KeyOrMapDataList, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/document/", CollName/binary, QueryBinary/binary>>,
+   Path = <<"/_api/document/", CollName/binary>>,
    BodyStr = eVPack:encodeBin(KeyOrMapDataList),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars, ?AgDefHeader, BodyStr).

src/agApi/agEdges.erl

@@ -38,6 +38,5 @@
 % 400：如果请求包含无效参数，则返回。
 % 404：如果未找到边缘集合，则返回。
 getEdges(PoolNameOrSocket, CollName, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/edges/", CollName/binary, QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   Path = <<"/_api/edges/", CollName/binary>>,
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, QueryPars).

src/agApi/agEndPoints.erl

@@ -27,7 +27,7 @@
 % 端点：协调器的绑定，例如tcp://[::1]:8530
 % 501：
 getClusterEndpoints(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/cluster/endpoints">>, ?AgDefQuery, ?AgDefHeader, ?AgDefBody, true).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/cluster/endpoints">>, ?AgDefQuery, true).
 
 % 所有端点的返回列表永久链接
 % 此API调用返回所有端点（单个服务器）的列表。

src/agApi/agFoxxServices.erl

@@ -31,11 +31,10 @@
 % 返回码
 %    200：如果请求成功，则返回。
 getFoxxList(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/foxx">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/foxx">>).
 
 getFoxxList(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/foxx", QueryBinary/binary>>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/foxx">>, QueryPars).
 
 % 服务说明
 % 服务元数据
@@ -55,9 +54,8 @@ getFoxxList(PoolNameOrSocket, QueryPars) ->
 % 返回码
 % 200：如果请求成功，则返回。
 % 400：如果安装路径未知，则返回。
-getFoxxService(PoolNameOrSocket, Mount) ->
-   Path = <<"/_api/foxx/service?mount=", (agMiscUtils:toBinary(Mount))/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+getFoxxService(PoolNameOrSocket, QueryPars) ->
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/foxx/service">>, QueryPars).
 
 % 安装新服务
 % POST /_api/foxx
@@ -83,10 +81,8 @@ getFoxxService(PoolNameOrSocket, Mount) ->
 % 返回码
 %    201：如果请求成功，则返回。
 installFoxx(PoolNameOrSocket, MapData, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/foxx", QueryBinary/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/foxx">>, QueryPars, ?AgDefHeader, BodyStr).
 
 % 卸载服务
 % DELETE /_api/foxx/service
@@ -98,9 +94,7 @@ installFoxx(PoolNameOrSocket, MapData, QueryPars) ->
 % 返回码
 %     204：如果请求成功，则返回。
 uninstallFoxx(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/foxx/service", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, <<"/_api/foxx/service">>, QueryPars).
 
 % 更换服务
 % PUT /_api/foxx/service
@@ -128,10 +122,8 @@ uninstallFoxx(PoolNameOrSocket, QueryPars) ->
 % 返回码
 %    200：如果请求成功，则返回。
 replaceFoxx(PoolNameOrSocket, MapData, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/foxx/service", QueryBinary/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/foxx/service">>, QueryPars, ?AgDefHeader, BodyStr).
 
 % 升级服务
 % PATCH /_api/foxx/service
@@ -159,10 +151,8 @@ replaceFoxx(PoolNameOrSocket, MapData, QueryPars) ->
 % 返回码
 % 200：如果请求成功，则返回。
 upgradeFoxx(PoolNameOrSocket, MapData, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/foxx/service", QueryBinary/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, <<"/_api/foxx/service">>, QueryPars, ?AgDefHeader, BodyStr).
 
 % Foxx服务配置/依赖关系
 % 这是用于管理Foxx服务配置和依赖关系的ArangoDB HTTP接口的简介。
@@ -176,9 +166,7 @@ upgradeFoxx(PoolNameOrSocket, MapData, QueryPars) ->
 % 返回码
 % 200：如果请求成功，则返回。
 getFoxxConfig(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/foxx/configuration", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/foxx/configuration">>, QueryPars).
 
 % 更新配置选项
 % PATCH /_api/foxx/configuration
@@ -191,10 +179,8 @@ getFoxxConfig(PoolNameOrSocket, QueryPars) ->
 % 返回码
 % 200：如果请求成功，则返回。
 updateFoxxConfig(PoolNameOrSocket, MapData, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/foxx/configuration", QueryBinary/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, <<"/_api/foxx/configuration">>, QueryPars, ?AgDefHeader, BodyStr).
 
 % 替换配置选项
 % PUT /_api/foxx/configuration
@@ -207,10 +193,8 @@ updateFoxxConfig(PoolNameOrSocket, MapData, QueryPars) ->
 % 返回码
 %     200：如果请求成功，则返回。
 replaceFoxxConfig(PoolNameOrSocket, MapData, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/foxx/configuration", QueryBinary/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/foxx/configuration">>, QueryPars, ?AgDefHeader, BodyStr).
 
 % 获取依赖项选项
 % GET /_api/foxx/dependencies
@@ -221,9 +205,7 @@ replaceFoxxConfig(PoolNameOrSocket, MapData, QueryPars) ->
 % 返回码
 % 200：如果请求成功，则返回。
 getFoxxDependencies(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/foxx/dependencies", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/foxx/dependencies">>, QueryPars).
 
 
 % 更新依赖项选项
@@ -237,10 +219,8 @@ getFoxxDependencies(PoolNameOrSocket, QueryPars) ->
 % 返回码
 %     200：如果请求成功，则返回。
 updateFoxxDependencies(PoolNameOrSocket, MapData, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/foxx/dependencies", QueryBinary/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch,  <<"/_api/foxx/dependencies">>, QueryPars, ?AgDefHeader, BodyStr).
 
 % 替换依赖项选项
 % PUT /_api/foxx/dependencies
@@ -253,10 +233,8 @@ updateFoxxDependencies(PoolNameOrSocket, MapData, QueryPars) ->
 % 返回码
 % 200：如果请求成功，则返回。
 replaceFoxxDependencies(PoolNameOrSocket, MapData, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/foxx/dependencies", QueryBinary/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/foxx/dependencies">>, QueryPars, ?AgDefHeader, BodyStr).
 
 % Foxx服务杂项
 %
@@ -269,9 +247,7 @@ replaceFoxxDependencies(PoolNameOrSocket, MapData, QueryPars) ->
 % 返回码
 %     200：如果请求成功，则返回。
 getFoxxScripts(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/foxx/scripts", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/foxx/scripts">>, QueryPars).
 
 % 运行服务脚本
 % POST /_api/foxx/scripts/{name}
@@ -286,10 +262,9 @@ getFoxxScripts(PoolNameOrSocket, QueryPars) ->
 % 返回码
 %     200：如果请求成功，则返回。
 runFoxxScripts(PoolNameOrSocket, ScriptName, MapData, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/foxx/scripts/", ScriptName/binary, QueryBinary/binary>>,
+   Path = <<"/_api/foxx/scripts/", ScriptName/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, BodyStr).
 
 % 运行服务测试
 % POST /_api/foxx/tests
@@ -313,9 +288,7 @@ runFoxxScripts(PoolNameOrSocket, ScriptName, MapData, QueryPars) ->
 % 返回码
 %     200：如果请求成功，则返回。
 runFoxxTest(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/foxx/tests", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/foxx/tests">>, QueryPars).
 
 % 启用开发模式
 % POST /_api/foxx/development
@@ -327,9 +300,7 @@ runFoxxTest(PoolNameOrSocket, QueryPars) ->
 % 返回码
 %  200：如果请求成功，则返回。
 enableFoxxDevelopment(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/foxx/development", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/foxx/development">>, QueryPars).
 
 % 禁用开发模式
 % DELETE /_api/foxx/development
@@ -340,9 +311,7 @@ enableFoxxDevelopment(PoolNameOrSocket, QueryPars) ->
 % 返回码
 % 200：如果请求成功，则返回。
 disableFoxxDevelopment(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/foxx/development", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, <<"/_api/foxx/development">>, QueryPars).
 
 % 服务自述文件
 % GET /_api/foxx/readme
@@ -353,9 +322,7 @@ disableFoxxDevelopment(PoolNameOrSocket, QueryPars) ->
 %     200：如果请求成功，则返回。
 %     204：如果未找到自述文件，则返回。
 getFoxxReadme(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/foxx/readme", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/foxx/readme">>, QueryPars).
 
 % 招摇说明
 % GET /_api/foxx/swagger
@@ -366,9 +333,7 @@ getFoxxReadme(PoolNameOrSocket, QueryPars) ->
 % 返回码
 % 200：如果请求成功，则返回。
 getFoxxSwagger(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/foxx/swagger", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/foxx/swagger">>, QueryPars).
 
 % 下载服务包
 % POST /_api/foxx/download
@@ -381,9 +346,7 @@ getFoxxSwagger(PoolNameOrSocket, QueryPars) ->
 %     200：如果请求成功，则返回。
 %     400：如果安装路径未知，则返回。
 downloadFoxxBundle(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/foxx/download", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/foxx/download">>, QueryPars).
 
 % 提交本地服务状态
 % POST /_api/foxx/commit
@@ -394,6 +357,4 @@ downloadFoxxBundle(PoolNameOrSocket, QueryPars) ->
 % 返回码
 %     204：如果请求成功，则返回。
 commitFoxxState(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/foxx/commit", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/foxx/commit">>, QueryPars).

src/agApi/agGeneralGraphs.erl

@@ -29,7 +29,7 @@
 % isSmart：标记图形是否为SmartGraph（仅限企业版）。
 % smartGraphAttribute：智能图例中的分片属性名称（仅企业版）
 graphList(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/gharial">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/gharial">>).
 
 % 创建一个图
 % 在图形模块中创建一个新图形。
@@ -78,13 +78,11 @@ graphList(PoolNameOrSocket) ->
 % errorMessage：为此错误创建的消息。
 newGraph(PoolNameOrSocket, MapData) ->
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/gharial">>, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/gharial">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 newGraph(PoolNameOrSocket, MapData, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial", QueryBinary/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/gharial">>, QueryPars, ?AgDefHeader, BodyStr).
 
 % 获取图表
 % GET /_api/gharial/{graph}
@@ -102,7 +100,7 @@ newGraph(PoolNameOrSocket, MapData, QueryPars) ->
 % errorMessage：为此错误创建的消息。
 getGraph(PoolNameOrSocket, GraphName) ->
    Path = <<"/_api/gharial/", GraphName/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path).
 
 % 删除现有图
 % DELETE /_api/gharial/{graph}
@@ -126,12 +124,11 @@ getGraph(PoolNameOrSocket, GraphName) ->
 % errorMessage：为此错误创建的消息。
 delGraph(PoolNameOrSocket, GraphName) ->
    Path = <<"/_api/gharial/", GraphName/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path).
 
 delGraph(PoolNameOrSocket, GraphName, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   Path = <<"/_api/gharial/", GraphName/binary>>,
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars).
 
 % 列出此图中使用的所有顶点集合。
 % GET /_api/gharial/{graph}/vertex
@@ -149,7 +146,7 @@ delGraph(PoolNameOrSocket, GraphName, QueryPars) ->
 % errorMessage：为此错误创建的消息。
 vertexCollList(PoolNameOrSocket, GraphName) ->
    Path = <<"/_api/gharial/", GraphName/binary, "/vertex">>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path).
 
 % 向图中添加一个额外的顶点集合。
 % POST /_api/gharial/{graph}/vertex
@@ -186,7 +183,7 @@ vertexCollList(PoolNameOrSocket, GraphName) ->
 addVertexColl(PoolNameOrSocket, GraphName, MapData) ->
    Path = <<"/_api/gharial/", GraphName/binary, "/vertex">>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 从图形中删除额外顶点集合。
 % DELETE /_api/gharial/{graph}/vertex/{collection}
@@ -222,12 +219,11 @@ addVertexColl(PoolNameOrSocket, GraphName, MapData) ->
 % errorMessage：为此错误创建的消息。
 delVertexColl(PoolNameOrSocket, GraphName, CollName) ->
    Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path).
 
 delVertexColl(PoolNameOrSocket, GraphName, CollName, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary>>,
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars).
 
 % 列出所有边缘定义
 % GET /_api/gharial/{graph}/edge
@@ -245,7 +241,7 @@ delVertexColl(PoolNameOrSocket, GraphName, CollName, QueryPars) ->
 % errorMessage：为此错误创建的消息。
 edgeDefList(PoolNameOrSocket, GraphName) ->
    Path = <<"/_api/gharial/", GraphName/binary, "/edge">>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path).
 
 % 向图添加新的边定义
 % POST /_api/gharial/{graph}/edge
@@ -284,7 +280,7 @@ edgeDefList(PoolNameOrSocket, GraphName) ->
 addEdgeDef(PoolNameOrSocket, GraphName, MapData) ->
    Path = <<"/_api/gharial/", GraphName/binary, "/edge">>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 替换现有的边缘定义
 % PUT /_api/gharial/{graph}/edge/{definition}#definition
@@ -328,13 +324,12 @@ addEdgeDef(PoolNameOrSocket, GraphName, MapData) ->
 replaceEdgeDef(PoolNameOrSocket, GraphName, EdgeDefName, MapData) ->
    Path = <<"/_api/gharial/", GraphName/binary, "/edge/", EdgeDefName/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 replaceEdgeDef(PoolNameOrSocket, GraphName, EdgeDefName, MapData, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", EdgeDefName/binary, QueryBinary/binary>>,
+   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", EdgeDefName/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, BodyStr).
 
 % 从图形中删除边缘定义
 % DELETE /_api/gharial/{graph}/edge/{definition}#definition
@@ -366,12 +361,11 @@ replaceEdgeDef(PoolNameOrSocket, GraphName, EdgeDefName, MapData, QueryPars) ->
 %     errorMessage：为此错误创建的消息。
 delEdgeDef(PoolNameOrSocket, GraphName, EdgeDefName) ->
    Path = <<"/_api/gharial/", GraphName/binary, "/edge/", EdgeDefName/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path).
 
 delEdgeDef(PoolNameOrSocket, GraphName, EdgeDefName, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", EdgeDefName/binary, QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", EdgeDefName/binary>>,
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars).
 
 % 处理顶点
 
@@ -410,13 +404,12 @@ delEdgeDef(PoolNameOrSocket, GraphName, EdgeDefName, QueryPars) ->
 newVertex(PoolNameOrSocket, GraphName, CollName, MapData) ->
    Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 newVertex(PoolNameOrSocket, GraphName, CollName, MapData, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, QueryBinary/binary>>,
+   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, BodyStr).
 
 % 获取现有顶点
 % GET /_api/gharial/{graph}/vertex/{collection}/{vertex}
@@ -461,17 +454,15 @@ newVertex(PoolNameOrSocket, GraphName, CollName, MapData, QueryPars) ->
 %    errorMessage：为此错误创建的消息。
 getVertex(PoolNameOrSocket, GraphName, CollName, VertexKey) ->
    Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path).
 
 getVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary, QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>,
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, QueryPars).
 
 getVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, QueryPars, Headers) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary, QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, Headers, undefined).
+   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>,
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, QueryPars, Headers, ?AgDefBody).
 
 % 更新现有顶点
 % PATCH /_api/gharial/{graph}/vertex/{collection}/{vertex}
@@ -524,19 +515,17 @@ getVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, QueryPars, Headers)
 updateVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData) ->
    Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 updateVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary, QueryBinary/binary>>,
+   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, ?AgDefHeader, BodyStr).
 
 updateVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPars, Headers) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary, QueryBinary/binary>>,
+   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, Headers, BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, Headers, BodyStr).
 
 % 替换现有的顶点
 % PUT /_api/gharial/{graph}/vertex/{collection}/{vertex}
@@ -589,19 +578,17 @@ updateVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPar
 replaceVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData) ->
    Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 replaceVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary, QueryBinary/binary>>,
+   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, BodyStr).
 
 replaceVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPars, Headers) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary, QueryBinary/binary>>,
+   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, Headers, BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, Headers, BodyStr).
 
 % 从图中删除顶点
 % DELETE /_api/gharial/{graph}/vertex/{collection}/{vertex}
@@ -647,17 +634,15 @@ replaceVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPa
 %     errorMessage：为此错误创建的消息。
 delVertex(PoolNameOrSocket, GraphName, CollName, VertexKey) ->
    Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path).
 
 delVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary, QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>,
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars).
 
 delVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, QueryPars, Headers) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary, QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, Headers, undefined).
+   Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>,
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars, Headers, ?AgDefBody).
 
 % 处理边缘
 % 在现有图形中创建边
@@ -705,13 +690,12 @@ delVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, QueryPars, Headers)
 newEdge(PoolNameOrSocket, GraphName, CollName, MapData) ->
    Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 newEdge(PoolNameOrSocket, GraphName, CollName, MapData, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, QueryBinary/binary>>,
+   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars,  ?AgDefHeader, BodyStr).
 
 % 获得边
 % GET /_api/gharial/{graph}/edge/{collection}/{edge}
@@ -756,17 +740,15 @@ newEdge(PoolNameOrSocket, GraphName, CollName, MapData, QueryPars) ->
 % errorMessage：为此错误创建的消息。
 getEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey) ->
    Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path).
 
 getEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary, QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>,
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, QueryPars).
 
 getEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, QueryPars, Headers) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary, QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, Headers, undefined).
+   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>,
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, QueryPars, Headers, ?AgDefBody).
 
 % 修改现有边
 % PATCH /_api/gharial/{graph}/edge/{collection}/{edge}
@@ -820,19 +802,17 @@ getEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, QueryPars, Headers) ->
 updateEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData) ->
    Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path,  ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 updateEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary, QueryBinary/binary>>,
+   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path,  QueryPars, ?AgDefHeader, BodyStr).
 
 updateEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, Headers, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary, QueryBinary/binary>>,
+   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, Headers, BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, Headers, BodyStr).
 
 
 % 替换现有边的内容
@@ -888,19 +868,17 @@ updateEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, Headers, Que
 replaceEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData) ->
    Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 replaceEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary, QueryBinary/binary>>,
+   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, BodyStr).
 
 replaceEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, QueryPars, Headers) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary, QueryBinary/binary>>,
+   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, Headers, BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, Headers, BodyStr).
 
 % 从图形中删除边
 % DELETE /_api/gharial/{graph}/edge/{collection}/{edge}
@@ -946,16 +924,14 @@ replaceEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, QueryPars,
 %     errorMessage：为此错误创建的消息。
 delEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey) ->
    Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path).
 
 delEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary, QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>,
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars).
 
 delEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, Headers, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary, QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, Headers, undefined).
+   Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>,
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars, Headers, ?AgDefBody).
 
 

src/agApi/agHotBackup.erl

@@ -31,7 +31,7 @@
 %    408：如果操作无法在超时时间内获得全局事务锁定，则返回HTTP 408。
 newBackup(PoolNameOrSocket, MapData) ->
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/create">>, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/create">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 从本地备份还原
 % POST /_admin/backup/restore
@@ -43,7 +43,7 @@ newBackup(PoolNameOrSocket, MapData) ->
 %    400：如果使用错误的参数或除以外的任何HTTP方法调用了restore命令POST，则返回HTTP 400。具体细节在返回的错误文档中有详细说明。
 restoreBackup(PoolNameOrSocket, MapData) ->
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/restore">>, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/restore">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 删除特定的本地备份
 % POST /_admin/backup/delete
@@ -56,7 +56,7 @@ restoreBackup(PoolNameOrSocket, MapData) ->
 %    404：如果id找不到与该标识符相对应的备份。
 delBackup(PoolNameOrSocket, MapData) ->
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/delete">>, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/delete">>,?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 列出所有本地备份
 % POST /_admin/backup/list
@@ -69,7 +69,7 @@ delBackup(PoolNameOrSocket, MapData) ->
 %    404：如果id给出了ID或ID列表，但未找到给定ID作为备份的标识符，则返回HTTP 404 NOT FOUND。
 %    405：如果使用以外的任何HTTP方法调用了list命令POST，则返回HTTP 405 METHOD NOT ALLOWED。
 getBackupList(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/list">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/list">>).
 
 % 结果由list热备份的一个对象组成id，其中id唯一地标识了特定的热备份，version描绘了用于创建任何单个热备份的ArangoDB的版本，并datetime显示了创建热备份的时间。
 % 其他参数包括：备份大小（以字节为单位）sizeInBytes，单个数据文件nrFiles的数量（以），创建时的数据库服务器nrDBServers的数量（以），备份部分的数量（在当前可访问的db服务器上找到的）为nrPiecesPresent。
@@ -94,7 +94,7 @@ getBackupList(PoolNameOrSocket) ->
 %    404：如果id 找不到对应于标识符的备份，或者没有已知的上载操作uploadId。
 uploadBackup(PoolNameOrSocket, MapData) ->
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/upload">>, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/upload">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 下载特定的本地备份
 % POST /_admin/backup/download
@@ -113,4 +113,4 @@ uploadBackup(PoolNameOrSocket, MapData) ->
 %    404：如果id 找不到与该标识符相对应的备份，或者如果没有已知的与的下载操作downloadId。
 downloadBackup(PoolNameOrSocket, MapData) ->
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/download">>, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/download">>, ?AgDefQuery, ?AgDefHeader, BodyStr).

src/agApi/agIndexes.erl

@@ -58,7 +58,7 @@
 %    404：如果索引不存在，则 返回HTTP 404。
 getIndexInfo(PoolNameOrSocket, IndexId) ->
    Path = <<"/_api/index/", (agMiscUtils:toBinary(IndexId))/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path).
 
 % 创建一个索引
 % POST /_api/index#general
@@ -85,10 +85,9 @@ getIndexInfo(PoolNameOrSocket, IndexId) ->
 %    201：如果索引尚不存在并且可以创建，则 返回HTTP 201。
 %    400：如果发布了无效的索引描述或使用了目标索引不支持的属性，则返回HTTP 400。
 %    404：如果集合未知，则返回HTTP 404。
-newIndex(PoolNameOrSocket, CollName, MapData) ->
-   Path = <<"/_api/index?collection=", CollName/binary>>,
+newIndex(PoolNameOrSocket, MapData, QueryPars) ->
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, BodyStr).
 
 % 删除索引
 % DELETE /_api/index/{index-id}
@@ -100,7 +99,7 @@ newIndex(PoolNameOrSocket, CollName, MapData) ->
 %    404：如果index-id未知，则返回HTTP 404。
 delIndex(PoolNameOrSocket, IndexId) ->
    Path = <<"/_api/index/", (agMiscUtils:toBinary(IndexId))/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path).
 
 % 返回集合的所有索引
 % GET /_api/index
@@ -109,9 +108,8 @@ delIndex(PoolNameOrSocket, IndexId) ->
 % 返回一个对象，该对象的属性索引包含给定集合的所有索引描述的数组。在标识符中还可以使用与索引句柄作为键的对象相同的信息。
 % 返回码
 %    200：返回一个JSON对象，其中包含该集合的索引列表。
-getIndexList(PoolNameOrSocket, CollName) ->
-   Path = <<"/_api/index?collection=", CollName/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+getIndexList(PoolNameOrSocket, QueryPars) ->
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/index">>, QueryPars).
 
 % 使用哈希索引
 % 如果存在合适的哈希索引，/_api/simple/by-example则将使用该索引执行示例查询。
@@ -135,19 +133,10 @@ getIndexList(PoolNameOrSocket, CollName) ->
 %    201：如果索引尚不存在并且可以创建，则 返回HTTP 201。
 %    400：如果集合中已经包含文档，并且您尝试创建唯一哈希索引以使某些文档违反唯一性，则返回HTTP 400。
 %    404：如果集合名称未知，则返回HTTP 404。
-newIndexOfHash(PoolNameOrSocket, CollName, MapData) ->
-   case MapData of
-      #{type := <<"hash">>} ->
-         Path = <<"/_api/index?collection=", CollName/binary>>,
-         BodyStr = eVPack:encodeBin(MapData),
-         agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
-      #{<<"type">> := <<"hash">>} ->
-         Path = <<"/_api/index?collection=", CollName/binary>>,
-         BodyStr = eVPack:encodeBin(MapData),
-         agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
-      _ ->
-         {error, param}
-   end.
+newIndexOfHash(PoolNameOrSocket, MapData, QueryPars) ->
+      BodyStr = eVPack:encodeBin(MapData),
+         agVstCli:callAgency(PoolNameOrSocket, ?AgPost,  <<"/_api/index">>, QueryPars, ?AgDefHeader, BodyStr).
+
 
 % 返回与给定示例匹配的集合的所有文档
 % PUT /_api/simple/by-example
@@ -204,19 +193,9 @@ newIndexOfHash(PoolNameOrSocket, CollName, MapData) ->
 %    201：如果索引尚不存在并且可以创建，则 返回HTTP 201。
 %    400：如果集合中已经包含文档，并且您尝试以存在违反唯一性的文档的方式创建唯一的跳过列表索引，则返回HTTP 400。
 %    404：如果集合名称未知，则返回HTTP 404。
-newIndexOfSkipList(PoolNameOrSocket, CollName, MapData) ->
-   case MapData of
-      #{type := <<"skiplist">>} ->
-         Path = <<"/_api/index?collection=", CollName/binary>>,
-         BodyStr = eVPack:encodeBin(MapData),
-         agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
-      #{<<"type">> := <<"skiplist">>} ->
-         Path = <<"/_api/index?collection=", CollName/binary>>,
+newIndexOfSkipList(PoolNameOrSocket, MapData, QueryPars) ->
          BodyStr = eVPack:encodeBin(MapData),
-         agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
-      _ ->
-         {error, param}
-   end.
+         agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>,QueryPars, ?AgDefHeader, BodyStr).
 
 % 使用持久索引
 % 如果存在合适的持久索引，则/_api/simple/range其他操作将使用该索引执行查询。
@@ -239,19 +218,9 @@ newIndexOfSkipList(PoolNameOrSocket, CollName, MapData) ->
 %     201：如果索引尚不存在并且可以创建，则 返回HTTP 201。
 %     400：如果集合中已经包含文档，并且您尝试以存在违反唯一性的文档的方式创建唯一的持久索引，那么将返回HTTP 400。
 %     404：如果集合名称未知，则返回HTTP 404。
-newIndexOfPersistent(PoolNameOrSocket, CollName, MapData) ->
-   case MapData of
-      #{type := <<"persistent">>} ->
-         Path = <<"/_api/index?collection=", CollName/binary>>,
-         BodyStr = eVPack:encodeBin(MapData),
-         agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
-      #{<<"type">> := <<"persistent">>} ->
-         Path = <<"/_api/index?collection=", CollName/binary>>,
-         BodyStr = eVPack:encodeBin(MapData),
-         agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
-      _ ->
-         {error, param}
-   end.
+newIndexOfPersistent(PoolNameOrSocket, MapData, QueryPars) ->
+   BodyStr = eVPack:encodeBin(MapData),
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>,QueryPars, ?AgDefHeader, BodyStr).
 
 % 使用TTL（生存时间）索引
 %
@@ -269,19 +238,9 @@ newIndexOfPersistent(PoolNameOrSocket, CollName, MapData) ->
 %     201：如果索引尚不存在并且可以创建，则 返回HTTP 201。
 %     400：如果集合已经包含另一个TTL索引，则返回HTTP 400，因为每个集合最多可以有一个TTL索引。
 %     404：如果集合名称未知，则返回HTTP 404。
-newIndexOfTtl(PoolNameOrSocket, CollName, MapData) ->
-   case MapData of
-      #{type := <<"ttl">>} ->
-         Path = <<"/_api/index?collection=", CollName/binary>>,
-         BodyStr = eVPack:encodeBin(MapData),
-         agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
-      #{<<"type">> := <<"ttl">>} ->
-         Path = <<"/_api/index?collection=", CollName/binary>>,
-         BodyStr = eVPack:encodeBin(MapData),
-         agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
-      _ ->
-         {error, param}
-   end.
+newIndexOfTtl(PoolNameOrSocket,  MapData, QueryPars) ->
+   BodyStr = eVPack:encodeBin(MapData),
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>,QueryPars, ?AgDefHeader, BodyStr).
 
 % 创建地理索引
 % POST /_api/index#geo
@@ -301,19 +260,9 @@ newIndexOfTtl(PoolNameOrSocket, CollName, MapData) ->
 %    200：如果索引已经存在，则返回HTTP 200。
 %    201：如果索引尚不存在并且可以创建，则 返回HTTP 201。
 %    404：如果集合名称未知，则返回HTTP 404。
-newIndexOfGeo(PoolNameOrSocket, CollName, MapData) ->
-   case MapData of
-      #{type := <<"geo">>} ->
-         Path = <<"/_api/index?collection=", CollName/binary>>,
-         BodyStr = eVPack:encodeBin(MapData),
-         agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
-      #{<<"type">> := <<"geo">>} ->
-         Path = <<"/_api/index?collection=", CollName/binary>>,
-         BodyStr = eVPack:encodeBin(MapData),
-         agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
-      _ ->
-         {error, param}
-   end.
+newIndexOfGeo(PoolNameOrSocket,  MapData, QueryPars) ->
+   BodyStr = eVPack:encodeBin(MapData),
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>,QueryPars, ?AgDefHeader, BodyStr).
 
 %返回给定位置附近集合的所有文档
 %PUT /_api/simple/near
@@ -373,19 +322,9 @@ newIndexOfGeo(PoolNameOrSocket, CollName, MapData) ->
 %       200：如果索引已经存在，则返回HTTP 200。
 %       201：如果索引尚不存在并且可以创建，则 返回HTTP 201。
 %       404：如果集合名称未知，则返回HTTP 404。
-newIndexOfFulltext(PoolNameOrSocket, CollName, MapData) ->
-   case MapData of
-      #{type := <<"fulltext">>} ->
-         Path = <<"/_api/index?collection=", CollName/binary>>,
-         BodyStr = eVPack:encodeBin(MapData),
-         agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
-      #{<<"type">> := <<"fulltext">>} ->
-         Path = <<"/_api/index?collection=", CollName/binary>>,
-         BodyStr = eVPack:encodeBin(MapData),
-         agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
-      _ ->
-         {error, param}
-   end.
+newIndexOfFulltext(PoolNameOrSocket,  MapData, QueryPars) ->
+   BodyStr = eVPack:encodeBin(MapData),
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>,QueryPars, ?AgDefHeader, BodyStr).
 
 % 全文索引查询
 % 通过全文查询返回集合的文档

src/agApi/agMiscFuns.erl

@@ -56,7 +56,7 @@ srvVersion(PoolNameOrSocket) ->
    agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/version">>).
 
 srvVersion(PoolNameOrSocket, QueryPars) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/version">>, QueryPars, ?AgDefHeader, ?AgDefBody).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/version">>, QueryPars).
 
 % 返回运行服务器的引擎类型
 % GET /_api/engine
@@ -64,7 +64,7 @@ srvVersion(PoolNameOrSocket, QueryPars) ->
 % 在所有情况下均返回HTTP 200。
 % 名称：将是mmfiles或rocksdb
 srvEngine(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/engine">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/engine">>).
 
 % 将WAL同步到磁盘。
 % PUT /_admin/wal/flush
@@ -76,12 +76,10 @@ srvEngine(PoolNameOrSocket) ->
 %    200：操作成功返回。
 %    405：使用无效的HTTP方法时返回。
 flushWal(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/wal/flush">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/wal/flush">>).
 
 flushWal(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_admin/wal/flush", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/wal/flush">>, QueryPars).
 
 % 获取当前配置。
 % GET /_admin/wal/properties
@@ -97,7 +95,7 @@ flushWal(PoolNameOrSocket, QueryPars) ->
 %    200：操作成功返回。
 %    405：使用无效的HTTP方法时返回。
 getWalProps(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/wal/properties">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/wal/properties">>).
 
 % 配置Wal的参数
 % PUT /_admin/wal/properties
@@ -114,7 +112,7 @@ getWalProps(PoolNameOrSocket) ->
 %    405：使用无效的HTTP方法时返回。
 setWalProps(PoolNameOrSocket, MapData) ->
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/wal/properties">>, BodyStr, undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/wal/properties">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 返回有关当前正在运行的事务的信息
 % GET /_admin/wal/transactions
@@ -126,7 +124,7 @@ setWalProps(PoolNameOrSocket, MapData) ->
 %    200：操作成功返回。
 %    405：使用无效的HTTP方法时返回。
 getTransactions(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/wal/transactions">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/wal/transactions">>).
 
 % 获取系统的当前时间
 % GET /_admin/time
@@ -136,7 +134,7 @@ getTransactions(PoolNameOrSocket) ->
 %    code：HTTP状态码
 %    time：当前系统时间（以Unix时间戳记为单位，服务器以微秒为单位）
 curDbTime(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/time">>, #{}, #{}, <<>>).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/time">>).
 
 % 返回当前请求永久链接固定链接
 % 发回所发送的内容，标题，帖子正文等。
@@ -178,7 +176,7 @@ echo(PoolNameOrSocket, MapData) ->
 % 返回码
 % 200：在所有情况下均返回。
 targetVersion(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/database/target-version">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/database/target-version">>).
 
 % 启动关机序列
 % DELETE /_admin/shutdown
@@ -186,7 +184,7 @@ targetVersion(PoolNameOrSocket) ->
 % 返回码
 % 200：在所有情况下OK都将返回，成功时将在结果缓冲区中返回。
 shutDown(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, <<"/_admin/shutdown">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, <<"/_admin/shutdown">>).
 
 
 % 在服务器上执行脚本。
@@ -201,7 +199,7 @@ shutDown(PoolNameOrSocket) ->
 % 403：如果ArangoDB不在集群模式下运行，则返回。
 % 404：如果未为群集操作编译ArangoDB，则返回404。
 execute(PoolNameOrSocket, BodyStr) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/execute">>, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/execute">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 返回服务器的状态信息。
 % GET /_admin/status
@@ -235,5 +233,5 @@ execute(PoolNameOrSocket, BodyStr) ->
 % 返回码
 %    200：状态信息返回成功
 dbStatus(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/status">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/status">>).
 

src/agApi/agRepairJobs.erl

@@ -30,7 +30,7 @@
 %% 检查修复
 %% GET /_admin/repairs/distributeShardsLike
 checkRepair(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/repairs/distributeShardsLike">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/repairs/distributeShardsLike">>).
 
 % 如果要修复某些内容，则响应将具有该属性 collections，<db>/<collection>其中包含每个必须修复的集合的条目。每个集合还作为单独的error属性，true如果该集合（以及false 其他情况）发生错误，则将作为错误。如果error为true，则还将设置属性errorNum和 errorMessage，并且在某些情况下还将errorDetails 提供有关如何处理特定错误的附加信息。
 % 用修复POST /_admin/repairs/distributeShardsLike
@@ -72,4 +72,4 @@ checkRepair(PoolNameOrSocket) ->
 %% 修复
 %% POST /_admin/repairs/distributeShardsLike
 doRepair(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/repairs/distributeShardsLike">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/repairs/distributeShardsLike">>).

src/agApi/agReplication.erl

@@ -52,9 +52,7 @@
 %     405：使用无效的HTTP方法时返回。
 %     500：如果组装响应时发生错误，则返回500。
 getRepInventory(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/replication/inventory", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/inventory">>, QueryPars).
 
 % 创建新的转储批次
 % 处理转储批处理命令
@@ -73,7 +71,7 @@ getRepInventory(PoolNameOrSocket, QueryPars) ->
 %    405：使用无效的HTTP方法时返回。
 newRepBatch(PoolNameOrSocket, MapData) ->
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/replication/batch">>, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/replication/batch">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 删除现有的转储批次固定链接
 % 处理转储批处理命令
@@ -89,7 +87,7 @@ newRepBatch(PoolNameOrSocket, MapData) ->
 %    405：使用无效的HTTP方法时返回。
 delRepBatch(PoolNameOrSocket, BatchId) ->
    Path = <<"/_api/replication/batch/", (agMiscUtils:toBinary(BatchId))/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path).
 
 % 延长现有的转储批次固定链接
 % 处理转储批处理命令
@@ -112,7 +110,7 @@ delRepBatch(PoolNameOrSocket, BatchId) ->
 prolongRepBatch(PoolNameOrSocket, BatchId, MapData) ->
    Path = <<"/_api/replication/batch/", (agMiscUtils:toBinary(BatchId))/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 返回集合的数据
 % 返回一个集合的全部内容
@@ -142,9 +140,7 @@ prolongRepBatch(PoolNameOrSocket, BatchId, MapData) ->
 %    405：使用无效的HTTP方法时返回。
 %    500：如果组装响应时发生错误，则返回500。
 getRepDump(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/replication/dump", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/dump">>, QueryPars).
 
 % 返回Merkle树以进行收集
 % 检索与集合关联的Merkle树
@@ -180,9 +176,7 @@ getRepDump(PoolNameOrSocket, QueryPars) ->
 % 500：如果组装响应时发生错误，则返回500。
 % 501：如果使用mmfiles调用或在不支持按版本同步的集合上返回，则返回
 getRepTree(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/replication/revisions/tree", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/revisions/tree">>, QueryPars).
 
 % 为集合永久链接重建Merkle树
 % 重建与集合关联的Merkle树
@@ -200,9 +194,7 @@ getRepTree(PoolNameOrSocket, QueryPars) ->
 %    500：如果组装响应时发生错误，则返回500。
 %    501：如果使用mmfiles调用或在不支持按版本同步的集合上返回，则返回
 resetRepTree(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/replication/revisions/tree", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/replication/revisions/tree">>, QueryPars).
 
 % 返回要求范围内的修订版ID 永久链接
 % 检索请求范围内的文档的修订ID
@@ -213,9 +205,7 @@ resetRepTree(PoolNameOrSocket, QueryPars) ->
 %    batchId（必填）：要使用的快照的ID
 %    resume（可选）：如果先前的请求被截断，则恢复的修订版本
 getRepRanges(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/replication/revisions/ranges", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/revisions/ranges">>, QueryPars).
 
 % 通过修订返回文档
 % 通过修订检索文档
@@ -244,9 +234,7 @@ getRepRanges(PoolNameOrSocket, QueryPars) ->
 %    500：如果组装响应时发生错误，则返回500。
 %    501：如果使用mmfiles调用或在不支持按版本同步的集合上返回，则返回
 getRepDoc(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/replication/revisions/documents", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/revisions/documents">>, QueryPars).
 
 % 从远程端点同步数据永久
 % 开始复制
@@ -278,7 +266,7 @@ getRepDoc(PoolNameOrSocket, QueryPars) ->
 %    501：在集群中的协调器上调用此操作时返回。
 startRepSync(PoolNameOrSocket, MapData) ->
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/sync">>, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/sync">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 返回集合和索引的集群清单
 % 重建集群中的集合和索引的概述
@@ -292,9 +280,7 @@ startRepSync(PoolNameOrSocket, MapData) ->
 %     405：使用无效的HTTP方法时返回。
 %     500：如果组装响应时发生错误，则返回500。
 getRepClusterInv(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/replication/clusterInventory", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/clusterInventory">>, QueryPars).
 
 % 复制记录器命令
 % 早期版本的ArangoDB允许启动，停止和配置复制记录器。这些命令在ArangoDB 2.2中是多余的，因为所有数据修改操作均写入服务器的预写日志，并且不再由单独的记录器处理。
@@ -323,7 +309,7 @@ getRepClusterInv(PoolNameOrSocket, QueryPars) ->
 %     405：使用无效的HTTP方法时返回。
 %     500：如果无法确定记录器状态，则返回。
 getRepLoggerState(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/logger-state">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/logger-state">>).
 
 
 % 返回日志条目永久链接固定链接
@@ -378,7 +364,7 @@ getRepLoggerState(PoolNameOrSocket) ->
 %     500：如果组装响应时发生错误，则返回500。
 %     501：在集群中的协调器上调用此操作时返回。
 getRepLoggerFirstTick(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/logger-first-tick">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/logger-first-tick">>).
 
 % 返回日志文件中可用的刻度值范围
 % GET /_api/replication/logger-tick-ranges
@@ -394,7 +380,7 @@ getRepLoggerFirstTick(PoolNameOrSocket) ->
 %     500：如果无法确定记录器状态，则返回。
 %     501：在集群中的协调器上调用此操作时返回。
 getRepLoggerTickRanges(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/logger-tick-ranges">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/logger-tick-ranges">>).
 
 % 复制应用程序命令
 % applier命令允许远程启动，停止和查询ArangoDB数据库复制应用程序的状态和配置。
@@ -433,11 +419,10 @@ getRepLoggerTickRanges(PoolNameOrSocket) ->
 % 405：使用无效的HTTP方法时返回。
 % 500：如果组装响应时发生错误，则返回500。
 getRepApplierConfig(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/applier-config">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/applier-config">>).
 
 getRepApplierConfig(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/applier-config", QueryBinary/binary>>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/applier-config">>, QueryPars).
 
 % 设置申请者的配置值
 % PUT /_api/replication/applier-config
@@ -475,12 +460,11 @@ getRepApplierConfig(PoolNameOrSocket, QueryPars) ->
 % 500：如果组装响应时发生错误，则返回500。
 setRepApplierConfig(PoolNameOrSocket, MapData) ->
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-config">>, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-config">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 setRepApplierConfig(PoolNameOrSocket, MapData, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-config", QueryBinary/binary>>, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-config">>, QueryPars, ?AgDefHeader, BodyStr).
 
 % 启动复制应用程序
 % PUT /_api/replication/applier-start
@@ -496,12 +480,10 @@ setRepApplierConfig(PoolNameOrSocket, MapData, QueryPars) ->
 % 405：使用无效的HTTP方法时返回。
 % 500：如果组装响应时发生错误，则返回500。
 startRepApplier(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-start">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-start">>).
 
 startRepApplier(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/replication/applier-start", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-start">>, QueryPars).
 
 % 停止复制
 % PUT /_api/replication/applier-stop
@@ -513,11 +495,10 @@ startRepApplier(PoolNameOrSocket, QueryPars) ->
 % 405：使用无效的HTTP方法时返回。
 % 500：如果组装响应时发生错误，则返回500。
 stopRepApplier(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-stop">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-stop">>).
 
 stopRepApplier(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-stop", QueryBinary/binary>>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-stop">>, QueryPars).
 
 % 输出复制的当前状态
 % GET /_api/replication/applier-state
@@ -559,11 +540,10 @@ stopRepApplier(PoolNameOrSocket, QueryPars) ->
 % 405：使用无效的HTTP方法时返回。
 % 500：如果组装响应时发生错误，则返回500。
 getRepApplierState(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/applier-state">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/applier-state">>).
 
 getRepApplierState(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/applier-state", QueryBinary/binary>>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/applier-state">>, QueryPars).
 
 % 将角色更改为奴隶
 % PUT /_api/replication/make-slave
@@ -632,7 +612,7 @@ getRepApplierState(PoolNameOrSocket, QueryPars) ->
 % 501：在集群中的协调器上调用此操作时返回。
 changeRepMakeSlave(PoolNameOrSocket, MapData) ->
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/make-slave">>, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/make-slave">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 %其他复制命令
 %返回服务器ID
@@ -645,7 +625,7 @@ changeRepMakeSlave(PoolNameOrSocket, MapData) ->
 %405：使用无效的HTTP方法时返回。
 %500：如果组装响应时发生错误，则返回500。
 getRepServerId(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/server-id">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/replication/server-id">>).
 
 % WAL 固定链接操作中可用的返回刻度范围
 % 返回预写日志中可用的刻度线范围
@@ -662,7 +642,7 @@ getRepServerId(PoolNameOrSocket) ->
 % 500：如果无法确定服务器操作状态，则返回。
 % 501：在集群中的协调器上调用此操作时返回。
 getWalRange(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/wal/range">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/wal/range">>).
 
 % 返回最后一个可用的刻度值固定链接
 % 返回最后一个可用的刻度值
@@ -679,7 +659,7 @@ getWalRange(PoolNameOrSocket) ->
 % 500：如果组装响应时发生错误，则返回500。
 % 501：在集群中的协调器上调用此操作时返回。
 getWalLastTick(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/wal/lastTick">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/wal/lastTick">>).
 
 % 获取最近的操作
 % GET /_api/wal/tail
@@ -725,10 +705,8 @@ getWalLastTick(PoolNameOrSocket) ->
 % 500：如果组装响应时发生错误，则返回500。
 % 501：在集群中的协调器上调用此操作时返回。
 getWalTail(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/wal/tail">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/wal/tail">>).
 
 getWalTail(PoolNameOrSocket, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/wal/tail", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/wal/tail">>, QueryPars).
 

src/agApi/agTasks.erl

@@ -17,7 +17,7 @@
 % HTTP 200任务列表
 % **：所有任务的列表
 getTaskList(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/tasks/">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/tasks/">>).
 
 % 检索一个当前活动的服务器任务
 % GET /_api/tasks/{id}
@@ -28,7 +28,7 @@ getTaskList(PoolNameOrSocket) ->
 % **：相关功能
 getTask(PoolNameOrSocket, TaskId) ->
    Path = <<"/_api/tasks/", (agMiscUtils:toBinary(TaskId))/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path).
 
 % 创建一个新任务
 % POST /_api/tasks
@@ -55,7 +55,7 @@ getTask(PoolNameOrSocket, TaskId) ->
 %    400：如果帖子正文不正确，则返回HTTP 400。
 newTask(PoolNameOrSocket, MapData) ->
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/tasks">>, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/tasks">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 注册具有预定义ID的新任务；与负载均衡器不兼容
 % PUT /_api/tasks/{id}
@@ -73,7 +73,7 @@ newTask(PoolNameOrSocket, MapData) ->
 newTask(PoolNameOrSocket, TaskId, MapData) ->
    Path = <<"/_api/tasks/", (agMiscUtils:toBinary(TaskId))/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 删除一个当前活动的服务器任务
 % DELETE /_api/tasks/{id}
@@ -89,4 +89,4 @@ newTask(PoolNameOrSocket, TaskId, MapData) ->
 %    errorMessage：一条纯文本消息，指出出了什么问题。
 delTask(PoolNameOrSocket, TaskId) ->
    Path = <<"/_api/tasks/", (agMiscUtils:toBinary(TaskId))/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path).

src/agApi/agTransactions.erl

@@ -80,7 +80,7 @@
 %    404：如果事务规范包含未知集合，则服务器将使用HTTP 404进行响应。
 beginTransaction(PoolNameOrSocket, MapData) ->
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/transaction/begin">>, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/transaction/begin">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 提取服务器端事务的状态
 % GET /_api/transaction/{transaction-id}
@@ -95,7 +95,7 @@ beginTransaction(PoolNameOrSocket, MapData) ->
 %    404：如果找不到具有指定标识符的交易，则服务器将使用HTTP 404进行响应。
 getTransactionStatus(PoolNameOrSocket, TransactionId) ->
    Path = <<"/_api/transaction/", (agMiscUtils:toBinary(TransactionId))/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path).
 
 % 提交或中止正在运行的事务必须由客户端完成。在完成使用事务后，不要提交或中止事务是一个坏习惯。这将迫使服务器保留资源和收集锁，直到整个事务超时为止。
 % 提交交易
@@ -123,7 +123,7 @@ getTransactionStatus(PoolNameOrSocket, TransactionId) ->
 %    409：如果事务已经中止，则服务器将使用HTTP 409进行响应。
 commitTransaction(PoolNameOrSocket, TransactionId) ->
    Path = <<"/_api/transaction/", (agMiscUtils:toBinary(TransactionId))/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path).
 
 % 中止服务器端事务
 % DELETE /_api/transaction/{transaction-id}
@@ -149,7 +149,7 @@ commitTransaction(PoolNameOrSocket, TransactionId) ->
 %    409：如果事务已经提交，则服务器将以HTTP 409响应。
 abortTransaction(PoolNameOrSocket, TransactionId) ->
    Path = <<"/_api/transaction/", (agMiscUtils:toBinary(TransactionId))/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path).
 
 % 返回当前运行的服务器端事务
 % GET /_api/transaction
@@ -160,7 +160,7 @@ abortTransaction(PoolNameOrSocket, TransactionId) ->
 % 返回码
 %    200：如果可以成功检索事务列表，则将返回HTTP 200。
 getTransactionList(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/transaction">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/transaction">>).
 
 % JavaScript交易的HTTP接口
 % ArangoDB的JS事务在服务器上执行。客户端可以通过将事务描述发送给服务器来启动事务。
@@ -198,7 +198,7 @@ getTransactionList(PoolNameOrSocket) ->
 %    500：用户抛出的异常将使服务器以HTTP 500的返回码进行响应
 executeTransaction(PoolNameOrSocket, MapData) ->
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/transaction">>, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/transaction">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 
 

src/agApi/agUserMgr.erl

@@ -29,7 +29,7 @@
 %    409：如果已经存在同名用户，则返回。
 newUser(PoolNameOrSocket, MapData) ->
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/user">>, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/user">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 设置数据库访问级别。
 % PUT /_api/user/{user}/database/{dbname}
@@ -49,7 +49,7 @@ newUser(PoolNameOrSocket, MapData) ->
 setUserDbAccessLevel(PoolNameOrSocket, UserName, DbName, MapData) ->
    Path = <<"/_api/user/", UserName/binary, "/database/", DbName/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 设置收集访问级别。
 % PUT /_api/user/{user}/database/{dbname}/{collection}
@@ -71,7 +71,7 @@ setUserDbAccessLevel(PoolNameOrSocket, UserName, DbName, MapData) ->
 setUserCollAccessLevel(PoolNameOrSocket, UserName, DbName, CollName, MapData) ->
    Path = <<"/_api/user/", UserName/binary, "/database/", DbName/binary, "/", CollName/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 清除数据库访问级别，恢复为默认访问级别
 % DELETE /_api/user/{user}/database/{dbname}
@@ -86,7 +86,7 @@ setUserCollAccessLevel(PoolNameOrSocket, UserName, DbName, CollName, MapData) ->
 %    400：如果JSON格式不正确或请求中缺少必需数据。。
 clearUserDbAccessLevel(PoolNameOrSocket, UserName, DbName) ->
    Path = <<"/_api/user/", UserName/binary, "/database/", DbName/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path).
 
 % 清除集合访问级别，恢复为默认访问级别
 % DELETE /_api/user/{user}/database/{dbname}/{collection}
@@ -101,7 +101,7 @@ clearUserDbAccessLevel(PoolNameOrSocket, UserName, DbName) ->
 %    400：如果有错误
 clearUserCollAccessLevel(PoolNameOrSocket, UserName, DbName, CollName) ->
    Path = <<"/_api/user/", UserName/binary, "/database/", DbName/binary, "/", CollName/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path).
 
 % 列出用户的可访问数据库
 % GET /_api/user/{user}/database/
@@ -119,12 +119,11 @@ clearUserCollAccessLevel(PoolNameOrSocket, UserName, DbName, CollName) ->
 %    403：如果您没有访问服务器访问级别，则返回。
 getUserDbList(PoolNameOrSocket, UserName) ->
    Path = <<"/_api/user/", UserName/binary, "/database/">>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path).
 
 getUserDbList(PoolNameOrSocket, UserName, QueryPars) ->
-   QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
-   Path = <<"/_api/user/", UserName/binary, "/database/", QueryBinary/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   Path = <<"/_api/user/", UserName/binary, "/database/">>,
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, QueryPars).
 
 % 获取特定的数据库访问级别
 % GET /_api/user/{user}/database/{dbname}
@@ -139,7 +138,7 @@ getUserDbList(PoolNameOrSocket, UserName, QueryPars) ->
 %    403：如果您没有访问服务器访问级别，则返回。
 getUserDbAccessLevel(PoolNameOrSocket, UserName, DbName) ->
    Path = <<"/_api/user/", UserName/binary, "/database/", DbName/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path).
 
 % 获取特定集合访问级别
 % GET /_api/user/{user}/database/{dbname}/{collection}
@@ -155,7 +154,7 @@ getUserDbAccessLevel(PoolNameOrSocket, UserName, DbName) ->
 %    403：如果您没有访问服务器访问级别，则返回。
 getUserCollAccessLevel(PoolNameOrSocket, UserName, DbName, CollName) ->
    Path = <<"/_api/user/", UserName/binary, "/database/", DbName/binary, "/", CollName/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path).
 
 % 替换现有用户属性。
 % PUT /_api/user/{user}
@@ -175,7 +174,7 @@ getUserCollAccessLevel(PoolNameOrSocket, UserName, DbName, CollName) ->
 replaceUser(PoolNameOrSocket, UserName, MapData) ->
    Path = <<"/_api/user/", UserName/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 修改现有用户的属性
 % PATCH /_api/user/{user}
@@ -195,7 +194,7 @@ replaceUser(PoolNameOrSocket, UserName, MapData) ->
 updateUser(PoolNameOrSocket, UserName, MapData) ->
    Path = <<"/_api/user/", UserName/binary>>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 永久删除用户。
 % DELETE /_api/user/{user}
@@ -209,7 +208,7 @@ updateUser(PoolNameOrSocket, UserName, MapData) ->
 %   404：指定的用户不存在
 delUser(PoolNameOrSocket, UserName) ->
    Path = <<"/_api/user/", UserName/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path).
 
 % 获取用户的属性。
 % GET /_api/user/{user}
@@ -223,7 +222,7 @@ delUser(PoolNameOrSocket, UserName) ->
 %    404：指定用户名不存在。
 getUser(PoolNameOrSocket, UserName) ->
    Path = <<"/_api/user/", UserName/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path).
 
 % 获取用户的属性。
 % GET /_api/user/
@@ -237,4 +236,4 @@ getUser(PoolNameOrSocket, UserName) ->
 %    401：如果您没有对_system 数据库的访问数据库访问级别，则返回。
 %    403：如果您没有访问服务器访问级别，则返回。
 getUserList(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/user/">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/user/">>).

src/agApi/agViews.erl

@@ -65,7 +65,7 @@
 %    409：如果已经存在一个名为name的视图，则返回HTTP 409错误。
 newView(PoolNameOrSocket, MapData) ->
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/view">>, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/view">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 返回一个视图
 % GET /_api/view/{view-name}
@@ -79,7 +79,7 @@ newView(PoolNameOrSocket, MapData) ->
 %    404：如果视图名称未知，则返回HTTP 404。
 getViewInfo(PoolNameOrSocket, ViewName) ->
    Path = <<"/_api/view/", ViewName/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path).
 
 % 返回所有视图
 % GET /_api/view
@@ -90,7 +90,7 @@ getViewInfo(PoolNameOrSocket, ViewName) ->
 % 返回码
 % 200：视图列表
 getViewList(PoolNameOrSocket) ->
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/view">>, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/view">>).
 
 % 读取指定视图的属性
 % GET /_api/view/{view-name}/properties
@@ -103,7 +103,7 @@ getViewList(PoolNameOrSocket) ->
 % 404：如果视图名称未知，则返回HTTP 404。
 getViewProps(PoolNameOrSocket, ViewName) ->
    Path = <<"/_api/view/", ViewName/binary, "/properties">>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path).
 
 % 更改ArangoSearch视图的所有属性
 % PUT /_api/view/{view-name}/properties#ArangoSearch
@@ -141,7 +141,7 @@ getViewProps(PoolNameOrSocket, ViewName) ->
 changeViewAllProps(PoolNameOrSocket, ViewName, MapData) ->
    Path = <<"/_api/view/", ViewName/binary, "/properties">>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 部分更改ArangoSearch视图的属性
 % PATCH /_api/view/{view-name}/properties#ArangoSearch
@@ -179,7 +179,7 @@ changeViewAllProps(PoolNameOrSocket, ViewName, MapData) ->
 changeViewPartProps(PoolNameOrSocket, ViewName, MapData) ->
    Path = <<"/_api/view/", ViewName/binary, "/properties">>,
    BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, BodyStr).
 
 % 重命名视图
 % PUT /_api/view/{view-name}/rename
@@ -213,4 +213,4 @@ renameView(PoolNameOrSocket, ViewName, NewViewName) ->
 % 404：如果视图名称未知，则返回HTTP 404。
 delView(PoolNameOrSocket, ViewName) ->
    Path = <<"/_api/view/", ViewName/binary>>,
-   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path).

src/agVstCli/agVstCli.erl

@@ -8,6 +8,7 @@
 -export([
    %% Common Request API
    callAgency/3
+   , callAgency/4
    , callAgency/6
    , callAgency/7
    , callAgency/8
@@ -39,6 +40,10 @@
 callAgency(PoolNameOrSocket, Method, Path) ->
    callAgency(PoolNameOrSocket, Method, Path, #{}, #{}, <<>>, false, ?AgDefTimeout).
 
+-spec callAgency(poolNameOrSocket(), method(), path(), queryPars()) -> term() | {error, term()}.
+callAgency(PoolNameOrSocket, Method, Path, QueryPars) ->
+   callAgency(PoolNameOrSocket, Method, Path, QueryPars, #{}, <<>>, false, ?AgDefTimeout).
+
 -spec callAgency(poolNameOrSocket(), method(), path(), queryPars(), headers(), body()) -> term() | {error, term()}.
 callAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body) ->
    callAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body, false, ?AgDefTimeout).

src/user_default.erl

@@ -156,7 +156,7 @@ jd1(0, Fun, Bin) ->
    ?MODULE:Fun(Bin);
 jd1(N, Fun, Bin) ->
    ?MODULE:Fun(Bin),
-   jd1(N - 1, Fun).
+   jd1(N - 1, Fun, Bin).
 
 decodeJy1(Bin) ->
    jiffy:decode(Bin, [return_maps]).