gx问题

apq-pc-client/src/main/java/com/priusis/controller/RemoteControlController.java

@@ -29,9 +29,7 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.util.Collections;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.*;
 
 /**
  * @author yangli
@@ -137,7 +135,7 @@ public class RemoteControlController {
         // 设置远程ID
         String path = "C:\\Program Files\\uvnc bvba\\UltraVNC\\";
         if (!FileUtil.exist(path)) {// 默认路径不存在 查注册表
-            path = ObjectUtil.defaultIfNull(installedProgramCache.getPrograms(), Collections.emptyList())
+            path = ObjectUtil.<List<Map<String, String>>>defaultIfNull(installedProgramCache.getPrograms(), Collections.emptyList())
                     .stream()
                     .filter(m -> "UltraVNC".equalsIgnoreCase(m.get("name")))
                     .findFirst()

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

+apq:
+  iot-gateway: 10.2.160.50:80/api
+  webrtc_path: https://ceshi.priusis.com:8443
+  client:
+    productId: 294
+    tenantId: 138
+  job:
+    type: all
+  control:
+    request:
+      isTimeSet: false
+
+PC_HOST: 10.2.160.50
+PC_PORT: 1883
+vnc-repeater: 10.2.160.50:5500
\ No newline at end of file

apq-pc-common/src/main/java/com/priusis/utils/CoreTempUtil.java

 package com.priusis.utils;
 
+import cn.hutool.system.oshi.OshiUtil;
 import com.sun.jna.NativeLibrary;
 import com.sun.jna.ptr.IntByReference;
 import lombok.extern.slf4j.Slf4j;

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

@@ -74,7 +74,7 @@ Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\client-soft\apq.exe";
 Filename: "{app}\Set_Env.bat"; Flags: runhidden;
 Filename: "{app}\service\启动服务.bat"; Flags: runhidden runascurrentuser waituntilterminated;
 Filename: "{app}\vnc\setup.bat"; Flags: skipifdoesntexist runhidden
-Filename: {app}\service\runtime\VC_redist.x86.exe; Parameters: /q; WorkingDir: {tmp}; Flags: skipifdoesntexist; StatusMsg: "Installing Microsoft Visual C++ Runtime ..."; Check: NeedInstallVC9SP1
+Filename: {app}\service\runtime\VC_redist.x86.exe; Parameters: /q /norestart; WorkingDir: {tmp}; Flags: skipifdoesntexist runhidden; StatusMsg: "Installing Microsoft Visual C++ Runtime ..."; Check: NeedInstallVC9SP1
 
 ;卸载后执行的操作(停止、删除各种服务)
 [UninstallRun]

tools/install-package/vnc/x32/setup.bat

@@ -9,7 +9,7 @@ IF not ERRORLEVEL 1 GOTO EXIST
   GOTO NOTEXIST
 
 :NOTEXIST
-"%~dp0\UltraVNC_1_2_40_X86_Setup.exe" /loadinf="%~dp0vnc.ini" /sp- /silent /suppressmsgboxes
+"%~dp0\UltraVNC_1_2_40_X86_Setup.exe" /loadinf="%~dp0vnc.ini" /sp- /silent /suppressmsgboxes /norestart
 GOTO END
 
 :EXIST

tools/install-package/vnc/x64/setup.bat

@@ -9,7 +9,7 @@ IF not ERRORLEVEL 1 GOTO EXIST
   GOTO NOTEXIST
 
 :NOTEXIST
-"%~dp0\UltraVNC_1_2_40_X64_Setup.exe" /loadinf="%~dp0vnc.ini" /sp- /silent /suppressmsgboxes
+"%~dp0\UltraVNC_1_2_40_X64_Setup.exe" /loadinf="%~dp0vnc.ini" /sp- /silent /suppressmsgboxes /norestart
 GOTO END
 
 :EXIST