Merge remote-tracking branch 'origin/master'

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

@@ -70,14 +70,16 @@ public class RemoteControlController {
      */
     @GetMapping(value = "accept_request")
     public R<Void> acceptRequest(@RequestParam @NotNull Long minutes)
-            throws IOException, ConfigParser.DuplicateSectionException, ConfigParser.NoSectionException {
+            throws IOException, ConfigParser.DuplicateSectionException, ConfigParser.NoSectionException, InterruptedException {
         Boolean hasRequest = Convert.toBool(SysConfigUtil.saveProperty("control.request", "0"), false);
         if (!hasRequest) return R.error("无远程请求");
         return startVncServer(minutes);
     }
 
-    private R<Void> startVncServer(long minutes)
-            throws IOException, ConfigParser.DuplicateSectionException, ConfigParser.NoSectionException {
+    private Timer timer = new Timer();
+
+    private synchronized R<Void> startVncServer(long minutes)
+            throws IOException, ConfigParser.DuplicateSectionException, ConfigParser.NoSectionException, InterruptedException {
         // 查询设备的远程ID
         String remoteId = getRemoteId();
         if (StrUtil.isBlank(remoteId)) return R.error("未查询到设备的远程ID");
@@ -97,11 +99,12 @@ public class RemoteControlController {
         configParser.write(file);
 
         // 重启VNC Server服务
-        Runtime.getRuntime().exec("cmd /c net stop uvnc_service");
-        Runtime.getRuntime().exec("cmd /c net start uvnc_service");
+        timer.cancel();
+        Runtime.getRuntime().exec("cmd /c net stop uvnc_service").waitFor();
+        Runtime.getRuntime().exec("cmd /c net start uvnc_service").waitFor();
 
         // 定时任务，指定分钟后执行一次
-        Timer timer = new Timer();
+        timer = new Timer();
         timer.schedule(new TimerTask() {
             @SneakyThrows
             @Override
@@ -126,7 +129,7 @@ public class RemoteControlController {
 
     @GetMapping(value = "send_request")
     public R<Void> sendRequest(@RequestParam @NotNull Long minutes)
-            throws IOException, ConfigParser.DuplicateSectionException, ConfigParser.NoSectionException {
+            throws IOException, ConfigParser.DuplicateSectionException, ConfigParser.NoSectionException, InterruptedException {
         JSONObject rsp = JSONUtil.parseObj(HttpUtil.post(gateway + sendControlReqUrl,
                 JSONUtil.createObj().set("minutes", minutes).set("macAddress", getMacAddress()).toString()));
         if (ObjectUtil.notEqual(rsp.getInt("code"), 0)) return R.error(rsp.getStr("msg"));

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

@@ -44,7 +44,7 @@ apq:
   url:
     device_info: /facility/facility/getByMacAddress?macAddress={}
     install: /ops/install/getClientList?macAddress={}&pageNum={}&pageSize={}
-    upgrade: /ops/upgrade/getList?macAddress={}&pageNum={}&pageSize={}
+    upgrade: /ops/upgrade/getClientList?macAddress={}&pageNum={}&pageSize={}
     add-program: /ops/program/addFacProgram
     send-control-req: /