From 9c67da3c6351c5e46152e359dad0c66a49ac439a Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Thu, 22 Sep 2016 17:20:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/config/config.properties          |  4 ++--
 src/com/platform/controller/DataModelController.java |  8 +++-----
 .../service/impl/OracleExtractServiceImpl.java       |  5 +++--
 src/com/platform/utils/FileOperateHelper.java        | 12 ++++++++----
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/WebContent/WEB-INF/config/config.properties b/WebContent/WEB-INF/config/config.properties
index 26e14c48..86b6b49e 100644
--- a/WebContent/WEB-INF/config/config.properties
+++ b/WebContent/WEB-INF/config/config.properties
@@ -4,7 +4,7 @@
 # 驱动程序
 jdbc.mysql.driver=com.mysql.jdbc.Driver
 # 连接url
-jdbc.mysql.url=jdbc:mysql://192.168.0.101:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+jdbc.mysql.url=jdbc:mysql://192.168.0.110:3306/ftpdata?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
 # 用户名
 jdbc.mysql.username=root
 # 密码
@@ -41,7 +41,7 @@ jdbc.minEvictableIdleTimeMillis=300000
 #
 #==============================================================================================================
 table-suffix=_20152016
-extract-log-localtion=D:\\log\\
+extract-log-localtion=/home/log/
 gather-tablespace-name=TS_TTSSS
 gather-tablespace-path=1
 gather-table-user-password=1
diff --git a/src/com/platform/controller/DataModelController.java b/src/com/platform/controller/DataModelController.java
index 0d518551..f768ab08 100644
--- a/src/com/platform/controller/DataModelController.java
+++ b/src/com/platform/controller/DataModelController.java
@@ -274,10 +274,8 @@ public class DataModelController extends BaseController{
 	public Object getExtractLog(@RequestParam("rcName") String name, HttpServletRequest res, HttpServletResponse req) throws Exception{
 		log.info("---------/oracle/extract/log-------------------");
 		String result = logReadService.readLog(name);
-//		StringBuilder sb = new StringBuilder();
-//		sb.append("查看相应日志").append("\n").append("看到了");
-//		Map<String, String> log = new HashMap<>();
-//		log.put(name, sb.toString());
-		return result;
+		Map<String, String> log = new HashMap<>();
+		log.put(name, result);
+		return log;
 	}
 }
diff --git a/src/com/platform/service/impl/OracleExtractServiceImpl.java b/src/com/platform/service/impl/OracleExtractServiceImpl.java
index 957b5a1a..908dc4c9 100644
--- a/src/com/platform/service/impl/OracleExtractServiceImpl.java
+++ b/src/com/platform/service/impl/OracleExtractServiceImpl.java
@@ -57,9 +57,10 @@ public class OracleExtractServiceImpl implements IOracleExtractService {
 					data.setId(Integer.valueOf(collectOracle.getDataId()));
 					data.setExtractStatus(1);
 					dataInfoDao.updateExtract(data);
+					String replicasName = collectOracle.getName();
 					collectOracle.setName("J" + collectOracle.getName().replace("-", "_"));
 						String cmd = "kubectl label --overwrite rc "
-							+ collectOracle.getName() + " isExtract=1";
+							+ replicasName + " isExtract=1";
 					List<String> rList = Constant.ganymedSSH
 							.execCmdWaitAcquiescent(cmd);
 					StringBuffer sb = new StringBuffer();
@@ -73,7 +74,7 @@ public class OracleExtractServiceImpl implements IOracleExtractService {
 					oracleExtract.extractColleDB(conn, collectOracle);//执行抽取
 	//				client.updateOrAddReplicasLabelById(collectOracle.getName(), "isExtract", "2"); //更新oracle汇总状态，0标示为未汇总，1标示汇总中，2标示汇总完成
 					cmd = "kubectl label --overwrite rc "
-							+ collectOracle.getName() + " isExtract=2";
+							+ replicasName + " isExtract=2";
 					rList = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
 					sb = new StringBuffer();
 					for (String string : rList)
diff --git a/src/com/platform/utils/FileOperateHelper.java b/src/com/platform/utils/FileOperateHelper.java
index 84b3d110..c07eba24 100644
--- a/src/com/platform/utils/FileOperateHelper.java
+++ b/src/com/platform/utils/FileOperateHelper.java
@@ -4,6 +4,7 @@ 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;
 
@@ -35,7 +36,7 @@ public class FileOperateHelper {
 				file.createNewFile();
 			FileOutputStream out = new FileOutputStream(file, true); // 如果追加方式用true
 			StringBuffer sb = new StringBuffer();
-			sb.append(message).append("\n");
+			sb.append(message);
 			out.write(sb.toString().getBytes("utf-8"));
 		} catch (IOException e) {
 			// TODO: handle exception
@@ -55,10 +56,13 @@ public class FileOperateHelper {
 			File file = new File(path);
 			if (!file.exists())
 				return "";
-			FileInputStream fis = new FileInputStream(file);
-			BufferedReader br = new BufferedReader(new InputStreamReader(fis));
+			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"));
 			while ((tempString = br.readLine()) != null) {
-				sb.append(tempString);
+				sb.append(tempString).append("\r\n");
 			}
 		} catch (Exception e) {
 			// TODO: handle exception