集成与自动升级

apq-pc-client/src/main/java/com/priusis/ApqClientApplication.java

@@ -20,6 +20,9 @@ public class ApqClientApplication {
         SpringApplication.run(ApqClientApplication.class, args);
     }
 
+//    public static void main(String[] args) {
+//        System.out.println(System.currentTimeMillis());
+//    }
 
     @Resource
     private TenantManagerService service;

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

@@ -80,6 +80,7 @@ public class ConfigController {
                 "{\"code\":\"ip\",\"name\":\"ip\",\"frequency\":60}," +
                 "{\"code\":\"cpuLoad\",\"name\":\"CPU负载\",\"frequency\":60}," +
                 "{\"code\":\"cpuTemp\",\"name\":\"CPU温度\",\"frequency\":60}," +
+                "{\"code\":\"cpuModel\",\"name\":\"CPU型号\",\"frequency\":60}," +
                 "{\"code\":\"mac\",\"name\":\"MAC地址\",\"frequency\":60}," +
                 "{\"code\":\"memoryAvailable\",\"name\":\"内存使用率\",\"frequency\":60}," +
                 "{\"code\":\"memoryCap\",\"name\":\"内存容量\",\"frequency\":60}," +

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

@@ -77,7 +77,7 @@ public class RemoteControlController {
             controlRequest = "0";
         }
 
-        if (StrUtil.equals(controlRequest, "-1")) {
+        if (StrUtil.equals(controlRequest, "-1") || StrUtil.equals(controlRequest, "1")) {
             SysConfigUtil.saveProperty("control.request", "0");
         }
         SysConfigUtil.saveProperty("control.request.time", System.currentTimeMillis() + "");

apq-pc-info/src/main/java/com/priusis/controller/InfoController.java

@@ -136,7 +136,7 @@ public class InfoController {
             String ipV = "";
 
             try {
-                baseboardV = baseboard = Oshi4NoneSigarUtil.getBaseboardWithCache();  // 获取主板信息  缓存;
+                baseboardV = Oshi4NoneSigarUtil.getBaseboardWithCache();  // 获取主板信息  缓存;
                 ipV = InetAddress.getLocalHost().getHostAddress();
 
                 org.hyperic.sigar.CpuInfo cpuInfo = sigar.getCpuInfoList()[0];

tools/install-package/boot/apq-client/service/apq-client-service.xml

@@ -12,5 +12,5 @@
     <startargument>-Dplatform=windows</startargument>
     <startargument>-jar</startargument>
     <startargument>%BASE%\apq-pc-client-0.0.1-SNAPSHOT-boot.jar</startargument>
-    <startargument>--spring.profiles.active=aprod</startargument>
+    <startargument>--spring.profiles.active=prod</startargument>
 </service>