V1.16.19

.gitignore

@@ -141,3 +141,6 @@ VaporRecoveryMonitor/油气回收系统安装包/1.bat
 VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.18.zip
 VaporRecoveryMonitor/VaporRecoveryMonitor/Bin/data-beijing/
 VaporRecoveryMonitor/VaporRecoveryMonitor/Bin/data-1/
+VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.19/
+VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.19.zip
+VaporRecoveryMonitor/VaporRecoveryMonitor/.vs/

ChatRoomClient-VR/Release/conn.ini

@@ -6,11 +6,12 @@ QLS=10.00
 YL=15.00
 QL=15.00
 VL=1.10
-TTC=39
-ERROR=0
-PRESS=0
-PWM=0
+TTC=44
+ERROR=110
+PRESS=10
+PWM=10
 OFFSET=0
 noz2=0
 noz3=0
 noz4=0
+PORT=1

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRecoveryMonitor.log

@@ -1,537 +1,23 @@
-Build started 2025/7/1 10:23:26.
+Build started 2025/7/28 15:03:13.
      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(375): 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(415): 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(426): 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(435): 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(545): 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(884): 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(1790): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(2114): 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
      1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\SM4.h(527): warning C4101: 'pbIV_pre' : unreferenced local variable
-     1>global.cpp(377): warning C4018: '<' : signed/unsigned mismatch
-     1>global.cpp(391): warning C4018: '<' : signed/unsigned mismatch
-     1>global.cpp(404): warning C4018: '<' : signed/unsigned mismatch
-     1>global.cpp(437): warning C4018: '<' : signed/unsigned mismatch
-     1>global.cpp(475): warning C4018: '<' : signed/unsigned mismatch
-     1>global.cpp(522): warning C4101: 'i' : unreferenced local variable
-     1>global.cpp(650): warning C4244: 'return' : conversion from 'uint64_t' to 'double', possible loss of data
-     1>global.cpp(659): warning C4101: 'Free' : unreferenced local variable
-     1>global.cpp(659): warning C4101: 'Available' : unreferenced local variable
-     1>global.cpp(1028): warning C4018: '<' : signed/unsigned mismatch
-     1>global.cpp(1050): warning C4018: '<' : signed/unsigned mismatch
-     1>global.cpp(1076): 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(6549): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_webservice.cpp(6577): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+     1>global.cpp(378): warning C4018: '<' : signed/unsigned mismatch
+     1>global.cpp(392): warning C4018: '<' : signed/unsigned mismatch
+     1>global.cpp(405): warning C4018: '<' : signed/unsigned mismatch
+     1>global.cpp(438): warning C4018: '<' : signed/unsigned mismatch
+     1>global.cpp(476): warning C4018: '<' : signed/unsigned mismatch
+     1>global.cpp(523): warning C4101: 'i' : unreferenced local variable
+     1>global.cpp(651): warning C4244: 'return' : conversion from 'uint64_t' to 'double', possible loss of data
+     1>global.cpp(660): warning C4101: 'Free' : unreferenced local variable
+     1>global.cpp(660): warning C4101: 'Available' : unreferenced local variable
+     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
        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
@@ -666,4 +152,4 @@
 
 Build succeeded.
 
-Time Elapsed 00:00:30.08
+Time Elapsed 00:00:12.41

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/StationInfo.ini

@@ -1,14 +1,29 @@
 [Config]
