Browse Source

增加与后端登录、心跳、链接自检

lishengyin 3 years ago
parent
commit
17004ec3fe

+ 310 - 0
build/CMakeFiles/main.dir/CXX.includecache

@@ -790,6 +790,232 @@ TSMediaSource.h
 Record/TsMuxer.h
 ../3rdparty/ZLMediaKit/src/TS/Record/TsMuxer.h
 
+../3rdparty/rapidjson/include/rapidjson/allocators.h
+rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+
+../3rdparty/rapidjson/include/rapidjson/document.h
+reader.h
+../3rdparty/rapidjson/include/rapidjson/reader.h
+internal/meta.h
+../3rdparty/rapidjson/include/rapidjson/internal/meta.h
+internal/strfunc.h
+../3rdparty/rapidjson/include/rapidjson/internal/strfunc.h
+memorystream.h
+../3rdparty/rapidjson/include/rapidjson/memorystream.h
+encodedstream.h
+../3rdparty/rapidjson/include/rapidjson/encodedstream.h
+new
+-
+limits
+-
+iterator
+-
+utility
+-
+
+../3rdparty/rapidjson/include/rapidjson/encodedstream.h
+stream.h
+../3rdparty/rapidjson/include/rapidjson/stream.h
+memorystream.h
+../3rdparty/rapidjson/include/rapidjson/memorystream.h
+
+../3rdparty/rapidjson/include/rapidjson/encodings.h
+rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+
+../3rdparty/rapidjson/include/rapidjson/error/error.h
+../rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+
+../3rdparty/rapidjson/include/rapidjson/internal/biginteger.h
+../rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+intrin.h
+-
+
+../3rdparty/rapidjson/include/rapidjson/internal/diyfp.h
+../rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+limits
+-
+intrin.h
+-
+
+../3rdparty/rapidjson/include/rapidjson/internal/dtoa.h
+itoa.h
+../3rdparty/rapidjson/include/rapidjson/internal/itoa.h
+diyfp.h
+../3rdparty/rapidjson/include/rapidjson/internal/diyfp.h
+ieee754.h
+../3rdparty/rapidjson/include/rapidjson/internal/ieee754.h
+
+../3rdparty/rapidjson/include/rapidjson/internal/ieee754.h
+../rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+
+../3rdparty/rapidjson/include/rapidjson/internal/itoa.h
+../rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+
+../3rdparty/rapidjson/include/rapidjson/internal/meta.h
+../rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+type_traits
+-
+
+../3rdparty/rapidjson/include/rapidjson/internal/pow10.h
+../rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+
+../3rdparty/rapidjson/include/rapidjson/internal/stack.h
+../allocators.h
+../3rdparty/rapidjson/include/rapidjson/allocators.h
+swap.h
+../3rdparty/rapidjson/include/rapidjson/internal/swap.h
+cstddef
+-
+
+../3rdparty/rapidjson/include/rapidjson/internal/strfunc.h
+../stream.h
+../3rdparty/rapidjson/include/rapidjson/stream.h
+cwchar
+-
+
+../3rdparty/rapidjson/include/rapidjson/internal/strtod.h
+ieee754.h
+../3rdparty/rapidjson/include/rapidjson/internal/ieee754.h
+biginteger.h
+../3rdparty/rapidjson/include/rapidjson/internal/biginteger.h
+diyfp.h
+../3rdparty/rapidjson/include/rapidjson/internal/diyfp.h
+pow10.h
+../3rdparty/rapidjson/include/rapidjson/internal/pow10.h
+climits
+-
+limits
+-
+
+../3rdparty/rapidjson/include/rapidjson/internal/swap.h
+../rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+
+../3rdparty/rapidjson/include/rapidjson/memorystream.h
+stream.h
+../3rdparty/rapidjson/include/rapidjson/stream.h
+
+../3rdparty/rapidjson/include/rapidjson/msinttypes/inttypes.h
+stdint.h
+../3rdparty/rapidjson/include/rapidjson/msinttypes/stdint.h
+inttypes.h
+-
+
+../3rdparty/rapidjson/include/rapidjson/msinttypes/stdint.h
+stdint.h
+-
+limits.h
+-
+wchar.h
+-
+
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+cstdlib
+-
+cstring
+-
+rapidjson/...
+../3rdparty/rapidjson/include/rapidjson/rapidjson/...
+string
+-
+msinttypes/stdint.h
+../3rdparty/rapidjson/include/rapidjson/msinttypes/stdint.h
+msinttypes/inttypes.h
+../3rdparty/rapidjson/include/rapidjson/msinttypes/inttypes.h
+stdint.h
+-
+inttypes.h
+-
+endian.h
+-
+rapidjson/...
+../3rdparty/rapidjson/include/rapidjson/rapidjson/...
+cassert
+-
+
+../3rdparty/rapidjson/include/rapidjson/reader.h
+allocators.h
+../3rdparty/rapidjson/include/rapidjson/allocators.h
+stream.h
+../3rdparty/rapidjson/include/rapidjson/stream.h
+encodedstream.h
+../3rdparty/rapidjson/include/rapidjson/encodedstream.h
+internal/meta.h
+../3rdparty/rapidjson/include/rapidjson/internal/meta.h
+internal/stack.h
+../3rdparty/rapidjson/include/rapidjson/internal/stack.h
+internal/strtod.h
+../3rdparty/rapidjson/include/rapidjson/internal/strtod.h
+limits
+-
+intrin.h
+-
+nmmintrin.h
+-
+emmintrin.h
+-
+arm_neon.h
+-
+stdexcept
+-
+rapidjson/error/error.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson/error/error.h
+rapidjson/reader.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson/reader.h
+error/error.h
+../3rdparty/rapidjson/include/rapidjson/error/error.h
+
+../3rdparty/rapidjson/include/rapidjson/stream.h
+rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+encodings.h
+../3rdparty/rapidjson/include/rapidjson/encodings.h
+
+../3rdparty/rapidjson/include/rapidjson/stringbuffer.h
+stream.h
+../3rdparty/rapidjson/include/rapidjson/stream.h
+internal/stack.h
+../3rdparty/rapidjson/include/rapidjson/internal/stack.h
+utility
+-
+internal/stack.h
+../3rdparty/rapidjson/include/rapidjson/internal/stack.h
+
+../3rdparty/rapidjson/include/rapidjson/writer.h
+stream.h
+../3rdparty/rapidjson/include/rapidjson/stream.h
+internal/meta.h
+../3rdparty/rapidjson/include/rapidjson/internal/meta.h
+internal/stack.h
+../3rdparty/rapidjson/include/rapidjson/internal/stack.h
+internal/strfunc.h
+../3rdparty/rapidjson/include/rapidjson/internal/strfunc.h
+internal/dtoa.h
+../3rdparty/rapidjson/include/rapidjson/internal/dtoa.h
+internal/itoa.h
+../3rdparty/rapidjson/include/rapidjson/internal/itoa.h
+stringbuffer.h
+../3rdparty/rapidjson/include/rapidjson/stringbuffer.h
+new
+-
+intrin.h
+-
+nmmintrin.h
+-
+emmintrin.h
+-
+arm_neon.h
+-
+
 ../modules/TCPClient/include/TCPClient.h
 signal.h
 -
