feat<central_clearing_system>优化综合业务系统和底层操作模块

利用代码分析器检查若干可能出现的问题，并进行修复

feat<central_clearing_system>优化综合业务系统和底层操作模块
利用代码分析器检查若干可能出现的问题，并进行修复
liuye
1 parent 10f68606
Showing 9 changed files with 27 additions and 24 deletions
central_clearing_system/Config/url_cfg.json
central_clearing_system/ETradeClient.rc
central_clearing_system/ETradeClient/hardware/hardware_cmd.cpp
central_clearing_system/ETradeClient/hardware/hardware_cmd.h
central_clearing_system/ETradeClient/hardware/id_card_reader.cpp
central_clearing_system/ETradeClient/mfc_ui/pay_dlg.cpp
central_clearing_system/ETradeClient/mfc_ui/place_order_dlg.cpp
central_clearing_system/out/Win32/综合业务系统.zip
dlcm/dlcm/DLCCard.cc
 {
 	"protocol": "http",
-	"host": "xtrade.esc.diligrp.com",
-	"port": 8080,
+	"host": "etrade.esc.diligrp.com",
+	"port": 80,
 	"main_path": "/iset/oauth/clientInitMain.iset",
     "login_path": "/iset/oauth/login.auth",
     "logout_path": "/iset/oauth/logout.auth",
@@ -277,8 +277,8 @@ END
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,1
- PRODUCTVERSION 2,0,0,1
+ FILEVERSION 2,0,0,2
+ PRODUCTVERSION 2,0,0,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -295,12 +295,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "地利集团【DILI GROUP】"
             VALUE "FileDescription", "电子交易结算综合业务系统"
-            VALUE "FileVersion", "2.0.0.1"
-            VALUE "InternalName", "ETradeClient.exe"
+            VALUE "FileVersion", "2.0.0.2"
+            VALUE "InternalName", "Central-Clearing-System_2.0.1.181024_beta"
             VALUE "LegalCopyright", "(C) 地利集团。  保留所有权利。"
-            VALUE "OriginalFilename", "ETradeClient.exe"
-            VALUE "ProductName", "Central-Clearing-System_2.0.1.181019_beta"
-            VALUE "ProductVersion", "2.0.0.1"
+            VALUE "OriginalFilename", "Central-Clearing-System_2.0.1.181024_beta"
+            VALUE "ProductName", "Central-Clearing-System_2.0.1.181024_beta"
+            VALUE "ProductVersion", "2.0.0.2"
         END
     END
     BLOCK "VarFileInfo"
@@ -341,14 +341,12 @@ BEGIN
     IDD_DIALOG_PLACE_ORDER, DIALOG
     BEGIN
-        MOCKUP, 1, 50, -25, -30, "C:\Users\WangGY\Desktop\TIM图片20180918183513.png"
         RIGHTMARGIN, 337
         HORZGUIDE, 67
     END
     IDD_DIALOG_PAY, DIALOG
     BEGIN
-        MOCKUP, 1, 50, -5, -34, "C:\Users\WangGY\Desktop\无标题.png"
         LEFTMARGIN, 7
         RIGHTMARGIN, 222
         TOPMARGIN, 7
@@ -54,6 +54,7 @@ namespace StatusCode
 	static const std::string BANK_CARD_READ_CARD_NUM_FAILED = "501"; // 读取银行卡卡号失败.
 	static const std::string PRINT_PARSE_DATA_FAILED = "1001"; //解析打印数据失败
+	static const std::string PRINT_GET_MACHINE_DATA_FAILED = "1002"; //获取打印机参数失败
 }
 namespace EncryptTools
@@ -1290,14 +1291,14 @@ StylusPrinterCmd::Reply StylusPrinterCmd::Execute(const std::string&amp; input)
 		{
 			break;
 		}
-		Print(comm_vector);
+		reply.error_code = Print(comm_vector);
 	} while (0);
 	return reply;
 }
-int StylusPrinterCmd::Print(std::vector<OrderInfo> &order_vector)
+std::string StylusPrinterCmd::Print(std::vector<OrderInfo> &order_vector)
 {
 	HDC print_dc;
 	DOCINFO docin;
@@ -1310,6 +1311,10 @@ int StylusPrinterCmd::Print(std::vector&lt;OrderInfo&gt; &amp;order_vector)
 	PRINTDLG *print_dlg_info = &print_dialog.m_pd;
 	AfxGetApp()->GetPrinterDeviceDefaults(print_dlg_info);
 	DEVMODE* lpDevMode = (DEVMODE*)::GlobalLock(print_dlg_info->hDevMode);
+	if (!lpDevMode)
+	{
+		return StatusCode::PRINT_GET_MACHINE_DATA_FAILED;
+	}
 	::GlobalUnlock(print_dlg_info->hDevMode);
 	lpDevMode->dmFields |= -1; 
 	lpDevMode->dmPaperLength = 1397; //设定纸长为 139.7mm 
@@ -1504,7 +1509,7 @@ int StylusPrinterCmd::Print(std::vector&lt;OrderInfo&gt; &amp;order_vector)
 	DeleteDC(print_dc);
 	delete dc;
-	return true;
+	return StatusCode::OK;
 }
