From 37692307435b03469c5e8d7e161c05a339238204 Mon Sep 17 00:00:00 2001 From: Elune <201507802@qq.com> Date: Sun, 22 Dec 2019 13:58:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/zhengjie/modules/mnt/service/AppService.java | 1 + .../me/zhengjie/modules/mnt/service/DatabaseService.java | 1 + .../modules/mnt/service/DeployHistoryService.java | 1 + .../me/zhengjie/modules/mnt/service/DeployService.java | 1 + .../modules/mnt/service/ServerDeployService.java | 1 + .../modules/mnt/service/impl/DeployServiceImpl.java | 9 ++++++--- 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java index dd7767ab..e2aaa93b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java @@ -61,6 +61,7 @@ public interface AppService { * 导出数据 * @param queryAll / * @param response / + * @throws IOException / */ void download(List queryAll, HttpServletResponse response) throws IOException; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java index d2b3579a..3ca46ae4 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java @@ -68,6 +68,7 @@ public interface DatabaseService { * 导出数据 * @param queryAll / * @param response / + * @throws IOException e */ void download(List queryAll, HttpServletResponse response) throws IOException; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java index b42fbea9..10150696 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java @@ -54,6 +54,7 @@ public interface DeployHistoryService { * 导出数据 * @param queryAll / * @param response / + * @throws IOException / */ void download(List queryAll, HttpServletResponse response) throws IOException; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java index 77d2f1f6..7332cb73 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java @@ -96,6 +96,7 @@ public interface DeployService { * 导出数据 * @param queryAll / * @param response / + * @throws IOException / */ void download(List queryAll, HttpServletResponse response) throws IOException; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerDeployService.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerDeployService.java index 25f999d3..927de74c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerDeployService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerDeployService.java @@ -75,6 +75,7 @@ public interface ServerDeployService { * 导出数据 * @param queryAll / * @param response / + * @throws IOException / */ void download(List queryAll, HttpServletResponse response) throws IOException; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java index 636cae33..47e95a39 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java @@ -48,6 +48,9 @@ public class DeployServiceImpl implements DeployService { private final DeployHistoryService deployHistoryService; + // 循环次数 + private final Integer count = 30; + public DeployServiceImpl(DeployRepository deployRepository, DeployMapper deployMapper, ServerDeployService serverDeployService, DeployHistoryService deployHistoryService) { this.deployRepository = deployRepository; this.deployMapper = deployMapper; @@ -158,7 +161,7 @@ public class DeployServiceImpl implements DeployService { int i = 0; boolean result = false; // 由于启动应用需要时间，所以需要循环获取状态，如果超过30次，则认为是启动失败 - while (i++ < 30){ + while (i++ < count){ result = checkIsRunningStatus(port, executeShellUtil); if(result){ break; @@ -286,7 +289,7 @@ public class DeployServiceImpl implements DeployService { int i = 0; boolean result = false; // 由于启动应用需要时间，所以需要循环获取状态，如果超过30次，则认为是启动失败 - while (i++ < 30){ + while (i++ < count){ result = checkIsRunningStatus(app.getPort(), executeShellUtil); if(result){ break; @@ -371,7 +374,7 @@ public class DeployServiceImpl implements DeployService { int i = 0; boolean result = false; // 由于启动应用需要时间，所以需要循环获取状态，如果超过30次，则认为是启动失败 - while (i++ < 30){ + while (i++ < count){ result = checkIsRunningStatus(app.getPort(), executeShellUtil); if(result){ break;