diff --git a/src/weaver/interfaces/dito/mq/HrmRocketmqServlet.java b/src/weaver/interfaces/dito/mq/HrmRocketmqServlet.java index 91447796..704b46fc 100644 --- a/src/weaver/interfaces/dito/mq/HrmRocketmqServlet.java +++ b/src/weaver/interfaces/dito/mq/HrmRocketmqServlet.java @@ -1,6 +1,7 @@ package weaver.interfaces.dito.mq; +import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer; import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.common.consumer.ConsumeFromWhere; @@ -16,6 +17,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.net.InetAddress; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -47,12 +49,32 @@ public class HrmRocketmqServlet extends HttpServlet { bb.writeLog("isSampleMode3:"+isSampleMode); if(isSampleMode){ - initData(); + + String hrmMqRunIP = PropBean.getUfPropValue("hrmMqRunIP"); + bb.writeLog("hrmMqRunIP:"+hrmMqRunIP); + InetAddress localHost = InetAddress.getLocalHost(); + String hostAddress = localHost.getHostAddress(); + bb.writeLog("hrmMqRunIP:"+hrmMqRunIP); + if(StringUtils.isNotBlank(hostAddress) && StringUtils.isNotBlank(hostAddress) && hostAddress.equals(hrmMqRunIP)){ + bb.writeLog("initData"); + initData(); + } }else{ - if (isMainIp) { - //则调用service方法加载设置,重新获取workflowid相关超时设置OvertimeEntity + + String hrmMqRunIP = PropBean.getUfPropValue("hrmMqRunIP"); + bb.writeLog("hrmMqRunIP:"+hrmMqRunIP); + InetAddress localHost = InetAddress.getLocalHost(); + String hostAddress = localHost.getHostAddress(); + bb.writeLog("hostAddress:"+hostAddress); + if(StringUtils.isNotBlank(hostAddress) && StringUtils.isNotBlank(hostAddress) && hostAddress.equals(hrmMqRunIP)){ + bb.writeLog("initData"); initData(); } + +// if (isMainIp) { +// //则调用service方法加载设置,重新获取workflowid相关超时设置OvertimeEntity +// initData(); +// } } }catch (Exception e){