feat<central_clearing_system>:新增下单流程超时处理

下单超时调用登录界面，重新登录继续之前操作，失败退出系统。

feat<central_clearing_system>:新增下单流程超时处理
下单超时调用登录界面，重新登录继续之前操作，失败退出系统。
liuye
1 parent 6d918b59
Showing 14 changed files with 140 additions and 22 deletions
central_clearing_system/Config/url_cfg.json
central_clearing_system/ETradeClient.rc
central_clearing_system/ETradeClient.vcxproj
central_clearing_system/ETradeClient/browser/async_js_callback_handler.cpp
central_clearing_system/ETradeClient/browser/main_view_browser_handler.cpp
central_clearing_system/ETradeClient/browser/popup_browser_handler.cpp
central_clearing_system/ETradeClient/mfc_ui/MainFrm.cpp
central_clearing_system/ETradeClient/mfc_ui/MainFrm.h
central_clearing_system/ETradeClient/mfc_ui/pay_dlg.cpp
central_clearing_system/ETradeClient/mfc_ui/pay_dlg.h
central_clearing_system/ETradeClient/mfc_ui/place_order_dlg.cpp
central_clearing_system/ETradeClient/mfc_ui/place_order_dlg.h
central_clearing_system/out/Win32/综合业务系统.zip
etrade_card_client/Resource/Menu/Menu.lnk
 {
 	"protocol": "http",
 	"host": "xtrade.esc.diligrp.com",
-	"port": 8082,
+	"port": 8080,
 	"main_path": "/iset/oauth/clientInitMain.iset",
     "login_path": "/iset/oauth/login.auth",
     "logout_path": "/iset/oauth/logout.auth",
@@ -146,15 +146,14 @@ END
 IDR_ACCELERATOR_ORDER ACCELERATORS
 BEGIN
+    "A",            ID_ACCELERATOR_A,       VIRTKEY, NOINVERT
     VK_DOWN,        ID_ACCELERATOR_DOWN,    VIRTKEY, NOINVERT
     VK_RETURN,      ID_ACCELERATOR_ENTER,   VIRTKEY, NOINVERT
+    "F",            ID_ACCELERATOR_F,       VIRTKEY, NOINVERT
     VK_F11,         ID_ACCELERATOR_F11,     VIRTKEY, NOINVERT
+    "S",            ID_ACCELERATOR_S,       VIRTKEY, NOINVERT
     VK_TAB,         ID_ACCELERATOR_TAB,     VIRTKEY, NOINVERT
     VK_UP,          ID_ACCELERATOR_UP,      VIRTKEY, NOINVERT
-    "S",            ID_ACCELERATOR_S,       VIRTKEY, NOINVERT
-    "S",            ID_ACCELERATOR_ALT_S,   VIRTKEY, ALT, NOINVERT
-    "A",            ID_ACCELERATOR_A,       VIRTKEY, NOINVERT
-    "F",            ID_ACCELERATOR_F,       VIRTKEY, NOINVERT
     "X",            ID_ACCELERATOR_X,       VIRTKEY, NOINVERT
 END
@@ -226,7 +225,7 @@ BEGIN
 END
 IDD_DIALOG_PLACE_ORDER DIALOGEX 0, 0, 342, 238
-STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "结算下单"
 FONT 12, "微软雅黑", 400, 0, 0x86
 BEGIN
@@ -278,8 +277,8 @@ END
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION 2,0,0,1
+ PRODUCTVERSION 2,0,0,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -295,13 +294,13 @@ BEGIN
         BLOCK "080404b0"
         BEGIN
             VALUE "CompanyName", "地利集团【DILI GROUP】"
-            VALUE "FileDescription", "电子交易结算柜员系统【ETradeClient】"
-            VALUE "FileVersion", "1.0.0.1"
+            VALUE "FileDescription", "电子交易结算综合业务系统"
+            VALUE "FileVersion", "2.0.0.1"
             VALUE "InternalName", "ETradeClient.exe"
             VALUE "LegalCopyright", "(C) 地利集团。  保留所有权利。"
             VALUE "OriginalFilename", "ETradeClient.exe"
-            VALUE "ProductName", "电子交易结算柜员系统"
-            VALUE "ProductVersion", "1.0.0.1"
+            VALUE "ProductName", "Central-Clearing-System_2.0.1.181019_beta"
+            VALUE "ProductVersion", "2.0.0.1"
         END
     END
     BLOCK "VarFileInfo"
@@ -45,6 +45,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>综合业务系统_beta</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
@@ -70,7 +70,21 @@ namespace HW
 		PT::read_json(ss, ptree);
 		std::string cmd = ptree.get<std::string>(JSON_TAG_CMD);
 		std::string file_id = ptree.get<std::string>(JSON_TAG_FILEID);
-		std::string data = ptree.get<std::string>(JSON_TAG_DATA);
+		
+		std::string data;
+		if (cmd.compare(JSON_VAL_CMD_PRINT) == 0 && file_id.compare(JSON_VAL_FILEID_ORDER) == 0)
+		{
+			PT::ptree data_child = ptree.get_child(JSON_TAG_DATA);
+			std::ostringstream os;
+			PT::write_json(os, data_child);
+			CString data_t = str_2_wstr(std::string(os.str())).c_str();
+			data = CT2A(data_t);
+		}
+		else
+		{
+			data = ptree.get<std::string>(JSON_TAG_DATA);
+		}
+
 		std::string seq = ptree.get<std::string>(JSON_TAG_SEQ);
 		return{ cmd, file_id, data, seq };
 	}
