Merge pull request #3384 from Nonlone/master

feat:增加统计页面展示废弃连接数

pom.xml

@@ -5,6 +5,7 @@
 	<artifactId>druid</artifactId>
 	<version>1.1.20</version>
 
+
 	<packaging>jar</packaging>
 	<name>druid</name>
 	<description>An JDBC datasource implementation.</description>
@@ -20,13 +21,13 @@
 		<javadoc.skip>true</javadoc.skip>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<jdk.version>1.6</jdk.version>
+		<jdk.version>1.8</jdk.version>
 	</properties>
 
 	<repositories>
 		<repository>
 			<id>local-file</id>
-			<url>file://${basedir}/lib/</url>
+			<url>file://${project.basedir}/lib/</url>
 			<layout>default</layout>
 		</repository>
 	</repositories>
@@ -678,5 +679,21 @@
 			<scope>test</scope>
 		</dependency>
 
-	</dependencies>
+        <dependency>
+            <groupId>com.sun</groupId>
+            <artifactId>tools</artifactId>
+            <version>1.8</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/openjdk-1.8-tools.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun</groupId>
+            <artifactId>jconsole</artifactId>
+            <version>1.8</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/openjdk-1.8-jconsole.jar</systemPath>
+        </dependency>
+
+    </dependencies>
 </project>

src/main/java/com/alibaba/druid/pool/DruidDataSource.java

@@ -3536,6 +3536,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         dataMap.put("PhysicalCloseCount", this.getDestroyCount());
         dataMap.put("PhysicalConnectErrorCount", this.getCreateErrorCount());
 
+        dataMap.put("DiscardCount", this.getDiscardCount());
+
         dataMap.put("ExecuteCount", this.getExecuteCount());
         dataMap.put("ExecuteUpdateCount", this.getExecuteUpdateCount());
         dataMap.put("ExecuteQueryCount", this.getExecuteQueryCount());

src/main/resources/support/http/resources/datasource.html

@@ -263,6 +263,11 @@
 								<td>{{=datasourceNow.LogicConnectErrorCount}}</td>
 								<td  class="lang"  langKey="LogicConnectErrorCountDesc">Total connect error times</td>
 							</tr>
+                            <tr>
+                                <td valign="top" class="td_lable" >   <span class="lang"  langKey="DiscardCount">DiscardCount</span></td>
+                                <td>{{=datasourceNow.DiscardCount}}</td>
+                                <td  class="lang"  langKey="DiscardCountDesc">Discard connection count with validate fail </td>
+                            </tr>
 							<tr>
 								<td valign="top" class="td_lable" >   <span class="lang"  langKey="RecycleErrorCount">RecycleErrorCount</span></td>
 								<td>{{=datasourceNow.RecycleErrorCount}}</td>

src/main/resources/support/http/resources/js/lang.js

@@ -63,6 +63,7 @@ druid.lang = function() {
 		'PhysicalConnectCount' : ['PhysicalConnectCount', '物理连接打开次数'],
 		'PhysicalCloseCount' : ['PhysicalCloseCount', '物理关闭数量'],
 		'PhysicalConnectErrorCount' : ['PhysicalConnectErrorCount', '物理连接错误次数'],
+        'DiscardCount' : ['DiscardCount', '校验失败废弃连接数'],
 		'ExecuteCount' : ['ExecuteCount (Total)', '执行数(总共)'],
 		'ErrorCount' : ['ErrorCount', '错误数'],
 		'CommitCount' : ['CommitCount', '提交数'],
@@ -114,6 +115,7 @@ druid.lang = function() {
 		'RecycleErrorCount' : ['Logic Connection Recycle Count', '逻辑连接回收重用次数'],
 		'PhysicalConnectCountDesc' : ['Create physical connnection count', '产生的物理连接建立总数'],
 		'PhysicalCloseCountDesc' : ['Close physical connnection count', '产生的物理关闭总数'],
+        'DiscardCountDesc' : ['Discard connection count with validate fail', '校验连接失败丢弃连接次数'],
 		'PhysicalConnectErrorCountDesc' : ['Total physical connect error times', '产生的物理连接失败总数'],
 		'ExecuteCountDesc' : ['', ''],
 		'ErrorCountDesc' : ['', ''],