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

@@ -7,9 +7,9 @@
          
          
 	<bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
 	<bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
         <!-- 基本属性 url、user、password -->
         <!-- 基本属性 url、user、password -->
-        <property name="url" value="${jdbc.imtegralurl}"/>
-        <property name="username" value="${jdbc.imtegralusername}"/>
-        <property name="password" value="${jdbc.imtegralpassword}"/>
+		<property name="url" value="${mall.read.url}?characterEncoding=utf8&amp;zeroDateTimeBehavior=convertToNull&amp;allowMultiQueries=true" />
+		<property name="username" value="${mall.read.username}" />
+		<property name="password" value="${mall.read.password}" />
         <property name="driverClassName" value="${jdbc.driverClassName}"/>
         <property name="driverClassName" value="${jdbc.driverClassName}"/>
 
 
         <!-- 配置初始化大小、最小、最大 -->
         <!-- 配置初始化大小、最小、最大 -->
@@ -51,8 +51,8 @@
 		<property name="targetDataSources">
 		<property name="targetDataSources">
 			<map>
 			<map>
 			</map>
 			</map>
-			<!-- 这里用配置设置多个数据源 <map key-type="java.lang.String"> <entry key="ORCL" 
-				value-ref="orclDataSource"></entry> <entry key="ISC" value-ref="iscDataSource"></entry> 
+			<!-- 这里用配置设置多个数据源 <map key-type="java.lang.String"> <entry key="ORCL"
+				value-ref="orclDataSource"></entry> <entry key="ISC" value-ref="iscDataSource"></entry>
 				</map> -->
 				</map> -->
 		</property>
 		</property>
 		<property name="defaultTargetDataSource" ref="dataSource" />
 		<property name="defaultTargetDataSource" ref="dataSource" />