zhangzhanping 5 лет назад
Родитель
Сommit
97efbc2902

+ 23 - 8
DataFusion/WebRoot/WEB-INF/classes/log4j.properties

@@ -1,10 +1,25 @@
-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
+#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
+#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
+
+
+log4j.rootCategory=DEBUG, CONSOLE,LOGFILE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=-%p-%d{yyyy/MM/dd HH:mm:ss,SSS}-%l-%L-%m%n
+
+log4j.appender.LOGFILE=org.apache.log4j.FileAppender
+log4j.appender.logFile.Threshold=ERROR
+#log4j.appender.logFile.ImmediateFlush=true
+#log4j.appender.LOGFILE.Append=true
+log4j.appender.LOGFILE.File=./mylog.log
+log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.LOGFILE.layout.ConversionPattern=-%p-%d{yyyy/MM/dd HH:mm:ss,SSS}-%l-%L-%m%n

+ 23 - 8
DataFusion/res/log4j.properties

@@ -1,10 +1,25 @@
-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
+#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
+#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
+
+
+log4j.rootCategory=DEBUG, CONSOLE,LOGFILE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=-%p-%d{yyyy/MM/dd HH:mm:ss,SSS}-%l-%L-%m%n
+
+log4j.appender.LOGFILE=org.apache.log4j.FileAppender
+log4j.appender.logFile.Threshold=ERROR
+#log4j.appender.logFile.ImmediateFlush=true
+#log4j.appender.LOGFILE.Append=true
+log4j.appender.LOGFILE.File=./mylog.log
+log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.LOGFILE.layout.ConversionPattern=-%p-%d{yyyy/MM/dd HH:mm:ss,SSS}-%l-%L-%m%n

+ 5 - 1
DataFusion/src/com/zskk/task/DataTask.java

@@ -15,6 +15,7 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.log4j.Logger;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -31,6 +32,7 @@ public class DataTask implements ITask {
 	private static String GET_EXAM_URL = "https://risserver3.pacsonline.cn/butt/getExam";
 	private static String SAVE_REPORT_URL = "https://risserver3.pacsonline.cn/butt/getExam/butt/saveReport";
 	private static CloseableHttpClient httpClient;
+	Logger logger = Logger.getLogger(DataTask.class);
 
 	static {
 		PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager();
@@ -96,7 +98,9 @@ public class DataTask implements ITask {
 				//患者身份证号
 				params.put("card_num",record.getStr("idcard"));
 				params.put("report_result","1");
-				post(SAVE_REPORT_URL, JSON.toJSONString(params));
+				String logs = post(SAVE_REPORT_URL, JSON.toJSONString(params));
+				logger.error(logs);
+
 				/*report.setImpression(record.getStr("impression"));
 				report.setDescription(record.getStr("description"));
 				report.setExamId(exams2.getId());

+ 4 - 1
DataFusion/src/com/zskk/task/UpdateTask.java

@@ -17,6 +17,7 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.log4j.Logger;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -28,6 +29,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 public class UpdateTask implements ITask {
+	Logger logger = Logger.getLogger(UpdateTask.class);
 	private static String GET_EXAM_URL = "https://risserver3.pacsonline.cn/butt/getExam";
 
 	private static String SAVE_REPORT_URL = "https://risserver3.pacsonline.cn/butt/saveReport";
@@ -98,7 +100,8 @@ public class UpdateTask implements ITask {
 							//患者身份证号
 							params.put("card_num",record.getStr("IDCARD"));
 							params.put("report_result","1");
-							post(SAVE_REPORT_URL, JSON.toJSONString(params));
+							String post = post(SAVE_REPORT_URL, JSON.toJSONString(params));
+							logger.error(post);
 						/*report.setImpression(record.getStr("IMPRESSION"));
 						report.setDescription(record.getStr("DESCRIPTION"));
 						report.setExamId(exams2.getId());