commit

DataFusion/WebRoot/WEB-INF/classes/.gitignore

@@ -1 +0,0 @@
-/com/

DataFusion/WebRoot/WEB-INF/classes/config.properties

@@ -1,8 +0,0 @@
-#DB-ZhongShiKangKai and connected partners
-jdbcUrl_zskk  = jdbc:mysql://47.104.6.21:3306/pacsonline?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
-user_zskk 	  = pacs
-password_zskk = ZSKK@2017~!@#
-
-jdbcUrl_connected  = jdbc:mysql://10.1.8.121:3306/gecris
-user_connected 	   = cloud
-password_connected = cloud

DataFusion/WebRoot/WEB-INF/classes/log4j.properties

@@ -1,10 +0,0 @@
-log4j.rootLogger=WARN, stdout, file
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]-[Thread: %t]-[%C.%M()]: %m%n
-
-# Output to the File
-log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.File=./jfinal_demo.log
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]-[Thread: %t]-[%C.%M()]: %m%n

DataFusion/res/config.properties

@@ -3,6 +3,7 @@ jdbcUrl_zskk  = jdbc:mysql://47.104.6.21:3306/pacsonline?characterEncoding=utf8&
 user_zskk 	  = pacs
 password_zskk = ZSKK@2017~!@#
 
+
 jdbcUrl_connected  = jdbc:mysql://10.1.8.121:3306/gecris
 user_connected 	   = cloud
 password_connected = cloud