-StationName=义乌市交旅综合能源销售有限公司后宅商城大道加油站
-legal=丁文旭
-orgCode=91330782MA2M5GWEX8
-AreaCode=330782
-Address=浙江省义乌市后宅街道商城大道B399号
-Contact=王旭佳
-Phone=13867920023
-Lon=120.095022
-Lat=29.333086
-username=lanyunliang
-appid=769992545596878702
-token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE2OTI1OTc5MzcsInN1YiI6IntcImFwcElkXCI6XCI3Njk5OTI1NDU1OTY4Nzg3MDJcIixcInVzZXJOYW1lXCI6XCIzOWEyYTA4MGYxOWFkZTBkNzllNmFmZTczMTZkN2FkNjYzODlmMTZlOTNjN2NmYWFjMTk3Y2VhMmJlMGVjNzExXCJ9IiwiYXVkIjoiNmEyYzdiZmZiN2Q4ZTJlMmViODljNDU3ZTkzZDMxNTA2NDcwZmZkNGY4YzVhYTcyZTAwZGY1NDI0ZTEzYzFmZSIsImV4cCI6MTc1NDgwNTkzNywibmJmIjoxNjkyNTk3OTM3fQ.lV6W1r_XF2IlVyJRvEknB4o7pxw3Y7eEZhCV8zQ5_pc
-TriggerUploadFlag=0
+CityCode=441322
+AreaCode=441322
+TownCode=441322002
+StationName=中国石化销售股份有限公司广东惠州博罗沙河北站加油站
+Company=2
+Lon=114.07884014
+Lat=23.17083228
+Address=博罗县龙华镇广惠高速公路沙河服务区北侧
+Contact=潘志伟
+Phone=13802866609
+JYJNum=6
+JYQNum=36
+Scale=2
+OwnerType=2
+Manufacturer=托肯恒山
+OperateStaff=林英寿
+YWSJHM=18078839830
+JYZJC=沙河北
+JYZTYPE=2
+CREDITCODE=91441322760623737P
+ESTDATE=20040324
+UNAME=曾嘉宏
+UCONTACT=13928305700
+GASCAPACITY=90
+DIESELCAPACITY=60
+GASSALES=8120.54684
+DIESELS=4513
+TriggerUploadFlag=1

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/WebLink_GD_HZ.cpp

@@ -1748,9 +1748,11 @@ void CwebLink_GD_HZ::PackWebData_StationInfo(VR::WebData& webdata)
 	data += "GASCAPACITY=" + getConfigValue("GASCAPACITY") + ";";
 	data += "DIESELCAPACITY=" + getConfigValue("DIESELCAPACITY") + ";";
 	data += "GASSALES=" + getConfigValue("GASSALES") + ";";
-	data += "DIESELSALES=" + getConfigValue("DIESELS") + "";;
+	data += "DIESELSALES=" + getConfigValue("DIESELS") + ";";
 
 
+	data += "GXYL=" + to_string(g_liquidgroup.GetLiquid()->getEnable()) + "";
+
 
 
 	char chTime_QN[18];
@@ -1765,10 +1767,96 @@ void CwebLink_GD_HZ::PackWebData_StationInfo(VR::WebData& webdata)
 	cdata += "Flag=5;";
 	cdata += "CP=&&" + data + "&&";
 
