6 år sedan · 5f5e7a310c
--- a/bin/Win32/Debug/zhipuzi_pos_windows/db/pos.db
+++ b/bin/Win32/Debug/zhipuzi_pos_windows/db/pos.db
--- a/bin/Win32/Debug/zhipuzi_pos_windows/zhipuzi_pos_windows.exe
+++ b/bin/Win32/Debug/zhipuzi_pos_windows/zhipuzi_pos_windows.exe
--- a/bin/Win32/Debug/zhipuzi_pos_windows_server/zhipuzi_pos_windows_server.exe
+++ b/bin/Win32/Debug/zhipuzi_pos_windows_server/zhipuzi_pos_windows_server.exe
--- a/zhipuzi_pos_windows.sln
+++ b/zhipuzi_pos_windows.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 
																 # Visual Studio 15
															
 
																 VisualStudioVersion = 15.0.28010.2016
															
 
																 MinimumVisualStudioVersion = 10.0.40219.1
															
 
																-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zhipuzi_pos_windows", "lewaimai_dispatch\lewaimai_dispatch_windows.vcxproj", "{1D694BE0-D976-4F29-8997-3308ADFFF413}"
															
 
																+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zhipuzi_pos_windows", "zhipuzi_pos_windows\zhipuzi_pos_windows.vcxproj", "{1D694BE0-D976-4F29-8997-3308ADFFF413}"
															
 
																 EndProject
															
 
																-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zhipuzi_pos_windows_server", "lewaimai_pathplanning\lewaimai_pathplanning_windows.vcxproj", "{2FF637C1-9F58-473C-A156-25EFE35C2FD7}"
															
 
																+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zhipuzi_pos_windows_server", "zhipuzi_pos_windows_server\zhipuzi_pos_windows_server_windows.vcxproj", "{2FF637C1-9F58-473C-A156-25EFE35C2FD7}"
															
 
																 EndProject
															
 
																 Global
															
 
																 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
															
