V1.16.21

.gitignore

@@ -145,3 +145,4 @@ VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统
 VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.19.zip
 VaporRecoveryMonitor/VaporRecoveryMonitor/.vs/
 VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.20.zip
+VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.21.zip

DatabaseUpdate/Bin/conn.ini

@@ -4,4 +4,4 @@
 ;是否开启数据备份。0-关闭；1-开启
 Enable=1
 ;备份盘符，如 E，必须是机械硬盘的盘符，不能为系统盘或者固态硬盘的盘符
-path=T
+path=K

DatabaseUpdate/DatabaseUpdate/DatabaseUpdateDlg.cpp

@@ -73,7 +73,7 @@ int thread1()
 
 
 	string path = str_url + "data\\";
-	string source = path + string("*.*");
+	string source = path + string("*.db");
 
 
 	g_total = getFileCount(source);
@@ -103,14 +103,18 @@ int thread1()
 		{
 
 			DB db;
-			bSuccess = db.update_trx(path + string(findData.name));
 
-			if (!bSuccess)
+			if (string(findData.name).length()== 14)
 			{
-				msgbox_topmost("主数据库升级失败，请在此次升级完成后重新升级！");
-				break;
+				bSuccess = db.update_trx(path + string(findData.name));
+				if (!bSuccess)
+				{
+					msgbox_topmost("主数据库升级失败，请在此次升级完成后重新升级！");
+					break;
+				}
 			}
 
+
 			g_cur++;
 
 
@@ -170,7 +174,7 @@ int thread2()
 
 
 	string path = str_url + "data\\";
-	string source = path + string("*.*");
+	string source = path + string("*.db");
 
 
 	g_total_2 = getFileCount(source);
@@ -200,14 +204,18 @@ int thread2()
 		{
 
 			DB db;
-			bSuccess = db.update_trx(path + string(findData.name));
 
-			if (!bSuccess)
+			if (string(findData.name).length() == 14)
 			{
-				msgbox_topmost("备份数据库升级失败，请在此次升级完成后重新升级！");
+				bSuccess = db.update_trx(path + string(findData.name));
+
+				if (!bSuccess)
+				{
+					msgbox_topmost("备份数据库升级失败，请在此次升级完成后重新升级！");
+
 
-				
-				break;
+					break;
+				}
 			}
 
 			g_cur_2++;

DatabaseUpdate/DatabaseUpdate/Release/DatabaseUpdate.log

@@ -1,13 +1,23 @@
-  stdafx.cpp
-C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\atlmfc\include\afx.h(38): warning C4996: 'MBCS_Support_Deprecated_In_MFC': MBCS support in MFC is deprecated and may be removed in a future version of MFC.
-          C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\atlmfc\include\afx.h(33) : see declaration of 'MBCS_Support_Deprecated_In_MFC'
-  DB.cpp
-  DatabaseUpdate.cpp
-  DatabaseUpdateDlg.cpp
-  global.cpp
-  sqlite3_engine.cpp
-  shell.c
-  sqlite3.c
-  Generating code
-  Finished generating code
-  DatabaseUpdate.vcxproj -> C:\Bitbucket\apacsys-vaporrecoverymonitor\DatabaseUpdate\Bin\DatabaseUpdate.exe
+Build started 2025/7/30 14:23:08.
+     1>Project "C:\bitbucket\apacsys-vaporrecoverymonitor_new\DatabaseUpdate\DatabaseUpdate\DatabaseUpdate.vcxproj" on node 2 (Build target(s)).
+     1>ClCompile:
+         C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\CL.exe /c /Zi /nologo /W3 /WX- /sdl /O2 /Oi /Oy- /GL /D WIN32 /D _WINDOWS /D NDEBUG /D _USING_V110_SDK71_ /D _MBCS /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Yu"stdafx.h" /Fp"Release\DatabaseUpdate.pch" /Fo"Release\\" /Fd"Release\vc120.pdb" /Gd /TP /analyze- /errorReport:prompt DatabaseUpdateDlg.cpp
+         DatabaseUpdateDlg.cpp
+       Link:
+         C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"C:\bitbucket\apacsys-vaporrecoverymonitor_new\DatabaseUpdate\Bin\DatabaseUpdate.exe" /INCREMENTAL:NO /NOLOGO /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /manifest:embed /manifestinput:"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\Include\Manifest\dpiaware.manifest" /DEBUG /PDB:"C:\bitbucket\apacsys-vaporrecoverymonitor_new\DatabaseUpdate\Bin\DatabaseUpdate.pdb" /SUBSYSTEM:WINDOWS,"5.01" /OPT:REF /OPT:ICF /LTCG /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"C:\bitbucket\apacsys-vaporrecoverymonitor_new\DatabaseUpdate\Bin\DatabaseUpdate.lib" /MACHINE:X86 /SAFESEH Release\DatabaseUpdate.res
+         Release\DatabaseUpdate.obj
+         Release\DatabaseUpdateDlg.obj
+         Release\DB.obj
+         Release\global.obj
+         Release\sqlite3_engine.obj
+         Release\shell.obj
+         Release\sqlite3.obj
+         Release\stdafx.obj
+         Generating code
+         Finished generating code
+         DatabaseUpdate.vcxproj -> C:\bitbucket\apacsys-vaporrecoverymonitor_new\DatabaseUpdate\Bin\DatabaseUpdate.exe
+     1>Done Building Project "C:\bitbucket\apacsys-vaporrecoverymonitor_new\DatabaseUpdate\DatabaseUpdate\DatabaseUpdate.vcxproj" (Build target(s)).
+
+Build succeeded.
+
+Time Elapsed 00:00:13.67

DatabaseUpdate/DatabaseUpdate/Release/DatabaseUpdate.tlog/DatabaseUpdate.lastbuildstate

@@ -1,2 +1,2 @@
 #TargetFrameworkVersion=v4.0:PlatformToolSet=v120_xp:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit
-Release|Win32|C:\Bitbucket\apacsys-vaporrecoverymonitor\DatabaseUpdate\|
+Release|Win32|C:\bitbucket\apacsys-vaporrecoverymonitor_new\DatabaseUpdate\|

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRecoveryMonitor.log

@@ -1,353 +1,7 @@
-Build started 2025/7/29 10:08:20.
+Build started 2025/8/8 10:47:39.
      1>Project "C:\bitbucket\apacsys-vaporrecoverymonitor_new\VaporRecoveryMonitor\VaporRecoveryMonitor\VaporRecoveryMonitor\VaporRecoveryMonitor.vcxproj" on node 2 (Build target(s)).
      1>ClCompile:
-         C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\CL.exe /c /I..\..\..\SDK\DuiLib /I..\VaporRecoveryMonitor /I..\..\..\cryptopp /Zi /nologo /W3 /WX- /sdl /Od /Oi /Oy- /GL /D WIN32 /D NDEBUG /D _WINDOWS /D _CRT_NONSTDC_NO_DEPRECATE /D _CRT_SECURE_NO_WARNINGS /D _USING_V110_SDK71_ /D _UNICODE /D UNICODE /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Yc"stdafx.h" /Fp"Release\VaporRecoveryMonitor.pch" /Fo"Release\\" /Fd"Release\vc120.pdb" /Gd /TP /analyze- /errorReport:prompt stdafx.cpp
-         stdafx.cpp
-         automatic-linking to duilib...
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_common.h(376): warning C4091: 'typedef ' : ignored on left of 'VR::protocol::msg_cmd4_callback' when no variable is declared
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_common.h(416): warning C4091: 'typedef ' : ignored on left of 'VR::protocol::msg_callback_day_send' when no variable is declared
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_common.h(427): warning C4091: 'typedef ' : ignored on left of 'VR::protocol::msg_callback_day_recv' when no variable is declared
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_common.h(436): warning C4091: 'typedef ' : ignored on left of 'VR::protocol::msg_callback_day_respond' when no variable is declared
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_common.h(546): warning C4091: 'typedef ' : ignored on left of 'VR::notify::upload_data' when no variable is declared
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_common.h(885): warning C4091: 'typedef ' : ignored on left of 'VR::settings::engine_setting' when no variable is declared
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\Report.h(228): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\global.h(1156): warning C4018: '>=' : signed/unsigned mismatch
-         C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\CL.exe /c /I..\..\..\SDK\DuiLib /I..\VaporRecoveryMonitor /I..\..\..\cryptopp /Zi /nologo /W3 /WX- /sdl /Od /Oi /Oy- /GL /D WIN32 /D NDEBUG /D _WINDOWS /D _CRT_NONSTDC_NO_DEPRECATE /D _CRT_SECURE_NO_WARNINGS /D _USING_V110_SDK71_ /D _UNICODE /D UNICODE /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Yu"stdafx.h" /Fp"Release\VaporRecoveryMonitor.pch" /Fo"Release\\" /Fd"Release\vc120.pdb" /Gd /TP /analyze- /errorReport:prompt AES.cpp BigScreenMonitor.cpp CommObject.cpp DataBackup.cpp ErrorDlg.cpp ErrorInfoDlg.cpp GasDetailDlg.cpp GasManage.cpp LiquidDetailDlg.cpp MySeries.cpp MyXML.cpp PressureDetailDlg.cpp SM3.cpp SM4.cpp TankManage.cpp TemperatureDetailDlg.cpp UploadData.cpp UploadDetailDlg.cpp VRCObject.cpp WebLink.cpp WebLink_AH_HF.cpp WebLink_BJ.cpp WebLink_BJ_ZSH.cpp WebLink_CQ.cpp WebLink_CQ_2.cpp WebLink_FJ_XM.cpp WebLink_FS.cpp WebLink_FSSD.cpp WebLink_FS_NH.cpp WebLink_GD_DG.cpp WebLink_GD_GZ.cpp WebLink_GD_HZ.cpp WebLink_GD_JM.cpp WebLink_GD_JY.cpp WebLink_GD_QY.cpp WebLink_GD_ST.cpp WebLink_GD_SZ.cpp WebLink_GD_YF.cpp WebLink_GD_YJ.cpp WebLink_GD_ZH.cpp WebLink_GD_ZJ.cpp WebLink_GD_ZSH.cpp WebLink_GD_ZS_ZH.cpp WebLink_HB_TS.cpp WebLink_HB_WH.cpp WebLink_HB_ZJK.cpp WebLink_HN.cpp WebLink_HN_CS.cpp WebLink_Middleware.cpp WebLink_NJ.cpp WebLink_NMG_HHHT.cpp WebLink_NX.cpp WebLink_SC_CD.cpp WebLink_SD.cpp WebLink_SD_YT.cpp WebLink_SY.cpp WebLink_Test1.cpp WebLink_ZHDDE.cpp WebLink_ZJ.cpp WebLink_ZJ_GS.cpp WebLink_ZJ_NB.cpp WebLink_ZJ_SY.cpp WebLink_ZJ_TZ.cpp WebLink_ZJ_WZ.cpp WebLink_ZJ_ZSH.cpp _io.cpp base64.cpp des.cpp global.cpp https.cpp instance.cpp jsoncpp.cpp md5.cpp sqlite3_engine.cpp tool.cpp vr_app.cpp vr_common.cpp vr_db.cpp vr_devices.cpp vr_ext.cpp vr_object.cpp vr_server.cpp vr_ui.cpp vr_webservice.cpp
-         AES.cpp
-     1>AES.cpp(1059): warning C4018: '<' : signed/unsigned mismatch
-     1>AES.cpp(1070): warning C4018: '<' : signed/unsigned mismatch
-     1>AES.cpp(1081): warning C4018: '<' : signed/unsigned mismatch
-     1>AES.cpp(1102): warning C4018: '<' : signed/unsigned mismatch
-     1>AES.cpp(1113): warning C4018: '<' : signed/unsigned mismatch
-     1>AES.cpp(1125): warning C4018: '<' : signed/unsigned mismatch
-         BigScreenMonitor.cpp
-         CommObject.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\VRCObject.h(9): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\CommObject.h(7) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(7): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(9) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>CommObject.cpp(82): warning C4018: '<' : signed/unsigned mismatch
-         DataBackup.cpp
-     1>DataBackup.cpp(50): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-         ErrorDlg.cpp
-         ErrorInfoDlg.cpp
-         GasDetailDlg.cpp
-         GasManage.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>GasManage.cpp(86): warning C4018: '>' : signed/unsigned mismatch
-     1>GasManage.cpp(96): warning C4018: '<' : signed/unsigned mismatch
-     1>GasManage.cpp(127): warning C4018: '<' : signed/unsigned mismatch
-     1>GasManage.cpp(170): warning C4018: '>' : signed/unsigned mismatch
-     1>GasManage.cpp(216): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>GasManage.cpp(225): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>GasManage.cpp(234): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>GasManage.cpp(242): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-         LiquidDetailDlg.cpp
-         MySeries.cpp
-         MyXML.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\MyXML.h(36): warning C4018: '<' : signed/unsigned mismatch
-         PressureDetailDlg.cpp
-         SM3.cpp
-         SM4.cpp
-         TankManage.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>TankManage.cpp(124): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(162): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(168): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(172): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(301): warning C4018: '>' : signed/unsigned mismatch
-     1>TankManage.cpp(314): warning C4018: '<' : signed/unsigned mismatch
-     1>TankManage.cpp(348): warning C4018: '<' : signed/unsigned mismatch
-     1>TankManage.cpp(398): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(402): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(406): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(410): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(414): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(420): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(424): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(428): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(432): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(437): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(441): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(445): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(449): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(453): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(457): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(461): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(465): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(469): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(473): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(477): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(481): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(485): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(489): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(493): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(497): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(501): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(505): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-         TemperatureDetailDlg.cpp
-         UploadData.cpp
-         UploadDetailDlg.cpp
-         VRCObject.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\CommObject.h(6): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\VRCObject.h(10) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(7): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(9) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>VRCObject.cpp(92): warning C4018: '<' : signed/unsigned mismatch
-         WebLink.cpp
-     1>WebLink.cpp(75): warning C4101: 'time' : unreferenced local variable
-         Compiling...
-         WebLink_AH_HF.cpp
-     1>WebLink_AH_HF.cpp(160): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_AH_HF.cpp(426): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_AH_HF.cpp(625): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_BJ.cpp
-     1>WebLink_BJ.cpp(167): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_BJ.cpp(465): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_BJ.cpp(663): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_BJ_ZSH.cpp
-     1>WebLink_BJ_ZSH.cpp(246): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_BJ_ZSH.cpp(577): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_BJ_ZSH.cpp(821): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_CQ.cpp
-     1>WebLink_CQ.cpp(168): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_CQ.cpp(452): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_CQ_2.cpp
-     1>WebLink_CQ_2.cpp(184): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_CQ_2.cpp(1192): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_FJ_XM.cpp
-         WebLink_FS.cpp
-     1>WebLink_FS.cpp(175): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS.cpp(188): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS.cpp(191): warning C4101: 'warn' : unreferenced local variable
-     1>WebLink_FS.cpp(515): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS.cpp(764): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_FSSD.cpp
-     1>WebLink_FSSD.cpp(172): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FSSD.cpp(471): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FSSD.cpp(726): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_FS_NH.cpp
-     1>WebLink_FS_NH.cpp(69): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(348): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(501): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(742): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(1152): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(1229): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(1304): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(1331): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(1474): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(1639): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(1805): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_DG.cpp
-     1>WebLink_GD_DG.cpp(180): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_DG.cpp(612): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_DG.cpp(796): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_GZ.cpp
-     1>WebLink_GD_GZ.cpp(214): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_GZ.cpp(521): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_GZ.cpp(794): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_HZ.cpp
-     1>WebLink_GD_HZ.cpp(65): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(342): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(682): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(923): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(1333): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(1410): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(1485): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(1512): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(1655): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(1822): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(2202): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_JM.cpp
-     1>WebLink_GD_JM.cpp(175): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_JM.cpp(466): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_JM.cpp(664): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_JY.cpp
-     1>WebLink_GD_JY.cpp(204): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_JY.cpp(271): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_JY.cpp(790): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_QY.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_QY.cpp(204): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_QY.cpp(600): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_QY.cpp(889): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_ST.cpp
-     1>WebLink_GD_ST.cpp(179): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ST.cpp(810): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_SZ.cpp
-     1>WebLink_GD_SZ.cpp(177): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_SZ.cpp(767): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_SZ.cpp(951): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_YF.cpp
-     1>WebLink_GD_YF.cpp(152): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(197): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(543): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(751): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(1169): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(1242): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(1311): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(1336): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(1450): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(1629): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(1776): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_YJ.cpp
-     1>WebLink_GD_YJ.cpp(203): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YJ.cpp(275): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YJ.cpp(799): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_ZH.cpp
-     1>WebLink_GD_ZH.cpp(178): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZH.cpp(595): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZH.cpp(779): warning C4018: '<' : signed/unsigned mismatch
-         Compiling...
-         WebLink_GD_ZJ.cpp
-     1>WebLink_GD_ZJ.cpp(203): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZJ.cpp(275): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZJ.cpp(799): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_ZSH.cpp
-     1>WebLink_GD_ZSH.cpp(336): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZSH.cpp(685): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZSH.cpp(854): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZSH.cpp(1120): warning C4018: '>' : signed/unsigned mismatch
-     1>WebLink_GD_ZSH.cpp(1121): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZSH.cpp(1121): warning C4018: '>' : signed/unsigned mismatch
-     1>WebLink_GD_ZSH.cpp(1275): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>WebLink_GD_ZSH.cpp(1279): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-         WebLink_GD_ZS_ZH.cpp
-     1>WebLink_GD_ZS_ZH.cpp(65): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(342): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(682): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(923): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(1333): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(1410): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(1485): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(1512): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(1655): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(1776): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(2100): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_HB_TS.cpp
-     1>WebLink_HB_TS.cpp(166): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HB_TS.cpp(457): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HB_TS.cpp(630): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_HB_WH.cpp
-     1>WebLink_HB_WH.cpp(180): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HB_WH.cpp(612): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HB_WH.cpp(796): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_HB_ZJK.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HB_ZJK.cpp(186): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HB_ZJK.cpp(712): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_HN.cpp
-     1>WebLink_HN.cpp(167): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HN.cpp(454): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HN.cpp(689): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_HN_CS.cpp
-     1>WebLink_HN_CS.cpp(160): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HN_CS.cpp(426): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HN_CS.cpp(625): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_Middleware.cpp
-     1>WebLink_Middleware.cpp(268): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_Middleware.cpp(552): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_Middleware.cpp(778): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_NJ.cpp
-     1>WebLink_NJ.cpp(60): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NJ.cpp(363): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_NMG_HHHT.cpp
-     1>WebLink_NMG_HHHT.cpp(164): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NMG_HHHT.cpp(286): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NMG_HHHT.cpp(506): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NMG_HHHT.cpp(665): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NMG_HHHT.cpp(832): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NMG_HHHT.cpp(904): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NMG_HHHT.cpp(974): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_NX.cpp
-     1>WebLink_NX.cpp(150): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NX.cpp(328): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NX.cpp(494): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NX.cpp(651): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NX.cpp(844): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NX.cpp(1011): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_SC_CD.cpp
-     1>WebLink_SC_CD.cpp(150): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_SC_CD.cpp(327): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_SC_CD.cpp(493): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_SC_CD.cpp(649): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_SC_CD.cpp(844): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_SC_CD.cpp(1011): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_SD.cpp
-     1>WebLink_SD.cpp(244): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_SD.cpp(324): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_SD_YT.cpp
-     1>WebLink_SD_YT.cpp(173): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_SY.cpp
-     1>WebLink_SY.cpp(267): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_Test1.cpp
-     1>WebLink_Test1.cpp(179): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_Test1.cpp(494): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_Test1.cpp(775): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_ZHDDE.cpp
-     1>WebLink_ZHDDE.cpp(178): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZHDDE.cpp(595): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZHDDE.cpp(779): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_ZJ.cpp
-     1>WebLink_ZJ.cpp(173): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ.cpp(460): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ.cpp(693): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_ZJ_GS.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-         Compiling...
-         WebLink_ZJ_NB.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(168): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(221): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(335): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(504): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(552): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(671): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(738): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(811): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(860): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(915): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_ZJ_SY.cpp
-     1>WebLink_ZJ_SY.cpp(173): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_SY.cpp(472): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_SY.cpp(721): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_ZJ_TZ.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(159): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(212): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(326): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(495): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(543): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(662): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(729): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(802): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(851): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(906): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_ZJ_WZ.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(150): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(203): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(317): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(486): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(534): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(653): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(720): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(793): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(842): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(897): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_ZJ_ZSH.cpp
-     1>WebLink_ZJ_ZSH.cpp(165): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_ZSH.cpp(445): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_ZSH.cpp(667): warning C4018: '<' : signed/unsigned mismatch
-         _io.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\VRCObject.h(9): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\CommObject.h(7) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(7): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(9) : see declaration of 'SocketPackage'
-         base64.cpp
-         des.cpp
+         C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\CL.exe /c /I..\..\..\SDK\DuiLib /I..\VaporRecoveryMonitor /I..\..\..\cryptopp /Zi /nologo /W3 /WX- /sdl /Od /Oi /Oy- /GL /D WIN32 /D NDEBUG /D _WINDOWS /D _CRT_NONSTDC_NO_DEPRECATE /D _CRT_SECURE_NO_WARNINGS /D _USING_V110_SDK71_ /D _UNICODE /D UNICODE /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Yu"stdafx.h" /Fp"Release\VaporRecoveryMonitor.pch" /Fo"Release\\" /Fd"Release\vc120.pdb" /Gd /TP /analyze- /errorReport:prompt global.cpp
          global.cpp
      1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\SM4.h(290): warning C4101: 'szArray' : unreferenced local variable
      1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\SM4.h(315): warning C4101: 'i' : unreferenced local variable
@@ -364,174 +18,6 @@
      1>global.cpp(1029): warning C4018: '<' : signed/unsigned mismatch
      1>global.cpp(1051): warning C4018: '<' : signed/unsigned mismatch
      1>global.cpp(1077): warning C4018: '<' : signed/unsigned mismatch
-         https.cpp
-     1>https.cpp(46): warning C4244: 'argument' : conversion from '__int64' to 'SOCKET', possible loss of data
-     1>https.cpp(62): warning C4244: 'argument' : conversion from '__int64' to 'SOCKET', possible loss of data
-     1>https.cpp(63): warning C4244: 'argument' : conversion from '__int64' to 'SOCKET', possible loss of data
-     1>https.cpp(135): warning C4244: 'argument' : conversion from '__int64' to 'int', possible loss of data
-     1>https.cpp(363): warning C4244: 'argument' : conversion from '__int64' to 'SOCKET', possible loss of data
-     1>https.cpp(378): warning C4244: 'argument' : conversion from '__int64' to 'SOCKET', possible loss of data
-     1>https.cpp(379): warning C4244: 'argument' : conversion from '__int64' to 'SOCKET', possible loss of data
-     1>https.cpp(393): warning C4244: 'argument' : conversion from '__int64' to 'SOCKET', possible loss of data
-         instance.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\VRCObject.h(9): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\CommObject.h(7) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(7): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(9) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>instance.cpp(340): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
-     1>instance.cpp(345): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
-     1>instance.cpp(350): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
-     1>instance.cpp(355): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
-         jsoncpp.cpp
-     1>jsoncpp.cpp(270): warning C4005: '_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES' : macro redefinition
-                 C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\crtdefs.h(421) : see previous definition of '_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES'
-     1>jsoncpp.cpp(3959): warning C4018: '<' : signed/unsigned mismatch
-         md5.cpp
-     1>md5.cpp(142): warning C4244: 'argument' : conversion from 'std::streamsize' to 'size_t', possible loss of data
-         sqlite3_engine.cpp
-         tool.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>tool.cpp(558): warning C4242: '=' : conversion from 'int' to 'char', possible loss of data
-     1>tool.cpp(692): warning C4804: '<=' : unsafe use of type 'bool' in operation
-     1>tool.cpp(695): warning C4018: '>=' : signed/unsigned mismatch
-         vr_app.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\MyXML.h(36): warning C4018: '<' : signed/unsigned mismatch
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\VRCObject.h(9): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\CommObject.h(7) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(7): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(9) : see declaration of 'SocketPackage'
-     1>vr_app.cpp(637): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>vr_app.cpp(641): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>vr_app.cpp(645): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>vr_app.cpp(649): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>vr_app.cpp(653): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>vr_app.cpp(902): warning C4928: illegal copy-initialization; more than one user-defined conversion has been implicitly applied
-                 while calling the constructor 'std::basic_string<wchar_t,std::char_traits<wchar_t>,std::allocator<wchar_t>>::basic_string(const _Elem *)'
-                 with
-                 [
-                     _Elem=wchar_t
-                 ]
-                 C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\xstring(778) : see declaration of 'std::basic_string<wchar_t,std::char_traits<wchar_t>,std::allocator<wchar_t>>::basic_string'
-     1>vr_app.cpp(1619): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_app.cpp(1700): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_app.cpp(1712): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_app.cpp(1726): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_app.cpp(1741): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_app.cpp(1753): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(1784): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_app.cpp(1786): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(1816): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(1825): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(1833): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(1841): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(1852): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(1862): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(1874): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(1884): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(2508): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_app.cpp(2601): warning C4302: 'type cast' : truncation from 'LPWSTR' to 'WORD'
-     1>vr_app.cpp(2954): warning C4172: returning address of local variable or temporary
-     1>vr_app.cpp(2955): warning C4172: returning address of local variable or temporary
-     1>vr_app.cpp(3059): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_app.cpp(3379): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_app.cpp(3748): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_app.cpp(4261): warning C4242: '=' : conversion from 'int' to 'byte', possible loss of data
-     1>vr_app.cpp(4389): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_app.cpp(4447): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_app.cpp(5175): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_app.cpp(5425): warning C4018: '<' : signed/unsigned mismatch
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\rapidxml_utils.hpp(40): warning C4244: 'initializing' : conversion from 'std::streamoff' to 'size_t', possible loss of data
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\rapidxml_utils.hpp(28) : while compiling class template member function 'rapidxml::file<char>::file(const char *)'
-                 vr_app.cpp(3475) : see reference to function template instantiation 'rapidxml::file<char>::file(const char *)' being compiled
-                 vr_app.cpp(3475) : see reference to class template instantiation 'rapidxml::file<char>' being compiled
-     1>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\xtree(836): warning C4503: 'std::_Tree<std::_Tmap_traits<_Kty,_Ty,_Pr,_Alloc,false>>::_Insert_hint' : decorated name length exceeded, name was truncated
-                 with
-                 [
-                     _Kty=int
-         ,            _Ty=std::map<std::string,std::vector<VR::notify::daily_report_record_updated,std::allocator<VR::notify::daily_report_record_updated>>,std::less<std::string>,std::allocator<std::pair<const std::string,std::vector<VR::notify::daily_report_record_updated,std::allocator<VR::notify::daily_report_record_updated>>>>>
-         ,            _Pr=std::less<int>
-         ,            _Alloc=std::allocator<std::pair<const int,std::map<std::string,std::vector<VR::notify::daily_report_record_updated,std::allocator<VR::notify::daily_report_record_updated>>,std::less<std::string>,std::allocator<std::pair<const std::string,std::vector<VR::notify::daily_report_record_updated,std::allocator<VR::notify::daily_report_record_updated>>>>>>>
-                 ]
-         vr_common.cpp
-         vr_db.cpp
-     1>vr_db.cpp(587): warning C4244: '=' : conversion from 'double' to 'float', possible loss of data
-     1>vr_db.cpp(651): warning C4244: '=' : conversion from 'double' to 'float', possible loss of data
-     1>vr_db.cpp(792): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_db.cpp(792): warning C4018: '<' : signed/unsigned mismatch
-         vr_devices.cpp
-         vr_ext.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\VRCObject.h(9): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\CommObject.h(7) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(7): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(9) : see declaration of 'SocketPackage'
-     1>vr_ext.cpp(542): warning C4101: 'time' : unreferenced local variable
-     1>vr_ext.cpp(568): warning C4101: 'time' : unreferenced local variable
-     1>vr_ext.cpp(812): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ext.cpp(827): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ext.cpp(889): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ext.cpp(1309): warning C4244: 'initializing' : conversion from 'double' to 'float', possible loss of data
-     1>vr_ext.cpp(1412): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_ext.cpp(1651): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ext.cpp(1846): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ext.cpp(1998): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_ext.cpp(2077): warning C4244: 'argument' : conversion from 'double' to 'int', possible loss of data
-     1>vr_ext.cpp(2079): warning C4244: 'argument' : conversion from 'double' to 'int', possible loss of data
-     1>vr_ext.cpp(2081): warning C4244: 'argument' : conversion from 'double' to 'int', possible loss of data
-     1>vr_ext.cpp(2083): warning C4244: 'argument' : conversion from 'double' to 'int', possible loss of data
-     1>vr_ext.cpp(2122): warning C4191: 'type cast' : unsafe conversion from 'FARPROC' to 'ADDPROC'
-                 Calling this function through the result pointer may cause your program to fail
-     1>vr_ext.cpp(4772): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ext.cpp(4872): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ext.cpp(5274): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ext.cpp(5572): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_ext.cpp(5605): warning C4244: '=' : conversion from 'double' to 'UINT', possible loss of data
-     1>vr_ext.cpp(5626): warning C4242: '=' : conversion from 'int' to 'BYTE', possible loss of data
-     1>vr_ext.cpp(5900): warning C4018: '<' : signed/unsigned mismatch
-         Compiling...
-         vr_object.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\VRCObject.h(9): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\CommObject.h(7) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(7): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(9) : see declaration of 'SocketPackage'
-     1>vr_object.cpp(364): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_object.cpp(394): warning C4800: 'BOOL' : forcing value to bool 'true' or 'false' (performance warning)
-     1>vr_object.cpp(581): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_object.cpp(596): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_object.cpp(619): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_object.cpp(621): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_object.cpp(630): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_object.cpp(639): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_object.cpp(1159): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-         vr_server.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\VRCObject.h(9): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\CommObject.h(7) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(7): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(9) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_server.cpp(151): warning C4242: '=' : conversion from 'int' to 'byte', possible loss of data
-         vr_ui.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ui.cpp(406): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_ui.cpp(406): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ui.cpp(1267): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ui.cpp(1394): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ui.cpp(1559): warning C4018: '<' : signed/unsigned mismatch
-         vr_webservice.cpp
-     1>vr_webservice.cpp(661): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_webservice.cpp(4245): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_webservice.cpp(4273): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_webservice.cpp(4535): warning C4244: 'initializing' : conversion from 'double' to 'float', possible loss of data
-     1>vr_webservice.cpp(4581): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
-     1>vr_webservice.cpp(4582): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
-     1>vr_webservice.cpp(4583): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
-     1>vr_webservice.cpp(4584): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
-     1>vr_webservice.cpp(6062): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_webservice.cpp(6090): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_webservice.cpp(6768): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_webservice.cpp(6796): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
        Link:
          C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"C:\bitbucket\apacsys-vaporrecoverymonitor_new\VaporRecoveryMonitor\VaporRecoveryMonitor\Bin\VaporRecoveryMonitor.exe" /INCREMENTAL:NO /NOLOGO /LIBPATH:"C:\bitbucket\apacsys-vaporrecoverymonitor_new\VaporRecoveryMonitor\VaporRecoveryMonitor\Lib\\" /LIBPATH:C:\common\openSSL\lib /LIBPATH:C:\common\openSSL /LIBPATH:"C:\Bitbucket\apacsys-vaporrecoverymonitor\cryptopp\lib\Output\Release" kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /manifest:embed /manifestinput:"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\Include\Manifest\dpiaware.manifest" /DEBUG /PDB:"C:\bitbucket\apacsys-vaporrecoverymonitor_new\VaporRecoveryMonitor\VaporRecoveryMonitor\Bin\VaporRecoveryMonitor.pdb" /SUBSYSTEM:WINDOWS,"5.01" /OPT:REF /OPT:ICF /LTCG /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"C:\bitbucket\apacsys-vaporrecoverymonitor_new\VaporRecoveryMonitor\VaporRecoveryMonitor\Bin\VaporRecoveryMonitor.lib" /MACHINE:X86 /SAFESEH Release\VaporRecoveryMonitor.res
          Release\AES.obj
@@ -623,8 +109,8 @@
          Release\vr_ui.obj
          Generating code
      1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\global.h(184): warning C4715: 'Area::getArea' : not all control paths return a value
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_ext.cpp(1082): warning C4715: 'ThreadHandle_Start_3' : not all control paths return a value
      1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_ext.cpp(1034): warning C4715: 'ThreadHandle_Start_2' : not all control paths return a value
+     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_ext.cpp(1082): warning C4715: 'ThreadHandle_Start_3' : not all control paths return a value
      1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_ext.cpp(978): warning C4715: 'ThreadHandle_Start' : not all control paths return a value
          Finished generating code
      1>cryptlib.lib(cryptlib.obj) : warning LNK4099: PDB 'vc120.pdb' was not found with 'cryptlib.lib(cryptlib.obj)' or at 'C:\bitbucket\apacsys-vaporrecoverymonitor_new\VaporRecoveryMonitor\VaporRecoveryMonitor\Bin\vc120.pdb'; linking object as if no debug info
@@ -666,4 +152,4 @@
 
 Build succeeded.
 
-Time Elapsed 00:01:16.87
+Time Elapsed 00:00:12.20

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/StationInfo.ini

@@ -24,6 +24,10 @@ UNAME=
 UCONTACT=13928305700
 GASCAPACITY=90
 DIESELCAPACITY=60
-GASSALES=8120.54684
+GASSALES=8120
 DIESELS=4513
-TriggerUploadFlag=1
+TriggerUploadFlag=0
+legal=
+orgCode=
+username=
+appid=

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/WebLink_FS_NH.cpp

@@ -1524,7 +1524,6 @@ void CWebLink_FS_NH::PackWebData_StationInfo(VR::WebData& webdata)
 	data += "SYZ=" + getConfigValue("OwnerType") + ";";
 	data += "ZXGYS=" + getConfigValue("Manufacturer") + ";";
 	data += "YWLXR=" + getConfigValue("OperateStaff") + ";";
-
 	data += "YWSJHM=" + getConfigValue("YWSJHM") + ";";
 	data += "JYJSL=" + getConfigValue("JYJNum") + ";";
 	data += "JYQSL=" + getConfigValue("JYQNum") + ";";
@@ -1534,28 +1533,28 @@ void CWebLink_FS_NH::PackWebData_StationInfo(VR::WebData& webdata)
 
 
 	stre = g_bEnablePostProcess > 0 ? "1" : "0";
-	data += "SCHS=" + stre + ";";;
+	data += "SCHS=" + stre + ";";
 
 	stre = g_pressgroup.getValidSize() > 0 ? "1" : "0";
-	data += "YGYL=" + stre + ";";;
+	data += "YGYL=" + stre + ";";
 
 	stre = g_liquidgroup.GetLiquid()->getEnable() > 0 ? "1" : "0";
-	data += "YZYL=" + stre + ";";;
+	data += "YZYL=" + stre + ";";
 
 	stre = g_gasgroup.GetGas()->getEnable() > 0 ? "1" : "0";
-	data += "XYND=" + stre + ";";;
+	data += "XYND=" + stre + ";";
 
 	stre = g_gasgroup.getOildValidSize() > 0 ? "1" : "0";
-	data += "JYND=" + stre + ";";;
+	data += "JYND=" + stre + ";";
 
 	stre = g_gasgroup.getWellValidSize() > 0 ? "1" : "0";
-	data += "YJND=" + stre + ";";;
+	data += "YJND=" + stre + ";";
 
 	stre = g_gasgroup.GetPostGas()->getEnable() > 0 ? "1" : "0";
-	data += "HCLND=" + stre + ";";;
+	data += "HCLND=" + stre + ";";
 
 	stre = g_tempgroup.getValidSize() > 0 ? "1" : "0";
-	data += "YQWD=" + stre + ";";;
+	data += "YQWD=" + stre + ";";
 
 
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/WebLink_GD_HZ.cpp

@@ -1705,40 +1705,38 @@ void CwebLink_GD_HZ::PackWebData_StationInfo(VR::WebData& webdata)
 	data += "SYZ=" + getConfigValue("OwnerType") + ";";
 	data += "ZXGYS=" + getConfigValue("Manufacturer") + ";";
 	data += "YWLXR=" + getConfigValue("OperateStaff") + ";";
-	data += "YWSJHM=" + getConfigValue("OperateStaffPhone") + ";";
+	data += "YWSJHM=" + getConfigValue("YWSJHM") + ";";
 	data += "JYJSL=" + getConfigValue("JYJNum") + ";";
 	data += "JYQSL=" + getConfigValue("JYQNum") + ";";
 
 
 	string stre;
 
+	stre = g_bEnablePostProcess > 0 ? "1" : "0";
+	data += "SCHS=" + stre + ";";
 
-	stre = g_bEnablePostProcess > 0 ? "是" : "否";
-	data += "SCHS=" + stre + ";";;
+	stre = g_pressgroup.getValidSize() > 0 ? "1" : "0";
+	data += "YGYL=" + stre + ";";
 
-	stre = g_pressgroup.getValidSize() > 0 ? "是" : "否";
-	data += "YGYL=" + stre + ";";;
+	stre = g_liquidgroup.GetLiquid()->getEnable() > 0 ? "1" : "0";
+	data += "YZYL=" + stre + ";";
 
-	stre = g_liquidgroup.GetLiquid()->getEnable() > 0 ? "是" : "否";
-	data += "YZYL=" + stre + ";";;
+	stre = g_gasgroup.GetGas()->getEnable() > 0 ? "1" : "0";
+	data += "XYND=" + stre + ";";
 
-	stre = g_gasgroup.GetGas()->getEnable() > 0 ? "是" : "否";
-	data += "XYND=" + stre + ";";;
+	stre = g_gasgroup.getOildValidSize() > 0 ? "1" : "0";
+	data += "JYND=" + stre + ";";
 
-	stre = g_gasgroup.getOildValidSize() > 0 ? "是" : "否";
-	data += "JYND=" + stre + ";";;
+	stre = g_gasgroup.getWellValidSize() > 0 ? "1" : "0";
+	data += "YJND=" + stre + ";";
 
-	stre = g_gasgroup.getWellValidSize() > 0 ? "是" : "否";
-	data += "YJND=" + stre + ";";;
+	stre = g_gasgroup.GetPostGas()->getEnable() > 0 ? "1" : "0";
+	data += "HCLND=" + stre + ";";
 
-	stre = g_gasgroup.GetPostGas()->getEnable() > 0 ? "是" : "否";
-	data += "HCLND=" + stre + ";";;
-
-	stre = g_tempgroup.getValidSize() > 0 ? "是" : "否";
+	stre = g_tempgroup.getValidSize() > 0 ? "1" : "0";
 	data += "YQWD=" + stre + ";";
 
 
-
 	data += "JYZJC=" + getConfigValue("JYZJC") + ";";
 	data += "JYZTYPE=" + getConfigValue("JYZTYPE") + ";";
 	data += "CREDITCODE=" + getConfigValue("CREDITCODE") + ";";
@@ -1750,7 +1748,6 @@ void CwebLink_GD_HZ::PackWebData_StationInfo(VR::WebData& webdata)
 	data += "GASSALES=" + getConfigValue("GASSALES") + ";";
 	data += "DIESELSALES=" + getConfigValue("DIESELS") + ";";
 
-
 	data += "GXYL=" + to_string(g_liquidgroup.GetLiquid()->getEnable()) + "";
 
 
@@ -1835,7 +1832,6 @@ void CwebLink_GD_HZ::PackWebData_StationInfo(VR::WebData& webdata)
 	webdata.data = strdata;
 
 
-
 	/*
 	char chTime_QN[18];
 	get_current_time_milliseconds(chTime_QN);
@@ -2161,7 +2157,9 @@ void CwebLink_GD_HZ::PackWebData_NozzleInfo(VR::WebData& webdata, nozzle_setting
 	data += "ID=" + string(chDataID) + ";";
 	data += "JYJID=" + to_string(ns.pump) + ";";
 	data += "JYQID=" + to_string(ns.id) + ";";
-	data += "YP=" + to_string(fueltype) + "";
+	data += "YP=" + to_string(fueltype) + ";";
+	data += "RECYCLEMANU=托肯恒山科技（广州）有限公司;";
+	data += "MONITORSTATUS=1";
 
 
 
@@ -2179,21 +2177,18 @@ void CwebLink_GD_HZ::PackWebData_NozzleInfo(VR::WebData& webdata, nozzle_setting
 	cdata += "Flag=5;";
 	cdata += "CP=&&" + data + "&&";
 
-	//封装包，包头包尾巴，校验
+
+
+	string strutf = GBKToUTF8(cdata);
+	wstring wdata = string2wstring(cdata);
 	string strdata = "";
 	strdata += "##";
 	char chlen[5];
-	sprintf_s(chlen, "%04d", cdata.length());
+	sprintf_s(chlen, "%04d", wdata.length());
 	strdata += chlen;
-	//strdata += "0";//是否加密
-
 	strdata += cdata;
 
-	BYTE ch[4096] = { 0 };
-	memcpy(ch, cdata.data(), cdata.size());
-
-
-	int icrc = CRC16_Checkout(ch, cdata.size());
+	int icrc = CRC16_Checkout_utf_unsigned(strutf);
 
 	char chcrc[5] = { 0 };
 	itoa(icrc, chcrc, 16);

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/conn.ini

@@ -1,7 +1,7 @@
 ;上传平台选择
 [City]
 ;上传平台1；  0-北京；1-；2-；3-浙江杭州环保局；4-；5-山东省环保；6-广州;7-湖南中石化;8-山东烟台;9-重庆;10-;11-浙江金华环保局;12-南京环保局；13-福建厦门环保局；14-东莞市环保局；15-深圳环保局；16-江门环保局；17-沈阳环保局；18-广东惠州环保局;19=汕头环保局；20-云浮环保局；21-揭阳环保局；22-浙江宁波环保局；23-佛山市环保2；24-阳江环保局；25-安徽合肥环保局；26-浙江温州环保局；27-珠海环保局; 28-河北张家口环保局；29-浙江台州环保；30-湛江环保局；31-清远环保局；32-河北唐山环保局；33-内蒙古呼和浩特环保局；34-武汉环保局；35-宁夏环保局；36-成都环保局；999-测试1；1000-不设置
-CityNo=6
+CityNo=18
 ;上传平台2；  0-不设置；1-浙江浙石油；2-浙江中石化；3-山东青岛；4-湖南长沙环保局；5-佛山顺德（佛山市）；6-广东中石化；7-重庆环保2；8-山东烟台；9-中化道达尔；999-测试2
 CityNo2=6
 ;上传平台3；0-不设置；1-浙江高速；2-中山智慧平台；3-北京中石化；4-山东烟台(新地址)
@@ -912,13 +912,13 @@ Port=10000
 [DataID]
 Record=67134
 Environment=105861
-Config=3272
+Config=3274
 Warning=13966
 Error=1637
 NozState=1614
 NozControl=69
-NozzleInfo=273
-StationInfo=137
+NozzleInfo=625
+StationInfo=148
 
 [Skin]
 ;分辨率宽度1366或1024
@@ -947,7 +947,7 @@ configupdatetime=20250717135510
 
 [RunningState]
 UnLockFlag=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Date=20250718
+Date=20250808
 TradeFlag=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/global.cpp

@@ -25,7 +25,7 @@
 
 using namespace VR::notify;
 
-string g_version = "V1.16.20";
+string g_version = "V1.16.21";
 
 
 int g_read_unuploadday = 31;	//程序开启时读未上传交易的天数 非特殊情况皆为31天

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_webservice.cpp

@@ -2103,10 +2103,10 @@ void vr_webservice::CreateRequestThread()
 						setsockopt(web_gd_hz.server, SOL_SOCKET, SO_SNDTIMEO, (const char*)&tv_out, sizeof(tv_out));
 
 
+						string strutf = GBKToUTF8(webdata.data);
 
 
-
-						send_len = send(web_gd_hz.server, webdata.data.c_str(), webdata.data.length(), 0);
+						send_len = send(web_gd_hz.server, strutf.c_str(), strutf.length(), 0);
 						if (send_len == -1)
 						{
 							log("发送失败，尝试重新连接服务器");