@@ -799,6 +1025,76 @@ Util/logger.h
 ../modules/TCPClient/include/Util/logger.h
 Network/TcpClient.h
 ../modules/TCPClient/include/Network/TcpClient.h
+SendLogin.h
+../modules/TCPClient/include/SendLogin.h
+NettyServerCommandEnum.h
+../modules/TCPClient/include/NettyServerCommandEnum.h
+NettyServerResultMsg.h
+../modules/TCPClient/include/NettyServerResultMsg.h
+NettyClientResultMsg.h
+../modules/TCPClient/include/NettyClientResultMsg.h
+SendLogin.h
+../modules/TCPClient/include/SendLogin.h
+NettyClientCommandEnum.h
+../modules/TCPClient/include/NettyClientCommandEnum.h
+SendHeartBeat.h
+../modules/TCPClient/include/SendHeartBeat.h
+
+../modules/dataType/include/NettyClientCommandEnum.h
+iostream
+-
+
+../modules/dataType/include/NettyClientResultMsg.h
+iostream
+-
+rapidjson/document.h
+-
+rapidjson/rapidjson.h
+-
+rapidjson/stringbuffer.h
+-
+rapidjson/writer.h
+-
+
+../modules/dataType/include/NettyServerCommandEnum.h
+iostream
+-
+
+../modules/dataType/include/NettyServerResultMsg.h
+iostream
+-
+rapidjson/document.h
+-
+rapidjson/rapidjson.h
+-
+rapidjson/stringbuffer.h
+-
+rapidjson/writer.h
+-
+
+../modules/dataType/include/SendHeartBeat.h
+istream
+-
+rapidjson/document.h
+-
+rapidjson/rapidjson.h
+-
+rapidjson/stringbuffer.h
+-
+rapidjson/writer.h
+-
+
+../modules/dataType/include/SendLogin.h
+iostream
+-
+rapidjson/document.h
+-
+rapidjson/rapidjson.h
+-
+rapidjson/stringbuffer.h
+-
+rapidjson/writer.h
+-
 
 ../modules/dataType/include/Stream.h
 iostream
@@ -869,6 +1165,8 @@ Util/SqlPool.h
 ../modules/userApp/include/Util/SqlPool.h
 Network/TcpClient.h
 ../modules/userApp/include/Network/TcpClient.h
+Poller/Timer.h
+../modules/userApp/include/Poller/Timer.h
 TCPClient.h
 ../modules/userApp/include/TCPClient.h
 inifile.h
@@ -883,6 +1181,18 @@ inference.h
 ../modules/userApp/include/inference.h
 Stream.h
 ../modules/userApp/include/Stream.h
