bugfix<central-clearing-system&card-client&auto-updata>调整自动升级模块

1、支持客户端程序中文命名； 2、增加读取本地配置文件失败后异常处理； 3、统一升级模块为autoupdata；

bugfix<central-clearing-system&card-client&auto-updata>调整自动升级模块
1、支持客户端程序中文命名； 2、增加读取本地配置文件失败后异常处理； 3、统一升级模块为autoupdata；
liuye
1 parent 8745d8d4
Showing 11 changed files with 177 additions and 41 deletions
central_clearing_system/ETradeClient/mfc_ui/LoginDialog.cpp
central_clearing_system/out/Win32/综合业务管理系统.zip
client_auto_updata/AutoUpdate/AUDataManage.cpp
client_auto_updata/AutoUpdate/AUDataManage.h
client_auto_updata/AutoUpdate/AutoUpdate.cpp
client_auto_updata/AutoUpdate/AutoUpdate.vcxproj
client_auto_updata/AutoUpdate/AutoUpdate.vcxproj.filters
client_auto_updata/AutoUpdate/AutoUpdateDlg.h
client_auto_updata/AutoUpdate/CNTranslate.h
doc/各市场版本/市场升级ftp账户IP-.xlsx
etrade_card_client/ETradeClient/mfc_ui/LoginDialog.cpp
@@ -149,7 +149,7 @@ void CLoginDialog::DoDataExchange(CDataExchange* pDX)
 BOOL CLoginDialog::OnInitDialog()
 {
 	//Æô¶¯×Ô¶¯Éý¼¶³ÌÐò add by liuye
-	ShellExecute(NULL, L"open", L".\\CardAutoUpdate.exe", NULL, NULL, SW_SHOW);
+	ShellExecute(NULL, L"open", L".\\AutoUpdate.exe", NULL, NULL, SW_SHOW);
 	//
 	ModifyStyleEx(0, WS_EX_APPWINDOW); // This enables minimizing the dialog into taskbar instead of bottom left corner.
@@ -5,6 +5,7 @@
 #include "tinyxml.h"
 #include ".\zlib\zip.h"
 #include ".\zlib\unzip.h"
+#include "CNTranslate.h"
 CAUDataManage* CAUDataManage::m_pInstance = NULL;
@@ -12,7 +13,7 @@ void Log(CString sLog)
 {
 	CStdioFile fileLog;
 	CString sPath;
-	TCHAR szPath[MAX_PATH];
+	TCHAR szPath[MAX_PATH] = {0};
 	GetModuleFileName(NULL, szPath, MAX_PATH);
 	CString sMudolePath = szPath;
 	CString sMudoleName = AfxGetAppName();
@@ -75,9 +76,6 @@ BOOL CAUDataManage::CheckVersion()
 	pFtpConnection = pInternetSession->GetFtpConnection(m_stuConfigData.sServerIP, m_stuConfigData.sUserName, m_stuConfigData.sPassWord);
 	CString sFilePath;
 	pFtpConnection->GetCurrentDirectory(sFilePath);
-	//add for test by liuye 2017.7.17
-	Log("for test 获取到的路径是： " + sFilePath);
-	//
 	sFilePath += m_stuConfigData.sUpdateDir + "/" + m_sConfigFileName;
 	CString sTempConfigPath = m_stuConfigData.sTempDir + "\\" + m_sConfigFileName;
 	if (pFtpConnection)
@@ -155,10 +153,13 @@ void CAUDataManage::Update()
 	PostMessage(hMainWnd, WM_UPDATEPROCESS, 0, PROCESS_COMPLETE);
 }
-BOOL CAUDataManage::KillCilent(CString sClientName)
+BOOL CAUDataManage::KillCilent(CString sName)
 {
 	BOOL bResult = FALSE;
 	Log("关闭进程。");
+
+	CString sClientName = W(sName);
+
 	PROCESSENTRY32 stuClient;
 	HANDLE hAllProcess = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
 	if (hAllProcess != INVALID_HANDLE_VALUE)
@@ -201,7 +202,8 @@ BOOL CAUDataManage::KillCilent(CString sClientName)
 void CAUDataManage::RestartClient()
 {
-	ShellExecute(NULL, "open", m_stuConfigData.sAppDir + CString("\\") + m_stuConfigData.sAppName, NULL, m_stuConfigData.sAppDir, SW_SHOW);   
+	CString sRealAppName = W(m_stuConfigData.sAppName);
+	ShellExecute(NULL, "open", m_stuConfigData.sAppDir + CString("\\") + sRealAppName, NULL, m_stuConfigData.sAppDir, SW_SHOW);
 }
 BOOL CAUDataManage::DownloadClientFile()
@@ -328,7 +330,7 @@ CString CAUDataManage::GetModulePath()
 {
 	CString sPath;
-	TCHAR szPath[MAX_PATH];
+	TCHAR szPath[MAX_PATH] = {0};
 	GetModuleFileName(NULL, szPath, MAX_PATH);
 	CString sMudolePath = szPath;
 	CString sMudoleName = AfxGetAppName();
@@ -42,22 +42,6 @@ typedef struct STU_CONFIG
 extern void Log(CString sLog);
-
-//class Lock
-//{
-//private:
-//	CCriticalSection m_cs;
-//public:
-//	Lock(CCriticalSection  cs) : m_cs(cs)
-//	{
-//		m_cs.Lock();
-//	}
-//	~Lock()
-//	{
-//		m_cs.Unlock();
-//	}
-//};
-
 class CAUDataManage
 {
 public:
@@ -75,7 +59,7 @@ private:
 	CAUDataManage(const CAUDataManage &);
 	CAUDataManage& operator = (const CAUDataManage &);
-	BOOL KillCilent(CString sClientName);
+	BOOL KillCilent(CString sName);
 	BOOL DownloadClientFile();
 	void CreateTempFolder();
 	void DeleteDirectory(CString sDirectory);
@@ -89,9 +73,11 @@ private:
 	static CAUDataManage *m_pInstance;
 	static CCriticalSection m_csLocker;
-	APPConfig m_stuConfigData;
 	CString m_sConfigFilePath;
 	CString m_sConfigFileName;
 	BOOL Unzip(CString sSrcDir, CString sDstDir);
+
+public:
+	APPConfig m_stuConfigData;
 };
@@ -102,21 +102,28 @@ BOOL CAUAutoUpdateApp::InitInstance()
 	CAUAutoUpdateDlg dlgUpdate;
 	m_pMainWnd = &dlgUpdate;
-	INT_PTR nResponse = dlgUpdate.DoModal();
-	if (nResponse == IDOK)
+	if (!dlgUpdate.m_pDataManage->m_stuConfigData.sAppName.IsEmpty())
 	{
-		// TODO:  在此放置处理何时用
-		//  “确定”来关闭对话框的代码
+		INT_PTR nResponse = dlgUpdate.DoModal();
+		if (nResponse == IDOK)
+		{
+			// TODO:  在此放置处理何时用
+			//  “确定”来关闭对话框的代码
+		}
+		else if (nResponse == IDCANCEL)
+		{
+			// TODO:  在此放置处理何时用
+			//  “取消”来关闭对话框的代码
+		}
+		else if (nResponse == -1)
+		{
+			TRACE(traceAppMsg, 0, "警告: 对话框创建失败，应用程序将意外终止。\n");
+			TRACE(traceAppMsg, 0, "警告: 如果您在对话框上使用 MFC 控件，则无法 #define _AFX_NO_MFC_CONTROLS_IN_DIALOGS。\n");
+		}
 	}
-	else if (nResponse == IDCANCEL)
-	{
-		// TODO:  在此放置处理何时用
-		//  “取消”来关闭对话框的代码
-	}
-	else if (nResponse == -1)
+	else
 	{
-		TRACE(traceAppMsg, 0, "警告: 对话框创建失败，应用程序将意外终止。\n");
-		TRACE(traceAppMsg, 0, "警告: 如果您在对话框上使用 MFC 控件，则无法 #define _AFX_NO_MFC_CONTROLS_IN_DIALOGS。\n");
+		AfxMessageBox("读取本地配置文件失败！");
 	}
 	CAUDataManage::Instantialize()->DestoryInstance();
@@ -113,6 +113,7 @@
     <ClInclude Include="AUDataManage.h" />
     <ClInclude Include="AutoUpdate.h" />
     <ClInclude Include="AutoUpdateDlg.h" />
+    <ClInclude Include="CNTranslate.h" />
     <ClInclude Include="Resource.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
@@ -48,6 +48,9 @@
     <ClInclude Include="zlib\zip.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="CNTranslate.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="AutoUpdate.cpp">
@@ -32,9 +32,10 @@ protected:
 	afx_msg HCURSOR OnQueryDragIcon();
 	DECLARE_MESSAGE_MAP()
-private:
-	//CAUDataManage m_cDataManage;
+public:
 	CAUDataManage* m_pDataManage;
+
+private:
 	CEdit m_editNotice;
 	CProgressCtrl m_progressUpdate;
+#include <Windows.h>
+
+#define U   (CUtf8String)
+#define W   (CGb2312String)
+
+class CUtf8String
+{
+public:
+	inline CUtf8String(const char* gb2312)
+	{
+		m_bIsConst = true;
+#ifdef TEST_TYPE_MAP
+		if (m[gb2312])
+		{
+			m_utf8 = m[gb2312];
+			return;
+		}
+#endif
+		int buffLen = 0;
+		WCHAR wbuff[5120];
+		MultiByteToWideChar(CP_ACP, 0, gb2312, -1, wbuff, 5120);
+		buffLen = WideCharToMultiByte(CP_UTF8, 0, wbuff, -1, NULL, 0, 0, 0);
+		m_utf8 = new char[buffLen + 1];
+		WideCharToMultiByte(CP_UTF8, 0, wbuff, -1, (LPSTR)m_utf8, buffLen, 0, 0);
+#ifdef TEST_TYPE_MAP
+		m[gb2312] = m_utf8;
+#endif
+	}
+
+	inline CUtf8String(char* gb2312)
+	{
+		m_bIsConst = false;
+		int buffLen = 0;
+		WCHAR wbuff[5120];
+		MultiByteToWideChar(CP_ACP, 0, gb2312, -1, wbuff, 5120);
+		buffLen = WideCharToMultiByte(CP_UTF8, 0, wbuff, -1, NULL, 0, 0, 0);
+		m_utf8 = new char[buffLen + 1];
+		WideCharToMultiByte(CP_UTF8, 0, wbuff, -1, (LPSTR)m_utf8, buffLen, 0, 0);
+	}
+
+	inline ~CUtf8String()
+	{
+#ifndef TEST_TYPE_MAP
+		if (m_utf8)
+		{
+			delete m_utf8;
+			m_utf8 = 0;
+		}
+#else
+		if (!m_bIsConst)
+		{
+			if (m_utf8)
+			{
+				delete m_utf8;
+				m_utf8 = 0;
+			}
+		}
+#endif
+	}
+
+	inline operator char*()
+	{
+		return (char*)m_utf8;
+	}
+private:
+	const char* m_utf8;
+	bool m_bIsConst;
+#ifdef TEST_TYPE_MAP
+	static strmap m;
+#endif
+};
+
+class CGb2312String
+{
+public:
+	inline CGb2312String(const char* utf8)
+	{
+#ifdef TEST_TYPE_MAP
+		if (m[utf8])
+		{
+			m_gb2312 = 0;
+			m_gb2312 = m[utf8];
+		}
+#endif
+		int buffLen = 0;
+		WCHAR wbuff[5120];
+		MultiByteToWideChar(CP_UTF8, 0, utf8, -1, wbuff, 5120);
+		buffLen = WideCharToMultiByte(CP_ACP, 0, wbuff, -1, NULL, 0, 0, 0);
+		m_gb2312 = new char[buffLen + 1];
+		WideCharToMultiByte(CP_ACP, 0, wbuff, -1, (LPSTR)m_gb2312, buffLen, 0, 0);
+#ifdef TEST_TYPE_MAP
+		m[utf8] = m_gb2312;
+#endif
+	}
+
+	inline CGb2312String(char* utf8)
+	{
+#ifdef TEST_TYPE_MAP
+		if (m[utf8])
+		{
+			m_gb2312 = 0;
+			m_gb2312 = m[utf8];
+		}
+#endif
+		int buffLen = 0;
+		WCHAR wbuff[5120];
+		MultiByteToWideChar(CP_UTF8, 0, utf8, -1, wbuff, 5120);
+		buffLen = WideCharToMultiByte(CP_ACP, 0, wbuff, -1, NULL, 0, 0, 0);
+		m_gb2312 = new char[buffLen + 1];
+		WideCharToMultiByte(CP_ACP, 0, wbuff, -1, (LPSTR)m_gb2312, buffLen, 0, 0);
+#ifdef TEST_TYPE_MAP
+		m[utf8] = m_gb2312;
+#endif
+	}
+
+	inline ~CGb2312String()
+	{
+#ifndef TEST_TYPE_MAP
+		if (m_gb2312)
+		{
+			delete m_gb2312;
+			m_gb2312 = 0;
+		}
+#endif
+	}
+
+	inline operator char*()
+	{
+		return (char*)m_gb2312;
+	}
+private:
+	const char* m_gb2312;
+#ifdef TEST_TYPE_MAP
+	static strmap m;
+#endif
+};
@@ -147,7 +147,7 @@ void CLoginDialog::DoDataExchange(CDataExchange* pDX)
 BOOL CLoginDialog::OnInitDialog()
 {
 	//Æô¶¯×Ô¶¯Éý¼¶³ÌÐò add by liuye
-	ShellExecute(NULL, L"open", L".\\CardAutoUpdate.exe", NULL, NULL, SW_SHOW);
+	ShellExecute(NULL, L"open", L".\\AutoUpdate.exe", NULL, NULL, SW_SHOW);
 	//
 	ModifyStyleEx(0, WS_EX_APPWINDOW); // This enables minimizing the dialog into taskbar instead of bottom left corner.