Commit b0d482a2 by 裴大威

Merge branch 'feat-dw-dealDruid' into 'master'

upgrade druid

See merge request rays/pcloud-common-parent!95
parents 3d1ab22a 2038fbca
...@@ -127,7 +127,7 @@ public class DataSourceConfig { ...@@ -127,7 +127,7 @@ public class DataSourceConfig {
servletRegistrationBean.addInitParameter("loginUsername","admin"); servletRegistrationBean.addInitParameter("loginUsername","admin");
servletRegistrationBean.addInitParameter("loginPassword","Rays123456"); servletRegistrationBean.addInitParameter("loginPassword","Rays123456");
//是否能够重置数据. //是否能够重置数据.
servletRegistrationBean.addInitParameter("resetEnable","false"); servletRegistrationBean.addInitParameter("resetEnable","true");
return servletRegistrationBean; return servletRegistrationBean;
} }
......
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>1.0.18</version> <version>1.1.20</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment