ft: 代码调整

src/agApi/agCollections.erl

@@ -92,12 +92,10 @@
 %   HTTP 200
 
 newColl(PoolNameOrSocket, MapData) ->
-   BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/collection">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/collection">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
 
 newColl(PoolNameOrSocket, MapData, QueryPars) ->
-   BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/collection">>, QueryPars, ?AgDefHeader, BodyStr).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/collection">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
 
 % 删除收藏
 % DELETE /_api/collection/{collection-name}

src/agApi/agDbMgr.erl

@@ -79,8 +79,7 @@ allDbs(PoolNameOrSocket) ->
 % 403：如果请求未在_system数据库中执行，则返回。
 % 409：如果具有指定名称的数据库已经存在，则返回。
 newDb(PoolNameOrSocket, MapData) ->
-   BodyStr = eVPack:encodeBin(MapData),
-   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/database">>, ?AgDefQuery, ?AgDefHeader, BodyStr, true).
+   agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/database">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData), true).
 
 % 删除现有数据库
 % DELETE /_api/database/{database-name}

src/agVstCli/agSslAgencyIns.erl

@@ -113,6 +113,10 @@ handleMsg(?AgMDoDBConn,
       _Ret ->
          ?AgWarn(ServerName, "deal connect not found agBeamPool:getv(~p) ret ~p is error ~n", [PoolName, _Ret])
    end;
+handleMsg({'$gen_call', FromTag, '$SrvInfo'}, SrvState, CliState) ->
+   {To, Tag} = FromTag,
+   catch To ! {Tag, {erlang:get(), SrvState, CliState}},
+   {ok, SrvState, CliState};
 handleMsg(Msg, #srvState{serverName = ServerName} = SrvState, CliState) ->
    ?AgWarn(ServerName, "unknown msg: ~p~n", [Msg]),
    {ok, SrvState, CliState}.

src/agVstCli/agTcpAgencyIns.erl

@@ -34,7 +34,12 @@ 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]),
+               BBBB  = iolist_to_binary(Request),
+               ?AgWarn(ServerName, "the request is:~p~n", [BBBB]),
+               %file:write_file("./request", BBBB),
+               %erlang:put(MessageId, {FromPid, undefined, 0, <<>>}),
+               %Ret = agVstProto:response(?AgUndef, 0, 0, 0, 0, <<>>, BBBB),
+               %?AgWarn(ServerName, "the request is response ret:~p~n", [Ret]),
                case gen_tcp:send(Socket, Request) of
                   ok ->
                      TimerRef = case OverTime of
@@ -114,6 +119,10 @@ handleMsg(?AgMDoDBConn,
       _Ret ->
          ?AgWarn(ServerName, "deal connect not found agBeamPool:getv(~p) ret ~p is error ~n", [PoolName, _Ret])
    end;
+handleMsg({'$gen_call', FromTag, '$SrvInfo'}, SrvState, CliState) ->
+   {To, Tag} = FromTag,
+   catch To ! {Tag, {erlang:get(), SrvState, CliState}},
+   {ok, SrvState, CliState};
 handleMsg(Msg, #srvState{serverName = ServerName} = SrvState, CliState) ->
    ?AgWarn(ServerName, "unknown msg: ~p~n", [Msg]),
    {ok, SrvState, CliState}.

src/agVstCli/agVstCli.erl

@@ -33,6 +33,8 @@
    , getMsgId/0
    , receiveTcpData/2
    , receiveSslData/2
+
+   , agencyInfo/1
 ]).
 
 
@@ -54,7 +56,7 @@ callAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body, IsSystem) -
 
 -spec callAgency(poolNameOrSocket(), method(), path(), queryPars(), headers(), body(), boolean(), timeout()) -> term() | {error, atom()}.
 callAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body, IsSystem, Timeout) ->
-   case castAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, eVPack:encodeBin(Body), self(), IsSystem, Timeout) of
+   case castAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body, self(), IsSystem, Timeout) of
       {waitRRT, RequestId, MonitorRef} ->
          receiveReqRet(RequestId, MonitorRef);
       {error, _Reason} = Err ->
@@ -314,3 +316,6 @@ getMsgId() ->
       true ->
          MessageId
    end.
+
+agencyInfo(AgencyName) ->
+   gen_server:call(AgencyName, '$SrvInfo').

src/agVstCli/agVstProto.erl

@@ -61,6 +61,9 @@ response(?AgUndef, DoneCnt, _MessageId, _ChunkIdx, _ChunkSize, _ChunkBuffer, Dat
       <<Length:32/integer-little-unsigned, ChunkX:31/integer-little-unsigned, IsFirst:1/integer-little-unsigned, MessageId:64/integer-little-unsigned, _MessageLength:64/integer-little-unsigned, LeftBuffer/binary>> ->
          ByteSize = erlang:byte_size(LeftBuffer),
          ChunkSize = Length - ?AgHeaderSize,
+
+         io:format("IMY***********get ret ~p ~n", [{Length, ChunkX, IsFirst, MessageId, _MessageLength, ChunkSize, ByteSize}]),
+
          if
             ByteSize == ChunkSize ->
                {PidFrom, TimerRef, ChunkCnt, MsgBuffer} = MsgCache = erlang:get(MessageId),