From 34e31fbc6d95556fd9b6e599d4f79b27c454f89d Mon Sep 17 00:00:00 2001
From: wu ming <569287825@qq.com>
Date: Thu, 22 Sep 2016 16:00:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8A=BD=E5=8F=96=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/config/log4j-config.xml                  | 2 +-
 src/com/base/CustomException.java                           | 2 +-
 src/com/platform/service/OracleExtractHelper.java           | 4 ++--
 src/com/platform/service/impl/LogReadServiceImpl.java       | 5 ++---
 src/com/platform/service/impl/OracleExtractServiceImpl.java | 5 +++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/WebContent/WEB-INF/config/log4j-config.xml b/WebContent/WEB-INF/config/log4j-config.xml
index 3a20a710..fb905a3f 100644
--- a/WebContent/WEB-INF/config/log4j-config.xml
+++ b/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>
diff --git a/src/com/base/CustomException.java b/src/com/base/CustomException.java
index e59bb6bd..e40f5697 100644
--- a/src/com/base/CustomException.java
+++ b/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());
 	}
 
 	/**
diff --git a/src/com/platform/service/OracleExtractHelper.java b/src/com/platform/service/OracleExtractHelper.java
index d3de043f..efbcd589 100644
--- a/src/com/platform/service/OracleExtractHelper.java
+++ b/src/com/platform/service/OracleExtractHelper.java
@@ -167,8 +167,8 @@ public class OracleExtractHelper {
 				while (rsSet.next()) {
 					try {
 					rsSet.getRow();
-					String resultSql = rsSet.getString(1);
-					OracleConnector.execUpdateOracleSQL(conn, resultSql, Configs.EXTRACT_LOG_LOCALTION + oc.getName());
+					String resultSql = rsSet.getString(1).replace(";", "");
+					OracleConnector.execOracleSQL(conn, resultSql, Configs.EXTRACT_LOG_LOCALTION + oc.getName());
 					FileOperateHelper
 					.fileWrite(
 							Configs.EXTRACT_LOG_LOCALTION + oc.getName(),
diff --git a/src/com/platform/service/impl/LogReadServiceImpl.java b/src/com/platform/service/impl/LogReadServiceImpl.java
index b5f32fd5..1660f77a 100644
--- a/src/com/platform/service/impl/LogReadServiceImpl.java
+++ b/src/com/platform/service/impl/LogReadServiceImpl.java
@@ -11,9 +11,8 @@ public class LogReadServiceImpl implements ILogRead {
 	
 
 	@Override
-	public String readLog(String filename) throws Exception {
-		
-		String result = FileOperateHelper.fileReader(Configs.EXTRACT_LOG_LOCALTION+filename+".log");
+	public String readLog(String filename) throws Exception {		
+		String result = FileOperateHelper.fileReader(Configs.EXTRACT_LOG_LOCALTION + filename + ".log");
 		return result;
 	}
 
diff --git a/src/com/platform/service/impl/OracleExtractServiceImpl.java b/src/com/platform/service/impl/OracleExtractServiceImpl.java
index d7324a80..3a29c2a1 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)