+
+
+
+	//BYTE ch[4096] = { 0 };
+	//memcpy(ch, cdata.data(), cdata.size());
+	//int icrc444 = CRC16_Checkout(ch, cdata.size());
+
+
+	//string strr = "add成就奖";
+	//wstring sss = string2wstring(strr);
+	//int slen = strr.size();
+	//int sslen = sss.size();
+
+	//cdata = "QN=20231226105520749;ST=31;CN=60009;PW=4406050120;MN=4406050120;CP=&&DATE=20231226105520;ID=000001;CSBM=440600;QYBM=440605;ZJBM=440605125000;MC=延长壳牌（广东)石油有限公司佛山新干线加油站;GS=延长壳牌（广东）石油有限公司;JD=	113.124837;WD=23.101272;DZ=广东省佛山市南海区大沥镇竹基南路;JYZLXR=欧宗勤;JYZSJHM=13702958253;JYGM=1;SYZ=10;ZXGYS=维德路特油站设备（上海）有限公司;YWLXR=1;YWSJHM=1;JYJSL=6;JYQSL=32;SCHS=0;YGYL=1;YZYL=0;XYND=0;JYND=0;YJND=	0;HCLND=0;YQWD=1;JYZJC=佛山新干线加油站;JYZTYPE=3;CREDITCODE=1;ESTDATE=20200101;UNAME=欧宗勤;UCONTACT=13702958253;GASCAPACITY=27;DIESELCAPACITY=27;GASSALES=100;DIESELSALES=100;Flag=5&&";
+
+	//cdata = "QN=20230525164503718;ST=31;CN=60010;PW=4406050187;MN=4406050187;Flag=5;CP=&&DATE=20230525164503;ID=001528;JYJID=1;JYQID=1;YP=4;RECYCLEMANU=托肯恒山科技（广州）有限公司;MONITORSTATUS=1&&";
+
+	//cdata = "QN=20210915181927422;ST=31;CN=60009;PW=000000;MN=0000000000;Flag=5;CP=&&DATE=20210915115847;ID=0003;CSBM=440100;QYBM=440106;ZJBM=440106002000;MC=天河区测试加油站;GS=天河中石油分公司;JD=113.246276;WD=23.105945;DZ=广东省广州市天河区明心路53号;JYZLXR=张三;JYZSJHM=13700000000;JYGM=1;SYZ=1:ZXGYS=广州市云景信息科技有限公司;YWLXR=李四;YWSJHM=13800000000;JYJSL=2;JYOSL=4;SCHS=1;YGYL=1;YZYL=1;XYND=1;JYND=1;YIND=1;HCLND=1;YOWD=1;JYZJC=天河测试站;JYZTYPE=1;CREDITCODE=111111111111111111;ESTDATE=20010101;UNAME=张三;UCONTACT=12056987458;GASCAPACITY=100.20;DIESELCAPACITY=100.20;GASSALES=8000.25;DIESELSALES=100.23&&";
+
+	//cdata = "QN=20210915181927422;ST=31;CN=60009;PW=000000;MN=0000000000;Flag=5;CP=&&DATE=20210915115847;ID=0003;CSBM=440100;QYBM=440106;ZJBM=440106002000;MC=天河区测试加油站;GS=天河中石油分公司;JD=113.246276;WD=23.105945;DZ=广东省广州市天河区明心路53号;JYZLXR=张三;JYZSJHM=13700000000;JYGM=1;SYZ=1;ZXGYS=广州市云景信息科技有限公司;YWLXR=李四;YWSJHM=13800000000;JYJSL=2;JYQSL=4;SCHS=1;YGYL=1;YZYL=1;XYND=1;JYND=1;YJND=1;HCLND=1;YQWD=1;JYZJC=天河测试站;JYZTYPE=1;CREDITCODE=111111111111111111;ESTDATE=20010101;UNAME=张三;UCONTACT=12056987458;GASCAPACITY=100.20;DIESELCAPACITY=100.20;GASSALES=8000.25;DIESELSALES=100.23&&";
+
+	//cdata = "QN=20231228113152259;ST=31;CN=60009;PW=4406050187;MN=4406050187;Flag=5;CP=&&DATE=20231228113152;ID=000006;CSBM=440600;QYBM=440605;ZJBM=011034;MC=佛山市南海日东加油站有限公司;GS=佛山市南海日东加油站有限公司;JD=113.192628;WD=23.042323;DZ=佛山市南海区平洲夏东路口;JYZLXR=罗站长;JYZSJHM=13425644915;JYGM=1;SYZ=7;ZXGYS=托肯恒山科技（广州）有限公司;YWLXR=罗站长;YWSJHM=13425644915;JYJSL=6;JYQSL=36;SCHS=1;YGYL=1;YZYL=1;XYND=0;JYND=0;YJND=0;HCLND=0;YQWD=1;JYZJC=日东加油站;JYZTYPE=2;CREDITCODE=9144060559899714X6;ESTDATE=20120706;UNAME=罗站长;UCONTACT=13425644915;GASCAPACITY=115;DIESELCAPACITY=35;GASSALES=13000;DIESELSALES=1300&&";
+
+	//cdata = "QN=20210915181927422;ST=31;CN=60009;PW=000000;MN=0000000000;Flag=5;CP= &&DATE=20210915115847;ID=0003;CSBM=440100;QYBM=440106;ZJBM=440106002000; MC=天河区测试加油站;GS=天河中石油分公司;JD=113.246276;WD=23.105945;DZ=广东省广州市天河区明心路53号;JYZLXR=张三;JYZSJHM=13700000000;JYGM=1;SYZ=1;ZXGYS=广州市云景信息科技有限公司;YWLXR=李四;YWSJHM=13800000000;JYJSL=2;JYQSL=4;SCHS=1;YGYL=1;YZYL=1;XYND=1;JYND =1;YJND=1;HCLND=1;YQWD=1;JYZJC=天河测试站;JYZTYPE=1;CREDITCODE=111111111111111111;ESTDATE=20010101;UNAME=张三;UCONTACT=12056987458;GASCAPACITY=100.20;DIESELCAPACITY=100.20;GASSA LES=8000.25;DIESELSALES=100.23&&";
+
+
+	//cdata = "QN=20240924152557785;ST=31;CN=60009;MN=4406060570;PW=4406060570;Flag=5;CP=&&DATE=20240923085955;ID=0001;CSBM=528000;QYBM=528300;ZJBM=528399;MC=广西永盛石油化工有限公司佛山云良路加油站;GS=广西永盛石油化工有限公司;JD=113.1536;WD=22.5112;DZ=佛山市顺德区大良街道新桂社区桂畔路32号;JYZLXR=陈亮;JYZSJHM=15912549500;JYGM=4;SYZ=9;ZXGYS=河南环宸新能源科技有限公司;YWLXR=张毛超;YWSJHM=18037730727;JYJSL=8;JYQSL=40;SCHS=0;YGYL=1;YZYL=1;XYND=1;JYND=0;YJND=0;HCLND=0;YQWD=1;JYZJC=永盛石化云良路加油站;JYZTYPE=1;CREDITCODE=91440606MA7G582D2U;ESTDATE=20220113;UNAME=陈亮;UCONTACT=15912549500;GASCAPACITY=90;DIESELCAPACITY=30;GASSALES=12800;DIESELSALES=220&&";
+
+	//cdata = "QN=20241008165210857;ST=31;CN=60009;PW=4406051514;MN=4406051514;Flag=5;CP=&&ID=000001;DATE=20241008165054;CSBM=440600;QYBM=440605;ZJBM=122000;MC=中国石化销售股份有限公司广东佛山南海金大南加油站;GS=中国石化销售股份有限公司广东佛山石油分公司;JD=112.933001;WD=22.911001;DZ=佛山市南海区西樵镇海舟工业区白沙岗;JYZLXR=苏永健;JYZSJHM=13823461182;JYGM=0;SYZ=2;ZXGYS=广东品物信息技术有限公司;YWLXR=黄加宇;JYJSL=4;JYQSL=20;SCHS=0;YGYL=1;YJND=0;HCLND=0;YQWD=1;JYZJC=佛山金大南加油站;JYZTYPE=9;CREDITCODE=91440605280037560R;ESTDATE=20010101;UNAME=admin;UCONTACT=13800000000;DIESELCAPACITY=0;GASSALES=0;DIESELSALES=0;XYND=0;JYND=0;YZYL=0&&";
+	//cdata = "QN=20250403112818951;ST=31;CN=60010;PW=4413030046;MN=4413030046;Flag=5;CP=&&DATE=20250403112818;JYJID=3;JYQID=11;YP=1;RECYCLEMANU=青岛澳波泰克安全设备有限责任公司;MONITORSTATUS=1&&";
+
+	string strutf = GBKToUTF8(cdata);
+	//cdata = GBKToUTF8(cdata);
+
+	string udata = 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;
+
+	int icrc = CRC16_Checkout_utf_unsigned(strutf);
+	//icrc = CRC16_Checkout(strutf);
+
+	char chcrc[5] = { 0 };
+	itoa(icrc, chcrc, 16);
+
+	string transferTmp = chcrc;
+	for (int i = 0; i < transferTmp.size(); i++)
+		if (chcrc[i] >= 'a')
+			chcrc[i] -= 32;
+
+	char transferItmp[5] = { 0 };
+	sprintf_s(transferItmp, "%s", chcrc);
+	memset(chcrc, 0, 5);
+	sprintf_s(chcrc, "%04s", transferItmp);
+
+
+	strdata += chcrc;
+	strdata += "\r\n";
+
+	webdata.data = strdata;
+
+
+
+	/*
+	char chTime_QN[18];
+	get_current_time_milliseconds(chTime_QN);
+
+	string cdata = "";
+	cdata += "QN=" + string(chTime_QN) + ";";
+	cdata += "ST=31;";
+	cdata += "CN=" + strCN + ";";
+	cdata += "PW=" + m_pw + ";";
+	cdata += "MN=" + m_mn + ";";
+	cdata += "Flag=5;";
+	cdata += "CP=&&" + data + "&&";
+
+
+	wstring wdata = string2wstring(cdata);
+
+
+	string strdata = "";
+	strdata += "##";
+	char chlen[5];
+	sprintf_s(chlen, "%04d", wdata.length());//cdata.length());
 	strdata += chlen;
 	//strdata += "0";//是否加密
 
@@ -1806,7 +1894,7 @@ void CwebLink_GD_HZ::PackWebData_StationInfo(VR::WebData& webdata)
 
 	webdata.data = GBKToUTF8(webdata.data);//带中文转码
 
-
+	*/
 }
 
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/conn.ini

