Merge branch 'web_backend_develope' of

https://git.trustie.net/fhx569287825/aggregation-platform into
web_backend_develope

Conflicts:
	src/com/platform/controller/DataModelController.java
	src/com/platform/utils/FileOperateHelper.java

WebContent/WEB-INF/config/log4j-config.xml

@@ -14,7 +14,7 @@
 	<appender name="dailyRollingFile" class="org.apache.log4j.DailyRollingFileAppender">
 		<param name="Threshold" value="info"></param>
 		<param name="ImmediateFlush" value="true"></param>
-		<param name="File" value="C:\\logs/dailyRollingFile.log"></param>
+		<param name="File" value="D:\\logs/dailyRollingFile.log"></param>
 		<param name="DatePattern" value="'.'yyyy-MM-dd'.log'"></param>
 		<layout class="org.apache.log4j.PatternLayout">
 			<param name="ConversionPattern" value="[%d{yyyy-MM-dd HH:mm:ss\} %-5p] [%t] {%c:%L}-%m%n"></param>

src/com/base/CustomException.java

@@ -94,7 +94,7 @@ public class CustomException extends Exception {
 		
 		sbuf.append("\r\n");
 		// 是否 写入 文件
-		log.error(sbuf.toString());
+		log.debug(sbuf.toString());
 	}
 
 	/**

src/com/platform/service/impl/LogReadServiceImpl.java

@@ -11,10 +11,9 @@ public class LogReadServiceImpl implements ILogRead {
 	
 
 	@Override
-	public String readLog(String filename) throws Exception {
-		
-		String result = FileOperateHelper.fileReader(Configs.EXTRACT_LOG_LOCALTION + "J" + filename.replace("-", "_")+".log");
+	public String readLog(String filename) throws Exception {		
+		String result = FileOperateHelper.fileReader(Configs.EXTRACT_LOG_LOCALTION + "J" + filename.replace("-", "_")+".log");		
 		return result;
 	}
 
-}
+}

src/com/platform/utils/FileOperateHelper.java

@@ -4,7 +4,6 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
@@ -49,23 +48,20 @@ public class FileOperateHelper {
 	 * @return
 	 */
 	@SuppressWarnings("resource")
-	public static String fileReader(String path) {
+	public static String fileReader(String path) {		
 		StringBuffer sb = new StringBuffer();
 		String tempString = "";
 		try {
-			File file = new File(path);
+			File file = new File(path);			
 			if (!file.exists())
-				return "";
-			FileReader f =new FileReader(path);
-	        BufferedReader br =new BufferedReader(f);
-//			FileInputStream fis = new FileInputStream(file);
-//			BufferedReader br = new BufferedReader(new InputStreamReader(fis));
-//			BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"));
+				return "当前没有日志信息！";
+			FileInputStream fis = new FileInputStream(file);
+			BufferedReader br = new BufferedReader(new InputStreamReader(fis,"UTF-8"));
 			while ((tempString = br.readLine()) != null) {
 				sb.append(tempString).append("\r\n");
 			}
 		} catch (Exception e) {
-			// TODO: handle exception
+			Configs.CONSOLE_LOGGER.info(e.getMessage());
 		}
 		return sb.toString();
 	}