@@ -407,7 +407,7 @@ bool MainViewBrowserHandler::OnResourceResponse(CefRefPtr&lt;CefBrowser&gt; browser, C
 	CEF_REQUIRE_IO_THREAD();
 	const CefString kTimeoutHeader("sessionStatus");
-	const CefString kTimeout("expired");
+	const CefString kTimeout("0"); //³¬Ê±Îª0£¬Õý³£Îª1
 	auto& url = request->GetURL();
 	CefRequest::HeaderMap headerMap;
@@ -63,7 +63,7 @@ bool PopupBrowserHandler::OnResourceResponse(CefRefPtr&lt;CefBrowser&gt; browser, CefR
 	CEF_REQUIRE_IO_THREAD();
 	const CefString kTimeoutHeader("sessionStatus");
-			const CefString kTimeout("expired");
+			const CefString kTimeout("0");
 	auto& url = request->GetURL();
 	CefRequest::HeaderMap headerMap;
@@ -102,7 +102,8 @@ CMainFrame::CMainFrame() : m_is_view_closing(false), m_msg_count(0)
 {}
 CMainFrame::~CMainFrame()
-{}
+{
+}
 bool CMainFrame::Launch()
 {
@@ -171,8 +172,8 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 {
 	do
 	{
-		if (CFrameWnd::OnCreate(lpCreateStruct) == -1)
-			break;
+		/*if (CFrameWnd::OnCreate(lpCreateStruct) == -1)
+			break;*/
 		if (!m_menu_res_auth_manager.UpdateAuth())
 			break;
 		if (!FilterMenuBar())
@@ -183,6 +184,9 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 			break;
 		return 0; // Return 0 if all succeed.
 	} while (0);
+
+	
+
 	return -1; // Return -1 to indicate error happens.
 }
@@ -11,6 +11,7 @@
 #include "etradeclient/browser/user_msg_monitor.h"
 #include "etradeclient/utility/menu_res_auth_mgr.h"
+#include "place_order_dlg.h"
 class CMainFrame : public CFrameWnd
 {
@@ -19,6 +19,7 @@
 #include "etradeclient/hardware/hardware_cmd.h"
 #include "ETradeClient/utility/logging.h"
 #include <sstream>
+#include "LoginDialog.h"
 // PayDlg 对话框
@@ -59,6 +60,7 @@ BEGIN_MESSAGE_MAP(PayDlg, CDialogEx)
 	ON_COMMAND(ID_ACCELERATOR_A, &PayDlg::OnBnClickedPayButtonPassword)
 	ON_COMMAND(ID_ACCELERATOR_F, &PayDlg::OnBnClickedPayButtonPay)
 	ON_COMMAND(ID_ACCELERATOR_X, &PayDlg::OnBnClickedPayButtonClose)
+	ON_MESSAGE(WM_CEF_SESSION_EXPIRED, &PayDlg::OnSessionExpired)
 END_MESSAGE_MAP()
@@ -162,6 +164,9 @@ void PayDlg::OnBnClickedPayButtonClose()
 void PayDlg::OnBnClickedPayButtonPay()
 {
+	//for test
+	//OnSessionExpired(NULL, NULL);
+	//
 	LOG_TRACE(L"支付订单");
 	CString error_msg;
@@ -211,6 +216,7 @@ void PayDlg::OnBnClickedPayButtonPay()
 			error_msg = err_msg.c_str();
 			break;
 		}
+		std::string response_header = request.ReadResponseHeader();
 		std::string response_body = request.ReadResponseBody();
 		if (response_body.empty())
 		{
@@ -223,6 +229,20 @@ void PayDlg::OnBnClickedPayButtonPay()
 		bool card_res = false;
 		try //Parse the configuration file
 		{
+			int status_index = response_header.find("sessionStatus");
+			if (std::string::npos == status_index)
+			{
+				LOG_ERROR(L"解析服务器返回的登录结果信息时出错！请确认返回数据不为空，返回的数据格式为正确的Json格式！");
+				error_msg = CString(L"解析服务器返回的登录结果信息时出错！请确认返回数据不为空，返回的数据格式为正确的Json格式！");
+				break;
+			}
+			std::string status = response_header.substr(status_index + 15, 1);
+			if (status.compare("0") == 0)
+			{
+				SendMessage(WM_CEF_SESSION_EXPIRED);
+				break;
+			}
+
 			PT::ptree ptree;
 			std::stringstream ss;
 			ss << response_body;
@@ -345,3 +365,14 @@ BOOL PayDlg::PreTranslateMessage(MSG* pMsg)
 	return CDialogEx::PreTranslateMessage(pMsg);
 }
+
+LRESULT PayDlg::OnSessionExpired(WPARAM wParam, LPARAM lParam)
+{
+	if (!CLoginDialog(L"当前连接已过期，请重新登录！", this).Launch())
+	{
+		AfxGetMainWnd()->PostMessage(WM_CLOSE);
+		return 0;
+	}
+	Session::Instance().OnValid(); // If login succeeded, recover the session state to be "not expired".
+	return 0;
+}
@@ -25,6 +25,9 @@ public:
 	afx_msg void OnBnClickedPayButtonClose();
 	afx_msg void OnBnClickedPayButtonPay();
 	afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
+	afx_msg LRESULT OnSessionExpired(WPARAM wParam, LPARAM lParam);
+	afx_msg void OnBnClickedPayButtonPassword();
+	virtual BOOL PreTranslateMessage(MSG* pMsg);
 private:
 	void SetCtrlPos();
@@ -45,7 +48,4 @@ private:
 	int card_type_;
 	HACCEL acce_;
-public:
-	afx_msg void OnBnClickedPayButtonPassword();
-	virtual BOOL PreTranslateMessage(MSG* pMsg);
 };
@@ -16,6 +16,7 @@
 #include "pay_dlg.h"
 #include "etradeclient/hardware/hardware_cmd.h"
 #include "etradeclient/boost_patch/property_tree/json_parser.hpp"
+#include "LoginDialog.h"
 // PlaceOrderDlg 对话框
@@ -81,6 +82,7 @@ BEGIN_MESSAGE_MAP(PlaceOrderDlg, CDialogEx)
 	ON_WM_SETFOCUS()
 	ON_BN_CLICKED(IDC_BUTTON_SWIP_CARD, &PlaceOrderDlg::OnBnClickedButtonSwipCard)
 	ON_MESSAGE(WM_ORDER_DELETE_ORDER, &PlaceOrderDlg::DeleteComm)
+	ON_MESSAGE(WM_CEF_SESSION_EXPIRED, &PlaceOrderDlg::OnSessionExpired)
 END_MESSAGE_MAP()
@@ -453,6 +455,7 @@ void PlaceOrderDlg::OnBnClickedButtonPay()
 			error_msg = err_msg.c_str();
 			break;
 		}
+		std::string response_header = request.ReadResponseHeader();
 		std::string response_body = request.ReadResponseBody();
 		if (response_body.empty())
 		{
@@ -465,6 +468,20 @@ void PlaceOrderDlg::OnBnClickedButtonPay()
 		bool card_res = false;
 		try //Parse the configuration file
 		{
+			int status_index = response_header.find("sessionStatus");
+			if (std::string::npos == status_index)
+			{
+				LOG_ERROR(L"解析服务器返回的登录结果信息时出错！请确认返回数据不为空，返回的数据格式为正确的Json格式！");
+				error_msg = CString(L"解析服务器返回的登录结果信息时出错！请确认返回数据不为空，返回的数据格式为正确的Json格式！");
+				break;
+			}
+			std::string status = response_header.substr(status_index + 15, 1);
+			if (status.compare("0") == 0)
+			{
+				SendMessage(WM_CEF_SESSION_EXPIRED);
+				break;
+			}
+
 			PT::ptree ptree;
 			std::stringstream ss;
 			ss << response_body;
@@ -858,8 +875,9 @@ bool PlaceOrderDlg::GetCardName(CString &amp;num, CString &amp;name, int type)
 			result = false;
 			break;
 		}
+		std::string response_header = request.ReadResponseHeader();
 		std::string response_body = request.ReadResponseBody();
-		if (response_body.empty())
+		if (response_body.empty() || response_header.empty())
 		{
 			LOG_ERROR(L"获取服务器响应数据失败，请确保网络连接正常！");
 			name = CString(L"获取服务器响应数据失败，请确保网络连接正常！");
@@ -871,6 +889,22 @@ bool PlaceOrderDlg::GetCardName(CString &amp;num, CString &amp;name, int type)
 		bool card_res = false;
 		try //Parse the configuration file
 		{
+			int status_index = response_header.find("sessionStatus");
+			if (std::string::npos == status_index)
+			{
+				LOG_ERROR(L"解析服务器返回的登录结果信息时出错！请确认返回数据不为空，返回的数据格式为正确的Json格式！");
+				name = CString(L"解析服务器返回的登录结果信息时出错！请确认返回数据不为空，返回的数据格式为正确的Json格式！");
+				result = false;
+				break;
+			}
+			std::string status = response_header.substr(status_index + 15, 1);
+			if (status.compare("0") == 0)
+			{
+				SendMessage(WM_CEF_SESSION_EXPIRED);
+				result = false;
+				break;
+			}
+
 			PT::ptree ptree;
 			std::stringstream ss;
 			ss << response_body;
@@ -935,6 +969,8 @@ bool PlaceOrderDlg::GetCommName(CString &amp;num, CString&amp; card, CString &amp;name, long
 			result = false;
 			break;
 		}
+
+		std::string response_header = request.ReadResponseHeader();
 		std::string response_body = request.ReadResponseBody();
 		if (response_body.empty())
@@ -949,6 +985,22 @@ bool PlaceOrderDlg::GetCommName(CString &amp;num, CString&amp; card, CString &amp;name, long
 		bool card_res = false;
 		try //Parse the configuration file
 		{
+			int status_index = response_header.find("sessionStatus");
+			if (std::string::npos == status_index)
+			{
+				LOG_ERROR(L"解析服务器返回的登录结果信息时出错！请确认返回数据不为空，返回的数据格式为正确的Json格式！");
+				name = CString(L"解析服务器返回的登录结果信息时出错！请确认返回数据不为空，返回的数据格式为正确的Json格式！");
+				result = false;
+				break;
+			}
+			std::string status = response_header.substr(status_index + 15, 1);
+			if (status.compare("0") == 0)
+			{
+				SendMessage(WM_CEF_SESSION_EXPIRED);
+				result = false;
+				break;
+			}
+
 			PT::ptree ptree;
 			std::stringstream ss;
 			ss << response_body;
@@ -1159,6 +1211,9 @@ void PlaceOrderDlg::EmptyCtrl(bool is_empty_buyer)
 void PlaceOrderDlg::OnBnClickedButtonSwipCard()
 {
+	//for test
+	//OnSessionExpired(NULL, NULL);
+	//
 	SetErrorMsg(CString(L""));
 	EmptyCtrl(true);
 	InitList();
@@ -1316,3 +1371,15 @@ afx_msg LRESULT PlaceOrderDlg::DeleteComm(WPARAM wParam, LPARAM lParam)
 	product_list_.Invalidate(TRUE);
 	return 0;
 }
+
+LRESULT PlaceOrderDlg::OnSessionExpired(WPARAM wParam, LPARAM lParam)
+{
+	if (!CLoginDialog(L"当前连接已过期，请重新登录！", this).Launch())
+	{
+		AfxGetMainWnd()->PostMessage(WM_CLOSE);
+		return 0;
+	}
+	Session::Instance().OnValid(); // If login succeeded, recover the session state to be "not expired".
+	//m_user_msg_monitor.Start(); // Start again after relogged in.
+	return 0;
+}
@@ -59,6 +59,7 @@ public:
 	afx_msg void OnSetFocus(CWnd* pOldWnd);
 	afx_msg void OnBnClickedButtonSwipCard();
 	afx_msg LRESULT DeleteComm(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnSessionExpired(WPARAM wParam, LPARAM lParam);
 // ¶Ô»°¿òÊý¾Ý
 	enum { IDD = IDD_DIALOG_PLACE_ORDER };