From c85772e74e94b796772b60c628c08eb43b66386e Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Tue, 17 Jan 2023 23:31:27 +0800 Subject: [PATCH] =?UTF-8?q?ft:=20=E9=80=82=E9=85=8DeVPack=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/agApi/agAdminMonitor.erl | 2 +- src/agApi/agAnalyzers.erl | 2 +- src/agApi/agAqls.erl | 12 +++++----- src/agApi/agBulkImports.erl | 6 ++--- src/agApi/agCluster.erl | 2 +- src/agApi/agColls.erl | 12 +++++----- src/agApi/agDbMgr.erl | 2 +- src/agApi/agDocs.erl | 36 ++++++++++++++--------------- src/agApi/agFoxxServices.erl | 16 ++++++------- src/agApi/agGraphs.erl | 44 ++++++++++++++++++------------------ src/agApi/agHotBackup.erl | 10 ++++---- src/agApi/agIndexes.erl | 14 ++++++------ src/agApi/agMiscFuns.erl | 4 ++-- src/agApi/agPregel.erl | 2 +- src/agApi/agReplication.erl | 12 +++++----- src/agApi/agTasks.erl | 4 ++-- src/agApi/agTransactions.erl | 4 ++-- src/agApi/agUserMgr.erl | 10 ++++---- src/agApi/agViews.erl | 8 +++---- src/agTest.erl | 10 ++++---- src/agVstCli/agVstProto.erl | 6 ++--- 21 files changed, 109 insertions(+), 109 deletions(-) diff --git a/src/agApi/agAdminMonitor.erl b/src/agApi/agAdminMonitor.erl index 15a69ed..624b6f1 100644 --- a/src/agApi/agAdminMonitor.erl +++ b/src/agApi/agAdminMonitor.erl @@ -106,7 +106,7 @@ getAdminLogLevel(PoolNameOrSocket) -> % 405：使用无效的HTTP方法时返回。 % 500：如果服务器由于内存不足错误而无法生成结果，则返回。 modifyAdminLogLevel(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/log/level">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/log/level">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % TLS % 返回TLS数据的摘要 diff --git a/src/agApi/agAnalyzers.erl b/src/agApi/agAnalyzers.erl index 46ddd8d..95a0be1 100644 --- a/src/agApi/agAnalyzers.erl +++ b/src/agApi/agAnalyzers.erl @@ -25,7 +25,7 @@ % 400：缺少一个或多个必需参数，或者一个或多个参数无效。 % 403：用户无权使用此配置创建和分析器。 newAnalyzer(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/analyzer">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/analyzer">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 返回分析器定义 % GET /_api/analyzer/{analyzer-name} diff --git a/src/agApi/agAqls.erl b/src/agApi/agAqls.erl index bfc08b8..41b1f76 100644 --- a/src/agApi/agAqls.erl +++ b/src/agApi/agAqls.erl @@ -98,7 +98,7 @@ % 404：如果在查询中访问了不存在的集合，服务器将使用HTTP 404进行响应。 % 405：如果使用了不受支持的 HTTP 方法，服务器将使用HTTP 405 进行响应。 newCursor(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/cursor">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/cursor">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 从现有游标返回下一个结果 % PUT /_api/cursor/{cursor-identifier} @@ -164,7 +164,7 @@ delCursor(PoolNameOrSocket, CursorId) -> % 400：如果请求格式错误，或者查询包含解析错误，服务器将使用HTTP 400响应。响应的正文将包含嵌入在 JSON 对象中的错误详细信息。如果查询引用任何绑定变量，则省略绑定变量也会导致HTTP 400错误。 % 404：如果在查询中访问了不存在的集合，服务器将使用HTTP 404进行响应。 explainQuery(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/explain">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/explain">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 解析一个AQL查询并返回有关它的信息 % POST /_api/query @@ -175,7 +175,7 @@ explainQuery(PoolNameOrSocket, MapData) -> % 200：如果查询有效，服务器将使用HTTP 200进行响应，并在响应的bindVars属性中返回在查询中找到的绑定参数的名称（如果有）。它还将在collections属性中返回查询中使用的collections的数组。如果查询可以成功解析，则返回的JSON 的ast属性将包含查询的抽象语法树表示形式。ast的格式在将来的ArangoDB版本中可能会发生变化，但是可以用来检查ArangoDB如何解释给定查询。请注意，将在不对其应用任何优化的情况下返回抽象语法树。 % 400：如果请求格式错误或查询包含解析错误，服务器将以HTTP 400响应。响应的正文将包含嵌入在JSON对象中的错误详细信息。 parseQuery(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/query">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/query">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 返回所有 AQL 优化器规则 @@ -229,7 +229,7 @@ getQueryProps(PoolNameOrSocket) -> % 200：如果属性更改成功，则返回。 % 400：如果请求格式错误，服务器将以HTTP 400进行响应， changeQueryProps(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/query/properties">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/query/properties">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 返回当前运行的 AQL 查询 % GET /_api/query/current @@ -381,7 +381,7 @@ getQCacheProps(PoolNameOrSocket) -> % 200：如果属性更改成功，则返回。 % 400：如果请求格式错误，服务器将以HTTP 400进行响应， changeQCacheProps(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/query-cache/properties">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/query-cache/properties">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % AQL用户功能管理固定链接 % 这是用于管理AQL用户功能的ArangoDB HTTP接口的简介。AQL用户功能是一种使用用户定义的JavaScript代码扩展ArangoDB查询语言（AQL）功能的方法。 @@ -410,7 +410,7 @@ changeQCacheProps(PoolNameOrSocket, MapData) -> % errorNum：服务器错误号 % errorMessage：描述性错误消息 newUserFun(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/aqlfunction">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/aqlfunction">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 删除现有的AQL用户功能 % DELETE /_api/aqlfunction/{name} diff --git a/src/agApi/agBulkImports.erl b/src/agApi/agBulkImports.erl index b46b25a..476db78 100644 --- a/src/agApi/agBulkImports.erl +++ b/src/agApi/agBulkImports.erl @@ -58,7 +58,7 @@ % 409：如果导入会触发唯一键冲突，complete则返回，并将 其设置为true。 % 500：如果服务器无法为没有用户定义密钥的文档自动生成文档密钥（密钥错误），则返回500。 docImports(PoolNameOrSocket, ListOfList, QueryPars) -> - BodyStr = <<<<(eVPack:encodeBin(OneList))/binary, "\n">> || OneList <- ListOfList>>, + BodyStr = <<<<(eVPack:encode(OneList))/binary, "\n">> || OneList <- ListOfList>>, agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/import">>, QueryPars, ?AgDefHeader, BodyStr). % 从JSON导入文档 @@ -101,9 +101,9 @@ docImports(PoolNameOrSocket, ListOfList, QueryPars) -> jsonImports(PoolNameOrSocket, MapDataList, QueryPars) -> case QueryPars of #{type := list} -> - BodyStr = eVPack:encodeBin(MapDataList); + BodyStr = eVPack:encode(MapDataList); #{type := documents} -> - BodyStr = <<<<(eVPack:encodeBin(OneList))/binary, "\n">> || OneList <- MapDataList>>; + BodyStr = <<<<(eVPack:encode(OneList))/binary, "\n">> || OneList <- MapDataList>>; _ -> BodyStr = MapDataList end, diff --git a/src/agApi/agCluster.erl b/src/agApi/agCluster.erl index 5a4dd7f..f1714bd 100644 --- a/src/agApi/agCluster.erl +++ b/src/agApi/agCluster.erl @@ -96,7 +96,7 @@ clusterHealth(PoolNameOrSocket) -> % 501： % 504： setClusterMaintenance(PoolNameOrSocket, OnOrOff) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/cluster/maintenance">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(OnOrOff)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/cluster/maintenance">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(OnOrOff)). %%%%%%%%%%%%%%% Agency ?????????????????????????? diff --git a/src/agApi/agColls.erl b/src/agApi/agColls.erl index d11af56..c2ec6f7 100644 --- a/src/agApi/agColls.erl +++ b/src/agApi/agColls.erl @@ -92,10 +92,10 @@ % HTTP 200 newColl(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/collection">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/collection">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). newColl(PoolNameOrSocket, MapData, QueryPars) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/collection">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/collection">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % 删除收藏 % DELETE /_api/collection/{collection-name} @@ -245,7 +245,7 @@ collFigures(PoolNameOrSocket, CollName, QueryPars) -> % eg: MapData = #{'_key' => testkey, value => 23} collResponsibleShard(PoolNameOrSocket, CollName, MapData) -> Path = <<"/_api/collection/", CollName/binary, "/responsibleShard">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 返回集合的分片ID % GET /_api/collection/{collection-name}/shards @@ -351,7 +351,7 @@ loadColl(PoolNameOrSocket, CollName) -> agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path). loadColl(PoolNameOrSocket, CollName, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/collection/", CollName/binary, "/load">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/collection/", CollName/binary, "/load">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 卸载集合 % PUT /_api/collection/{collection-name}/unload @@ -394,7 +394,7 @@ unloadColl(PoolNameOrSocket, CollName) -> % 404：如果集合名称未知，则 返回HTTP 404。 renameColl(PoolNameOrSocket, OldName, MapData) -> Path = <<"/_api/collection/", OldName/binary, "/rename">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 将索引加载到内存中 % PUT /_api/collection/{collection-name}/loadIndexesIntoMemory @@ -439,7 +439,7 @@ collLoadIndexesIntoMemory(PoolNameOrSocket, CollName) -> % 404：如果集合名称未知，则 返回HTTP 404。 collChangeProps(PoolNameOrSocket, CollName, MapData) -> Path = <<"/_api/collection/", CollName/binary, "/properties">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 压缩集合的数据永久链接 % 紧凑系列 diff --git a/src/agApi/agDbMgr.erl b/src/agApi/agDbMgr.erl index b09d142..250369b 100644 --- a/src/agApi/agDbMgr.erl +++ b/src/agApi/agDbMgr.erl @@ -79,7 +79,7 @@ allDbs(PoolNameOrSocket) -> % 403：如果请求未在_system数据库中执行，则返回。 % 409：如果具有指定名称的数据库已经存在，则返回。 newDb(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/database">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData), true). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/database">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData), true). % 删除现有数据库 % DELETE /_api/database/{database-name} diff --git a/src/agApi/agDocs.erl b/src/agApi/agDocs.erl index 5c4a529..aefffc7 100644 --- a/src/agApi/agDocs.erl +++ b/src/agApi/agDocs.erl @@ -168,11 +168,11 @@ getHead(PoolNameOrSocket, CollName, Key, Headers) -> % 409：如果在索引属性中具有相同限定词的文档与现有文档发生冲突并因此违反了该唯一约束，则在单个文档的情况下返回409。在这种情况下，响应主体包含一个错误文档。 newDoc(PoolNameOrSocket, CollName, MapData) -> Path = <<"/_api/document/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). newDoc(PoolNameOrSocket, CollName, MapData, QueryPars) -> Path = <<"/_api/document/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % 替换文档 % PUT /_api/document/{collection}/{key} @@ -209,15 +209,15 @@ newDoc(PoolNameOrSocket, CollName, MapData, QueryPars) -> % 412：如果违反了前提条件，则返回。该响应还将在_rev 属性中包含找到的文档的当前修订。此外，将返回属性_id和_key。 replaceDoc(PoolNameOrSocket, CollName, Key, MapData) -> Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). replaceDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars) -> Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). replaceDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars, Headers) -> Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, Headers, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, Headers, eVPack:encode(MapData)). % 更新文档 % PATCH /_api/document/{collection}/{key} @@ -257,15 +257,15 @@ replaceDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars, Headers) -> % 412：如果违反了前提条件，则返回。该响应还将在_rev 属性中包含找到的文档的当前修订。此外，将返回属性_id和_key。 updateDoc(PoolNameOrSocket, CollName, Key, MapData) -> Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). updateDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars) -> Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). updateDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars, Headers) -> Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, Headers, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, Headers, eVPack:encode(MapData)). % 删除文档 % DELETE /_api/document/{collection}/{key} @@ -321,7 +321,7 @@ delDoc(PoolNameOrSocket, CollName, Key, QueryPars, Headers) -> % 对于该操作的返回 列表 如果文档不存在 或者_rev条件不满足 则返回列表的中包含相关的错误 可能需要在使用的时候过滤正确和非正确的返回文档 getDocs(PoolNameOrSocket, CollName, KeyOrMapDataList) -> Path = <<"/_api/document/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, #{<<"onlyget">> => <<"true">>}, ?AgDefHeader, eVPack:encodeBin(KeyOrMapDataList)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, #{<<"onlyget">> => <<"true">>}, ?AgDefHeader, eVPack:encode(KeyOrMapDataList)). getDocs(PoolNameOrSocket, CollName, KeyOrMapDataList, QueryPars) -> LastQueryPars = @@ -334,7 +334,7 @@ getDocs(PoolNameOrSocket, CollName, KeyOrMapDataList, QueryPars) -> QueryPars#{<<"onlyget">> => <<"true">>} end, Path = <<"/_api/document/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, LastQueryPars, ?AgDefHeader, eVPack:encodeBin(KeyOrMapDataList)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, LastQueryPars, ?AgDefHeader, eVPack:encode(KeyOrMapDataList)). % 创建多个文档 % POST /_api/document/{collection}#multiple @@ -374,11 +374,11 @@ getDocs(PoolNameOrSocket, CollName, KeyOrMapDataList, QueryPars) -> % 404：collection指定的collection未知时返回。在这种情况下，响应正文包含一个错误文档。 newDocs(PoolNameOrSocket, CollName, MapDataList) -> Path = <<"/_api/document/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapDataList)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapDataList)). newDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) -> Path = <<"/_api/document/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapDataList)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapDataList)). % 替换多个文件 % PUT /_api/document/{collection} @@ -407,11 +407,11 @@ newDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) -> % 404：如果找不到集合，则返回。 replaceDocs(PoolNameOrSocket, CollName, MapDataList) -> Path = <<"/_api/document/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapDataList)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapDataList)). replaceDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) -> Path = <<"/_api/document/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapDataList)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapDataList)). % 更新多个文件 % PATCH /_api/document/{collection} @@ -443,11 +443,11 @@ replaceDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) -> % 404：如果找不到集合，则返回。 updateDocs(PoolNameOrSocket, CollName, MapDataList) -> Path = <<"/_api/document/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapDataList)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapDataList)). updateDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) -> Path = <<"/_api/document/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapDataList)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapDataList)). % 删除多个文件 % DELETE /_api/document/{collection} @@ -470,8 +470,8 @@ updateDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) -> % 404：如果找不到集合，则返回。在这种情况下，响应主体包含一个错误文档。 delDocs(PoolNameOrSocket, CollName, KeyOrMapDataList) -> Path = <<"/_api/document/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(KeyOrMapDataList)). + agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(KeyOrMapDataList)). delDocs(PoolNameOrSocket, CollName, KeyOrMapDataList, QueryPars) -> Path = <<"/_api/document/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(KeyOrMapDataList)). + agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars, ?AgDefHeader, eVPack:encode(KeyOrMapDataList)). diff --git a/src/agApi/agFoxxServices.erl b/src/agApi/agFoxxServices.erl index 6a53acb..5f59c67 100644 --- a/src/agApi/agFoxxServices.erl +++ b/src/agApi/agFoxxServices.erl @@ -81,7 +81,7 @@ getFoxxService(PoolNameOrSocket, QueryPars) -> % 返回码 % 201：如果请求成功，则返回。 installFoxx(PoolNameOrSocket, MapData, QueryPars) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/foxx">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/foxx">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % 卸载服务 % DELETE /_api/foxx/service @@ -121,7 +121,7 @@ uninstallFoxx(PoolNameOrSocket, QueryPars) -> % 返回码 % 200：如果请求成功，则返回。 replaceFoxx(PoolNameOrSocket, MapData, QueryPars) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/foxx/service">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/foxx/service">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % 升级服务 % PATCH /_api/foxx/service @@ -149,7 +149,7 @@ replaceFoxx(PoolNameOrSocket, MapData, QueryPars) -> % 返回码 % 200：如果请求成功，则返回。 upgradeFoxx(PoolNameOrSocket, MapData, QueryPars) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, <<"/_api/foxx/service">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, <<"/_api/foxx/service">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % Foxx服务配置/依赖关系 % 这是用于管理Foxx服务配置和依赖关系的ArangoDB HTTP接口的简介。 @@ -176,7 +176,7 @@ getFoxxConfig(PoolNameOrSocket, QueryPars) -> % 返回码 % 200：如果请求成功，则返回。 updateFoxxConfig(PoolNameOrSocket, MapData, QueryPars) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, <<"/_api/foxx/configuration">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, <<"/_api/foxx/configuration">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % 替换配置选项 % PUT /_api/foxx/configuration @@ -189,7 +189,7 @@ updateFoxxConfig(PoolNameOrSocket, MapData, QueryPars) -> % 返回码 % 200：如果请求成功，则返回。 replaceFoxxConfig(PoolNameOrSocket, MapData, QueryPars) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/foxx/configuration">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/foxx/configuration">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % 获取依赖项选项 % GET /_api/foxx/dependencies @@ -214,7 +214,7 @@ getFoxxDependencies(PoolNameOrSocket, QueryPars) -> % 返回码 % 200：如果请求成功，则返回。 updateFoxxDependencies(PoolNameOrSocket, MapData, QueryPars) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, <<"/_api/foxx/dependencies">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, <<"/_api/foxx/dependencies">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % 替换依赖项选项 % PUT /_api/foxx/dependencies @@ -227,7 +227,7 @@ updateFoxxDependencies(PoolNameOrSocket, MapData, QueryPars) -> % 返回码 % 200：如果请求成功，则返回。 replaceFoxxDependencies(PoolNameOrSocket, MapData, QueryPars) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/foxx/dependencies">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/foxx/dependencies">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % Foxx服务杂项 % @@ -256,7 +256,7 @@ getFoxxScripts(PoolNameOrSocket, QueryPars) -> % 200：如果请求成功，则返回。 runFoxxScripts(PoolNameOrSocket, ScriptName, MapData, QueryPars) -> Path = <<"/_api/foxx/scripts/", ScriptName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % 运行服务测试 % POST /_api/foxx/tests diff --git a/src/agApi/agGraphs.erl b/src/agApi/agGraphs.erl index f3ff54f..4cae84a 100644 --- a/src/agApi/agGraphs.erl +++ b/src/agApi/agGraphs.erl @@ -80,10 +80,10 @@ graphs(PoolNameOrSocket) -> % errorNum：发生错误的ArangoDB错误号。 % errorMessage：为此错误创建的消息。 newGraph(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/gharial">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/gharial">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). newGraph(PoolNameOrSocket, MapData, QueryPars) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/gharial">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/gharial">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % 获取图表 % GET /_api/gharial/{graph} @@ -183,7 +183,7 @@ vertexCollList(PoolNameOrSocket, GraphName) -> %% MapData = #{"collection" => "otherVertices"} addVertexColl(PoolNameOrSocket, GraphName, MapData) -> Path = <<"/_api/gharial/", GraphName/binary, "/vertex">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 从图形中删除额外顶点集合。 % DELETE /_api/gharial/{graph}/vertex/{collection} @@ -279,7 +279,7 @@ edgeDefs(PoolNameOrSocket, GraphName) -> % errorMessage：为此错误创建的消息。 addEdgeDef(PoolNameOrSocket, GraphName, MapData) -> Path = <<"/_api/gharial/", GraphName/binary, "/edge">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 替换现有的边缘定义 % PUT /_api/gharial/{graph}/edge/{definition}#definition @@ -322,11 +322,11 @@ addEdgeDef(PoolNameOrSocket, GraphName, MapData) -> % EdgeDefName 名字 要在定义列表中存在 MapData中的collection 也要存在 只是替换 from to 中的集合 replaceEdgeDef(PoolNameOrSocket, GraphName, EdgeDefName, MapData) -> Path = <<"/_api/gharial/", GraphName/binary, "/edge/", EdgeDefName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). replaceEdgeDef(PoolNameOrSocket, GraphName, EdgeDefName, MapData, QueryPars) -> Path = <<"/_api/gharial/", GraphName/binary, "/edge/", EdgeDefName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % 从图形中删除边缘定义 % DELETE /_api/gharial/{graph}/edge/{definition}#definition @@ -400,11 +400,11 @@ delEdgeDef(PoolNameOrSocket, GraphName, EdgeDefName, QueryPars) -> % errorMessage：为此错误创建的消息。 newVertex(PoolNameOrSocket, GraphName, CollName, MapData) -> Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). newVertex(PoolNameOrSocket, GraphName, CollName, MapData, QueryPars) -> Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % 获取现有顶点 % GET /_api/gharial/{graph}/vertex/{collection}/{vertex} @@ -509,15 +509,15 @@ getVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, QueryPars, Headers) % errorMessage：为此错误创建的消息。 updateVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData) -> Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). updateVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPars) -> Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). updateVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPars, Headers) -> Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, Headers, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, Headers, eVPack:encode(MapData)). % 替换现有的顶点 % PUT /_api/gharial/{graph}/vertex/{collection}/{vertex} @@ -569,15 +569,15 @@ updateVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPar % errorMessage：为此错误创建的消息。 replaceVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData) -> Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). replaceVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPars) -> Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). replaceVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPars, Headers) -> Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, Headers, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, Headers, eVPack:encode(MapData)). % 从图中删除顶点 % DELETE /_api/gharial/{graph}/vertex/{collection}/{vertex} @@ -678,11 +678,11 @@ delVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, QueryPars, Headers) % errorMessage：为此错误创建的消息。 newEdge(PoolNameOrSocket, GraphName, CollName, MapData) -> Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). newEdge(PoolNameOrSocket, GraphName, CollName, MapData, QueryPars) -> Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % 获得边 % GET /_api/gharial/{graph}/edge/{collection}/{edge} @@ -788,15 +788,15 @@ getEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, QueryPars, Headers) -> % errorMessage：为此错误创建的消息。 updateEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData) -> Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). updateEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, QueryPars) -> Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). updateEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, Headers, QueryPars) -> Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, Headers, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, Headers, eVPack:encode(MapData)). % 替换现有边的内容 @@ -851,15 +851,15 @@ updateEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, Headers, Que % errorMessage：为此错误创建的消息。 replaceEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData) -> Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). replaceEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, QueryPars) -> Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). replaceEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, QueryPars, Headers) -> Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, Headers, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, Headers, eVPack:encode(MapData)). % 从图形中删除边 % DELETE /_api/gharial/{graph}/edge/{collection}/{edge} diff --git a/src/agApi/agHotBackup.erl b/src/agApi/agHotBackup.erl index 1aed582..6bca4a3 100644 --- a/src/agApi/agHotBackup.erl +++ b/src/agApi/agHotBackup.erl @@ -30,7 +30,7 @@ % 400：如果使用错误的参数或除之外的任何HTTP方法调用了create命令POST，则返回HTTP 400。具体细节在返回的错误文档中有详细说明。 % 408：如果操作无法在超时时间内获得全局事务锁定，则返回HTTP 408。 newBackup(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/create">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/create">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 从本地备份还原 % POST /_admin/backup/restore @@ -41,7 +41,7 @@ newBackup(PoolNameOrSocket, MapData) -> % 200：如果可以恢复备份，则返回。请注意，单个服务器和群集之间不可避免存在差异。在单个服务器中，请求成功返回，但是还原仅在之后执行。在集群中，仅在成功完成还原操作后才返回请求。群集行为显然是所需的行为，但是在单个实例中，无法在重新启动期间保持连接打开。 % 400：如果使用错误的参数或除以外的任何HTTP方法调用了restore命令POST，则返回HTTP 400。具体细节在返回的错误文档中有详细说明。 restoreBackup(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/restore">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/restore">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 删除特定的本地备份 % POST /_admin/backup/delete @@ -53,7 +53,7 @@ restoreBackup(PoolNameOrSocket, MapData) -> % 400：如果使用错误的参数或除以外的任何HTTP方法调用delete命令POST，则返回HTTP 400。 % 404：如果id找不到与该标识符相对应的备份。 delBackup(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/delete">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/delete">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 列出所有本地备份 % POST /_admin/backup/list @@ -90,7 +90,7 @@ backupList(PoolNameOrSocket) -> % 401：如果对转储存储库的身份验证失败，则返回HTTP 400。 % 404：如果id 找不到对应于标识符的备份，或者没有已知的上载操作uploadId。 uploadBackup(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/upload">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/upload">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 下载特定的本地备份 % POST /_admin/backup/download @@ -108,4 +108,4 @@ uploadBackup(PoolNameOrSocket, MapData) -> % 401：如果对转储存储库的身份验证失败，则返回HTTP 401。 % 404：如果id 找不到与该标识符相对应的备份，或者如果没有已知的与的下载操作downloadId。 downloadBackup(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/download">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/download">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). diff --git a/src/agApi/agIndexes.erl b/src/agApi/agIndexes.erl index dd11823..ccbc2bd 100644 --- a/src/agApi/agIndexes.erl +++ b/src/agApi/agIndexes.erl @@ -75,7 +75,7 @@ getIndexInfo(PoolNameOrSocket, IndexId) -> % 400：如果发布了无效的索引描述或使用了目标索引不支持的属性，则返回HTTP 400。 % 404：如果集合未知，则返回HTTP 404。 newIndex(PoolNameOrSocket, MapData, QueryPars) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % 删除索引 % DELETE /_api/index/{index-id} @@ -122,7 +122,7 @@ indexList(PoolNameOrSocket, QueryPars) -> % 400：如果集合中已经包含文档，并且您尝试创建唯一哈希索引以使某些文档违反唯一性，则返回HTTP 400。 % 404：如果集合名称未知，则返回HTTP 404。 newIndexOfHash(PoolNameOrSocket, MapData, QueryPars) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % 使用跳过列表索引 % 如果存在合适的跳过列表索引，则/_api/simple/range和其他操作将使用该索引来执行查询。 @@ -147,7 +147,7 @@ newIndexOfHash(PoolNameOrSocket, MapData, QueryPars) -> % 400：如果集合已经包含文档，并且您尝试以存在违反唯一性的文档的方式创建唯一的跳过列表索引，则返回HTTP 400。 % 404：如果集合名称未知，则返回HTTP 404。 newIndexOfSkipList(PoolNameOrSocket, MapData, QueryPars) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % 使用持久索引 % 如果存在合适的持久索引，则/_api/simple/range其他操作将使用该索引执行查询。 @@ -172,7 +172,7 @@ newIndexOfSkipList(PoolNameOrSocket, MapData, QueryPars) -> % 400：如果集合已经包含文档，并且您尝试以存在违反唯一性的文档的方式创建唯一的持久索引，则返回HTTP 400。 % 404：如果集合名称未知，则返回HTTP 404。 newIndexOfPersistent(PoolNameOrSocket, MapData, QueryPars) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % 使用TTL（生存时间）索引 % @@ -191,7 +191,7 @@ newIndexOfPersistent(PoolNameOrSocket, MapData, QueryPars) -> % 400：如果集合已经包含另一个TTL索引，则返回HTTP 400，因为每个集合最多可以有一个TTL索引。 % 404：如果集合名称未知，则返回HTTP 404。 newIndexOfTtl(PoolNameOrSocket, MapData, QueryPars) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % 创建地理索引 % POST /_api/index#geo @@ -211,7 +211,7 @@ newIndexOfTtl(PoolNameOrSocket, MapData, QueryPars) -> % 201：如果索引尚不存在并且可以创建，则 返回HTTP 201。 % 404：如果集合名称未知，则返回HTTP 404。 newIndexOfGeo(PoolNameOrSocket, MapData, QueryPars) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % 全文 % 如果存在全文索引， /_api/simple/fulltext则将使用该索引执行指定的全文查询。 @@ -229,4 +229,4 @@ newIndexOfGeo(PoolNameOrSocket, MapData, QueryPars) -> % 201：如果索引不存在并且可以创建，则 返回HTTP 201。 % 404：如果集合名称未知，则返回HTTP 404。 newIndexOfFulltext(PoolNameOrSocket, MapData, QueryPars) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). \ No newline at end of file + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). \ No newline at end of file diff --git a/src/agApi/agMiscFuns.erl b/src/agApi/agMiscFuns.erl index 5c3adfb..0d2725f 100644 --- a/src/agApi/agMiscFuns.erl +++ b/src/agApi/agMiscFuns.erl @@ -111,7 +111,7 @@ getWalProps(PoolNameOrSocket) -> % 200：操作成功返回。 % 405：使用无效的HTTP方法时返回。 setWalProps(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/wal/properties">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/wal/properties">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 返回有关当前正在运行的事务的信息 % GET /_admin/wal/transactions @@ -166,7 +166,7 @@ curDbTime(PoolNameOrSocket) -> % path：此请求的相对路径 % rawRequestBody：已发送字符的数字列表 echo(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/echo">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/echo">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 返回数据库的版本。 % GET /_admin/database/target-version diff --git a/src/agApi/agPregel.erl b/src/agApi/agPregel.erl index d18adbe..26ff165 100644 --- a/src/agApi/agPregel.erl +++ b/src/agApi/agPregel.erl @@ -35,7 +35,7 @@ % 403：如果没有足够的权限访问为 Pregel 作业指定的集合，则返回 HTTP 403 错误。 % 404：如果未找到指定的“算法”，或未找到“graphName”中指定的图形，或至少未找到“vertexCollections”或“edgeCollections”中指定的集合，则返回 HTTP 404 错误。 run(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/control_pregel">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/control_pregel">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 获取 Pregel 作业执行状态 % GET /_api/control_pregel/{id} diff --git a/src/agApi/agReplication.erl b/src/agApi/agReplication.erl index 49ad2a4..df78d7f 100644 --- a/src/agApi/agReplication.erl +++ b/src/agApi/agReplication.erl @@ -77,7 +77,7 @@ getRepInventory(PoolNameOrSocket, QueryPars) -> % 400：如果 ttl 值无效或未指定DBserver属性或协调器上的DBserver属性不合法，则返回。 % 405：使用无效的HTTP方法时返回。 newRepBatch(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/replication/batch">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/replication/batch">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 删除现有的转储批次 % 处理转储批处理命令 @@ -114,7 +114,7 @@ delRepBatch(PoolNameOrSocket, BatchId) -> % 为了获得相同的数据状态，复制客户端应按照提供的顺序使用转储结果的各个部分。 prolongRepBatch(PoolNameOrSocket, BatchId, MapData) -> Path = <<"/_api/replication/batch/", (agMiscUtils:toBinary(BatchId))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 返回集合的数据 % 返回一个集合的全部内容 @@ -269,7 +269,7 @@ getRepDoc(PoolNameOrSocket, QueryPars) -> % 500：如果同步期间发生错误，则返回。 % 501：在集群中的协调器上调用此操作时返回。 startRepSync(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/sync">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/sync">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 返回集合和索引的集群清单 % 重建集群中的集合和索引的概述 @@ -462,10 +462,10 @@ getRepApplierConfig(PoolNameOrSocket, QueryPars) -> % 405：使用无效的HTTP方法时返回。 % 500：如果组装响应时发生错误，则返回500。 setRepApplierConfig(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-config">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-config">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). setRepApplierConfig(PoolNameOrSocket, MapData, QueryPars) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-config">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-config">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)). % 启动复制应用程序 % PUT /_api/replication/applier-start @@ -613,7 +613,7 @@ getRepApplierState(PoolNameOrSocket, QueryPars) -> % 500：同步或启动连续复制时出错返回。 % 501：在集群中的Coordinator上调用该操作时返回。 changeRepMakeSlave(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/make-follower">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/make-follower">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). %其他复制命令 %返回服务器ID diff --git a/src/agApi/agTasks.erl b/src/agApi/agTasks.erl index d7ea1fa..77d56a2 100644 --- a/src/agApi/agTasks.erl +++ b/src/agApi/agTasks.erl @@ -54,7 +54,7 @@ getTask(PoolNameOrSocket, TaskId) -> % error：在这种情况下为false % 400：如果帖子正文不正确，则返回HTTP 400。 newTask(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/tasks">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/tasks">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 注册具有预定义ID的新任务；与负载均衡器不兼容 % PUT /_api/tasks/{id} @@ -71,7 +71,7 @@ newTask(PoolNameOrSocket, MapData) -> % 400：如果任务ID已经存在或其余主体不正确，则返回HTTP 400。 newTask(PoolNameOrSocket, TaskId, MapData) -> Path = <<"/_api/tasks/", (agMiscUtils:toBinary(TaskId))/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 删除一个当前活动的服务器任务 % DELETE /_api/tasks/{id} diff --git a/src/agApi/agTransactions.erl b/src/agApi/agTransactions.erl index 0e90f6a..a4d6d9c 100644 --- a/src/agApi/agTransactions.erl +++ b/src/agApi/agTransactions.erl @@ -79,7 +79,7 @@ % 400：如果事务规范丢失或格式不正确，则服务器将使用HTTP 400进行响应。 % 404：如果事务规范包含未知集合，则服务器将使用HTTP 404进行响应。 beginTransaction(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/transaction/begin">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/transaction/begin">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 提取服务器端事务的状态 % GET /_api/transaction/{transaction-id} @@ -196,7 +196,7 @@ transactionList(PoolNameOrSocket) -> % 404：如果事务规范包含未知集合，则服务器将使用HTTP 404进行响应。 % 500：用户抛出的异常将使服务器以HTTP 500的返回码进行响应 executeTransaction(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/transaction">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/transaction">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). diff --git a/src/agApi/agUserMgr.erl b/src/agApi/agUserMgr.erl index a9315ce..00b718d 100644 --- a/src/agApi/agUserMgr.erl +++ b/src/agApi/agUserMgr.erl @@ -28,7 +28,7 @@ % 403：如果您没有访问服务器访问级别，则返回。 % 409：如果已经存在同名用户，则返回。 newUser(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/user">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/user">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 设置数据库访问级别。 % PUT /_api/user/{user}/database/{dbname} @@ -47,7 +47,7 @@ newUser(PoolNameOrSocket, MapData) -> % 403：如果您没有访问服务器访问级别，则返回。 setUserDbAccessLevel(PoolNameOrSocket, UserName, DbName, MapData) -> Path = <<"/_api/user/", UserName/binary, "/database/", DbName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 设置收集访问级别。 % PUT /_api/user/{user}/database/{dbname}/{collection} @@ -68,7 +68,7 @@ setUserDbAccessLevel(PoolNameOrSocket, UserName, DbName, MapData) -> % 403：如果您没有访问服务器访问级别，则返回。 setUserCollAccessLevel(PoolNameOrSocket, UserName, DbName, CollName, MapData) -> Path = <<"/_api/user/", UserName/binary, "/database/", DbName/binary, "/", CollName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 清除数据库访问级别，恢复为默认访问级别 % DELETE /_api/user/{user}/database/{dbname} @@ -170,7 +170,7 @@ getUserCollAccessLevel(PoolNameOrSocket, UserName, DbName, CollName) -> % 404：指定的用户不存在 replaceUser(PoolNameOrSocket, UserName, MapData) -> Path = <<"/_api/user/", UserName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 修改现有用户的属性 % PATCH /_api/user/{user} @@ -189,7 +189,7 @@ replaceUser(PoolNameOrSocket, UserName, MapData) -> % 404：指定的用户不存在 updateUser(PoolNameOrSocket, UserName, MapData) -> Path = <<"/_api/user/", UserName/binary>>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 永久删除用户。 % DELETE /_api/user/{user} diff --git a/src/agApi/agViews.erl b/src/agApi/agViews.erl index c77abf8..3c1d9ed 100644 --- a/src/agApi/agViews.erl +++ b/src/agApi/agViews.erl @@ -64,7 +64,7 @@ % 400：如果name或type属性丢失或无效，则 返回HTTP 400错误。 % 409：如果已经存在一个名为name的视图，则返回HTTP 409错误。 newView(PoolNameOrSocket, MapData) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/view">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/view">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 返回一个视图 % GET /_api/view/{view-name} @@ -139,7 +139,7 @@ getViewProps(PoolNameOrSocket, ViewName) -> % 404：如果视图名称未知，则返回HTTP 404。 changeViewAllProps(PoolNameOrSocket, ViewName, MapData) -> Path = <<"/_api/view/", ViewName/binary, "/properties">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 部分更改ArangoSearch视图的属性 % PATCH /_api/view/{view-name}/properties#ArangoSearch @@ -176,7 +176,7 @@ changeViewAllProps(PoolNameOrSocket, ViewName, MapData) -> % 404：如果视图名称未知，则返回HTTP 404。 changeViewPartProps(PoolNameOrSocket, ViewName, MapData) -> Path = <<"/_api/view/", ViewName/binary, "/properties">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 重命名视图 % PUT /_api/view/{view-name}/rename @@ -194,7 +194,7 @@ changeViewPartProps(PoolNameOrSocket, ViewName, MapData) -> % 404：如果视图名称未知，则返回HTTP 404。 renameView(PoolNameOrSocket, ViewName, MapData) -> Path = <<"/_api/view/", ViewName/binary, "/rename">>, - agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)). + agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)). % 删除视图 % DELETE /_api/view/{view-name} diff --git a/src/agTest.erl b/src/agTest.erl index 27aad67..2215cc7 100644 --- a/src/agTest.erl +++ b/src/agTest.erl @@ -126,10 +126,10 @@ tcjf(N, Args1) -> tcvp(0, _Args1) -> Args = #{name => ffd, tet => "fdsff", <<"dfdf">> => 131245435346}, - eVPack:encodeBin(Args); + eVPack:encode(Args); tcvp(N, Args1) -> Args = #{name => ffd, tet => "fdsff", <<"dfdf">> => 131245435346}, - eVPack:encodeBin(Args), + eVPack:encode(Args), tcvp(N - 1, Args1). tcjx(0, _Args1) -> @@ -147,12 +147,12 @@ getBin(2) -> <<"{\"_key\":\"01J\",\"_id\":\"airports/01J\",\"_rev\":\"_aPaBl7O--_\",\"name\":\"Hilliard Airpark\",\"city\":\"Hilliardfdfsdfdsffffffffffffffffffffffffffffffffffffffffffffffffffffffffafdsfasdfdafsdafdsfsdafdsafdsfdsfdsafdsfdsfdsfhghfghfghgfhsdsdfdsfdsfdsffdfddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddggggggggggggggggggggggggggggggggggggggggg\",\"state\":\"FL\",\"country\":\"USAjjkjkjkfgjkgjfkdjgldgjldjglfdjglfjdljljrlejtrltjewltjrelwtjrletjrletrletjlrejtjtrlwjrejwlrjjreljtljelwjrtlwjtreljrlewjrlwjrlwejrlejltkdfsafd\",\"lat\":30.6880125,\"long\":-81.90594389,\"vip\":false}">>; getBin(3) -> Map = jiffy:decode(getBin(1), [return_maps]), - eVPack:encodeBin(Map); + eVPack:encode(Map); getBin(4) -> Map = jiffy:decode(getBin(2), [return_maps]), - eVPack:encodeBin(Map); + eVPack:encode(Map); getBin(5) -> - Header = eVPack:encodeBin([1, 2, 200, #{aaa => bbbb}]), + Header = eVPack:encode([1, 2, 200, #{aaa => bbbb}]), <
>. diff --git a/src/agVstCli/agVstProto.erl b/src/agVstCli/agVstProto.erl index f3578d1..53e45d2 100644 --- a/src/agVstCli/agVstProto.erl +++ b/src/agVstCli/agVstProto.erl @@ -14,7 +14,7 @@ -spec authInfo(User :: binary(), Password :: binary()) -> ok. authInfo(User, Password) -> ?AgDebug('IMY******authInfo', " User:~p", [User]), - AuthInfo = eVPack:encodeBin([1, 1000, <<"plain">>, User, Password]), + AuthInfo = eVPack:encode([1, 1000, <<"plain">>, User, Password]), MsgSize = erlang:byte_size(AuthInfo), <<(MsgSize + ?AgHeaderSize):32/integer-little-unsigned, 3:32/integer-little-unsigned, (agVstCli:getMsgId()):64/integer-little-unsigned, MsgSize:64/integer-little-unsigned, AuthInfo/binary>>. @@ -25,9 +25,9 @@ request(IsSystem, MessageId, Method, DbName, Path, QueryPars, Headers, Body, Vst ReqBin = case IsSystem of false -> - eVPack:encodeBin([1, 1, DbName, Method, Path, QueryPars, Headers]); + eVPack:encode([1, 1, DbName, Method, Path, QueryPars, Headers]); _ -> - eVPack:encodeBin([1, 1, <<"_system">>, Method, Path, QueryPars, Headers]) + eVPack:encode([1, 1, <<"_system">>, Method, Path, QueryPars, Headers]) end, MsgBin = <>,