diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 37b0332f97..61473b16ed 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -1338,7 +1338,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat @Override public String getVersion() { - return VERSION.MajorVersion + "." + VERSION.MinorVersion + "." + VERSION.RevisionVersion + "-2012-1-6 10:14"; + return VERSION.MajorVersion + "." + VERSION.MinorVersion + "." + VERSION.RevisionVersion; } } diff --git a/src/main/java/com/alibaba/druid/proxy/DruidDriver.java b/src/main/java/com/alibaba/druid/proxy/DruidDriver.java index 042f53982c..3ffa11e54c 100644 --- a/src/main/java/com/alibaba/druid/proxy/DruidDriver.java +++ b/src/main/java/com/alibaba/druid/proxy/DruidDriver.java @@ -34,6 +34,7 @@ import java.util.logging.Logger; import javax.management.MBeanServer; import javax.management.ObjectName; +import com.alibaba.druid.VERSION; import com.alibaba.druid.filter.Filter; import com.alibaba.druid.logging.Log; import com.alibaba.druid.logging.LogFactory; @@ -309,4 +310,9 @@ public class DruidDriver implements Driver, DruidDriverMBean { public void resetStat() { connectCount.set(0); } + + @Override + public String getDruidVersion() { + return VERSION.MajorVersion + "." + VERSION.MinorVersion + "." + VERSION.RevisionVersion; + } } diff --git a/src/main/java/com/alibaba/druid/proxy/DruidDriverMBean.java b/src/main/java/com/alibaba/druid/proxy/DruidDriverMBean.java index 446c262525..966449b117 100644 --- a/src/main/java/com/alibaba/druid/proxy/DruidDriverMBean.java +++ b/src/main/java/com/alibaba/druid/proxy/DruidDriverMBean.java @@ -19,6 +19,7 @@ package com.alibaba.druid.proxy; * @author wenshao */ public interface DruidDriverMBean { + String getDruidVersion(); long getConnectCount();