delete:not used configure field

Author: xengine-qyt

XEngine_Source/AuthorizeModule_Configure/Config_Define.h

@@ -31,7 +31,6 @@ typedef struct
 	}st_XMax;
 	struct   
 	{
-		int nUserTimeout;                                   //用户登录超时时间
 		int nTokenTimeout;                                  //TOKEN登录超时时间
 		int nDynamicTimeout;                                //动态码超时时间
 		int nVerTime;                                       //验证时间

XEngine_Source/AuthorizeModule_Configure/ModuleConfigure_Json/ModuleConfigure_Json.cpp

@@ -101,14 +101,13 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
 	pSt_ServerConfig->st_XMax.nWSThread = st_JsonXMax["nWSThread"].asInt();
 	pSt_ServerConfig->st_XMax.nHTTPThread = st_JsonXMax["nHTTPThread"].asInt();
 	//验证配置
-	if (st_JsonRoot["XVerification"].empty() || (7 != st_JsonRoot["XVerification"].size()))
+	if (st_JsonRoot["XVerification"].empty() || (6 != st_JsonRoot["XVerification"].size()))
 	{
 		Config_IsErrorOccur = true;
 		Config_dwErrorCode = ERROR_AUTHORIZE_MODULE_CONFIGURE_XVER;
 		return false;
 	}
 	Json::Value st_JsonXVerification = st_JsonRoot["XVerification"];
-	pSt_ServerConfig->st_XVerification.nUserTimeout = st_JsonXVerification["nUserTimeout"].asInt();
 	pSt_ServerConfig->st_XVerification.nTokenTimeout = st_JsonXVerification["nTokenTimeout"].asInt();
 	pSt_ServerConfig->st_XVerification.nDynamicTimeout = st_JsonXVerification["nDynamicTimeout"].asInt();
 	pSt_ServerConfig->st_XVerification.nVerTime = st_JsonXVerification["nVerTime"].asInt();

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Hdr.h

@@ -59,13 +59,20 @@ extern XHANDLE xhLog;
 extern XHANDLE xhTCPSocket;
 extern XHANDLE xhWSSocket;
 extern XHANDLE xhHttpSocket;
+
 extern XHANDLE xhTCPPacket;
 extern XHANDLE xhWSPacket;
 extern XHANDLE xhHttpPacket;
+
+extern XHANDLE xhTCPHeart;
+extern XHANDLE xhWSHeart;
+extern XHANDLE xhHTTPHeart;
+
 extern XHANDLE xhMemPool;
 extern XHANDLE xhTCPPool;
 extern XHANDLE xhWSPool;
 extern XHANDLE xhHttpPool;
+
 extern XENGINE_SERVICECONFIG st_AuthConfig;
 extern XENGINE_FUNCTIONSWITCH st_FunSwitch;
 

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Net.h

@@ -13,6 +13,5 @@ void CALLBACK XEngine_Client_HttpRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, L
 void CALLBACK XEngine_Client_HttpClose(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
 
 bool XEngine_CloseClient(LPCXSTR lpszClientAddr, bool bHeart);
-
 bool XEngine_Client_TaskSend(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, int nNetType);
 bool XEngine_SendMsg(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, int nNetType, LPCXSTR lpszPass = NULL);

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/XEngine_AuthorizeService.cpp

@@ -5,13 +5,20 @@ XHANDLE xhLog = NULL;
 XHANDLE xhTCPSocket = NULL;
 XHANDLE xhWSSocket = NULL;
 XHANDLE xhHttpSocket = NULL;
+
 XHANDLE xhTCPPacket = NULL;
 XHANDLE xhWSPacket = NULL;
 XHANDLE xhHttpPacket = NULL;
+
+XHANDLE xhTCPHeart = NULL;
+XHANDLE xhWSHeart = NULL;
+XHANDLE xhHTTPHeart = NULL;
+
 XHANDLE xhMemPool = NULL;
 XHANDLE xhTCPPool = NULL;
 XHANDLE xhWSPool = NULL;
 XHANDLE xhHttpPool = NULL;
+
 XENGINE_SERVICECONFIG st_AuthConfig;
 XENGINE_FUNCTIONSWITCH st_FunSwitch;
 
@@ -30,6 +37,10 @@ void ServiceApp_Stop(int signo)
 		NetCore_TCPXCore_DestroyEx(xhWSSocket);
 		NetCore_TCPXCore_DestroyEx(xhHttpSocket);
 
+		SocketOpt_HeartBeat_DestoryEx(xhTCPHeart);
+		SocketOpt_HeartBeat_DestoryEx(xhWSHeart);
+		SocketOpt_HeartBeat_DestoryEx(xhHTTPHeart);
+
 		ManagePool_Thread_NQDestroy(xhTCPPool);
 		ManagePool_Thread_NQDestroy(xhWSPool);
 		ManagePool_Thread_NQDestroy(xhHttpPool);
@@ -175,6 +186,7 @@ int main(int argc, char** argv)
 		NetCore_TCPXCore_RegisterCallBackEx(xhTCPSocket, XEngine_Client_TCPAccept, XEngine_Client_TCPRecv, XEngine_Client_TCPClose);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中，初始化TCP验证网络事件成功"));
 
+
 		BaseLib_OperatorMemory_Malloc((XPPPMEM)&ppSt_ListTCPThread, st_AuthConfig.st_XMax.nTCPThread, sizeof(THREADPOOL_PARAMENT));
 		for (int i = 0; i < st_AuthConfig.st_XMax.nTCPThread; i++)
 		{
@@ -307,6 +319,10 @@ int main(int argc, char** argv)
 		NetCore_TCPXCore_DestroyEx(xhWSSocket);
 		NetCore_TCPXCore_DestroyEx(xhHttpSocket);
 
+		SocketOpt_HeartBeat_DestoryEx(xhTCPHeart);
+		SocketOpt_HeartBeat_DestoryEx(xhWSHeart);
+		SocketOpt_HeartBeat_DestoryEx(xhHTTPHeart);
+
 		ManagePool_Thread_NQDestroy(xhTCPPool);
 		ManagePool_Thread_NQDestroy(xhWSPool);
 		ManagePool_Thread_NQDestroy(xhHttpPool);