--- a/zhipuzi_pos_windows/control/CSettingUI.cpp
+++ b/zhipuzi_pos_windows/control/CSettingUI.cpp
--- a/zhipuzi_pos_windows/control/CSettingUI.h
+++ b/zhipuzi_pos_windows/control/CSettingUI.h
--- a/zhipuzi_pos_windows/control/CWaimaiOrderInfoUI.cpp
+++ b/zhipuzi_pos_windows/control/CWaimaiOrderInfoUI.cpp
--- a/zhipuzi_pos_windows/control/CWaimaiOrderInfoUI.h
+++ b/zhipuzi_pos_windows/control/CWaimaiOrderInfoUI.h
--- a/zhipuzi_pos_windows/control/CWaimaiOrderItemUI.cpp
+++ b/zhipuzi_pos_windows/control/CWaimaiOrderItemUI.cpp
--- a/zhipuzi_pos_windows/control/CWaimaiOrderItemUI.h
+++ b/zhipuzi_pos_windows/control/CWaimaiOrderItemUI.h
--- a/zhipuzi_pos_windows/control/ControlEx.h
+++ b/zhipuzi_pos_windows/control/ControlEx.h
--- a/zhipuzi_pos_windows/control/OrderListUI.cpp
+++ b/zhipuzi_pos_windows/control/OrderListUI.cpp
--- a/zhipuzi_pos_windows/control/OrderListUI.h
+++ b/zhipuzi_pos_windows/control/OrderListUI.h
--- a/zhipuzi_pos_windows/helper/CLewaimaiString.cpp
+++ b/zhipuzi_pos_windows/helper/CLewaimaiString.cpp
--- a/zhipuzi_pos_windows/helper/CLewaimaiString.h
+++ b/zhipuzi_pos_windows/helper/CLewaimaiString.h
--- a/zhipuzi_pos_windows/helper/CRandomHelper.cpp
+++ b/zhipuzi_pos_windows/helper/CRandomHelper.cpp
--- a/zhipuzi_pos_windows/helper/CRandomHelper.h
+++ b/zhipuzi_pos_windows/helper/CRandomHelper.h
--- a/zhipuzi_pos_windows/helper/CSystem.cpp
+++ b/zhipuzi_pos_windows/helper/CSystem.cpp
--- a/zhipuzi_pos_windows/helper/CSystem.h
+++ b/zhipuzi_pos_windows/helper/CSystem.h
--- a/zhipuzi_pos_windows/helper/MD5.cpp
+++ b/zhipuzi_pos_windows/helper/MD5.cpp
--- a/zhipuzi_pos_windows/helper/MD5.h
+++ b/zhipuzi_pos_windows/helper/MD5.h
--- a/zhipuzi_pos_windows/helper/define.h
+++ b/zhipuzi_pos_windows/helper/define.h
--- a/zhipuzi_pos_windows/network/CHttpClient.cpp
+++ b/zhipuzi_pos_windows/network/CHttpClient.cpp
--- a/zhipuzi_pos_windows/network/CHttpClient.h
+++ b/zhipuzi_pos_windows/network/CHttpClient.h
--- a/zhipuzi_pos_windows/network/CMessagePush.cpp
+++ b/zhipuzi_pos_windows/network/CMessagePush.cpp
--- a/zhipuzi_pos_windows/network/CMessagePush.h
+++ b/zhipuzi_pos_windows/network/CMessagePush.h
--- a/zhipuzi_pos_windows/network/CZhipuziHttpClient.cpp
+++ b/zhipuzi_pos_windows/network/CZhipuziHttpClient.cpp
--- a/zhipuzi_pos_windows/network/CZhipuziHttpClient.h
+++ b/zhipuzi_pos_windows/network/CZhipuziHttpClient.h
--- a/zhipuzi_pos_windows/network/PosMessage.h
+++ b/zhipuzi_pos_windows/network/PosMessage.h
--- a/zhipuzi_pos_windows/order/CWaimaiOrder.cpp
+++ b/zhipuzi_pos_windows/order/CWaimaiOrder.cpp
--- a/zhipuzi_pos_windows/order/CWaimaiOrder.h
+++ b/zhipuzi_pos_windows/order/CWaimaiOrder.h
--- a/zhipuzi_pos_windows/pch/pch.cpp
+++ b/zhipuzi_pos_windows/pch/pch.cpp
--- a/zhipuzi_pos_windows/pch/pch.h
+++ b/zhipuzi_pos_windows/pch/pch.h
--- a/zhipuzi_pos_windows/resource/duilib.ico
+++ b/zhipuzi_pos_windows/resource/duilib.ico
--- a/zhipuzi_pos_windows/resource/resource.h
+++ b/zhipuzi_pos_windows/resource/resource.h
--- a/zhipuzi_pos_windows/resource/zhipuzi_pos_windows.aps
+++ b/zhipuzi_pos_windows/resource/zhipuzi_pos_windows.aps
--- a/zhipuzi_pos_windows/resource/zhipuzi_pos_windows.rc
+++ b/zhipuzi_pos_windows/resource/zhipuzi_pos_windows.rc
--- a/zhipuzi_pos_windows/tool/CLewaimaiLog.cpp
+++ b/zhipuzi_pos_windows/tool/CLewaimaiLog.cpp
--- a/zhipuzi_pos_windows/tool/CLewaimaiLog.h
+++ b/zhipuzi_pos_windows/tool/CLewaimaiLog.h
--- a/zhipuzi_pos_windows/tool/CLewaimaiTime.cpp
+++ b/zhipuzi_pos_windows/tool/CLewaimaiTime.cpp
--- a/zhipuzi_pos_windows/tool/CLewaimaiTime.h
+++ b/zhipuzi_pos_windows/tool/CLewaimaiTime.h
--- a/zhipuzi_pos_windows/tool/CPosPrinter.cpp
+++ b/zhipuzi_pos_windows/tool/CPosPrinter.cpp
--- a/zhipuzi_pos_windows/tool/CPosPrinter.h
+++ b/zhipuzi_pos_windows/tool/CPosPrinter.h
--- a/zhipuzi_pos_windows/tool/CSetting.cpp
+++ b/zhipuzi_pos_windows/tool/CSetting.cpp
--- a/zhipuzi_pos_windows/tool/CSetting.h
+++ b/zhipuzi_pos_windows/tool/CSetting.h
--- a/zhipuzi_pos_windows/tool/CSqlite3.cpp
+++ b/zhipuzi_pos_windows/tool/CSqlite3.cpp
--- a/zhipuzi_pos_windows/tool/CSqlite3.h
+++ b/zhipuzi_pos_windows/tool/CSqlite3.h
--- a/zhipuzi_pos_windows/wnd/CChufangSettingWnd.cpp
+++ b/zhipuzi_pos_windows/wnd/CChufangSettingWnd.cpp
--- a/zhipuzi_pos_windows/wnd/CChufangSettingWnd.h
+++ b/zhipuzi_pos_windows/wnd/CChufangSettingWnd.h
--- a/zhipuzi_pos_windows/wnd/CLoginWnd.cpp
+++ b/zhipuzi_pos_windows/wnd/CLoginWnd.cpp
--- a/zhipuzi_pos_windows/wnd/CLoginWnd.h
+++ b/zhipuzi_pos_windows/wnd/CLoginWnd.h
--- a/zhipuzi_pos_windows/wnd/CMainWnd.cpp
+++ b/zhipuzi_pos_windows/wnd/CMainWnd.cpp
--- a/zhipuzi_pos_windows/wnd/CMainWnd.h
+++ b/zhipuzi_pos_windows/wnd/CMainWnd.h
--- a/zhipuzi_pos_windows/zhipuzi_pos_windows.cpp
+++ b/zhipuzi_pos_windows/zhipuzi_pos_windows.cpp
--- a/lewaimai_dispatch/lewaimai_dispatch_windows.vcxproj
+++ b/lewaimai_dispatch/lewaimai_dispatch_windows.vcxproj
@@ -22,7 +22,7 @@
 
																     <VCProjectVersion>15.0</VCProjectVersion>
															
 
																     <ProjectGuid>{1D694BE0-D976-4F29-8997-3308ADFFF413}</ProjectGuid>
															
 
																     <Keyword>Win32Proj</Keyword>
															
 
																-    <RootNamespace>lewaimaidispatchwindows</RootNamespace>
															
 
																+    <RootNamespace>zhipuziposwindows</RootNamespace>
															
 
																     <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
															
 
																     <ProjectName>zhipuzi_pos_windows</ProjectName>
															
 
																   </PropertyGroup>
															
