diff --git a/include/agVstCli.hrl b/include/agVstCli.hrl index 153bf26..879eb9f 100644 --- a/include/agVstCli.hrl +++ b/include/agVstCli.hrl @@ -27,10 +27,10 @@ -define(AgHeaderSize, 24). %% 默认选项定义 --define(AgDefBaseUrl, <<"http://192.168.0.88:8529">>). +-define(AgDefBaseUrl, <<"http://47.108.26.175:8529">>). -define(AgDefDbName, <<"_system">>). -define(AgDefUser, <<"root">>). --define(AgDefPassWord, <<"156736">>). +-define(AgDefPassWord, <<"arangodb3">>). -define(AgDefBacklogSize, 1024). -define(AgDefConnTimeout, 5000). diff --git a/src/agApi/agDbMgr.erl b/src/agApi/agDbMgr.erl index 4c981c3..e9d6563 100644 --- a/src/agApi/agDbMgr.erl +++ b/src/agApi/agDbMgr.erl @@ -55,7 +55,7 @@ visitDbs(PoolNameOrSocket) -> % 400:如果请求无效,则返回。 % 403:如果请求未在_system数据库中执行,则返回。 allDbs(PoolNameOrSocket) -> - agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/database">>, ?AgDefQuery, true). + agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/database">>, ?AgDefQuery, ?AgDefHeader, ?AgDefBody, 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, true). + agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, ?AgDefQuery, ?AgDefHeader, ?AgDefBody, true). diff --git a/src/agVstCli/agTcpAgencyIns.erl b/src/agVstCli/agTcpAgencyIns.erl index 6bb8d1b..7525d9b 100644 --- a/src/agVstCli/agTcpAgencyIns.erl +++ b/src/agVstCli/agTcpAgencyIns.erl @@ -34,6 +34,7 @@ handleMsg(#agReq{method = Method, path = Path, queryPars = QueryPars, headers = {ok, SrvState, CliState}; _ -> Request = agVstProto:request(IsSystem, MessageId, Method, DbName, Path, QueryPars, Headers, Body, VstSize), + ?AgWarn(ServerName, "the request is:~p~n", [Request]), case gen_tcp:send(Socket, Request) of ok -> TimerRef = case OverTime of diff --git a/src/agVstCli/agVstCli.erl b/src/agVstCli/agVstCli.erl index 4e84987..a875be6 100644 --- a/src/agVstCli/agVstCli.erl +++ b/src/agVstCli/agVstCli.erl @@ -38,11 +38,11 @@ -spec callAgency(poolNameOrSocket(), method(), path()) -> term() | {error, term()}. callAgency(PoolNameOrSocket, Method, Path) -> - callAgency(PoolNameOrSocket, Method, Path, #{}, #{}, <<>>, false, ?AgDefTimeout). + callAgency(PoolNameOrSocket, Method, Path, ?AgDefQuery, ?AgDefHeader, ?AgDefBody, false, ?AgDefTimeout). -spec callAgency(poolNameOrSocket(), method(), path(), queryPars()) -> term() | {error, term()}. callAgency(PoolNameOrSocket, Method, Path, QueryPars) -> - callAgency(PoolNameOrSocket, Method, Path, QueryPars, #{}, <<>>, false, ?AgDefTimeout). + callAgency(PoolNameOrSocket, Method, Path, QueryPars, ?AgDefHeader, ?AgDefBody, false, ?AgDefTimeout). -spec callAgency(poolNameOrSocket(), method(), path(), queryPars(), headers(), body()) -> term() | {error, term()}. callAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body) ->