diff --git a/mars-common/src/main/java/com/mars/common/constant/MarsConstant.java b/mars-common/src/main/java/com/mars/common/constant/MarsConstant.java index acaa67f..1850022 100644 --- a/mars-common/src/main/java/com/mars/common/constant/MarsConstant.java +++ b/mars-common/src/main/java/com/mars/common/constant/MarsConstant.java @@ -18,9 +18,9 @@ public class MarsConstant { */ public static final String HAS_START="hasStart"; /** - * 记录netty是否已经启动了 + * 记录服务是否已经启动了 */ - public static final String HAS_NETTY_START="hasNettyStart"; + public static final String HAS_SERVER_START ="hasNettyStart"; /** * 记录是否已经启动过单测了 */ diff --git a/mars-core/src/main/java/com/mars/timer/execute/ExecuteMarsTimer.java b/mars-core/src/main/java/com/mars/timer/execute/ExecuteMarsTimer.java index 557dd85..dc9c26e 100644 --- a/mars-core/src/main/java/com/mars/timer/execute/ExecuteMarsTimer.java +++ b/mars-core/src/main/java/com/mars/timer/execute/ExecuteMarsTimer.java @@ -60,7 +60,7 @@ public class ExecuteMarsTimer { */ private static void executeTimer(MarsTimerModel marsTimerModel){ try { - Object hasNettyStart = constants.getAttr(MarsConstant.HAS_NETTY_START); + Object hasNettyStart = constants.getAttr(MarsConstant.HAS_SERVER_START); if(hasNettyStart != null){ Object beanObject = marsTimerModel.getObj(); Method method = marsTimerModel.getMethod(); diff --git a/mars-server/src/main/java/com/mars/iserver/server/MarsServer.java b/mars-server/src/main/java/com/mars/iserver/server/MarsServer.java index 53136b0..3eb38ee 100644 --- a/mars-server/src/main/java/com/mars/iserver/server/MarsServer.java +++ b/mars-server/src/main/java/com/mars/iserver/server/MarsServer.java @@ -38,8 +38,8 @@ public class MarsServer { //设置服务器的线程池对象 httpServer.setExecutor(ThreadPool.getThreadPoolExecutor()); - /* 标识tomcat是否已经启动 */ - MarsSpace.getEasySpace().setAttr(MarsConstant.HAS_NETTY_START,"yes"); + /* 标识服务是否已经启动 */ + MarsSpace.getEasySpace().setAttr(MarsConstant.HAS_SERVER_START,"yes"); log.info("启动成功"); //启动服务器 diff --git a/mars-starter/src/main/java/com/mars/start/base/MarsJunitStart.java b/mars-starter/src/main/java/com/mars/start/base/MarsJunitStart.java index fda2b12..395eff0 100644 --- a/mars-starter/src/main/java/com/mars/start/base/MarsJunitStart.java +++ b/mars-starter/src/main/java/com/mars/start/base/MarsJunitStart.java @@ -48,7 +48,7 @@ public class MarsJunitStart { autoWrite(obj); /* 标识是否已经启动 */ - constants.setAttr(MarsConstant.HAS_NETTY_START,"yes"); + constants.setAttr(MarsConstant.HAS_SERVER_START,"yes"); log.info("开始执行单测......"); } catch (Exception e) {