+SendLogin.h
+../modules/userApp/include/SendLogin.h
+NettyServerCommandEnum.h
+../modules/userApp/include/NettyServerCommandEnum.h
+NettyServerResultMsg.h
+../modules/userApp/include/NettyServerResultMsg.h
+NettyClientResultMsg.h
+../modules/userApp/include/NettyClientResultMsg.h
+SendLogin.h
+../modules/userApp/include/SendLogin.h
+NettyClientCommandEnum.h
+../modules/userApp/include/NettyClientCommandEnum.h
 
 /home/nvidia/work/MIVA/source/src/main.cpp
 iostream

+ 30 - 0
build/CMakeFiles/main.dir/depend.internal

@@ -61,7 +61,37 @@ CMakeFiles/main.dir/source/src/main.cpp.o
  ../3rdparty/ZLMediaKit/src/Rtsp/RtspSplitter.h
  ../3rdparty/ZLMediaKit/src/TS/TSMediaSource.h
  ../3rdparty/ZLMediaKit/src/TS/TSMediaSourceMuxer.h
+ ../3rdparty/rapidjson/include/rapidjson/allocators.h
+ ../3rdparty/rapidjson/include/rapidjson/document.h
+ ../3rdparty/rapidjson/include/rapidjson/encodedstream.h
+ ../3rdparty/rapidjson/include/rapidjson/encodings.h
+ ../3rdparty/rapidjson/include/rapidjson/error/error.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/biginteger.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/diyfp.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/dtoa.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/ieee754.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/itoa.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/meta.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/pow10.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/stack.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/strfunc.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/strtod.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/swap.h
+ ../3rdparty/rapidjson/include/rapidjson/memorystream.h
+ ../3rdparty/rapidjson/include/rapidjson/msinttypes/inttypes.h
+ ../3rdparty/rapidjson/include/rapidjson/msinttypes/stdint.h
+ ../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+ ../3rdparty/rapidjson/include/rapidjson/reader.h
+ ../3rdparty/rapidjson/include/rapidjson/stream.h
+ ../3rdparty/rapidjson/include/rapidjson/stringbuffer.h
+ ../3rdparty/rapidjson/include/rapidjson/writer.h
  ../modules/TCPClient/include/TCPClient.h
+ ../modules/dataType/include/NettyClientCommandEnum.h
+ ../modules/dataType/include/NettyClientResultMsg.h
+ ../modules/dataType/include/NettyServerCommandEnum.h
+ ../modules/dataType/include/NettyServerResultMsg.h
+ ../modules/dataType/include/SendHeartBeat.h
+ ../modules/dataType/include/SendLogin.h
  ../modules/dataType/include/Stream.h
  ../modules/inference/include/inference.h
  ../modules/inifile/include/inifile.h

+ 30 - 0
build/CMakeFiles/main.dir/depend.make

@@ -60,7 +60,37 @@ CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/ZLMediaKit/src/Rtsp/RtspS
 CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/ZLMediaKit/src/Rtsp/RtspSplitter.h
 CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/ZLMediaKit/src/TS/TSMediaSource.h
 CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/ZLMediaKit/src/TS/TSMediaSourceMuxer.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/allocators.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/document.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/encodedstream.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/encodings.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/error/error.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/biginteger.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/diyfp.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/dtoa.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/ieee754.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/itoa.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/meta.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/pow10.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/stack.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/strfunc.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/strtod.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/swap.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/memorystream.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/msinttypes/inttypes.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/msinttypes/stdint.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/reader.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/stream.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/stringbuffer.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/writer.h
 CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/TCPClient/include/TCPClient.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/dataType/include/NettyClientCommandEnum.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/dataType/include/NettyClientResultMsg.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/dataType/include/NettyServerCommandEnum.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/dataType/include/NettyServerResultMsg.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/dataType/include/SendHeartBeat.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/dataType/include/SendLogin.h
 CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/dataType/include/Stream.h
 CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/inference/include/inference.h
 CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/inifile/include/inifile.h

BIN
build/CMakeFiles/main.dir/source/src/main.cpp.o


+ 310 - 0
build/modules/CMakeFiles/modules.dir/CXX.includecache

@@ -790,6 +790,232 @@ TSMediaSource.h
 Record/TsMuxer.h
 ../3rdparty/ZLMediaKit/src/TS/Record/TsMuxer.h
 
