added:timeout notification mode setting

XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/CDialog_Configure.cpp

@@ -41,6 +41,7 @@ void CDialog_Configure::DoDataExchange(CDataExchange* pDX)
 	DDX_Control(pDX, IDC_EDIT9, m_EditSmtpUser);
 	DDX_Control(pDX, IDC_EDIT10, m_EditSmtpPass);
 	DDX_Control(pDX, IDC_EDIT15, m_EditWSPort);
+	DDX_Control(pDX, IDC_CHECK2, m_EditTimeNotift);
 }
 
 
@@ -72,7 +73,7 @@ BOOL CDialog_Configure::OnInitDialog()
 
 void CDialog_Configure::AuthorizeService_ReadConfigure()
 {
-	CString m_StrConfigTCPPort;               //服务器端口
+	CString m_StrConfigTCPPort;            //服务器端口
 	CString m_StrConfigWSPort;             //WS端口
 	CString m_StrConfigThread;             //启动的线程个数
 	CString m_StrTimedOut;                 //用户验证超时时间
@@ -104,6 +105,11 @@ void CDialog_Configure::AuthorizeService_ReadConfigure()
 		m_BtnAutoStop.SetCheck(1);
 	}
 
+	if (st_AuthConfig.bTimeNotify)
+	{
+		m_EditTimeNotift.SetCheck(TRUE);
+	}
+
 	if (st_AuthConfig.st_Crypto.bEnable)
 	{
 		m_EditPass.EnableWindow(TRUE);
@@ -121,17 +127,17 @@ void CDialog_Configure::AuthorizeService_ReadConfigure()
 
 	m_StrConfigTryTime.Format(_T("%d"), st_AuthConfig.st_Verification.nTryTime);
 	m_EditTryTime.SetWindowText(m_StrConfigTryTime);
-	m_ComboRegTry.AddString(_T("不支持"));
-	m_ComboRegTry.AddString(_T("分钟"));
-	m_ComboRegTry.AddString(_T("次数"));
+	m_ComboRegTry.InsertString(0, _T("不支持"));
+	m_ComboRegTry.InsertString(1, _T("分钟"));
+	m_ComboRegTry.InsertString(2, _T("次数"));
 	m_ComboRegTry.SetCurSel(st_AuthConfig.st_Verification.nTryMode);
 
 	m_StrConfigAuthTime.Format(_T("%d"), st_AuthConfig.st_Verification.nVerTime);
 	m_EditAuthTime.SetWindowText(m_StrConfigAuthTime);
-	m_ComboListAuth.AddString(_T("不支持"));
-	m_ComboListAuth.AddString(_T("分钟"));
-	m_ComboListAuth.AddString(_T("天数"));
-	m_ComboListAuth.AddString(_T("次数"));
+	m_ComboListAuth.InsertString(0, _T("不支持"));
+	m_ComboListAuth.InsertString(1, _T("分钟"));
+	m_ComboListAuth.InsertString(2, _T("天数"));
+	m_ComboListAuth.InsertString(3, _T("次数"));
 	m_ComboListAuth.SetCurSel(st_AuthConfig.st_Verification.nVerMode);
 
 	m_EditSmtpAddr.SetWindowText(st_AuthConfig.st_EMail.tszSmtpAddr);
@@ -158,6 +164,15 @@ void CDialog_Configure::AuthorizeService_WriteConfigure()
 	CString m_StrConfigSmtpUser;           //用户名
 	CString m_StrConfigSmtpPass;           //密码
 
+	if (BST_CHECKED == m_EditTimeNotift.GetCheck())
+	{
+		st_AuthConfig.bTimeNotify = TRUE;
+	}
+	else
+	{
+		st_AuthConfig.bTimeNotify = FALSE;
+	}
+
 	m_EditServicePort.GetWindowText(m_StrConfigTCPPort);
 	m_EditWSPort.GetWindowText(m_StrConfigWSPort);
 	m_EditThreadPool.GetWindowText(m_StrConfigThread);

XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/CDialog_Configure.h

@@ -47,4 +47,5 @@ public:
 	afx_msg void OnBnClickedRadio2();
 	afx_msg void OnBnClickedRadio1();
 	CEdit m_EditWSPort;
+	CButton m_EditTimeNotift;
 };

XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Task/Authorize_TaskEvent.cpp

@@ -43,14 +43,17 @@ void __stdcall XEngine_TaskEvent_Client(LPCSTR lpszUserAddr, LPCSTR lpszUserName
 				st_ProtocolHdr.unOperatorCode = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_AUTH_TIMEDOUT;
 				st_ProtocolHdr.wTail = XENGIEN_COMMUNICATION_PACKET_PROTOCOL_TAIL;
 
-				pClass_This->m_DlgUser.m_ListCtrlOnlineClient.DeleteItem(i);
-
 				pClass_This->m_EditLog.GetWindowText(m_StrPntLog);
 				m_StrFmtLog.Format(_T("用户:%s,地址:%s,没有剩余时间,已经通知客户单超时\r\n"), lpszUserName, lpszUserAddr);
 				m_StrPntLog += m_StrFmtLog;
 				pClass_This->m_EditLog.SetWindowText(m_StrPntLog);
 
 				XEngine_Client_TaskSend(lpszUserAddr, &st_ProtocolHdr, lParam, enDeviceType == ENUM_PROTOCOL_FOR_DEVICE_TYPE_PC ? XENGINE_AUTH_APP_NETTYPE_TCP : XENGINE_AUTH_APP_NETTYPE_WS);
+				if (!st_AuthConfig.bTimeNotify)
+				{
+					XEngine_CloseClient(lpszUserAddr, lParam);
+					pClass_This->m_DlgUser.m_ListCtrlOnlineClient.DeleteItem(i);
+				}
 			}
 		}
 	}

XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/XEngineAuthorizeApp.rc

 // Microsoft Visual C++ generated resource script.

XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/resource.h

@@ -39,6 +39,7 @@
 #define IDC_LIST1                       1019
 #define IDC_EDIT15                      1020
 #define IDC_IPADDRESS1                  1021
+#define IDC_CHECK2                      1024
 
 // Next default values for new objects
 // 
@@ -46,7 +47,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        138
 #define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1022
+#define _APS_NEXT_CONTROL_VALUE         1025
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Task.cpp

@@ -15,5 +15,10 @@ void __stdcall XEngine_TaskEvent_Client(LPCSTR lpszUserAddr, LPCSTR lpszUserName
 
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("用户:%s,地址:%s,没有剩余时间,已经通知客户单超时\r\n"), lpszUserName, lpszUserAddr);
 		XEngine_Client_TaskSend(lpszUserAddr, &st_ProtocolHdr, enDeviceType == ENUM_PROTOCOL_FOR_DEVICE_TYPE_PC ? XENGINE_AUTH_APP_NETTYPE_TCP : XENGINE_AUTH_APP_NETTYPE_WS);
+
+		if (!st_AuthConfig.bTimeNotify)
+		{
+			XEngine_CloseClient(lpszUserAddr);
+		}
 	}
 }
\ No newline at end of file