@@ -1,11 +1,11 @@
 ;上传平台选择
 [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=0
+CityNo=5
 ;上传平台2；  0-不设置；1-浙江浙石油；2-浙江中石化；3-山东青岛；4-湖南长沙环保局；5-佛山顺德（佛山市）；6-广东中石化；7-重庆环保2；8-山东烟台；9-中化道达尔；999-测试2
 CityNo2=0
-;上传平台3；0-不设置；1-浙江高速；2-中山智慧平台；3-北京中石化
-CityNo3=0
+;上传平台3；0-不设置；1-浙江高速；2-中山智慧平台；3-北京中石化；4-山东烟台(新地址)
+CityNo3=1
 ;主平台设置；1-以平台1规则为主；2-以平台2规则为主
 MainCity=1
 
@@ -139,11 +139,13 @@ port=9998
 ;山东烟台加油站设置
 [Config_SD_YT]
 ;区域代码标识
-id=
+id=6606110009
 ;IP地址
 IP=120.220.248.146
+IP_new=144.123.23.224
 ;端口
 port=7001
+port_new=16501
 ;路径，后面不用带?wsdl
 path=/WS_Server/Webservice
 
@@ -373,9 +375,9 @@ IP=113.96.111.154
 ;端口
 port=6102
 ;每个油站的独立MN码，由环保局分发
-MN=4413020095
+MN=441322115
 ;密码
-PW=4413020095
+PW=441322115
 
 
 ;汕头环保局设置
@@ -721,7 +723,7 @@ path=/1/
 ;VRC36通讯
 [VRC36]
 ;串口号
-Comm=0
+Comm=2
 ;波特率
 baudrate=9600
 ;最小周期，单位毫秒，防止周期循环太快(范围为500-10000，默认3000)
@@ -909,14 +911,14 @@ Port=10000
 
 [DataID]
 Record=67134
-Environment=105859
-Config=3228
-Warning=13732
-Error=1626
-NozState=1603
-NozControl=36
-NozzleInfo=153
-StationInfo=94
+Environment=105861
+Config=3248
+Warning=13733
+Error=1627
+NozState=1604
+NozControl=49
+NozzleInfo=259
+StationInfo=123
 
 [Skin]
 ;分辨率宽度1366或1024
@@ -941,11 +943,11 @@ tankstr=
 stationname=珠江二加油站
 Times=1:0;2:0;5:0;6:0;13:0;14:0;15:0;16:0;17:0;18:0;19:0;20:0;23:0;24:0;
 Times_alert=1:0;2:0;5:0;6:0;13:0;14:0;15:0;16:0;17:0;18:0;19:0;20:0;23:0;24:0;
-configupdatetime=20250703160542
+configupdatetime=20250717135510
 
 [RunningState]
 UnLockFlag=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Date=20250702
+Date=20250728
 TradeFlag=100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/global.cpp

@@ -25,7 +25,7 @@
 
 using namespace VR::notify;
 
-string g_version = "V1.16.18";
+string g_version = "V1.16.19";
 
 
 int g_read_unuploadday = 31;	//程序开启时读未上传交易的天数 非特殊情况皆为31天
@@ -85,6 +85,7 @@ CWebLink_ZHDDE web_zhdde;
 CWebLink_ZJGS web_zj_gs;
 CWebLink_GD_ZS_ZH web_gd_zs_zh;
 CWebLink_BJ_ZSH web_bj_zsh;
+CWebLink_SD_YT web_sd_yt_3;
 
 AllWebLink g_AllWebLinks;
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/global.h

@@ -2188,6 +2188,7 @@ extern CWebLink_FS web_fs;
 extern CWebLink_SD web_sd;
 extern CWebLink_SD_YT web_sd_yt;
 extern CWebLink_SD_YT web_sd_yt_2;
+extern CWebLink_SD_YT web_sd_yt_3;
 extern CWebLink_HN web_hn;
 extern CWebLink_CQ web_cq;
 extern CWebLink_FSSD web_fssd;

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/instance.cpp

@@ -880,18 +880,30 @@ void getconfig3()
 	{
 		appname = "Config_BJ_ZSH";
 	}
+	else if (cityno == CITY_3_SD_YT_NEW)
+	{
+		appname = "Config_SD_YT";
+	}
 
 	GetPrivateProfileStringA(appname.c_str(), "id", "", chID_3, 21, ".//conn.ini");
 
 	g_strUserID_3 = chID_3;
 
 
+	string ipstr = "IP";
+	string portstr = "port";
+
+	if (cityno == CITY_3_SD_YT_NEW)
+	{
+		ipstr = "IP_new";
+		portstr = "port_new";
+	}
 
 	//上传平台3的配置
 	char chIP_general_3[50];
-	GetPrivateProfileStringA(appname.c_str(), "IP", "", chIP_general_3, 50, ".//conn.ini");
+	GetPrivateProfileStringA(appname.c_str(), ipstr.c_str(), "", chIP_general_3, 50, ".//conn.ini");
 	singleton<GData>::GetInstance()->g_ip_general_3 = chIP_general_3;
-	singleton<GData>::GetInstance()->g_port_general_3 = GetPrivateProfileIntA(appname.c_str(), "port", 0, ".//conn.ini");
+	singleton<GData>::GetInstance()->g_port_general_3 = GetPrivateProfileIntA(appname.c_str(), portstr.c_str(), 0, ".//conn.ini");
 
 	char chPath_general_3[50];
 	GetPrivateProfileStringA(appname.c_str(), "path", "", chPath_general_3, 50, ".//conn.ini");
@@ -1156,6 +1168,10 @@ void InitCityString()
 		{
 			g_strCity_3 = "北京中石化";
 		}
+		else if (g_CityNo_3 == CITY_3_SD_YT_NEW)
+		{
+			g_strCity_3 = "烟台（新）";
+		}
 	}
 
 		
