瀏覽代碼

ft: 代码调整

master
SisMaker 3 年之前
父節點
當前提交
bfa5e700b7
共有 4 個文件被更改,包括 7 次插入6 次删除
  1. +2
    -2
      include/agVstCli.hrl
  2. +2
    -2
      src/agApi/agDbMgr.erl
  3. +1
    -0
      src/agVstCli/agTcpAgencyIns.erl
  4. +2
    -2
      src/agVstCli/agVstCli.erl

+ 2
- 2
include/agVstCli.hrl 查看文件

@ -27,10 +27,10 @@
-define(AgHeaderSize, 24). -define(AgHeaderSize, 24).
%% %%
-define(AgDefBaseUrl, <<"http://192.168.0.88:8529">>).
-define(AgDefBaseUrl, <<"http://47.108.26.175:8529">>).
-define(AgDefDbName, <<"_system">>). -define(AgDefDbName, <<"_system">>).
-define(AgDefUser, <<"root">>). -define(AgDefUser, <<"root">>).
-define(AgDefPassWord, <<"156736">>).
-define(AgDefPassWord, <<"arangodb3">>).
-define(AgDefBacklogSize, 1024). -define(AgDefBacklogSize, 1024).
-define(AgDefConnTimeout, 5000). -define(AgDefConnTimeout, 5000).

+ 2
- 2
src/agApi/agDbMgr.erl 查看文件

@ -55,7 +55,7 @@ visitDbs(PoolNameOrSocket) ->
% 400 % 400
% 403_system数据库中执行 % 403_system数据库中执行
allDbs(PoolNameOrSocket) -> allDbs(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/database">>, ?AgDefQuery, true).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/database">>, ?AgDefQuery, ?AgDefHeader, ?AgDefBody, true).
% %
% POST /_api/database % POST /_api/database
@ -95,4 +95,4 @@ newDb(PoolNameOrSocket, MapData) ->
% 404 % 404
delDb(PoolNameOrSocket, Name) -> delDb(PoolNameOrSocket, Name) ->
Path = <<"/_api/database/", Name/binary>>, Path = <<"/_api/database/", Name/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, ?AgDefQuery, true).
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, ?AgDefQuery, ?AgDefHeader, ?AgDefBody, true).

+ 1
- 0
src/agVstCli/agTcpAgencyIns.erl 查看文件

@ -34,6 +34,7 @@ handleMsg(#agReq{method = Method, path = Path, queryPars = QueryPars, headers =
{ok, SrvState, CliState}; {ok, SrvState, CliState};
_ -> _ ->
Request = agVstProto:request(IsSystem, MessageId, Method, DbName, Path, QueryPars, Headers, Body, VstSize), 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 case gen_tcp:send(Socket, Request) of
ok -> ok ->
TimerRef = case OverTime of TimerRef = case OverTime of

+ 2
- 2
src/agVstCli/agVstCli.erl 查看文件

@ -38,11 +38,11 @@
-spec callAgency(poolNameOrSocket(), method(), path()) -> term() | {error, term()}. -spec callAgency(poolNameOrSocket(), method(), path()) -> term() | {error, term()}.
callAgency(PoolNameOrSocket, Method, Path) -> 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()}. -spec callAgency(poolNameOrSocket(), method(), path(), queryPars()) -> term() | {error, term()}.
callAgency(PoolNameOrSocket, Method, Path, QueryPars) -> 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()}. -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) ->

Loading…
取消
儲存