15888b7f lauka

Merge remote-tracking branch 'origin/master_doubo' into doubo

2 个父辈 33d13a3a 341cf49c
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
7 7
8 <bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close"> 8 <bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
9 <!-- 基本属性 url、user、password --> 9 <!-- 基本属性 url、user、password -->
10 <property name="url" value="${jdbc.imtegralurl}"/> 10 <property name="url" value="${mall.read.url}?characterEncoding=utf8&amp;zeroDateTimeBehavior=convertToNull&amp;allowMultiQueries=true" />
11 <property name="username" value="${jdbc.imtegralusername}"/> 11 <property name="username" value="${mall.read.username}" />
12 <property name="password" value="${jdbc.imtegralpassword}"/> 12 <property name="password" value="${mall.read.password}" />
13 <property name="driverClassName" value="${jdbc.driverClassName}"/> 13 <property name="driverClassName" value="${jdbc.driverClassName}"/>
14 14
15 <!-- 配置初始化大小、最小、最大 --> 15 <!-- 配置初始化大小、最小、最大 -->
......