@@ -124,7 +124,7 @@ public:
 private:
 	std::string ParseInput(std::string &input, std::vector<OrderInfo> &order_vector);
-	int Print(std::vector<OrderInfo> &order_vector);
+	std::string Print(std::vector<OrderInfo> &order_vector);
 };
 //
@@ -137,7 +137,7 @@ void IDCardReader::GetPortraitPath(std::wstring&amp; portrait_path) const
 	wchar_t exe_path[MAX_PATH];
 	HMODULE h_module = GetModuleHandle(NULL);
 	if (NULL != h_module)
-		GetModuleFileName(h_module, exe_path, sizeof(exe_path));
+		GetModuleFileName(h_module, exe_path, MAX_PATH);
 	else
 		throw std::exception("Calling windows API to get exe path failed.");
@@ -57,9 +57,9 @@ BEGIN_MESSAGE_MAP(PayDlg, CDialogEx)
 	ON_BN_CLICKED(IDC_PAY_BUTTON_PAY, &PayDlg::OnBnClickedPayButtonPay)
 	ON_WM_CTLCOLOR()
 	ON_BN_CLICKED(IDC_PAY_BUTTON_PASSWORD, &PayDlg::OnBnClickedPayButtonPassword)
-	ON_COMMAND(ID_ACCELERATOR_A, &PayDlg::OnBnClickedPayButtonPassword)
+	ON_COMMAND(ID_ACCELERATOR_X, &PayDlg::OnBnClickedPayButtonPassword)
 	ON_COMMAND(ID_ACCELERATOR_F, &PayDlg::OnBnClickedPayButtonPay)
-	ON_COMMAND(ID_ACCELERATOR_X, &PayDlg::OnBnClickedPayButtonClose)
+	ON_COMMAND(ID_ACCELERATOR_S, &PayDlg::OnBnClickedPayButtonClose)
 	ON_MESSAGE(WM_CEF_SESSION_EXPIRED, &PayDlg::OnSessionExpired)
 END_MESSAGE_MAP()
@@ -149,8 +149,8 @@ void PlaceOrderDlg::SetCtrlPos()
 	ctrl_rect.right += EditWidth;
 	buyer_card_edit_.MoveWindow(&ctrl_rect);
-	line_point_[3].x = ctrl_rect.right + 3;
-	line_point_[3].y = ctrl_rect.bottom - EditHeigth / 2 - 3;
+	line_point_[2].x = ctrl_rect.right + 3;
+	line_point_[2].y = ctrl_rect.bottom - EditHeigth / 2 - 3;
 	ctrl_rect.left = ctrl_rect.right + 30;
 	ctrl_rect.right = ctrl_rect.left + EditWidth;
@@ -333,8 +333,8 @@ void PlaceOrderDlg::OnPaint()
 	dc.MoveTo(line_point_[1]);
 	dc.LineTo(line_point_[1].x + 24, line_point_[1].y);
-	dc.MoveTo(line_point_[3]);
-	dc.LineTo(line_point_[3].x + 24, line_point_[3].y);
+	dc.MoveTo(line_point_[2]);
+	dc.LineTo(line_point_[2].x + 24, line_point_[2].y);
 	dc.SelectObject(old_pen);
@@ -751,7 +751,7 @@ int DLCCard::CreatCardFile(const unsigned char* parent_dir, const unsigned char*
 			}
 		}
-		else if (card_mf = kCardHDZB)
+		else if (card_mf == kCardHDZB)
 		{
 			if (file_type == kFTDDF)
 			{
@@ -779,7 +779,7 @@ int DLCCard::CreatCardFile(const unsigned char* parent_dir, const unsigned char*
 				create_file_cmd[15] = 0x00;
 				create_file_cmd[16] = 0x01;
 				create_file_cmd[17] = 0x03;
-				memcpy(&create_file_cmd[18], kDF10FileAID, 8);
+				memcpy(&create_file_cmd[18], kDF10FileAID, 7);
 				unsigned char recv_data[kHalfBlock], recv_data_len = 0;
 				result = DLCDevice::Instance().SendCommand(create_file_cmd, 15, recv_data, recv_data_len);