--- a/lewaimai_dispatch/lewaimai_dispatch_windows.vcxproj.filters
+++ b/lewaimai_dispatch/lewaimai_dispatch_windows.vcxproj.filters
--- a/lewaimai_dispatch/lewaimai_dispatch_windows.vcxproj.user
+++ b/lewaimai_dispatch/lewaimai_dispatch_windows.vcxproj.user
--- a/zhipuzi_pos_windows_server/conf/zhipuzi_pos_windows_server.conf
+++ b/zhipuzi_pos_windows_server/conf/zhipuzi_pos_windows_server.conf
--- a/zhipuzi_pos_windows_server/helper/CAliyunMNS.cpp
+++ b/zhipuzi_pos_windows_server/helper/CAliyunMNS.cpp
--- a/zhipuzi_pos_windows_server/helper/CAliyunMNS.h
+++ b/zhipuzi_pos_windows_server/helper/CAliyunMNS.h
--- a/zhipuzi_pos_windows_server/helper/CConfigReader.cpp
+++ b/zhipuzi_pos_windows_server/helper/CConfigReader.cpp
--- a/zhipuzi_pos_windows_server/helper/CConfigReader.h
+++ b/zhipuzi_pos_windows_server/helper/CConfigReader.h
--- a/zhipuzi_pos_windows_server/helper/CLewaimaiString.cpp
+++ b/zhipuzi_pos_windows_server/helper/CLewaimaiString.cpp
--- a/zhipuzi_pos_windows_server/helper/CLewaimaiString.h
+++ b/zhipuzi_pos_windows_server/helper/CLewaimaiString.h
--- a/zhipuzi_pos_windows_server/helper/CRandomHelper.cpp
+++ b/zhipuzi_pos_windows_server/helper/CRandomHelper.cpp
--- a/zhipuzi_pos_windows_server/helper/CRandomHelper.h
+++ b/zhipuzi_pos_windows_server/helper/CRandomHelper.h
--- a/zhipuzi_pos_windows_server/helper/CSystem.cpp
+++ b/zhipuzi_pos_windows_server/helper/CSystem.cpp
--- a/zhipuzi_pos_windows_server/helper/CSystem.h
+++ b/zhipuzi_pos_windows_server/helper/CSystem.h
--- a/zhipuzi_pos_windows_server/helper/define.h
+++ b/zhipuzi_pos_windows_server/helper/define.h
--- a/zhipuzi_pos_windows_server/main.cpp
+++ b/zhipuzi_pos_windows_server/main.cpp
--- a/zhipuzi_pos_windows_server/network/CClientSession.cpp
+++ b/zhipuzi_pos_windows_server/network/CClientSession.cpp
--- a/zhipuzi_pos_windows_server/network/CClientSession.h
+++ b/zhipuzi_pos_windows_server/network/CClientSession.h
--- a/zhipuzi_pos_windows_server/network/CServer.cpp
+++ b/zhipuzi_pos_windows_server/network/CServer.cpp
--- a/zhipuzi_pos_windows_server/network/CServer.h
+++ b/zhipuzi_pos_windows_server/network/CServer.h
--- a/zhipuzi_pos_windows_server/network/PosMessage.h
+++ b/zhipuzi_pos_windows_server/network/PosMessage.h
--- a/zhipuzi_pos_windows_server/pch/pch.cpp
+++ b/zhipuzi_pos_windows_server/pch/pch.cpp
--- a/zhipuzi_pos_windows_server/pch/pch.h
+++ b/zhipuzi_pos_windows_server/pch/pch.h
--- a/zhipuzi_pos_windows_server/tool/CLewaimaiLog.cpp
+++ b/zhipuzi_pos_windows_server/tool/CLewaimaiLog.cpp
--- a/zhipuzi_pos_windows_server/tool/CLewaimaiLog.h
+++ b/zhipuzi_pos_windows_server/tool/CLewaimaiLog.h
--- a/zhipuzi_pos_windows_server/tool/CLewaimaiTime.cpp
+++ b/zhipuzi_pos_windows_server/tool/CLewaimaiTime.cpp
--- a/zhipuzi_pos_windows_server/tool/CLewaimaiTime.h
+++ b/zhipuzi_pos_windows_server/tool/CLewaimaiTime.h
--- a/zhipuzi_pos_windows_server/zhipuzi_pos_windows_server.cpp
+++ b/zhipuzi_pos_windows_server/zhipuzi_pos_windows_server.cpp
--- a/zhipuzi_pos_windows_server/zhipuzi_pos_windows_server.vcxproj
+++ b/zhipuzi_pos_windows_server/zhipuzi_pos_windows_server.vcxproj
--- a/zhipuzi_pos_windows_server/zhipuzi_pos_windows_server.vcxproj.user
+++ b/zhipuzi_pos_windows_server/zhipuzi_pos_windows_server.vcxproj.user
--- a/lewaimai_pathplanning/lewaimai_pathplanning_windows.vcxproj
+++ b/lewaimai_pathplanning/lewaimai_pathplanning_windows.vcxproj
@@ -22,7 +22,7 @@
 
																     <VCProjectVersion>15.0</VCProjectVersion>
															
 
																     <ProjectGuid>{2FF637C1-9F58-473C-A156-25EFE35C2FD7}</ProjectGuid>
															
 
																     <Keyword>Win32Proj</Keyword>
															
 
																-    <RootNamespace>lewaimaipathplanningwindows</RootNamespace>
															
 
																+    <RootNamespace>zhipuziposwindowsserverwindows</RootNamespace>
															
 
																     <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
															
 
																     <ProjectName>zhipuzi_pos_windows_server</ProjectName>
															
 
																   </PropertyGroup>
															
@@ -223,7 +223,7 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
 
																     <ClCompile Include="helper\CSystem.cpp" />
															
 
																   </ItemGroup>
															
 
																   <ItemGroup>
															
 
																-    <None Include="conf\pathplanning.conf" />
															
 
																+    <None Include="conf\zhipuzi_pos_windows_server.conf" />
															
 
																   </ItemGroup>
															
 
																   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
															
 
																   <ImportGroup Label="ExtensionTargets">
															
--- a/zhipuzi_pos_windows_server/zhipuzi_pos_windows_server_windows.vcxproj.filters
+++ b/zhipuzi_pos_windows_server/zhipuzi_pos_windows_server_windows.vcxproj.filters
--- a/zhipuzi_pos_windows_server/zhipuzi_pos_windows_server_windows.vcxproj.user
+++ b/zhipuzi_pos_windows_server/zhipuzi_pos_windows_server_windows.vcxproj.user