Merge pull request #61 from libxengine/develop

xengine-qyt · web-flow · commit 136209efaf46 · 2024-06-21T14:10:41.000+08:00
V3.12.1.1001 Merge
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,17 @@
+XEngine_Authorize V3.12.1.1001
+
+修改:用户列表刷新时间修改
+修改:用户增加和修改的时候会刷新用户列表
+修改:websocket协议close和ping消息协议支持了
+修正:关闭客户端重复关闭的问题
+删除:不需要的配置项目
+
+modify:user flush time
+modify:flush user list for user add and modify
+modify:websocket close and ping message protocol support
+fixed:repeat close client
+delete:not used configure field
+================================================================
 XEngine_Authorize V3.12.0.1001
 
 增加:使用新的git module替换jsoncpp
diff --git a/README.en.md b/README.en.md
@@ -32,7 +32,7 @@ feature list:
 4. Support Serial Management
 5. Support Log Management
 6. Support Configure Management
-7. Support Serical Multie types(Minute card, day card, frequency card, custom card)
+7. Support Serical Multie types(second card, day card, frequency card, custom card)
 8. Support Try,Support quick verification
 9. Support Retrieve password through email
 10. Support app program and html web Authorize
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ V2可以直接升级到V3版本,因为数据库并没有修改,直接替换程
 4. 支持序列卡管理
 5. 支持日志管理
 6. 支持配置管理
-7. 序列卡多种类型支持(分钟卡,天数卡,次数卡,自定义卡)
+7. 序列卡多种类型支持(秒卡,天数卡,次数卡,自定义卡)
 8. 支持试用,支持快速验证
 9. 支持通过邮件找回密码
 10. 支持APP程序和HTML网页授权验证
@@ -152,25 +152,3 @@ V3版本为全新版本,为了适应过多环境要求开发
 ## 提交问题
 
 如果你有问题,可以在issues中提交