+../3rdparty/rapidjson/include/rapidjson/allocators.h
+rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+
+../3rdparty/rapidjson/include/rapidjson/document.h
+reader.h
+../3rdparty/rapidjson/include/rapidjson/reader.h
+internal/meta.h
+../3rdparty/rapidjson/include/rapidjson/internal/meta.h
+internal/strfunc.h
+../3rdparty/rapidjson/include/rapidjson/internal/strfunc.h
+memorystream.h
+../3rdparty/rapidjson/include/rapidjson/memorystream.h
+encodedstream.h
+../3rdparty/rapidjson/include/rapidjson/encodedstream.h
+new
+-
+limits
+-
+iterator
+-
+utility
+-
+
+../3rdparty/rapidjson/include/rapidjson/encodedstream.h
+stream.h
+../3rdparty/rapidjson/include/rapidjson/stream.h
+memorystream.h
+../3rdparty/rapidjson/include/rapidjson/memorystream.h
+
+../3rdparty/rapidjson/include/rapidjson/encodings.h
+rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+
+../3rdparty/rapidjson/include/rapidjson/error/error.h
+../rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+
+../3rdparty/rapidjson/include/rapidjson/internal/biginteger.h
+../rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+intrin.h
+-
+
+../3rdparty/rapidjson/include/rapidjson/internal/diyfp.h
+../rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+limits
+-
+intrin.h
+-
+
+../3rdparty/rapidjson/include/rapidjson/internal/dtoa.h
+itoa.h
+../3rdparty/rapidjson/include/rapidjson/internal/itoa.h
+diyfp.h
+../3rdparty/rapidjson/include/rapidjson/internal/diyfp.h
+ieee754.h
+../3rdparty/rapidjson/include/rapidjson/internal/ieee754.h
+
+../3rdparty/rapidjson/include/rapidjson/internal/ieee754.h
+../rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+
+../3rdparty/rapidjson/include/rapidjson/internal/itoa.h
+../rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+
+../3rdparty/rapidjson/include/rapidjson/internal/meta.h
+../rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+type_traits
+-
+
+../3rdparty/rapidjson/include/rapidjson/internal/pow10.h
+../rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+
+../3rdparty/rapidjson/include/rapidjson/internal/stack.h
+../allocators.h
+../3rdparty/rapidjson/include/rapidjson/allocators.h
+swap.h
+../3rdparty/rapidjson/include/rapidjson/internal/swap.h
+cstddef
+-
+
+../3rdparty/rapidjson/include/rapidjson/internal/strfunc.h
+../stream.h
+../3rdparty/rapidjson/include/rapidjson/stream.h
+cwchar
+-
+
+../3rdparty/rapidjson/include/rapidjson/internal/strtod.h
+ieee754.h
+../3rdparty/rapidjson/include/rapidjson/internal/ieee754.h
+biginteger.h
+../3rdparty/rapidjson/include/rapidjson/internal/biginteger.h
+diyfp.h
+../3rdparty/rapidjson/include/rapidjson/internal/diyfp.h
+pow10.h
+../3rdparty/rapidjson/include/rapidjson/internal/pow10.h
+climits
+-
+limits
+-
+
+../3rdparty/rapidjson/include/rapidjson/internal/swap.h
+../rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+
+../3rdparty/rapidjson/include/rapidjson/memorystream.h
+stream.h
+../3rdparty/rapidjson/include/rapidjson/stream.h
+
+../3rdparty/rapidjson/include/rapidjson/msinttypes/inttypes.h
+stdint.h
+../3rdparty/rapidjson/include/rapidjson/msinttypes/stdint.h
+inttypes.h
+-
+
+../3rdparty/rapidjson/include/rapidjson/msinttypes/stdint.h
+stdint.h
+-
+limits.h
+-
+wchar.h
+-
+
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+cstdlib
+-
+cstring
+-
+rapidjson/...
+../3rdparty/rapidjson/include/rapidjson/rapidjson/...
+string
+-
+msinttypes/stdint.h
+../3rdparty/rapidjson/include/rapidjson/msinttypes/stdint.h
+msinttypes/inttypes.h
+../3rdparty/rapidjson/include/rapidjson/msinttypes/inttypes.h
+stdint.h
+-
+inttypes.h
+-
+endian.h
+-
+rapidjson/...
+../3rdparty/rapidjson/include/rapidjson/rapidjson/...
+cassert
+-
+
+../3rdparty/rapidjson/include/rapidjson/reader.h
+allocators.h
+../3rdparty/rapidjson/include/rapidjson/allocators.h
+stream.h
+../3rdparty/rapidjson/include/rapidjson/stream.h
+encodedstream.h
+../3rdparty/rapidjson/include/rapidjson/encodedstream.h
+internal/meta.h
+../3rdparty/rapidjson/include/rapidjson/internal/meta.h
+internal/stack.h
+../3rdparty/rapidjson/include/rapidjson/internal/stack.h
+internal/strtod.h
+../3rdparty/rapidjson/include/rapidjson/internal/strtod.h
+limits
+-
+intrin.h
+-
+nmmintrin.h
+-
+emmintrin.h
+-
+arm_neon.h
+-
+stdexcept
+-
+rapidjson/error/error.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson/error/error.h
+rapidjson/reader.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson/reader.h
+error/error.h
+../3rdparty/rapidjson/include/rapidjson/error/error.h
+
+../3rdparty/rapidjson/include/rapidjson/stream.h
+rapidjson.h
+../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+encodings.h
+../3rdparty/rapidjson/include/rapidjson/encodings.h
+
+../3rdparty/rapidjson/include/rapidjson/stringbuffer.h
+stream.h
+../3rdparty/rapidjson/include/rapidjson/stream.h
+internal/stack.h
+../3rdparty/rapidjson/include/rapidjson/internal/stack.h
+utility
+-
+internal/stack.h
+../3rdparty/rapidjson/include/rapidjson/internal/stack.h
+
+../3rdparty/rapidjson/include/rapidjson/writer.h
+stream.h
+../3rdparty/rapidjson/include/rapidjson/stream.h
+internal/meta.h
+../3rdparty/rapidjson/include/rapidjson/internal/meta.h
+internal/stack.h
+../3rdparty/rapidjson/include/rapidjson/internal/stack.h
+internal/strfunc.h
+../3rdparty/rapidjson/include/rapidjson/internal/strfunc.h
+internal/dtoa.h
+../3rdparty/rapidjson/include/rapidjson/internal/dtoa.h
+internal/itoa.h
+../3rdparty/rapidjson/include/rapidjson/internal/itoa.h
+stringbuffer.h
+../3rdparty/rapidjson/include/rapidjson/stringbuffer.h
+new
+-
+intrin.h
+-
+nmmintrin.h
+-
+emmintrin.h
+-
+arm_neon.h
+-
+
 ../modules/TCPClient/include/TCPClient.h
 signal.h
 -
