5 years ago · f10e2c3200
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,8 @@
 
															 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
														
 
															 hs_err_pid*
														
 
															+DataFusion/.idea/workspace.xml
														
 
															+DataFusion/.idea/encodings.xml
														
 
															+DataFusion/.idea/misc.xml
														
 
															+DataFusion/.idea/modules.xml
														
 
															+DataFusion/DataFusion.iml
														
--- a/DataFusion/res/config.properties
+++ b/DataFusion/res/config.properties
@@ -3,6 +3,6 @@ jdbcUrl_zskk  = jdbc:mysql://www.pacsonline.cn:3306/pacsonline?characterEncoding
 
															 user_zskk 	  = pacs
														
 
															 password_zskk = ZSKK@2017~!@#
														
 
															-jdbcUrl_connected  = jdbc:oracle:thin:@192.168.5.5:1521:orcl
														
 
															-user_connected 	   = YXYJK
														
 
															-password_connected = i39
														
 
															+jdbcUrl_connected  = jdbc:oracle:thin:@10.1.100.1:1521:orcl
														
 
															+user_connected 	   = hsefi
														
 
															+password_connected = hsefi