32

apq-pc-client/src/main/java/com/priusis/vo/ApqInfoDataVo.java

-package com.priusis.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class ApqInfoDataVo implements Serializable {
-
-    private String code;
-    private String name;
-    private int frequency;
-
-}

apq-pc-client/src/main/java/com/priusis/vo/MqttRpcDataMessage.java

-package com.priusis.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class MqttRpcDataMessage implements Serializable {
-
-    private static final long serialVersionUID = -3133461476074777891L;
-
-    private int requestId;
-    private String method;
-    private String params;
-
-    @Override
-    public String toString() {
-        return "{requestId=" + requestId +
-                ", method=" + method +
-                ", params=" + params +
-                '}';
-    }
-}

apq-pc-client/src/main/resources/application-atest.yaml

+#apq:
+#  iot-gateway: 192.168.6.23:7033
+#PC_HOST: 192.168.6.23
+#vnc-repeater: 192.168.6.29:5500
+apq:
+  iot-gateway: 120.24.236.245:7033
+  job:
+    type: all
+PC_HOST: 120.24.184.117
+vnc-repeater: 120.24.236.245:5500
+

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

@@ -33,7 +33,7 @@ SetupIconFile=logo.ico
 OutputDir=..\dist\
 
 ;安装包文件名
-OutputBaseFilename={#MyAppName}_x86
+OutputBaseFilename={#MyAppName}_x32
 
 ;压缩文件
 Compression=lzma
@@ -53,9 +53,9 @@ Name: "chinese"; MessagesFile: "compiler:Languages/Chinese.isl"
 
 [Files]
 Source: "../apq-client/*"; Excludes: "bak"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs;
-Source: "../../java/x86/jre/*"; DestDir: "{app}/jre"; Flags: ignoreversion recursesubdirs createallsubdirs;
-Source: "../../dact/x86/*"; DestDir: "{app}/service/dact"; Flags: ignoreversion recursesubdirs createallsubdirs;
-Source: "../../client/x86/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs;
+Source: "../../java/x32/jre/*"; DestDir: "{app}/jre"; Flags: ignoreversion recursesubdirs createallsubdirs;
+Source: "../../dact/x32/*"; DestDir: "{app}/service/dact"; Flags: ignoreversion recursesubdirs createallsubdirs;
+Source: "../../client/x32/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs;
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

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

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

tools/install-package/boot/apq-control/apq-control-x86.iss → tools/install-package/boot/apq-control/apq-control-x32.iss

@@ -31,7 +31,7 @@ SetupIconFile=logo.ico
 OutputDir=..\dist\
 
 ;安装包文件名
-OutputBaseFilename={#MyAppName}_x86
+OutputBaseFilename={#MyAppName}_x32
 
 ;压缩文件
 Compression=lzma
@@ -51,7 +51,7 @@ Name: "chinesesimp"; MessagesFile: "compiler:Languages/Chinese.isl"
 
 [Files]
 Source: "../apq-control/*"; Excludes: "bak"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs;
-Source: "../../dact/x86/*"; DestDir: "{app}/service/dact"; Flags: ignoreversion recursesubdirs createallsubdirs;
+Source: "../../dact/x32/*"; DestDir: "{app}/service/dact"; Flags: ignoreversion recursesubdirs createallsubdirs;
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 //[Tasks]