@@ -799,6 +1025,76 @@ Util/logger.h
 ../modules/TCPClient/include/Util/logger.h
 Network/TcpClient.h
 ../modules/TCPClient/include/Network/TcpClient.h
+SendLogin.h
+../modules/TCPClient/include/SendLogin.h
+NettyServerCommandEnum.h
+../modules/TCPClient/include/NettyServerCommandEnum.h
+NettyServerResultMsg.h
+../modules/TCPClient/include/NettyServerResultMsg.h
+NettyClientResultMsg.h
+../modules/TCPClient/include/NettyClientResultMsg.h
+SendLogin.h
+../modules/TCPClient/include/SendLogin.h
+NettyClientCommandEnum.h
+../modules/TCPClient/include/NettyClientCommandEnum.h
+SendHeartBeat.h
+../modules/TCPClient/include/SendHeartBeat.h
+
+../modules/dataType/include/NettyClientCommandEnum.h
+iostream
+-
+
+../modules/dataType/include/NettyClientResultMsg.h
+iostream
+-
+rapidjson/document.h
+-
+rapidjson/rapidjson.h
+-
+rapidjson/stringbuffer.h
+-
+rapidjson/writer.h
+-
+
+../modules/dataType/include/NettyServerCommandEnum.h
+iostream
+-
+
+../modules/dataType/include/NettyServerResultMsg.h
+iostream
+-
+rapidjson/document.h
+-
+rapidjson/rapidjson.h
+-
+rapidjson/stringbuffer.h
+-
+rapidjson/writer.h
+-
+
+../modules/dataType/include/SendHeartBeat.h
+istream
+-
+rapidjson/document.h
+-
+rapidjson/rapidjson.h
+-
+rapidjson/stringbuffer.h
+-
+rapidjson/writer.h
+-
+
+../modules/dataType/include/SendLogin.h
+iostream
+-
+rapidjson/document.h
+-
+rapidjson/rapidjson.h
+-
+rapidjson/stringbuffer.h
+-
+rapidjson/writer.h
+-
 
 ../modules/dataType/include/Stream.h
 iostream
@@ -893,6 +1189,8 @@ Util/SqlPool.h
 ../modules/userApp/include/Util/SqlPool.h
 Network/TcpClient.h
 ../modules/userApp/include/Network/TcpClient.h
+Poller/Timer.h
+../modules/userApp/include/Poller/Timer.h
 TCPClient.h
 ../modules/userApp/include/TCPClient.h
 inifile.h
@@ -907,6 +1205,18 @@ inference.h
 ../modules/userApp/include/inference.h
 Stream.h
 ../modules/userApp/include/Stream.h
+SendLogin.h
+../modules/userApp/include/SendLogin.h
+NettyServerCommandEnum.h
+../modules/userApp/include/NettyServerCommandEnum.h
+NettyServerResultMsg.h
+../modules/userApp/include/NettyServerResultMsg.h
+NettyClientResultMsg.h
+../modules/userApp/include/NettyClientResultMsg.h
+SendLogin.h
+../modules/userApp/include/SendLogin.h
+NettyClientCommandEnum.h
+../modules/userApp/include/NettyClientCommandEnum.h
 
 /home/nvidia/work/MIVA/modules/TCPClient/src/TCPClient.cpp
 TCPClient.h

BIN
build/modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o


+ 90 - 0
build/modules/CMakeFiles/modules.dir/depend.internal

@@ -2,7 +2,37 @@
 # Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o
