init apq monitor from thingsboard

apq-pc-client/src/main/java/com/priusis/client/service/core/MqttServiceImpl.java

@@ -129,10 +129,13 @@ public class MqttServiceImpl implements MqttService, MqttHandler, MqttClientCall
         this.persistence = configuration.getPersistence();
         this.tenantLabel = configuration.getLabel();
         initTimeouts();
-        initMqttClient();
-        initMqttSender(incomingQueue);
-        initMqttReceiver(incomingQueue);
+
         scheduler = Executors.newSingleThreadScheduledExecutor();
+        scheduler.submit(() -> {
+            initMqttClient();
+            initMqttSender(incomingQueue);
+            initMqttReceiver(incomingQueue);
+        });
     }
 
     private void initTimeouts() {

apq-pc-client/src/main/resources/application-dev.yml

@@ -3,4 +3,9 @@ apq:
 PC_HOST: 192.168.124.6
 #apq:
 #  iot-gateway: 192.168.6.23:7033
-#PC_HOST: 192.168.6.23
\ No newline at end of file
+#PC_HOST: 192.168.6.23
+#vnc-repeater: 192.168.6.29:5500
+#apq:
+#  iot-gateway: 10.2.68.40:7033
+#PC_HOST: 10.2.68.40
+#vnc-repeater: 10.2.68.41:5500
\ No newline at end of file

apq-pc-client/src/main/resources/application.yml

@@ -51,6 +51,5 @@ apq:
 
 
 # VNC中继服务器
-vnc-repeater: 192.168.6.29:5500
-#vnc-repeater: 120.24.236.245:5500
+vnc-repeater: 120.24.236.245:5500
 

tools/install-package/boot/apq-client/apq-client.iss

@@ -2,13 +2,13 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
                  
 #define MyAppName "阿普奇检测客户端"     
-#define MyAppVersion "V1.0"               
-#define MyAppPublisher "阿普奇"          
-#define MyAppURL "https://www.apq.com/"     
-#define MyAppDirName "apq-client"            
+#define MyAppVersion "V1.0"                   
+#define MyAppPublisher "阿普奇"
+#define MyAppURL "https://www.apq.com/"
+#define MyAppDirName "apq-client"
 #define MyAppEnName "apq-client"
-#define MyAppExeName "apq-client.exe"  
-#define MyAppReBootName "service\启动服务R.bat"    
+#define MyAppExeName "apq-client.exe"
+#define MyAppReBootName "service\启动服务R.bat"
 
 [Setup]
 ; 注: AppId的值为单独标识该应用程序。
@@ -17,7 +17,7 @@
 ; Tell Windows Explorer to reload the environment
 ChangesEnvironment=yes
 DisableDirPage=no
-; AlwaysRestart=yes
+AlwaysRestart=yes
 AppId={{1394783A-5D3C-48CD-0000-E2DFBB844E42}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
@@ -47,43 +47,38 @@ PrivilegesRequired=admin
 UninstallDisplayIcon={app}/{#MyAppExeName}
 //CreateUninstallRegKey=no
 //UpdateUninstallLogAppName=no
-VersionInfoVersion=1.0.0.1  
+VersionInfoVersion=1.0.0.1
 
 [Languages]
 Name: "chinese"; MessagesFile: "compiler:Languages/Chinese.isl"
 
-[Files]             
-Source: "../apq-client/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs;
+[Files]
+Source: "../apq-client/*"; Excludes: "bak"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs;
 Source: "../../java/jre/jre/*"; DestDir: "{app}/jre"; Flags: ignoreversion recursesubdirs createallsubdirs;
 Source: "../../client/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs;
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
-[Icons]            
+[Icons]
 Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
 Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\client-soft\apq.exe";
 
-[Run]             
-Filename: "{app}\Set_Env.bat"; Flags: runhidden; 
+[Run]
+Filename: "{app}\Set_Env.bat"; Flags: runhidden;
 Filename: "{app}\service\启动服务.bat"; Flags: runhidden runascurrentuser waituntilterminated;
 
 ;卸载后执行的操作(停止、删除各种服务)
-[UninstallRun]  
+[UninstallRun]
 Filename: "{app}\service\删除服务.bat"; Flags: runhidden;
 
 ;卸载后删除目录所有文件，删除空目录
 [UninstallDelete]
-Type: filesandordirs; Name: "{app}\*" 
+Type: filesandordirs; Name: "{app}\*"
 Type: dirifempty; Name: "{app}"
 
 ;操作注册表
 [Registry]
 Root: HKLM; Subkey: "Software\{#MyAppEnName}"; Flags: uninsdeletekey;
 Root: HKCU; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "{#MyAppEnName}"; ValueData: "{app}\{#MyAppReBootName}"; Flags: uninsdeletevalue;
-; set JAVA_HOME 
-Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType:string; ValueName:"JAVA_HOME"; ValueData:"{app}\jre"; Flags: preservestringtype 
-; set PATH 
-Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType:string; ValueName:"PATH"; ValueData:"{olddata};{app}\jre\bin"; Flags: preservestringtype
-
 
 [Code]
 function CheckProcessRunning( aProcName,

tools/install-package/boot/apq-client/bak/bat/apq-client.iss

@@ -17,7 +17,7 @@
 ; Tell Windows Explorer to reload the environment
 ChangesEnvironment=yes
 DisableDirPage=no
-; AlwaysRestart=yes
+AlwaysRestart=yes
 AppId={{1394783A-5D3C-48CD-0000-E2DFBB844E42}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
@@ -79,11 +79,6 @@ Type: dirifempty; Name: "{app}"
 [Registry]
 Root: HKLM; Subkey: "Software\{#MyAppEnName}"; Flags: uninsdeletekey;
 Root: HKCU; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "{#MyAppEnName}"; ValueData: "{app}\{#MyAppReBootName}"; Flags: uninsdeletevalue;
-; set JAVA_HOME 
-Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType:string; ValueName:"JAVA_HOME"; ValueData:"{app}\jre"; Flags: preservestringtype 
-; set PATH 
-Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType:string; ValueName:"PATH"; ValueData:"{olddata};{app}\jre\bin"; Flags: preservestringtype
-
 
 [Code]
 function CheckProcessRunning( aProcName,

tools/install-package/boot/apq-control/apq-control.iss

@@ -51,7 +51,7 @@ VersionInfoVersion=1.0.0.0
 Name: "chinesesimp"; MessagesFile: "compiler:Languages/Chinese.isl"
 
 [Files]
-Source: "../apq-control/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs;
+Source: "../apq-control/*"; Excludes: "bak"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs;
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 //[Tasks]

tools/install-package/boot/apq-info/apq-info.iss

@@ -49,7 +49,7 @@ VersionInfoVersion=1.0.0.0
 Name: "chinesesimp"; MessagesFile: "compiler:Languages/Chinese.isl"
 
 [Files]
-Source: "../apq-info/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs;
+Source: "../apq-info/*"; Excludes: "bak"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs;
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

tools/install-package/boot/apq-register/apq-register.iss

@@ -48,7 +48,7 @@ VersionInfoVersion=1.0.0.0
 Name: "chinesesimp"; MessagesFile: "compiler:Languages/Chinese.isl"
 
 [Files]
-Source: "../apq-register/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs;
+Source: "../apq-register/*"; Excludes: "bak"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs;
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]