-
-## 开发计划 
-mfc转qt界面库(我们需要会Qt的人员加入一起开发)  
-多端登录注册类型开关  
-短信登录,扫码登录  
-生成会话TOKEN分布式鉴权  
-token 自动续期  
-密码加密  
-关键日志(强日志)  
-http basic和disgt支持  
-支持OAuth验证  
-mysql支持  
-支持用户和硬件绑定同时验证  
-统计用户所有在线时间  
-持久层,redis,memcached等支持  
-支持代理端(序列号分发,权限控制)  
-支持设置用户可以使用IP地址段  
-支持绑定自定义内容  
-自动售卡(支付宝,微信)  
-MQTT协议支持,让你的嵌入式设备也用上授时验证  
-支持三方验证(其他服务也可以发送验证请求给验证服务来做验证)  
-优化第三方验证(密码系统的适配问题修改)  
diff --git a/XEngine_Release/XEngine_Config/XEngine_Config.json b/XEngine_Release/XEngine_Config/XEngine_Config.json
@@ -13,7 +13,6 @@
         "nHTTPThread":2
     },
     "XVerification":{
-        "nUserTimeout":30,
         "nTokenTimeout":3600,
         "nDynamicTimeout":30,
         "nVerTime":5,
diff --git a/XEngine_Release/XEngine_Config/XEngine_VersionConfig.json b/XEngine_Release/XEngine_Config/XEngine_VersionConfig.json
@@ -1,5 +1,6 @@
 {
     "XVer":[
+        "V3.12.1.1001 Build20240621",
         "V3.12.0.1001 Build20240513",
         "V3.11.0.1001 Build20240223",
         "V3.10.0.1001 Build20240109",
diff --git a/XEngine_Source/AuthorizeModule_Configure/Config_Define.h b/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;                                       //验证时间
diff --git a/XEngine_Source/AuthorizeModule_Configure/ModuleConfigure_Json/ModuleConfigure_Json.cpp b/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();
diff --git a/XEngine_Source/VSCopy_Debug.bat b/XEngine_Source/VSCopy_Debug.bat
@@ -1,4 +1,5 @@
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_BaseLib.dll" "./"
+copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_BaseSafe.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_Algorithm.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_Core.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_ManagePool.dll" "./"
diff --git a/XEngine_Source/VSCopy_x64.bat b/XEngine_Source/VSCopy_x64.bat
@@ -1,4 +1,5 @@
 copy /y "%XEngine_Lib64%\XEngine_BaseLib\XEngine_BaseLib.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_BaseLib\XEngine_BaseSafe.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_BaseLib\XEngine_Algorithm.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_Core.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_ManagePool.dll" "./"
diff --git a/XEngine_Source/VSCopy_x86.bat b/XEngine_Source/VSCopy_x86.bat
@@ -1,4 +1,5 @@
 copy /y "%XEngine_Lib32%\XEngine_BaseLib\XEngine_BaseLib.dll" "./"
+copy /y "%XEngine_Lib32%\XEngine_BaseLib\XEngine_BaseSafe.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_BaseLib\XEngine_Algorithm.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_Core.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_ManagePool.dll" "./"
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_User.cpp b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_User.cpp
@@ -64,7 +64,7 @@ BOOL CDialog_User::OnInitDialog()
 	m_ListCtrlClient.InsertColumn(8, _T("是否在线"), LVCFMT_LEFT, 60);
 	m_ListCtrlClient.SetExtendedStyle(LVS_EX_FULLROWSELECT);
 
-	m_EditFlushTime.SetWindowText("1");
+	m_EditFlushTime.SetWindowText("10");
 	m_EditPosStart.SetWindowText("0");
 	m_EditPosEnd.SetWindowText("50");
 	hUserWnd = m_hWnd;
@@ -380,7 +380,10 @@ void CDialog_User::OnBnClickedButton4()
 		return;
 	}
 	CDialog_Modify m_DlgModify;
-	m_DlgModify.DoModal();
+	if (IDOK == m_DlgModify.DoModal())
+	{
+		OnBnClickedButton1();
+	}
 }
 
 
@@ -424,14 +427,23 @@ void CDialog_User::OnBnClickedButton5()
 {
 	// TODO: 在此添加控件通知处理程序代码
 	CDialog_Modify m_DlgModify;
-	m_DlgModify.DoModal();
+	if (IDOK == m_DlgModify.DoModal())
+	{
+		OnBnClickedButton1();
+	}
 }
 
 
 void CDialog_User::OnNMDblclkList1(NMHDR* pNMHDR, LRESULT* pResult)
 {
 	LPNMITEMACTIVATE pNMItemActivate = reinterpret_cast<LPNMITEMACTIVATE>(pNMHDR);
 	// TODO: 在此添加控件通知处理程序代码
-	OnBnClickedButton4();
+	 // 假设m_listControl是你的CListCtrl成员变量
+	POSITION m_ListPosition = m_ListCtrlClient.GetFirstSelectedItemPosition();
+	if (m_ListPosition != NULL)
+	{
+		OnBnClickedButton4();
+	}
+	
 	*pResult = 0;
 }
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/XEngineAuthorizeApp.aps b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/XEngineAuthorizeApp.aps
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/AuthorizeHTTP_Post/AuthorizeHTTP_Client.cpp b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/AuthorizeHTTP_Post/AuthorizeHTTP_Client.cpp
@@ -91,7 +91,7 @@ bool XEngine_AuthorizeHTTP_Client(LPCXSTR lpszClientAddr, LPCXSTR lpszAPIName, L
 		}
 		for (int i = 0; i < nListCount; i++)
 		{
-			XEngine_CloseClient(ppSt_ListClient[i]->tszClientAddr);
+			XEngine_CloseClient(ppSt_ListClient[i]->tszClientAddr, true);
 		}
 		BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ListClient, nListCount);
 		Protocol_Packet_HttpComm(tszSDBuffer, &nSDLen);
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/AuthorizeHTTP_Post/AuthorizeHTTP_User.cpp b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/AuthorizeHTTP_Post/AuthorizeHTTP_User.cpp
@@ -32,7 +32,7 @@ bool XEngine_AuthorizeHTTP_User(LPCXSTR lpszClientAddr, LPCXSTR lpszAPIName, LPC
 		Session_Authorize_GetClient(&ppSt_ListClient, &nListCount, st_UserInfo.tszUserName);
 		for (int i = 0; i < nListCount; i++)
 		{
-			XEngine_CloseClient(ppSt_ListClient[i]->tszClientAddr);
+			XEngine_CloseClient(ppSt_ListClient[i]->tszClientAddr, true);
 		}
 		BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ListClient, nListCount);
 
