commit

.gitignore

@@ -7,14 +7,12 @@
 # Package Files #
 *.war
 *.ear
+classes/
+**/build
+/.settings/
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
 DataFusion/DataFusion.iml
-DataFusion/.idea/misc.xml
-DataFusion/.idea/workspace.xml
-DataFusion/.idea/encodings.xml
-DataFusion/.idea/modules.xml
-DataFusion/.idea/inspectionProfiles/Project_Default.xml
-DataFusion/.idea/uiDesigner.xml
+**/.idea

DataFusion/WebRoot/WEB-INF/.gitignore

@@ -0,0 +1 @@
+/classes/

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:sqlserver://192.168.21.238:1433;DatabaseName=report
-user_connected 	   = yjp
-password_connected = zlyymassunsoft009

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/src/com/zskk/task/DataTask.java

@@ -131,7 +131,7 @@ public class DataTask implements ITask {
 						String dadaString = JSON.toJSONString(data);
 						dadaString = dadaString.replace("\\r\\n", "");
 						dadaString = dadaString.replace("*", "X");
-//						dadaString = dadaString.replace("、", ",");
+						dadaString = dadaString.replace("：", ":");
 						Map maps = (Map) JSON.parse(dadaString);
 						try {
 							post(null, maps);