From 0efbc517b5ef58dc5b5aa3bf284e560c2a983517 Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Tue, 8 Dec 2020 13:12:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/agApi/agBulkImportExport.erl | 2 + src/agApi/agCluster.erl | 11 ++-- src/agApi/agCollections.erl | 87 ++++++++++++-------------------- src/agApi/agDbMgr.erl | 10 ++-- src/agApi/agDocuments.erl | 39 +++++++------- 5 files changed, 62 insertions(+), 87 deletions(-) diff --git a/src/agApi/agBulkImportExport.erl b/src/agApi/agBulkImportExport.erl index eb8a061..d0eb61d 100644 --- a/src/agApi/agBulkImportExport.erl +++ b/src/agApi/agBulkImportExport.erl @@ -5,6 +5,8 @@ -compile({inline_size, 128}). -compile([export_all, nowarn_export_all]). +%% IMY-todo 这个文档需要修改 需要引入json + % doc_address:https://www.arangodb.com/docs/stable/http/bulk-imports.html % 批量导入的HTTP接口 diff --git a/src/agApi/agCluster.erl b/src/agApi/agCluster.erl index 7add39a..52990a1 100644 --- a/src/agApi/agCluster.erl +++ b/src/agApi/agCluster.erl @@ -25,7 +25,7 @@ % 200：当服务器以群集模式运行时返回。 % 500：当服务器未在群集模式下运行时返回。 serverId(PoolNameOrSocket) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/server/id">>, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/server/id">>). % 返回集群中服务器的角色 % GET /_admin/server/role @@ -42,7 +42,7 @@ serverId(PoolNameOrSocket) -> % errorNum：服务器错误号 % role：之一[ SINGLE，COORDINATOR，PRIMARY，SECONDARY，AGENT，UNDEFINED ] serverRole(PoolNameOrSocket) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/server/role">>, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/server/role">>). % 数据库服务器的查询统计信息 % 允许查询集群中DB-Server的统计信息 @@ -54,8 +54,7 @@ serverRole(PoolNameOrSocket) -> % 400：数据库服务器的ID % 403： clusterStats(PoolNameOrSocket, QueryPars) -> - QueryBinary = agMiscUtils:spellQueryPars(QueryPars), - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/clusterStatistics", QueryBinary/binary>>, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/clusterStatistics">>, QueryPars, ?AgDefHeader, ?AgDefBody). % 返回监督（机构）评估的集群的运行状况 % GET /_admin/cluster/health @@ -85,7 +84,7 @@ clusterStats(PoolNameOrSocket, QueryPars) -> % 返回码 % 200： clusterHealth(PoolNameOrSocket) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/cluster/health">>, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/cluster/health">>). % 启用或禁用集群监督（代理）维护模式 % PUT /_admin/cluster/maintenance @@ -97,7 +96,7 @@ clusterHealth(PoolNameOrSocket) -> % 501： % 504： setClusterMaintenance(PoolNameOrSocket, OnOrOff) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/cluster/maintenance">>, [], OnOrOff). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/cluster/maintenance">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(OnOrOff)). %%%%%%%%%%%%%%% Agency ?????????????????????????? diff --git a/src/agApi/agCollections.erl b/src/agApi/agCollections.erl index d6054d6..7476825 100644 --- a/src/agApi/agCollections.erl +++ b/src/agApi/agCollections.erl @@ -93,13 +93,11 @@ newColl(PoolNameOrSocket, MapData) -> BodyStr = eVPack:encodeBin(MapData), - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/collection">>, [], BodyStr). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/collection">>, ?AgDefQuery, ?AgDefHeader, BodyStr). newColl(PoolNameOrSocket, MapData, QueryPars) -> - QueryBinary = agMiscUtils:spellQueryPars(QueryPars), - Path = <<"/_api/collection", QueryBinary/binary>>, BodyStr = eVPack:encodeBin(MapData), - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/collection">>, QueryPars, ?AgDefHeader, BodyStr). % 删除收藏 % DELETE /_api/collection/{collection-name} @@ -117,17 +115,11 @@ newColl(PoolNameOrSocket, MapData, QueryPars) -> % 404：如果集合名称未知，则返回HTTP 404。 delColl(PoolNameOrSocket, CollName) -> Path = <<"/_api/collection/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path). -delColl(PoolNameOrSocket, CollName, IsSystem) -> - case IsSystem of - true -> - Path = <<"/_api/collection/", CollName/binary, "?isSystem=true">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined); - _ -> - Path = <<"/_api/collection/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined) - end. +delColl(PoolNameOrSocket, CollName, QueryPars) -> + Path = <<"/_api/collection/", CollName/binary>>, + agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars, ?AgDefHeader, ?AgDefBody). % 清除集合 % PUT /_api/collection/{collection-name}/truncate @@ -140,7 +132,7 @@ delColl(PoolNameOrSocket, CollName, IsSystem) -> % 404：如果集合名称未知，则 返回HTTP 404。 clearColl(PoolNameOrSocket, CollName) -> Path = <<"/_api/collection/", CollName/binary, "/truncate">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path). % 返回有关集合的信息 % GET /_api/collection/{collection-name} @@ -166,7 +158,7 @@ clearColl(PoolNameOrSocket, CollName) -> % 404：如果集合名称未知，则返回HTTP 404。 collInfo(PoolNameOrSocket, CollName) -> Path = <<"/_api/collection/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path). % 读取指定集合的属性 @@ -179,7 +171,7 @@ collInfo(PoolNameOrSocket, CollName) -> % HTTP 200 collProps(PoolNameOrSocket, CollName) -> Path = <<"/_api/collection/", (CollName)/binary, "/properties">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path). % 计算集合中的文档数量 % GET /_api/collection/{collection-name}/count @@ -193,7 +185,7 @@ collProps(PoolNameOrSocket, CollName) -> % 404：如果集合名称未知，则 返回HTTP 404。 collCount(PoolNameOrSocket, CollName) -> Path = <<"/_api/collection/", CollName/binary, "/count">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path). % 获取集合的统计信息 % GET /_api/collection/{collection-name}/figures @@ -211,7 +203,7 @@ collCount(PoolNameOrSocket, CollName) -> % 404：如果集合名称未知，则 返回HTTP 404。 collFigures(PoolNameOrSocket, CollName) -> Path = <<"/_api/collection/", CollName/binary, "/figures">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path). % 返回负责文档的分片 % PUT /_api/collection/{collection-name}/responsibleShard @@ -232,7 +224,7 @@ collFigures(PoolNameOrSocket, CollName) -> collResponsibleShard(PoolNameOrSocket, CollName, MapData) -> Path = <<"/_api/collection/", CollName/binary, "/responsibleShard">>, BodyStr = eVPack:encodeBin(MapData), - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], BodyStr). + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, ?AgDefQuery, ?AgDefHeader, BodyStr). % 返回集合的分片ID % GET /_api/collection/{collection-name}/shards @@ -250,17 +242,11 @@ collResponsibleShard(PoolNameOrSocket, CollName, MapData) -> % 501：如果在单个服务器上调用该方法，则返回HTTP 501。 collShards(PoolNameOrSocket, CollName) -> Path = <<"/_api/collection/", CollName/binary, "/shards">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path). -collShards(PoolNameOrSocket, CollName, IsDetails) -> - case IsDetails of - true -> - Path = <<"/_api/collection/", CollName/binary, "/shards?details=true">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined); - _ -> - Path = <<"/_api/collection/", CollName/binary, "/shards">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined) - end. +collShards(PoolNameOrSocket, CollName, QueryPars) -> + Path = <<"/_api/collection/", CollName/binary, "/shards">>, + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, QueryPars, ?AgDefHeader, ?AgDefBody). % 返回集合修订版ID % GET /_api/collection/{collection-name}/revision @@ -274,7 +260,7 @@ collShards(PoolNameOrSocket, CollName, IsDetails) -> % 404：如果集合名称未知，则 返回HTTP 404。 collRev(PoolNameOrSocket, CollName) -> Path = <<"/_api/collection/", CollName/binary, "/revision">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path). % 返回指定集合的校验和 % GET /_api/collection/{collection-name}/checksum @@ -298,12 +284,11 @@ collRev(PoolNameOrSocket, CollName) -> % 404：如果集合名称未知，则 返回HTTP 404。 collChecksum(PoolNameOrSocket, CollName) -> Path = <<"/_api/collection/", CollName/binary, "/checksum">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path). collChecksum(PoolNameOrSocket, CollName, QueryPars) -> - QueryBinary = agMiscUtils:spellQueryPars(QueryPars), - Path = <<"/_api/collection/", CollName/binary, "/checksum", QueryBinary/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined). + Path = <<"/_api/collection/", CollName/binary, "/checksum">>, + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, QueryPars, ?AgDefHeader, ?AgDefBody). % 返回所有集合列表 % GET /_api/collection @@ -315,16 +300,10 @@ collChecksum(PoolNameOrSocket, CollName, QueryPars) -> % 返回码 % 200：收藏列表 collList(PoolNameOrSocket) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/collection">>, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/collection">>). -collList(PoolNameOrSocket, IsExcludeSystem) -> - case IsExcludeSystem of - false -> - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/collection">>, [], undefined); - _ -> - Path = <<"/_api/collection?excludeSystem=true">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined) - end. +collList(PoolNameOrSocket, QueryPars) -> + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/collection">>, QueryPars, ?AgDefHeader, ?AgDefBody). % 加载集合 % PUT /_api/collection/{collection-name}/load @@ -348,11 +327,11 @@ collList(PoolNameOrSocket, IsExcludeSystem) -> % 404：如果集合名称未知，则 返回HTTP 404。 loadColl(PoolNameOrSocket, CollName) -> Path = <<"/_api/collection/", CollName/binary, "/load">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path). loadColl(PoolNameOrSocket, CollName, MapData) -> BodyStr = eVPack:encodeBin(MapData), - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/collection/", CollName/binary, "/load">>, [], BodyStr). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/collection/", CollName/binary, "/load">>, ?AgDefQuery, ?AgDefHeader, BodyStr). % 卸载集合 % PUT /_api/collection/{collection-name}/unload @@ -371,7 +350,7 @@ loadColl(PoolNameOrSocket, CollName, MapData) -> % 404：如果集合名称未知，则返回HTTP 404。 unloadColl(PoolNameOrSocket, CollName) -> Path = <<"/_api/collection/", CollName/binary, "/unload">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path). % 将索引加载到内存中 % PUT /_api/collection/{collection-name}/loadIndexesIntoMemory @@ -387,7 +366,7 @@ unloadColl(PoolNameOrSocket, CollName) -> % 404：如果集合名称未知，则返回HTTP 404。 collLoadIndexesIntoMemory(PoolNameOrSocket, CollName) -> Path = <<"/_api/collection/", CollName/binary, "/loadIndexesIntoMemory">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path). % 更改集合的属性 % PUT /_api/collection/{collection-name}/properties @@ -422,7 +401,7 @@ collLoadIndexesIntoMemory(PoolNameOrSocket, CollName) -> collChangeProps(PoolNameOrSocket, CollName, MapData) -> Path = <<"/_api/collection/", CollName/binary, "/properties">>, BodyStr = eVPack:encodeBin(MapData), - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, BodyStr). % 重命名集合 % PUT /_api/collection/{collection-name}/rename @@ -444,10 +423,10 @@ collChangeProps(PoolNameOrSocket, CollName, MapData) -> % 返回码 % 400：如果缺少集合名称，则返回HTTP 400。 % 404：如果集合名称未知，则 返回HTTP 404。 -renameColl(PoolNameOrSocket, OldName, NewName) -> +renameColl(PoolNameOrSocket, OldName, MapData) -> Path = <<"/_api/collection/", OldName/binary, "/rename">>, - NameStr = eVPack:encodeBin(NewName), - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], <<"{\"name\":", NameStr/binary, "}">>). + BodyStr = eVPack:encodeBin(MapData), + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefQuery, BodyStr). % 旋转收藏夹的日记 % PUT /_api/collection/{collection-name}/rotate @@ -464,7 +443,7 @@ renameColl(PoolNameOrSocket, OldName, NewName) -> % 3.7中删掉了该方法 collRotate(PoolNameOrSocket, CollName) -> Path = <<"/_api/collection/", CollName/binary, "/rotate">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path). % 重新计算集合的文档数 % PUT /_api/collection/{collection-name}/recalculateCount @@ -479,4 +458,4 @@ collRotate(PoolNameOrSocket, CollName) -> % 404：如果集合名称未知，则返回HTTP 404。 collRecount(PoolNameOrSocket, CollName) -> Path = <<"/_api/collection/", CollName/binary, "/recalculateCount">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], undefined). \ No newline at end of file + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path). \ No newline at end of file diff --git a/src/agApi/agDbMgr.erl b/src/agApi/agDbMgr.erl index 664338e..e9d6563 100644 --- a/src/agApi/agDbMgr.erl +++ b/src/agApi/agDbMgr.erl @@ -34,7 +34,7 @@ % 400：如果请求无效，则返回。 % 404：如果找不到数据库，则返回。 curDbInfo(PoolNameOrSocket) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/database/current">>, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/database/current">>). % 检索当前用户可以访问的所有数据库的列表 % GET /_api/database/user @@ -43,7 +43,7 @@ curDbInfo(PoolNameOrSocket) -> % 200：如果数据库列表编译成功，则返回。 % 400：如果请求无效，则返回。 visitDbs(PoolNameOrSocket) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/database/user">>, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/database/user">>). % 检索所有现有数据库的列表 % GET /_api/database @@ -55,7 +55,7 @@ visitDbs(PoolNameOrSocket) -> % 400：如果请求无效，则返回。 % 403：如果请求未在_system数据库中执行，则返回。 allDbs(PoolNameOrSocket) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/database">>, [], undefined, true). + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/database">>, ?AgDefQuery, ?AgDefHeader, ?AgDefBody, true). % 创建一个新的数据库 % POST /_api/database @@ -80,7 +80,7 @@ allDbs(PoolNameOrSocket) -> % 409：如果具有指定名称的数据库已经存在，则返回。 newDb(PoolNameOrSocket, MapData) -> BodyStr = eVPack:encodeBin(MapData), - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/database">>, [], BodyStr, true). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/database">>, ?AgDefQuery, ?AgDefHeader, BodyStr, true). % 删除现有数据库 % DELETE /_api/database/{database-name} @@ -95,4 +95,4 @@ newDb(PoolNameOrSocket, MapData) -> % 404：如果找不到数据库，则返回。 delDb(PoolNameOrSocket, Name) -> Path = <<"/_api/database/", Name/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined, true). + agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, ?AgDefQuery, ?AgDefHeader, ?AgDefBody, true). diff --git a/src/agApi/agDocuments.erl b/src/agApi/agDocuments.erl index 58de825..a923d83 100644 --- a/src/agApi/agDocuments.erl +++ b/src/agApi/agDocuments.erl @@ -102,11 +102,11 @@ % 412：如果给出“ If-Match”标头并且找到的文档具有不同版本，则返回412。响应还将在_rev属性中包含找到的文档的当前修订。此外，将返回属性_id和_key。 getDoc(PoolNameOrSocket, CollName, Key) -> Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path). getDoc(PoolNameOrSocket, CollName, Key, Headers) -> Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, Headers, undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, ?AgDefQuery, Headers, ?AgDefBody). % 读取单个文档头 % HEAD /_api/document/{collection}/{key} @@ -124,11 +124,11 @@ getDoc(PoolNameOrSocket, CollName, Key, Headers) -> % 412：如果给出“ If-Match”标头并且找到的文档具有不同版本，则返回412。响应还将在Etag标头中包含找到的文档的当前版本。 getDocHead(PoolNameOrSocket, CollName, Key) -> Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgHead, Path, [], undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgHead, Path). getDocHead(PoolNameOrSocket, CollName, Key, Headers) -> Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgHead, Path, Headers, undefined). + agVstCli:callAgency(PoolNameOrSocket, ?AgHead, Path, ?AgDefQuery, Headers, ?AgDefBody). % 创建文档 % POST /_api/document/{collection} @@ -169,13 +169,12 @@ getDocHead(PoolNameOrSocket, CollName, Key, Headers) -> newDoc(PoolNameOrSocket, CollName, MapData) -> Path = <<"/_api/document/", CollName/binary>>, BodyStr = eVPack:encodeBin(MapData), - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, BodyStr). newDoc(PoolNameOrSocket, CollName, MapData, QueryPars) -> - QueryBinary = agMiscUtils:spellQueryPars(QueryPars), - Path = <<"/_api/document/", CollName/binary, QueryBinary/binary>>, + Path = <<"/_api/document/", CollName/binary>>, BodyStr = eVPack:encodeBin(MapData), - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, BodyStr). % 替换文档 % PUT /_api/document/{collection}/{key} @@ -213,19 +212,17 @@ newDoc(PoolNameOrSocket, CollName, MapData, QueryPars) -> replaceDoc(PoolNameOrSocket, CollName, Key, MapData) -> Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>, BodyStr = eVPack:encodeBin(MapData), - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, BodyStr). replaceDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars) -> - QueryBinary = agMiscUtils:spellQueryPars(QueryPars), - Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary, QueryBinary/binary>>, + Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>, BodyStr = eVPack:encodeBin(MapData), - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, BodyStr). replaceDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars, Headers) -> - QueryBinary = agMiscUtils:spellQueryPars(QueryPars), - Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary, QueryBinary/binary>>, + Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>, BodyStr = eVPack:encodeBin(MapData), - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, Headers, BodyStr). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, Headers, BodyStr). % 更新文档 % PATCH /_api/document/{collection}/{key} @@ -266,19 +263,17 @@ replaceDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars, Headers) -> updateDoc(PoolNameOrSocket, CollName, Key, MapData) -> Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>, BodyStr = eVPack:encodeBin(MapData), - agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr). + agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, BodyStr). updateDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars) -> - QueryBinary = agMiscUtils:spellQueryPars(QueryPars), - Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary, QueryBinary/binary>>, + Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>, BodyStr = eVPack:encodeBin(MapData), - agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr). + agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, ?AgDefHeader, BodyStr). updateDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars, Headers) -> - QueryBinary = agMiscUtils:spellQueryPars(QueryPars), - Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary, QueryBinary/binary>>, + Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>, BodyStr = eVPack:encodeBin(MapData), - agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, Headers, BodyStr). + agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, Headers, BodyStr). % 删除文档 % DELETE /_api/document/{collection}/{key}