@@ -1592,7 +1608,7 @@ int APIENTRY WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
 	web_test2.init(platform, AREA_TEST, CITY_2_TEST, "TEST2");
 	web_gd_zsh.init(platform, AREA_GD, CITY_2_GD_ZSH, "GD_ZSH");
 	web_cq_2.init(platform, AREA_CQ, CITY_2_CQ, "CQ_2");
-	web_sd_yt_2.init(platform, AREA_SD, CITY_SD_YT, "SD_YT");
+	web_sd_yt_2.init(platform, AREA_SD, CITY_2_SD_YT, "SD_YT");
 	web_zhdde.init(platform, AREA_UNLIMIT, CITY_2_ZHDDE, "ZHDDE");
 
 
@@ -1601,6 +1617,7 @@ int APIENTRY WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
 	web_zj_gs.init(platform, AREA_ZJ, CITY_3_ZJ_GS, "ZJ_GS");
 	web_gd_zs_zh.init(platform, AREA_GD, CITY_3_GD_ZS_ZH, "GD_ZS_ZH");
 	web_bj_zsh.init(platform, AREA_BJ, CITY_3_BJ_ZSH, "BJ_ZSH");
+	web_sd_yt_3.init(platform, AREA_SD, CITY_3_SD_YT_NEW, "SD_YT");
 
 
 