@@ -226,7 +226,7 @@ bool XEngine_AuthorizeHTTP_User(LPCXSTR lpszClientAddr, LPCXSTR lpszAPIName, LPC
 				BaseLib_OperatorTime_TimeToStr(tszTimeStart);
 				BaseLib_OperatorTimeSpan_GetForStr(tszTimeStart, tszTimeEnd, &nTimeSpan);
 
-				st_VERTemp.nLTime = nTimeSpan;
+				st_VERTemp.nLTime = (int)nTimeSpan;
 			}
 			//是否超过
 			if (nTimeSpan >= 0)
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Hdr.h b/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;
 
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Net.cpp b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Net.cpp
@@ -15,7 +15,7 @@ void CALLBACK XEngine_Client_TCPRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LP
 }
 void CALLBACK XEngine_Client_TCPClose(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
 {
-	XEngine_CloseClient(lpszClientAddr);
+	XEngine_CloseClient(lpszClientAddr, false);
 }
 //////////////////////////////////////////////////////////////////////////
 bool CALLBACK XEngine_Client_WSAccept(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
@@ -49,7 +49,7 @@ void CALLBACK XEngine_Client_WSRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPC
 }
 void CALLBACK XEngine_Client_WSClose(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
 {
-	XEngine_CloseClient(lpszClientAddr);
+	XEngine_CloseClient(lpszClientAddr, false);
 }
 //////////////////////////////////////////////////////////////////////////
 bool CALLBACK XEngine_Client_HttpAccept(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
@@ -67,19 +67,21 @@ void CALLBACK XEngine_Client_HttpRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, L
 }
 void CALLBACK XEngine_Client_HttpClose(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
 {
-	XEngine_CloseClient(lpszClientAddr);
+	XEngine_CloseClient(lpszClientAddr, false);
 }
 //////////////////////////////////////////////////////////////////////////
-bool XEngine_CloseClient(LPCXSTR lpszClientAddr)
+bool XEngine_CloseClient(LPCXSTR lpszClientAddr, bool bHeart)
 {
+	if (bHeart)
+	{
+		NetCore_TCPXCore_CloseForClientEx(xhTCPSocket, lpszClientAddr);
+		NetCore_TCPXCore_CloseForClientEx(xhWSSocket, lpszClientAddr);
+		NetCore_TCPXCore_CloseForClientEx(xhHttpSocket, lpszClientAddr);
+	}
 	HelpComponents_Datas_DeleteEx(xhTCPPacket, lpszClientAddr);
 	RfcComponents_WSPacket_DeleteEx(xhWSPacket, lpszClientAddr);
 	HttpProtocol_Server_CloseClinetEx(xhHttpPacket, lpszClientAddr);
-
-	NetCore_TCPXCore_CloseForClientEx(xhTCPSocket, lpszClientAddr);
-	NetCore_TCPXCore_CloseForClientEx(xhWSSocket, lpszClientAddr);
-	NetCore_TCPXCore_CloseForClientEx(xhHttpSocket, lpszClientAddr);
-
+	
 	AUTHSESSION_NETCLIENT st_NETClient;
 	memset(&st_NETClient, '\0', sizeof(AUTHSESSION_NETCLIENT));
 
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Net.h b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Net.h
@@ -12,7 +12,6 @@ bool CALLBACK XEngine_Client_HttpAccept(LPCXSTR lpszClientAddr, XSOCKET hSocket,
 void CALLBACK XEngine_Client_HttpRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam);
 void CALLBACK XEngine_Client_HttpClose(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
 
-bool XEngine_CloseClient(LPCXSTR lpszClientAddr);
-
+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);
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Task.cpp b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Task.cpp
@@ -38,7 +38,7 @@ void CALLBACK XEngine_TaskEvent_Client(LPCXSTR lpszUserAddr, LPCXSTR lpszUserNam
 		XEngine_Client_TaskSend(lpszUserAddr, tszMsgBuffer, nMsgLen, nNetType);
 		if (!st_AuthConfig.bTimeNotify)
 		{
-			XEngine_CloseClient(lpszUserAddr);
+			XEngine_CloseClient(lpszUserAddr, true);
 		}
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("地址:%s,用户:%s,网络类型:%d,没有剩余时间,已经通知客户单超时,三方通知设置:%d"), lpszUserName, lpszUserAddr, nNetType, st_AuthConfig.st_XLogin.bPassAuth);
 	}
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_WSTask.cpp b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_WSTask.cpp
@@ -52,19 +52,37 @@ bool XEngine_Client_WSTask(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nM
 	XENGINE_PROTOCOLHDR st_ProtocolHdr;
 	memset(&st_ProtocolHdr, '\0', sizeof(XENGINE_PROTOCOLHDR));
 
-	if (!Protocol_Parse_WSHdr(lpszMsgBuffer, nMsgLen, &st_ProtocolHdr))
+	if (ENUM_XENGINE_RFCOMPONENTS_WEBSOCKET_OPCODE_CLOSE == enOPCode)
 	{
-		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("WS客户端：%s，协议错误"), lpszClientAddr);
-		return false;
+		int nSDLen = 0;
+		XCHAR tszMSGBuffer[MAX_PATH] = {};
+		RfcComponents_WSCodec_EncodeMsg(NULL, tszMSGBuffer, &nSDLen, ENUM_XENGINE_RFCOMPONENTS_WEBSOCKET_OPCODE_CLOSE);
+		NetCore_TCPXCore_SendEx(xhWSSocket, lpszClientAddr, tszMSGBuffer, nSDLen);
 	}
-
-	if (XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_AUTH_REQLOGIN == st_ProtocolHdr.unOperatorCode)
+	else if (ENUM_XENGINE_RFCOMPONENTS_WEBSOCKET_OPCODE_PING == enOPCode)
+	{
+		int nSDLen = 0;
+		XCHAR tszMSGBuffer[MAX_PATH] = {};
+		RfcComponents_WSCodec_EncodeMsg(NULL, tszMSGBuffer, &nSDLen, ENUM_XENGINE_RFCOMPONENTS_WEBSOCKET_OPCODE_PONG);
+		NetCore_TCPXCore_SendEx(xhWSSocket, lpszClientAddr, tszMSGBuffer, nSDLen);
+	}
+	else
 	{
-		XENGINE_PROTOCOL_USERAUTH st_UserAuth;
-		memset(&st_UserAuth, '\0', sizeof(XENGINE_PROTOCOL_USERAUTH));
+		if (!Protocol_Parse_WSHdr(lpszMsgBuffer, nMsgLen, &st_ProtocolHdr))
+		{
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("WS客户端：%s，协议错误"), lpszClientAddr);
+			return false;
+		}
+
+		if (XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_AUTH_REQLOGIN == st_ProtocolHdr.unOperatorCode)
+		{
+			XENGINE_PROTOCOL_USERAUTH st_UserAuth;
+			memset(&st_UserAuth, '\0', sizeof(XENGINE_PROTOCOL_USERAUTH));
 
-		Protocol_Parse_HttpParseAuth(lpszMsgBuffer, nMsgLen, &st_UserAuth);
-		XEngine_Client_TCPTask(lpszClientAddr, (LPCXSTR)&st_UserAuth, sizeof(XENGINE_PROTOCOL_USERAUTH), &st_ProtocolHdr, XENGINE_AUTH_APP_NETTYPE_WS);
+			Protocol_Parse_HttpParseAuth(lpszMsgBuffer, nMsgLen, &st_UserAuth);
+			XEngine_Client_TCPTask(lpszClientAddr, (LPCXSTR)&st_UserAuth, sizeof(XENGINE_PROTOCOL_USERAUTH), &st_ProtocolHdr, XENGINE_AUTH_APP_NETTYPE_WS);
+		}
 	}
+	
 	return true;
 }
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/XEngine_AuthorizeService.cpp b/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);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"XVer":[`
	`3`	`+ "V3.12.1.1001 Build20240621",`
`3`	`4`	`"V3.12.0.1001 Build20240513",`
`4`	`5`	`"V3.11.0.1001 Build20240223",`
`5`	`6`	`"V3.10.0.1001 Build20240109",`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ typedef struct`
`31`	`31`	`}st_XMax;`
`32`	`32`	`struct`
`33`	`33`	`{`
`34`		`- int nUserTimeout; //用户登录超时时间`
`35`	`34`	`int nTokenTimeout; //TOKEN登录超时时间`
`36`	`35`	`int nDynamicTimeout; //动态码超时时间`
`37`	`36`	`int nVerTime; //验证时间`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_BaseLib.dll" "./"`
	`2`	`+copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_BaseSafe.dll" "./"`
`2`	`3`	`copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_Algorithm.dll" "./"`
`3`	`4`	`copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_Core.dll" "./"`
`4`	`5`	`copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_ManagePool.dll" "./"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`copy /y "%XEngine_Lib64%\XEngine_BaseLib\XEngine_BaseLib.dll" "./"`
	`2`	`+copy /y "%XEngine_Lib64%\XEngine_BaseLib\XEngine_BaseSafe.dll" "./"`
`2`	`3`	`copy /y "%XEngine_Lib64%\XEngine_BaseLib\XEngine_Algorithm.dll" "./"`
`3`	`4`	`copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_Core.dll" "./"`
`4`	`5`	`copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_ManagePool.dll" "./"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`copy /y "%XEngine_Lib32%\XEngine_BaseLib\XEngine_BaseLib.dll" "./"`
	`2`	`+copy /y "%XEngine_Lib32%\XEngine_BaseLib\XEngine_BaseSafe.dll" "./"`
`2`	`3`	`copy /y "%XEngine_Lib32%\XEngine_BaseLib\XEngine_Algorithm.dll" "./"`
`3`	`4`	`copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_Core.dll" "./"`
`4`	`5`	`copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_ManagePool.dll" "./"`