commit

DataFusion/.classpath

@@ -19,10 +19,10 @@
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/kotlin-stdlib-1.3.50.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/kotlin-stdlib-common-1.3.50.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/mysql-connector-java-8.0.18.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/ojdbc6.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/okhttp-4.2.2.jar" sourcepath="/Users/liutao/.m2/repository/com/squareup/okhttp3/okhttp/4.2.2/okhttp-4.2.2-sources.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/okio-2.2.2.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/sqljdbc42.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jfinal-4.8-bin-with-src.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/ojdbc10.jar"/>
 	<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
 </classpath>

DataFusion/res/config.properties

@@ -1,7 +1,7 @@
 #DB-connected partners
 #jdbcUrl_connected  = jdbc:sqlserver://188.188.2.1:1433;DatabaseName=PACS
 #jdbcUrl_connected  = jdbc:oracle:thin:@//10.0.0.4:1521/RIS
-jdbcUrl_connected  = jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.0.0.4)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=orcl)))
+jdbcUrl_connected  = jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.0.0.4)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=RIS)))
 user_connected 	   = ZL_MXYYX
 password_connected = ZL_MXYYX
 #DATA-Parms