@@ -2501,6 +2518,7 @@ int APIENTRY WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
 
 	web_sd_yt.SendWebData_SystemState(2, 1);
 	web_sd_yt_2.SendWebData_SystemState(2, 1);
+	web_sd_yt_3.SendWebData_SystemState(2, 1);
 
 
 
@@ -2525,6 +2543,7 @@ int APIENTRY WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
 
 	web_sd_yt.SendWebData_SystemState(2, 2);
 	web_sd_yt_2.SendWebData_SystemState(2, 2);
+	web_sd_yt_3.SendWebData_SystemState(2, 2);
 
 	g_ExitFlag = TRUE;
 	vr_log_vrState("油气回收在线监控系统关闭");

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_common.h

@@ -102,6 +102,7 @@ typedef unsigned char byte;
 #define CITY_3_ZJ_GS	1	//浙江高速
 #define CITY_3_GD_ZS_ZH	2	//中山智慧平台
 #define CITY_3_BJ_ZSH	3	//北京中石化
+#define CITY_3_SD_YT_NEW	4	//山东烟台（新地址）
 
 
 enum GAS_UNIT

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_ext.cpp

@@ -5506,7 +5506,7 @@ void testUpload()
 		}
 
 		SendWebData_Warning_ALL(0, 0, g_strDate,1);
-		SendWebData_Warning_ALL(1, 1, g_strDate);
+		//SendWebData_Warning_ALL(1, 1, g_strDate);
 
 		SendWebData_NozState_ALL(g_strDate);
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_ui.cpp

