From a404fabff25b07672287cda80f64d0ffe0d5c64b Mon Sep 17 00:00:00 2001 From: zhangdongxu Date: Thu, 6 Dec 2018 15:13:29 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81NMS=E4=B8=8A=E6=8A=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=B8=8D=E8=AE=B0=E5=BD=95=E8=AF=B7=E6=B1=82=E6=97=A5?= =?UTF-8?q?=E5=BF=97=EF=BC=9B=202=E3=80=81=E5=9C=A8jdbc.properties?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0druid.log.mysql.validationQuery=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/web/controller/restful/NmsInfoController.java | 6 +++--- src/main/resources/jdbc.properties | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/nis/web/controller/restful/NmsInfoController.java b/src/main/java/com/nis/web/controller/restful/NmsInfoController.java index 06c5fdb..c0d9415 100644 --- a/src/main/java/com/nis/web/controller/restful/NmsInfoController.java +++ b/src/main/java/com/nis/web/controller/restful/NmsInfoController.java @@ -71,7 +71,7 @@ public class NmsInfoController extends BaseRestController { } } - return compileServiceResponse(thread, System.currentTimeMillis() - start, request, response, "上报服务器状态信息成功", + return testServiceResponse(System.currentTimeMillis() - start, request, response, "上报服务器状态信息成功", Constants.IS_DEBUG ? trafficNmsServerStatisticList : null); } @@ -100,7 +100,7 @@ public class NmsInfoController extends BaseRestController { "上报NmsDiRule信息异常:" + e.getMessage(), RestBusinessCode.unknow_error.getValue()); } } - return compileServiceResponse(thread, System.currentTimeMillis() - start, request, response, "上报NmsDiRule信息成功", + return testServiceResponse(System.currentTimeMillis() - start, request, response, "上报NmsDiRule信息成功", Constants.IS_DEBUG ? nmsDiRuleList : null); } @@ -131,7 +131,7 @@ public class NmsInfoController extends BaseRestController { "上报trafficNetflowPort信息异常:" + e.getMessage(), RestBusinessCode.unknow_error.getValue()); } } - return compileServiceResponse(thread, System.currentTimeMillis() - start, request, response, + return testServiceResponse(System.currentTimeMillis() - start, request, response, "上报trafficNetflowPort信息成功", Constants.IS_DEBUG ? trafficNetflowPortInfoList : null); } diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties index 6d1a214..4c72855 100644 --- a/src/main/resources/jdbc.properties +++ b/src/main/resources/jdbc.properties @@ -5,9 +5,9 @@ jdbc.log.driver=com.mysql.jdbc.Driver #华严 #jdbc.log.url=jdbc:mysql://192.168.11.242:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull #元辰鑫外网-开发环境 -#jdbc.log.url=jdbc:mysql://192.168.10.204:3306/galaxy-dev?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull +jdbc.log.url=jdbc:mysql://192.168.10.204:3306/galaxy-dev?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull #元辰鑫外网 -jdbc.log.url=jdbc:mysql://192.168.10.204:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull +#jdbc.log.url=jdbc:mysql://192.168.10.204:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull #亦庄演示环境 #jdbc.log.url=jdbc:mysql://10.3.48.5:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull jdbc.log.username=root @@ -128,6 +128,8 @@ druid.log.minEvictableIdleTimeMillis=300000 druid.log.hive.validationQuery=select unix_timestamp() #用来检测连接是否有效的sql，要求是一个查询语句,下面是clickhouse的 druid.log.clickHouse.validationQuery=show tables +#用来检测连接是否有效的sql，要求是一个查询语句,下面是mysql的 +druid.log.mysql.validationQuery=show tables #申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效 druid.log.testWhileIdle=true #申请连接时执行validationQuery检测连接是否有效