diff --git a/build.gradle b/build.gradle index c011743..9b8a71f 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ uploadArchives { authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD) } pom.project { - version '1.1.12' + version '1.1.14' artifactId ARTIFACT_Id groupId GROUP_ID packaging TYPE diff --git a/src/main/java/com/taover/heartbeat/bean/ClientRequest.java b/src/main/java/com/taover/heartbeat/bean/ClientRequest.java index 1bae7e8..b0893d8 100644 --- a/src/main/java/com/taover/heartbeat/bean/ClientRequest.java +++ b/src/main/java/com/taover/heartbeat/bean/ClientRequest.java @@ -72,7 +72,7 @@ public class ClientRequest { String unixtime = request.getParameter("unixtime"); String seckey = request.getParameter("seckey"); String ip = request.getRemoteHost(); - return new ClientRequest(code, ip, + return new ClientRequest(code, ip, maxWaitSec==null?Instance.DEFAULT_MAX_WAIT_SEC:Integer.valueOf(maxWaitSec), fixRateSec==null?Instance.DEFAULT_FIX_RATE_SEC:Integer.valueOf(fixRateSec), unixtime==null?System.currentTimeMillis()/1000:Long.valueOf(unixtime), @@ -80,6 +80,7 @@ public class ClientRequest { } public String getIdentity() { - return this.code + "@" + this.ip; + //return this.code + "@" + this.ip; + return this.code; } } diff --git a/src/main/java/com/taover/heartbeat/bean/ReformInstance.java b/src/main/java/com/taover/heartbeat/bean/ReformInstance.java index 74630ca..488d4c4 100644 --- a/src/main/java/com/taover/heartbeat/bean/ReformInstance.java +++ b/src/main/java/com/taover/heartbeat/bean/ReformInstance.java @@ -62,11 +62,11 @@ public class ReformInstance { htmlContent += " 未收到服务器响应\n"; }else { if(instance.getLatestServerResponse().isOverdue()) { - htmlContent += " 向服务器接口["+instance.getUrl()+"]发送请求,响应超时["+instance.getMaxWaitSec()+"s],请及时确认服务器是否正常运行\n"; + htmlContent += " 向接口["+instance.getUrl()+"]发送请求,响应超时["+instance.getMaxWaitSec()+"s],请及时确认服务是否正常运行\n"; }else if(!instance.getLatestServerResponse().isCodeOk()) { - htmlContent += " 向服务器接口["+instance.getUrl()+"]发送请求,响应数据不正常(详细请查看邮件),请及时确认服务器是否正常运行\n"; + htmlContent += " 向接口["+instance.getUrl()+"]发送请求,响应数据不正常(详细请查看邮件),请及时确认服务是否正常运行\n"; }else { - htmlContent += " 向服务器接口["+instance.getUrl()+"]发送请求,未知异常,请及时确认服务器是否正常运行\n"; + htmlContent += " 向接口["+instance.getUrl()+"]发送请求,未知异常,请及时确认服务是否正常运行\n"; } } htmlContent += " 最后一次请求时间: "+new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(instance.getLatestRequestUnixtime()*1000)); @@ -74,9 +74,9 @@ public class ReformInstance { } private String formatWeixin(ClientInstance instance) { - String htmlContent = " 超过"+instance.getFixRateSec()+"秒未收到请求,请确认CODE["+instance.getCode()+"]对应的客户端是否运行正常\n"; + String htmlContent = " 超过"+instance.getFixRateSec()+"秒未收到请求,请确认CODE["+instance.getCode()+"]对应的服务是否运行正常\n"; htmlContent += " 客户端最后一次请求时间: "+new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(instance.getLastestClientRequest().getUnixtime()*1000))+"\n"; - htmlContent += " 客户端IP:"+instance.getIp(); + //htmlContent += " 客户端IP:"+instance.getIp(); htmlContent += " 累计次数(3次后不再报警):"+instance.getLostClientRequestCount(); return htmlContent; } @@ -108,9 +108,9 @@ public class ReformInstance { htmlContent += "

"; if(instance.getLatestServerResponse() != null) { if(instance.getLatestServerResponse().isOverdue()) { - htmlContent += " 向服务器接口["+instance.getUrl()+"]发送请求,响应超时["+instance.getMaxWaitSec()+"s],请及时确认服务器是否正常运行"; + htmlContent += " 向接口["+instance.getUrl()+"]发送请求,响应超时["+instance.getMaxWaitSec()+"s],请及时确认服务是否正常运行"; }else if(!instance.getLatestServerResponse().isCodeOk()) { - htmlContent += " 向服务器接口["+instance.getUrl()+"]发送请求,响应数据不正常(详细请查看邮件),请及时确认服务器是否正常运行"; + htmlContent += " 向接口["+instance.getUrl()+"]发送请求,响应数据不正常(详细请查看邮件),请及时确认服务是否正常运行"; }else { htmlContent += "未知异常"; } @@ -138,7 +138,7 @@ public class ReformInstance { htmlContent += "

"; htmlContent += "