提交 d2b3d16a authored 作者: wangqiang's avatar wangqiang

客户端更新

上级 16e05229
...@@ -66,7 +66,7 @@ public class ConfigController { ...@@ -66,7 +66,7 @@ public class ConfigController {
@GetMapping(value = "get_auto_upgrade") @GetMapping(value = "get_auto_upgrade")
public R<Boolean> getAutoUpgrade() throws IOException { public R<Boolean> getAutoUpgrade() throws IOException {
return R.success(Convert.toBool(SysConfigUtil.getProperty("auto.upgrade"), false)); return R.success(Convert.toBool(SysConfigUtil.getProperty("auto.upgrade"), true));
} }
@GetMapping(value = "get_device_sn") @GetMapping(value = "get_device_sn")
......
...@@ -406,7 +406,7 @@ public class ProgramController { ...@@ -406,7 +406,7 @@ public class ProgramController {
try { try {
String controlRequestTimeStr = SysConfigUtil.getProperty("control.request.time"); String controlRequestTimeStr = SysConfigUtil.getProperty("control.request.time");
if (StrUtil.isNotBlank(controlRequestTimeStr) && System.currentTimeMillis() - NumberUtil.toBigDecimal(controlRequestTimeStr).longValue() < 120 * 1000) { if (StrUtil.isNotBlank(controlRequestTimeStr) && System.currentTimeMillis() - NumberUtil.toBigDecimal(controlRequestTimeStr).longValue() < 120 * 1000) {
boolean autoUpgrade = Convert.toBool(SysConfigUtil.getProperty("auto.upgrade"), false); boolean autoUpgrade = Convert.toBool(SysConfigUtil.getProperty("auto.upgrade"), true);
if (!autoUpgrade) return; if (!autoUpgrade) return;
String downloadPath = SysConfigUtil.getProperty("download.path", String downloadPath = SysConfigUtil.getProperty("download.path",
System.getProperty("user.dir").substring(0, 3) + "apqdownloads"); System.getProperty("user.dir").substring(0, 3) + "apqdownloads");
......
apq: apq:
iot-gateway: 10.2.68.45:7033 iot-gateway: 10.2.68.45:7033
webrtc_path: http://10.2.68.41:81 webrtc_path: http://10.2.68.44:81
client: client:
productId: 1 productId: 1
tenantId: 148 tenantId: 148
......
...@@ -9,7 +9,8 @@ setx JAVA_HOME "%jdkpath%" -m ...@@ -9,7 +9,8 @@ setx JAVA_HOME "%jdkpath%" -m
set JAVA_HOME="%jdkpath%" set JAVA_HOME="%jdkpath%"
setx CLASSPATH ".;%%JAVA_HOME%%\lib\tools.jar;%%JAVA_HOME%%\lib\dt.jar" -m setx CLASSPATH ".;%%JAVA_HOME%%\lib\tools.jar;%%JAVA_HOME%%\lib\dt.jar" -m
echo %Path% echo %Path%
echo %Path%|find /i "%JAVA_HOME%" && set IsNull=true || set IsNull=false echo %JAVA_HOME%
echo %Path%|find /i %JAVA_HOME% && set IsNull=true || set IsNull=false
echo %IsNull% echo %IsNull%
if not %IsNull%==true ( if not %IsNull%==true (
reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v Path /t REG_SZ /d "%Path%;%%JAVA_HOME%%\bin;%%JAVA_HOME%%\jre\bin" /f reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v Path /t REG_SZ /d "%Path%;%%JAVA_HOME%%\bin;%%JAVA_HOME%%\jre\bin" /f
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "阿普奇检测客户端" #define MyAppName "阿普奇检测客户端"
#define MyAppVersion "V1.2" #define MyAppVersion "V1.2.1"
#define MyAppPublisher "阿普奇" #define MyAppPublisher "阿普奇"
#define MyAppURL "https://www.apq.com/" #define MyAppURL "https://www.apq.com/"
#define MyAppDirName "apq-client" #define MyAppDirName "apq-client"
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#define MyAppUnInstallPwd "5b559ab76c08f97b5bd6c3a852e44141" #define MyAppUnInstallPwd "5b559ab76c08f97b5bd6c3a852e44141"
[Setup] [Setup]
; 注: AppId的值为单独标识该应用程序。 ; 注: AppId的值为单独标识该应用程序。
; 不要为其他安装程序使用相同的AppId值。 ; 不要为其他安装程序使用相同的AppId值。
; (生成新的GUID,点击 工具|在IDE中生成GUID。) ; (生成新的GUID,点击 工具|在IDE中生成GUID。)
; Tell Windows Explorer to reload the environment ; Tell Windows Explorer to reload the environment
......
...@@ -11,5 +11,5 @@ ...@@ -11,5 +11,5 @@
<startargument>-Dplatform=windows</startargument> <startargument>-Dplatform=windows</startargument>
<startargument>-jar</startargument> <startargument>-jar</startargument>
<startargument>%BASE%\apq-pc-client-0.0.1-SNAPSHOT-boot.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> </service>
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论