Merge remote-tracking branch 'origin/develop' into develop

WebContent/WEB-INF/conf/gaowj/bl/applicationContext-business.xml

@@ -73,9 +73,9 @@
         <!-- 增加数据源dataSource-standard -->
       <bean id="dataSource-standard"  class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
           <!-- 基本属性 url、user、password -->  
-			<property name="url" value="jdbc:mysql://192.168.1.116:3306/jw_standard?useUnicode=true&amp;characterEncoding=utf8&amp;autoReconnect=true&amp;useSSL=false" />  
-			<property name="username" value="jw_standard" />  
-			<property name="password" value="jw_standard" /> 
+			<property name="url" value="jdbc:mysql://192.168.1.116:3306/jf_standard?useUnicode=true&amp;characterEncoding=utf8&amp;autoReconnect=true&amp;useSSL=false" />  
+			<property name="username" value="jf_standard" /> 
+			<property name="password" value="jf_standard" /> 
 			<property name="driverClassName" value="com.mysql.jdbc.Driver" /> 
 			
 			<!-- 配置初始化大小、最小、最大 -->  
@@ -124,9 +124,9 @@
        <!-- 增加数据源dataSource-business -->
        <bean id="dataSource-business"  class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
           <!-- 基本属性 url、user、password -->  
-			<property name="url" value="jdbc:mysql://192.168.1.116:3306/jw_apps?useUnicode=true&amp;characterEncoding=utf8&amp;autoReconnect=true&amp;useSSL=false" />  
-			<property name="username" value="jw_apps" />  
-			<property name="password" value="jw_apps" /> 
+			<property name="url" value="jdbc:mysql://192.168.1.116:3306/jf_apps?useUnicode=true&amp;characterEncoding=utf8&amp;autoReconnect=true&amp;useSSL=false" />  
+			<property name="username" value="jf_apps" />  
+			<property name="password" value="jf_apps" /> 
 			<property name="driverClassName" value="com.mysql.jdbc.Driver" /> 
 			
 			<!-- 配置初始化大小、最小、最大 -->