+ ../3rdparty/rapidjson/include/rapidjson/allocators.h
+ ../3rdparty/rapidjson/include/rapidjson/document.h
+ ../3rdparty/rapidjson/include/rapidjson/encodedstream.h
+ ../3rdparty/rapidjson/include/rapidjson/encodings.h
+ ../3rdparty/rapidjson/include/rapidjson/error/error.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/biginteger.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/diyfp.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/dtoa.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/ieee754.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/itoa.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/meta.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/pow10.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/stack.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/strfunc.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/strtod.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/swap.h
+ ../3rdparty/rapidjson/include/rapidjson/memorystream.h
+ ../3rdparty/rapidjson/include/rapidjson/msinttypes/inttypes.h
+ ../3rdparty/rapidjson/include/rapidjson/msinttypes/stdint.h
+ ../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+ ../3rdparty/rapidjson/include/rapidjson/reader.h
+ ../3rdparty/rapidjson/include/rapidjson/stream.h
+ ../3rdparty/rapidjson/include/rapidjson/stringbuffer.h
+ ../3rdparty/rapidjson/include/rapidjson/writer.h
  ../modules/TCPClient/include/TCPClient.h
+ ../modules/dataType/include/NettyClientCommandEnum.h
+ ../modules/dataType/include/NettyClientResultMsg.h
+ ../modules/dataType/include/NettyServerCommandEnum.h
+ ../modules/dataType/include/NettyServerResultMsg.h
+ ../modules/dataType/include/SendHeartBeat.h
+ ../modules/dataType/include/SendLogin.h
  /home/nvidia/work/MIVA/modules/TCPClient/src/TCPClient.cpp
  /usr/local/include/Network/Buffer.h
  /usr/local/include/Network/Socket.h
@@ -140,7 +170,37 @@ modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o
  ../3rdparty/ZLMediaKit/src/Rtsp/RtspSplitter.h
  ../3rdparty/ZLMediaKit/src/TS/TSMediaSource.h
  ../3rdparty/ZLMediaKit/src/TS/TSMediaSourceMuxer.h
+ ../3rdparty/rapidjson/include/rapidjson/allocators.h
+ ../3rdparty/rapidjson/include/rapidjson/document.h
+ ../3rdparty/rapidjson/include/rapidjson/encodedstream.h
+ ../3rdparty/rapidjson/include/rapidjson/encodings.h
+ ../3rdparty/rapidjson/include/rapidjson/error/error.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/biginteger.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/diyfp.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/dtoa.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/ieee754.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/itoa.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/meta.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/pow10.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/stack.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/strfunc.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/strtod.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/swap.h
+ ../3rdparty/rapidjson/include/rapidjson/memorystream.h
+ ../3rdparty/rapidjson/include/rapidjson/msinttypes/inttypes.h
+ ../3rdparty/rapidjson/include/rapidjson/msinttypes/stdint.h
+ ../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+ ../3rdparty/rapidjson/include/rapidjson/reader.h
+ ../3rdparty/rapidjson/include/rapidjson/stream.h
+ ../3rdparty/rapidjson/include/rapidjson/stringbuffer.h
+ ../3rdparty/rapidjson/include/rapidjson/writer.h
  ../modules/TCPClient/include/TCPClient.h
+ ../modules/dataType/include/NettyClientCommandEnum.h
+ ../modules/dataType/include/NettyClientResultMsg.h
+ ../modules/dataType/include/NettyServerCommandEnum.h
+ ../modules/dataType/include/NettyServerResultMsg.h
+ ../modules/dataType/include/SendHeartBeat.h
+ ../modules/dataType/include/SendLogin.h
  ../modules/dataType/include/Stream.h
  ../modules/inference/include/inference.h
  ../modules/inifile/include/inifile.h
@@ -470,7 +530,37 @@ modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o
  ../3rdparty/ZLMediaKit/src/Rtsp/RtspSplitter.h
  ../3rdparty/ZLMediaKit/src/TS/TSMediaSource.h
  ../3rdparty/ZLMediaKit/src/TS/TSMediaSourceMuxer.h
+ ../3rdparty/rapidjson/include/rapidjson/allocators.h
+ ../3rdparty/rapidjson/include/rapidjson/document.h
+ ../3rdparty/rapidjson/include/rapidjson/encodedstream.h
+ ../3rdparty/rapidjson/include/rapidjson/encodings.h
+ ../3rdparty/rapidjson/include/rapidjson/error/error.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/biginteger.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/diyfp.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/dtoa.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/ieee754.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/itoa.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/meta.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/pow10.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/stack.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/strfunc.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/strtod.h
+ ../3rdparty/rapidjson/include/rapidjson/internal/swap.h
+ ../3rdparty/rapidjson/include/rapidjson/memorystream.h
+ ../3rdparty/rapidjson/include/rapidjson/msinttypes/inttypes.h
+ ../3rdparty/rapidjson/include/rapidjson/msinttypes/stdint.h
+ ../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+ ../3rdparty/rapidjson/include/rapidjson/reader.h
+ ../3rdparty/rapidjson/include/rapidjson/stream.h
+ ../3rdparty/rapidjson/include/rapidjson/stringbuffer.h
+ ../3rdparty/rapidjson/include/rapidjson/writer.h
  ../modules/TCPClient/include/TCPClient.h
+ ../modules/dataType/include/NettyClientCommandEnum.h
+ ../modules/dataType/include/NettyClientResultMsg.h
+ ../modules/dataType/include/NettyServerCommandEnum.h
+ ../modules/dataType/include/NettyServerResultMsg.h
+ ../modules/dataType/include/SendHeartBeat.h
+ ../modules/dataType/include/SendLogin.h
  ../modules/dataType/include/Stream.h
  ../modules/inference/include/inference.h
  ../modules/inifile/include/inifile.h

