Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

datasources2 properties

See merge request root/atms!138

atms-api/src/main/resources/applicationContext.xml

@@ -28,7 +28,7 @@
 
   <bean id="datasource2" class="com.alibaba.druid.pool.DruidDataSource">
     <property name="url" value="${jdbc2_url}" />
-    <property name="username" value="${jdbc2_username}" />
+    <property name="username" value="${jdbc2_user}" />
     <property name="password" value="${jdbc2_password}" />
   </bean>
   <!-- **************************************************************** -->

atms-api/src/main/resources/conf/conf.properties

@@ -3,6 +3,11 @@ jdbc_user=${jdbc_user}
 jdbc_password=${jdbc_password}
 jdbc_admin_db=${jdbc_admin_db}
 
+jdbc2_url=${jdbc2_url}
+jdbc2_user=${jdbc2_user}
+jdbc2_password=${jdbc2_password}
+jdbc2_admin_db=${jdbc2_admin_db}
+
 jdbc_url_demo=${jdbc_url_demo}
 
 mail_jdbc_url=${mail_jdbc_url}

atms-api/src/main/resources/conf/conf_profile_dev.properties

@@ -7,7 +7,6 @@ jdbc_admin_db=tax_admin
 jdbc2_url=jdbc:oracle:thin:@10.158.230.144:11521:XE
 jdbc2_user=pwc_invoice
 jdbc2_password=pwc_invoice
-#jdbc_password=111111
 jdbc2_admin_db=pwc_invoice
 
 jdbc_url_demo=jdbc:mysql://10.158.230.144:3306/demo_db_name?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false