release以及安装包弄好了

bin/Win32/Release/setup/listen.txt

@@ -0,0 +1,7 @@
+1.本软件为智铺子收银插件，主要提供PC收银功能
+
+2.本软件的所有权归深圳市迅享智慧云科技有限公司，任何人不得对本软件进行破解与反编译等侵犯软件著作权的行为；
+
+3.本协议的最终解释权归深圳市迅享智慧云科技有限公司所有；
+
+乐外卖官网 https://www.zhipuzi.com/

bin/Win32/Release/setup/智铺子收银插件安装脚本.nsi

@@ -0,0 +1,149 @@
+; Script generated by the HM NIS Edit Script Wizard.
+
+; HM NIS Edit Wizard helper defines
+!define PRODUCT_NAME "智铺子收银插件"
+!define PRODUCT_VERSION "1.0.0.1"
+!define PRODUCT_PUBLISHER "深圳市迅享智慧云科技有限公司"
+!define PRODUCT_WEB_SITE "https://www.zhipuzi.com"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+!define PRODUCT_UNINST_ROOT_KEY "HKCU"
+
+; MUI 1.67 compatible ------
+!include "MUI.nsh"
+
+; MUI Settings
+!define MUI_ABORTWARNING
+!define MUI_ICON "zhipuzi.ico"
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
+
+!define MUI_WELCOMEFINISHPAGE_BITMAP "welcome.bmp"
+
+; Welcome page
+!insertmacro MUI_PAGE_WELCOME
+; License page
+!insertmacro MUI_PAGE_LICENSE "listen.txt"
+; Directory page
+!insertmacro MUI_PAGE_DIRECTORY
+; Instfiles page
+!insertmacro MUI_PAGE_INSTFILES
+; Finish page
+!define MUI_FINISHPAGE_RUN "$INSTDIR\zhipuzi_pay_plugin.exe"
+!define MUI_FINISHPAGE_SHOWREADME
+!define MUI_FINISHPAGE_SHOWREADME_FUNCTION autostart
+!define MUI_FINISHPAGE_SHOWREADME_TEXT "开机自动启动"
+!insertmacro MUI_PAGE_FINISH
+
+Function autostart
+WriteRegStr HKCU Software\Microsoft\Windows\CurrentVersion\Run 智铺子收银插件 "$INSTDIR\zhipuzi_pay_plugin.exe"
+Functionend
+
+; Uninstaller pages
+!insertmacro MUI_UNPAGE_INSTFILES
+
+; Language files
+!insertmacro MUI_LANGUAGE "SimpChinese"
+
+; MUI end ------
+
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+OutFile "zhipuzi_pay_plugin_setup_${PRODUCT_VERSION}.exe"
+InstallDir "$PROGRAMFILES\zhipuzi_pay_plugin"
+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
+ShowInstDetails show
+ShowUnInstDetails show
+
+Section "MainSection" SEC01
+  SetOutPath "$INSTDIR"
+  SetOverwrite ifnewer
+  
+  File /r "..\zhipuzi_pay_plugin\*"
+SectionEnd
+
+Section -AdditionalIcons
+  WriteIniStr "$INSTDIR\智铺子官网.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
+  
+  ;桌面快捷方式的文件
+  CreateShortCut "$DESKTOP\智铺子收银插件.lnk" "$INSTDIR\zhipuzi_pay_plugin.exe"
+  CreateShortCut "$DESKTOP\智铺子官网.lnk" "$INSTDIR\智铺子官网.url" "" "$INSTDIR\icon\zhipuzi.ico"
+  
+  ;开始程序里面的文件
+  CreateDirectory "$SMPROGRAMS\智铺子收银插件"
+  CreateShortCut "$SMPROGRAMS\智铺子收银插件\智铺子收银插件.lnk" "$INSTDIR\zhipuzi_pay_plugin.exe"
+  CreateShortCut "$SMPROGRAMS\智铺子收银插件\智铺子官网.lnk" "$INSTDIR\智铺子官网.url" "" "$INSTDIR\icon\zhipuzi.ico"
+SectionEnd
+
+Section -Post
+  WriteUninstaller "$INSTDIR\卸载.exe"
+  CreateShortCut "$SMPROGRAMS\智铺子收银插件\卸载.lnk" "$INSTDIR\卸载.exe"
+  
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\zhipuzi_pay_plugin.exe"
+  
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\卸载.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\zhipuzi_pay_plugin.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
+SectionEnd
+
+
+Function un.onUninstSuccess
+  HideWindow
+  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) 已成功地从你的计算机移除。"
+FunctionEnd
+
+Function .onInit
+  ;关闭进程
+  Push $R0
+  CheckProc:
+    Push "zhipuzi_pay_plugin.exe"
+    ProcessWork::existsprocess
+    Pop $R0
+    IntCmp $R0 0 Done
+    MessageBox MB_OKCANCEL|MB_ICONSTOP "安装程序检测到 ${PRODUCT_NAME} 正在运行。$\r$\n$\r$\n点击 “确定” 强制关闭${PRODUCT_NAME}，继续安装。$\r$\n点击 “取消” 退出安装程序。" IDCANCEL Exit
+    Push "zhipuzi_pay_plugin.exe"
+    Processwork::KillProcess
+    Sleep 1000
+    Goto CheckProc
+    Exit:
+    Abort
+    Done:
+    Pop $R0
+FunctionEnd
+
+Function un.onInit
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "您确实要完全移除 $(^Name) ，及其所有的组件？" IDYES +2
+  Abort
+  ;检测程序是否运行
+  FindProcDLL::FindProc "zhipuzi_pay_plugin.exe"
+   Pop $R0
+   IntCmp $R0 1 0 no_run
+   MessageBox MB_ICONSTOP "卸载程序检测到 ${PRODUCT_NAME} 正在运行，请关闭之后再卸载！"
+   Quit
+   no_run:
+FunctionEnd
+
+Section Uninstall  
+  RMDir /r "$INSTDIR"
+
+  Delete "$DESKTOP\智铺子收银插件.lnk"
+  Delete "$DESKTOP\智铺子官网.lnk"
+  
+  SetShellVarContext current
+  Delete "$SMPROGRAMS\智铺子收银插件\卸载.lnk"
+  Delete "$SMPROGRAMS\智铺子收银插件\智铺子官网.lnk"
+  Delete "$SMPROGRAMS\智铺子收银插件\智铺子收银插件.lnk"
+  RMDir "$SMPROGRAMS\智铺子收银插件"
+  
+  SetShellVarContext all
+  Delete "$SMPROGRAMS\智铺子收银插件\卸载.lnk"
+  Delete "$SMPROGRAMS\智铺子收银插件\智铺子官网.lnk"
+  Delete "$SMPROGRAMS\智铺子收银插件\智铺子收银插件.lnk"
+  RMDir "$SMPROGRAMS\智铺子收银插件"
+
+  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
+  DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "智铺子收银插件"
+  SetAutoClose true
+SectionEnd