+ 90 - 0
build/modules/CMakeFiles/modules.dir/depend.make

@@ -1,7 +1,37 @@
 # CMAKE generated file: DO NOT EDIT!
 # Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/allocators.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/document.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/encodedstream.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/encodings.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/error/error.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/biginteger.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/diyfp.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/dtoa.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/ieee754.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/itoa.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/meta.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/pow10.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/stack.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/strfunc.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/strtod.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/swap.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/memorystream.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/msinttypes/inttypes.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/msinttypes/stdint.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/reader.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/stream.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/stringbuffer.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../3rdparty/rapidjson/include/rapidjson/writer.h
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../modules/TCPClient/include/TCPClient.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../modules/dataType/include/NettyClientCommandEnum.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../modules/dataType/include/NettyClientResultMsg.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../modules/dataType/include/NettyServerCommandEnum.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../modules/dataType/include/NettyServerResultMsg.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../modules/dataType/include/SendHeartBeat.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../modules/dataType/include/SendLogin.h
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../modules/TCPClient/src/TCPClient.cpp
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: /usr/local/include/Network/Buffer.h
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: /usr/local/include/Network/Socket.h
@@ -139,7 +169,37 @@ modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/ZLMedi
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/ZLMediaKit/src/Rtsp/RtspSplitter.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/ZLMediaKit/src/TS/TSMediaSource.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/ZLMediaKit/src/TS/TSMediaSourceMuxer.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/allocators.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/document.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/encodedstream.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/encodings.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/error/error.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/biginteger.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/diyfp.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/dtoa.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/ieee754.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/itoa.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/meta.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/pow10.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/stack.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/strfunc.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/strtod.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/swap.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/memorystream.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/msinttypes/inttypes.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/msinttypes/stdint.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/reader.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/stream.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/stringbuffer.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/writer.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/TCPClient/include/TCPClient.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/dataType/include/NettyClientCommandEnum.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/dataType/include/NettyClientResultMsg.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/dataType/include/NettyServerCommandEnum.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/dataType/include/NettyServerResultMsg.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/dataType/include/SendHeartBeat.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/dataType/include/SendLogin.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/dataType/include/Stream.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/inference/include/inference.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/inifile/include/inifile.h
@@ -469,7 +529,37 @@ modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/ZLMediaKi
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/ZLMediaKit/src/Rtsp/RtspSplitter.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/ZLMediaKit/src/TS/TSMediaSource.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/ZLMediaKit/src/TS/TSMediaSourceMuxer.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/allocators.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/document.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/encodedstream.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/encodings.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/error/error.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/biginteger.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/diyfp.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/dtoa.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/ieee754.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/itoa.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/meta.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/pow10.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/stack.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/strfunc.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/strtod.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/internal/swap.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/memorystream.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/msinttypes/inttypes.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/msinttypes/stdint.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/rapidjson.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/reader.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/stream.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/stringbuffer.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/writer.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/TCPClient/include/TCPClient.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/dataType/include/NettyClientCommandEnum.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/dataType/include/NettyClientResultMsg.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/dataType/include/NettyServerCommandEnum.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/dataType/include/NettyServerResultMsg.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/dataType/include/SendHeartBeat.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/dataType/include/SendLogin.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/dataType/include/Stream.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/inference/include/inference.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/inifile/include/inifile.h

BIN
build/modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o


BIN
build/modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o


BIN
lib/libmodules.so


+ 9 - 0
modules/TCPClient/include/TCPClient.h

@@ -6,6 +6,15 @@
 using namespace std;
 using namespace toolkit;
 
