修改数据源为druid，通用mapper为1.1.0版本

abel533 · abel533 · commit 6da75abba018 · 2015-01-06T14:54:58.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
     <!--  编译jdk版本  -->
     <jdk.version>1.6</jdk.version>
     <!--  依赖版本  -->
-    <mapper.version>1.0.0</mapper.version>
+    <mapper.version>1.1.0</mapper.version>
     <pagehelper.version>3.4.0</pagehelper.version>
     <mysql.version>5.1.29</mysql.version>
     <spring.version>4.1.2.RELEASE</spring.version>
@@ -138,29 +138,24 @@
       <version>1.8.2</version>
     </dependency>
 
-    <!--Commons-->
-    <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-      <version>1.4</version>
-    </dependency>
     <!--上传文件-->
     <dependency>
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
       <version>1.3.1</version>
     </dependency>
 
-    <!--hsqldb-->
+    <!--mysql-->
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
       <version>${mysql.version}</version>
     </dependency>
+    <!--druid-->
     <dependency>
-      <groupId>c3p0</groupId>
-      <artifactId>c3p0</artifactId>
-      <version>0.9.1.2</version>
+      <groupId>com.alibaba</groupId>
+      <artifactId>druid</artifactId>
+      <version>1.0.11</version>
     </dependency>
 
     <!--Mybatis-->
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
@@ -41,16 +41,26 @@
 
   <context:property-placeholder location="classpath:config.properties"/>
 
-  <!--  c3p0  -->
-  <bean id="dataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close">
-    <property name="driverClass" value="${jdbc.driverClass}"/>
-    <property name="jdbcUrl" value="${jdbc.url}"/>
-    <property name="user" value="${jdbc.user}"/>
-    <property name="password" value="${jdbc.password}"/>
-    <property name="maxPoolSize" value="${jdbc.maxPoolSize}"/>
-    <property name="minPoolSize" value="${jdbc.minPoolSize}"/>
-    <property name="maxStatements" value="${jdbc.maxStatements}"/>
-    <property name="testConnectionOnCheckout" value="${jdbc.testConnection}"/>
+  <bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
+    <property name="driverClassName" value="${jdbc.driverClass}"/>
+    <property name="url" value="${jdbc.url}" />
+    <property name="username" value="${jdbc.user}"/>
+    <property name="password" value="${jdbc.password}" />
+
+    <property name="filters" value="stat" />
+
+    <property name="maxActive" value="20"/>
+    <property name="initialSize" value="1"/>
+    <property name="maxWait" value="60000"/>
+    <property name="minIdle" value="1"/>
+
+    <property name="timeBetweenEvictionRunsMillis" value="60000"/>
+    <property name="minEvictableIdleTimeMillis" value="300000"/>
+
+    <property name="validationQuery" value="SELECT 'x'"/>
+    <property name="testWhileIdle" value="true"/>
+    <property name="testOnBorrow" value="false"/>
+    <property name="testOnReturn" value="false"/>
   </bean>
 
   <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