@@ -1571,6 +1571,7 @@ void NozzleMonitor::UpdateMonitor ()
 
 							web_sd_yt.SendWebData_Warning(0, 2, "", noz);
 							web_sd_yt_2.SendWebData_Warning(0, 2, "", noz);
+							web_sd_yt_3.SendWebData_Warning(0, 2, "", noz);
 
 							lwdays[noz] = warning->continue_days;
 						}
@@ -1587,6 +1588,7 @@ void NozzleMonitor::UpdateMonitor ()
 							{
 								web_sd_yt.SendWebData_Warning(0, 1, "", noz);
 								web_sd_yt_2.SendWebData_Warning(0, 1, "", noz);
+								web_sd_yt_3.SendWebData_Warning(0, 1, "", noz);
 
 								lastwstate[noz] = wstate[noz];
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_webservice.cpp

@@ -6475,6 +6475,225 @@ void vr_webservice::CreateRequestThread_3()
 
 
 					}
+					else if (cityno == CITY_3_SD_YT_NEW)// 山东烟台(新地址)
+					{
+
+						string strErrNum;
+						string strErrMsg;
+						string strValue;
+
+						char *pdata = new char[2 * webdata.data.size()];
+						memset(pdata, 0, 2 * webdata.data.size());
+						memcpy(pdata, webdata.data.data(), webdata.data.size());
+						strrpc(pdata, "<", "&lt;");
+						strrpc(pdata, ">", "&gt;");
+
+
+						std::string  xml = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:int=\"http://inteface.com/\">\r\n"
+							+ string("<soapenv:Header/>\r\n")
+							+ "<soapenv:Body>\r\n"
+							+ "<int:UpLoadData>\r\n"
+							+ "<arg0>" + webdata.strfunc + "</arg0>\r\n"
+							+ "<arg1>" + pdata + "</arg1>\r\n"
+							+ "<arg2>Memo</arg2>\r\n"
+							+ "</int:UpLoadData>\r\n"
+							+ "</soapenv:Body>\r\n"
+							+ "</soapenv:Envelope>\r\n";
+
+
+
+
+						string sendlog = "类型：" + webdata.strtype + "; ID：" + to_string(webdata.ID) + ";   发送：" + xml;
+						log(sendlog.c_str());
+
+
+						std::string strpath = path_gen + "?wsdl";
+						rtnstr = http_post_xml(ip_gen.c_str(), port_gen, strpath.c_str(), xml.c_str());
+						rtnstr = UTF8_To_GBKA(rtnstr);
+
+						delete[]pdata;
+						pdata = nullptr;
+
+						int bError = FALSE;
+						if (rtnstr.find("服务器错") != -1)
+						{
+							bError = TRUE;
+						}
+
+						int index = rtnstr.find_first_of("<");
+						if (bError || index == -1)
+						{
+							char recvlogs[100] = { 0 };
+							sprintf_s(recvlogs, "类型：%s;   接收：", webdata.strtype.c_str());
+							string strlog = recvlogs + rtnstr;
+							log(strlog.c_str());
+
+							Sleep(3 * 1000);
+						}
+						else
+						{
+
+
+							rtnstr = rtnstr.substr(index, rtnstr.length());
+
+
+
+							char *pdata = new char[2 * rtnstr.size()];
+							memset(pdata, 0, 2 * rtnstr.size());
+							memcpy(pdata, rtnstr.data(), rtnstr.size());
+							strrpc(pdata, "&lt;", "<");
+							strrpc(pdata, "&gt;", ">");
+							strrpc(pdata, "&quot;", "\"");
+
+
+							rtnstr = pdata;
+
+							delete[]pdata;
+							pdata = nullptr;
+
+							int lastpost = rtnstr.find_last_of(">");
+							rtnstr = rtnstr.substr(0, lastpost + 1);
+
+
+
+							char recvlogs[100] = { 0 };
+							sprintf_s(recvlogs, "类型：%s;   接收：", webdata.strtype.c_str());
+							string strlog = recvlogs + rtnstr;
+							log(strlog.c_str());
+
+
+							std::string rtnstr2 = "";
+
+
+							int pos1 = rtnstr.find("<RetValue>");
+							int pos2 = rtnstr.find("</RetValue>");
+
+							string rtnstrnew;
+
+							if (pos1 != -1 && pos2 != -1)
+							{
+								rtnstrnew = rtnstr.substr(pos1, pos2 - pos1 + string("</RetValue>").length());
+
+
+								//rapidxml::xml_document<> doc;
+								doc.parse<0>(const_cast<char*>(rtnstrnew.c_str()));
+
+								string name;
+								//! 获取根节点
+								rapidxml::xml_node<>* root = doc.first_node();
+								name = root->name();
+
+
+								for (rapidxml::xml_node<char> * node = root->first_node();
+									node != NULL;
+									node = node->next_sibling())
+								{
+									std::string name = node->name();
+
+									webtick = GetTickCount();
+
+									if (name == "ErrNum")
+									{
+										std::string value = node->value();
+										strErrNum = value;
+									}
+									if (name == "ErrMsg")
+									{
+										std::string value = node->value();
+										strErrMsg = value;
+									}
+									if (name == "InternalErrNum")//"Value"
+									{
+										std::string value = node->value();
+										strValue = value;
+									}
+								}
+
+							}
+
+
+
+							//rapidxml::xml_document<> doc;
+							//doc.parse<0>(const_cast<char*>(rtnstr.c_str()));
+
+							//string name;
+							////! 获取根节点
+							//rapidxml::xml_node<>* root = doc.first_node();
+							//name = root->name();
+
+							////! 获取根节点第一个节点
+							//rapidxml::xml_node<>* node1 = root->first_node();
+							//name = node1->name();
+
+							//rapidxml::xml_node<>* node11 = node1->first_node()->first_node();
+							//name = node11->name();
+							//
+							//{
+							//
+							//	rapidxml::xml_node<>* node12 = node11->first_node();
+							//	for (rapidxml::xml_node<char> * node = node11->first_node();
+							//		node != NULL;
+							//		node = node->next_sibling())
+							//	{
+							//		std::string name = node->name();
+							//		if (name == "RetValue")
+							//		{
+							//			node12 = node;
+							//			break;
+							//		}
+
+							//	}
+
+
+
+							//	for (rapidxml::xml_node<char> * node = node12->first_node();
+							//		node != NULL;
+							//		node = node->next_sibling())
+							//	{
+							//		std::string name = node->name();
+
+							//		webtick = GetTickCount();
+
+							//		if (name == "ErrNum")
+							//		{
+							//			std::string value = node->value();
+							//			strErrNum = value;
+							//		}
+							//		if (name == "ErrMsg")
+							//		{
+							//			std::string value = node->value();
+							//			strErrMsg = value;
+							//		}
+							//		if (name == "InternalErrNum")//"Value"
+							//		{
+							//			std::string value = node->value();
+							//			strValue = value;
+							//		}
+							//	}
+
+
+							webtick = GetTickCount();
+
+
+							if (strErrNum == "0" || webdata.strtype == "HeartBeat") //成功 //心跳数据是自己发的空环境数据，只要能收到回复就算成功
+							{
+								bSuccess = TRUE;
+							}
+							else //其它错误
+							{
+								log(strErrMsg.c_str());
+								errmsg = strErrMsg.c_str();
+							}
+
+						}
+						//}
+
+
+
+
+					}
+
+
 
 					if (IsWebData)
 					{

VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包/files/VR/conn.ini

@@ -4,7 +4,7 @@
 CityNo=0
 ;上传平台2；  0-不设置；1-浙江浙石油；2-浙江中石化；3-山东青岛；4-湖南长沙环保局；5-佛山顺德（佛山市）；6-广东中石化；7-重庆环保2；8-山东烟台；9-中化道达尔；999-测试2
 CityNo2=0
-;上传平台3；0-不设置；1-浙江高速；2-中山智慧平台；3-北京中石化
+;上传平台3；0-不设置；1-浙江高速；2-中山智慧平台；3-北京中石化；4-山东烟台(新地址)
 CityNo3=0
 ;主平台设置；1-以平台1规则为主；2-以平台2规则为主
 MainCity=1
@@ -139,11 +139,13 @@ port=9998
 ;山东烟台加油站设置
 [Config_SD_YT]
 ;区域代码标识
-id=
+id=6606110009
 ;IP地址
 IP=120.220.248.146
+IP_new=144.123.23.224
 ;端口
 port=7001
+port_new=16501
 ;路径，后面不用带?wsdl
 path=/WS_Server/Webservice