+// dataType
+#include "SendLogin.h"
+#include "NettyServerCommandEnum.h"
+#include "NettyServerResultMsg.h"
+#include "NettyClientResultMsg.h"
+#include "SendLogin.h"
+#include "NettyClientCommandEnum.h"
+#include "SendHeartBeat.h"
+
 namespace MIVA
 {
     class TCPClient: public TcpClient

+ 22 - 12
modules/TCPClient/src/TCPClient.cpp

@@ -10,7 +10,6 @@ namespace MIVA
     void TCPClient::onRecv(const Buffer::Ptr &pBuf){
         //接收数据事件
         DebugL << pBuf->data() << " from port:" << get_peer_port();
-
     }
 
     void TCPClient::onFlush(){
@@ -20,20 +19,31 @@ namespace MIVA
 
     void TCPClient::onErr(const SockException &ex){
         //断开连接事件,一般是EOF
+        _nTick = 0;
         WarnL << ex.what();
-        
-        
     }
 
-    void TCPClient::onManager() {
-        //定时发送数据到服务器
-        auto buf = BufferRaw::create();
-        if(buf){
-            buf->assign("[BufferRaw]\0");
-            (*this) << _nTick++ << " "
-                    << 3.14 << " "
-                    << string("string") << " "
-                    <<(Buffer::Ptr &)buf;
+    void TCPClient::onManager(){
+        std::string json;
+        if(_nTick == 0){ // 心跳
+            _nTick++;
+            SendLogin sendLogin;
+            sendLogin.setAccount("admin");
+            sendLogin.setPwd("123456");
+            sendLogin.setCameraIp("192.168.31.95");
+            NettyClientResultMsg<SendLogin> nettyClientResultMsg;
+            nettyClientResultMsg.setRequestId("1");
+            nettyClientResultMsg.setDataType(NettyClientCommandEnum().login);
+            nettyClientResultMsg.setData(sendLogin);
+            nettyClientResultMsg.objectToJson(json);
+        }
+        else{ // 心跳
+            NettyClientResultMsg<SendHeartBeat> nettyClientResultMsg;
+            nettyClientResultMsg.setRequestId("");
+            nettyClientResultMsg.setDataType(NettyClientCommandEnum().heartbeat);
+            nettyClientResultMsg.objectToJson(json);
         }
+        json += "\r\n";
+        (*this) << json;
     }
 } // namespace MIVA

+ 26 - 0
modules/dataType/include/NettyClientCommandEnum.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <iostream>
+
+using namespace std;
+
+class NettyClientCommandEnum
+{
+private:
+ 
+public:
+    NettyClientCommandEnum(/* args */){};
+    ~NettyClientCommandEnum(){};
+
+        // 客户端传输给服务端-登录数据中
+    const string login = "login";
+    //客户端传输到服务端-心跳包数据
+    const string heartbeat = "heartbeat";
+    //客户端传输到服务端-鸟情预警数据
+    const string bird_info = "bird_info";
+    //客户端传输到服务端-设备状态数据
+    const string device_info = "device_info";
+    //相机IP映射客户端
+    const string camera_ip_mapping_client_ip = "camera_ip_mapping_client_ip";
+};
+

+ 10 - 2
modules/userApp/include/user_app.h

@@ -14,6 +14,7 @@
 #include "Extension/Frame.h"
 #include "Util/SqlPool.h"
 #include "Network/TcpClient.h"
+#include "Poller/Timer.h"
 #include "TCPClient.h"
 #include "inifile.h"
 
@@ -23,6 +24,13 @@
 #include "inference.h"
 #include "Stream.h"
 
+// dataType
+#include "SendLogin.h"
+#include "NettyServerCommandEnum.h"
+#include "NettyServerResultMsg.h"
+#include "NettyClientResultMsg.h"
+#include "SendLogin.h"
+#include "NettyClientCommandEnum.h"
 
 using namespace toolkit;
 using namespace mediakit;
@@ -75,9 +83,9 @@ namespace MIVA
         // 负责链接Netty的Socker
         std::shared_ptr<TCPClient> m_tcpClient;
         std::list<Stream> DataList;
-
+        Timer::Ptr m_timer0;
     private:
         void ListenInfer(int Source_id, int num);
-
+        void ConnectNetty();
     };
 }

+ 21 - 8
modules/userApp/src/user_app.cpp

@@ -67,8 +67,7 @@ namespace MIVA
         #endif
 
         // 链接Netty后端
-        // m_tcpClient = TCPClient::Ptr();
-        // m_tcpClient->startConnect(this->Netty_ip, this->Netty_port);
+        ConnectNetty();
 
         // 查询需要播放的流
         vector<vector<string>> sqlRet;
@@ -112,22 +111,36 @@ namespace MIVA
     // 启动任务
     void UserApp::StartTask()
     {
-        // 创建线程池
-        ThreadPool pool(1,ThreadPool::PRIORITY_HIGHEST, false);
+        // 创建推理线程池
+        ThreadPool poolInfer(1,ThreadPool::PRIORITY_HIGHEST, false);
 
         // 挂起任务一
-        pool.async([&](){
+        poolInfer.async([&](){
             if(m_Infer != NULL) m_Infer->StartTask();
         });
         
-        // 启动任务
-        pool.start();
+        // 定时检查连接状态
+        this->m_timer0 = std::make_shared<Timer>(5.0f,[&](){
+            if(!m_tcpClient->alive()){
+                this->ConnectNetty();
+            }
+            return true;
+        }, nullptr);
 
+        // 启动任务
+        poolInfer.start();
         InfoL << "Task started successfully!";
     }
 
     void UserApp::ListenInfer(int Source_id, int num)
+    {   
+
+
+    }
+
+    void UserApp::ConnectNetty()
     {
-        InfoL << "Id:" << Source_id << " :" << num;
+        if(this->m_tcpClient == NULL) this->m_tcpClient = TCPClient::Ptr(new TCPClient());
+        this->m_tcpClient->startConnect(this->Netty_ip, this->Netty_port);
     }
 }

BIN
source/bin/main


+ 1 - 0
source/src/main.cpp

@@ -26,6 +26,7 @@ int main(int argc, char *argv[])
     ErrorL << "System initialization failed";
     return -1;
   }
+  
   // 挂起任务
   app->StartTask();