zhipuzi_pay_plugin/network/CZhipuziHttpClient.cpp

@@ -7,8 +7,11 @@
 
 CZhipuziHttpClient::CZhipuziHttpClient()
 {
-	//htttp请求环境
+#ifdef _DEBUG
 	m_env = DEV;
+#else
+	m_env = RELEASE;
+#endif	
 
 	if (m_env == DEV)
 	{

zhipuzi_pay_plugin/wnd/CLoginWnd.cpp

@@ -383,69 +383,69 @@ void CLoginWnd::HandleLogin()
 	CLabelUI* pLoginResultLabel = static_cast<CLabelUI*>(m_pm.FindControl(_T("loginresult")));
 
 	//真正登录前，先检测是否有需要更新
-	//std::map<string, string> params;
+	std::map<string, string> params;
 
-	//std::string response;
-	//bool ret = CZhipuziHttpClient::Request("/version/getwindowsversion", params, response);
-	//if (!ret)
-	//{
-	//	pLoginResultLabel->SetText(std::wstring(_T("网络请求出错")).c_str());
-	//	pLoginResultLabel->SetVisible(true);
+	std::string response;
+	bool ret = CZhipuziHttpClient::RequestPingtaiNew("/version/getwindwoschajianversion", params, response);
+	if (!ret)
+	{
+		pLoginResultLabel->SetText(std::wstring(_T("网络请求出错")).c_str());
+		pLoginResultLabel->SetVisible(true);
 
-	//	PostMessage(WM_LOGIN_ERROR);
+		PostMessage(WM_LOGIN_ERROR);
 
-	//	return;
-	//}
+		return;
+	}
 
-	//rapidjson::Document document;
-	//document.Parse(response.c_str());
+	rapidjson::Document document;
+	document.Parse(response.c_str());
 
-	//if (document.HasParseError())
-	//{
-	//	pLoginResultLabel->SetText(std::wstring(_T("服务器返回数据格式错误")).c_str());
-	//	pLoginResultLabel->SetVisible(true);
+	if (document.HasParseError())
+	{
+		pLoginResultLabel->SetText(std::wstring(_T("服务器返回数据格式错误")).c_str());
+		pLoginResultLabel->SetVisible(true);
 
-	//	PostMessage(WM_LOGIN_ERROR);
+		PostMessage(WM_LOGIN_ERROR);
 
-	//	return;
-	//}
-	//else
-	//{
-	//	if (!document.HasMember("errcode") || !document.HasMember("errmsg") || !document.HasMember("data"))
-	//	{
-	//		pLoginResultLabel->SetText(std::wstring(_T("服务器返回数据格式错误")).c_str());
-	//		pLoginResultLabel->SetVisible(true);
+		return;
+	}
+	else
+	{
+		if (!document.HasMember("errcode") || !document.HasMember("errmsg") || !document.HasMember("data"))
+		{
+			pLoginResultLabel->SetText(std::wstring(_T("服务器返回数据格式错误")).c_str());
+			pLoginResultLabel->SetVisible(true);
 
-	//		PostMessage(WM_LOGIN_ERROR);
+			PostMessage(WM_LOGIN_ERROR);
 
-	//		return;
-	//	}
+			return;
+		}
 
-	//	rapidjson::Value& v_errcode = document["errcode"];
-	//	int errcode = v_errcode.GetInt();
-	//	if (errcode != 0)
-	//	{
-	//		std::string errmsg = "response failed! message:" + string(document["errmsg"].GetString());
-	//		pLoginResultLabel->SetText(CLewaimaiString::UTF8ToUnicode(errmsg).c_str());
-	//		pLoginResultLabel->SetVisible(true);
+		rapidjson::Value& v_errcode = document["errcode"];
+		int errcode = v_errcode.GetInt();
+		if (errcode != 0)
+		{
+			std::string errmsg = "response failed! message:" + string(document["errmsg"].GetString());
+			pLoginResultLabel->SetText(CLewaimaiString::UTF8ToUnicode(errmsg).c_str());
+			pLoginResultLabel->SetVisible(true);
 
-	//		PostMessage(WM_LOGIN_ERROR);
+			PostMessage(WM_LOGIN_ERROR);
 
-	//		return;
-	//	}
+			return;
+		}
 
-	//	rapidjson::Value& data = document["data"];
+		rapidjson::Value& data = document["data"];
 
-	//	std::string newest_version = data["newest_version"].GetString();
-	//	m_update_url = data["url"].GetString();
+		std::string newest_version = data["newest_version"].GetString();
+		m_update_url = data["url"].GetString();
 
-	//	if (newest_version > CSystem::GetVersion())
-	//	{
-	//		//说明有新版本，要更新
-	//		PostMessage(WM_NEED_UPDATE);
-	//		return;
-	//	}
-	//}
+		if (newest_version > CSystem::GetVersion())
+		{
+			//说明有新版本，要更新
+			PostMessage(WM_NEED_UPDATE);
+			return;
+		}
+	}
 
 	//判断账号密码是否正确
 	std::wstring account, password;

zhipuzi_pay_plugin/zhipuzi_pay_plugin.vcxproj

@@ -165,10 +165,10 @@ copy $(SolutionDir)res\icon\ $(SolutionDir)bin\$(Platform)\$(Configuration)\$(Pr
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x600;LOG4CPLUS_DISABLE_DLL_RUNTIME_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x600;LOG4CPLUS_DISABLE_DLL_RUNTIME_WARNING;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>false</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(SolutionDir)include;$(ProjectDir)pch</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)include;</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <DisableSpecificWarnings>4099</DisableSpecificWarnings>
     </ClCompile>
@@ -178,7 +178,8 @@ copy $(SolutionDir)res\icon\ $(SolutionDir)bin\$(Platform)\$(Configuration)\$(Pr
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)lib\release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>dbghelp.lib;winmm.lib;setupapi.lib;AdvAPI32.lib;Shell32.lib;user32.lib;kernel32.lib;Gdi32.lib;sqlite3.lib;libcurl.lib;DuiLib_u.lib;log4cplusU.lib;version.lib;libboost_date_time-vc141-mt-s-x32-1_70.lib;libboost_regex-vc141-mt-s-x32-1_70.lib;liblept171.lib;libtesseract304.lib;libqrencode.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>dbghelp.lib;winmm.lib;version.lib;ws2_32.lib;setupapi.lib;AdvAPI32.lib;wldap32.lib;crypt32.lib;sapi.lib;Shell32.lib;user32.lib;kernel32.lib;Gdi32.lib;libboost_date_time-vc141-mt-s-x32-1_70.lib;libboost_regex-vc141-mt-s-x32-1_70.lib;sqlite3.lib;DuiLib_u.lib;log4cplusU.lib;zpzDll.lib;libcurl.lib;liblept171.lib;libtesseract304.lib;libqrencode.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
     </Link>
     <PostBuildEvent>
       <Command>mkdir $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\
@@ -190,6 +191,9 @@ copy $(SolutionDir)res\music\ $(SolutionDir)bin\$(Platform)\$(Configuration)\$(P
 copy $(SolutionDir)res\icon\ $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\icon\
 </Command>
     </PostBuildEvent>
+    <Manifest>
+      <EnableDpiAwareness>true</EnableDpiAwareness>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>

zpzDll/zpzDll.vcxproj

@@ -80,6 +80,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)temp\link\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)temp\compile\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -128,16 +130,23 @@ copy $(SolutionDir)temp\link\$(Platform)\$(Configuration)\$(ProjectName)\zpzDll.
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;ZPZDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;ZPZDLL_EXPORTS;_WINDOWS;_USRDLL;HOOKAPI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalIncludeDirectories>$(SolutionDir)include;</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>$(SolutionDir)lib\release</AdditionalLibraryDirectories>
+      <AdditionalDependencies>detours.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <PostBuildEvent>
+      <Command>copy $(TargetPath) $(SolutionDir)bin\$(Platform)\$(Configuration)\zhipuzi_pay_plugin\
+copy $(SolutionDir)temp\link\$(Platform)\$(Configuration)\$(ProjectName)\zpzDll.lib $(SolutionDir)lib\release\</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>

zpzDll/zpzDll.vcxproj.user

@@ -8,4 +8,9 @@
   <PropertyGroup>
     <ShowAllFiles>true</ShowAllFiles>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerCommand>D:\Program Files %28x86%29\PosPalTouch\PosTouch.exe</LocalDebuggerCommand>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerWorkingDirectory>D:\Program Files %28x86%29\PosPalTouch\</LocalDebuggerWorkingDirectory>
+  </PropertyGroup>
 </Project>