diff --git a/WebContent/WEB-INF/config/config.properties b/WebContent/WEB-INF/config/config.properties
index 04910986..06761557 100644
--- a/WebContent/WEB-INF/config/config.properties
+++ b/WebContent/WEB-INF/config/config.properties
@@ -17,6 +17,7 @@ jdbc.mysql.password=root
gather-user-name=system
# 密码
gather-user-password=oracle
+
#
gather-port=1521
#
@@ -40,10 +41,10 @@ jdbc.minEvictableIdleTimeMillis=300000
#
#==============================================================================================================
table-suffix=_20152016
-extract-log-localtion=/home/log/
+extract-log-localtion=D:\\log\\
gather-tablespace-name=TS_TTSSS
-gather-tablespace-path=
-gather-table-user-password=
+gather-tablespace-path=/opt/oracle/app/oradata/orcl/
+gather-table-user-password=1
kubeMasterUrl=http://192.168.0.110:8080/
collect-user-name=system
collect-password=oracle
diff --git a/src/com/base/BaseController.java b/src/com/base/BaseController.java
index 88ef5f48..804f833a 100644
--- a/src/com/base/BaseController.java
+++ b/src/com/base/BaseController.java
@@ -45,6 +45,7 @@ public class BaseController {
System.out.println("URI"+request.getRequestURI());
request.setAttribute("ex", ex);
System.err.println("BaseController --exp " + ex);
+ new CustomException("base_code_", ex);
// 根据不同错误转向不同页面
if(ex instanceof CustomException) {
CustomException cuse = (CustomException) ex;
diff --git a/src/com/base/Custom4exception.java b/src/com/base/Custom4exception.java
index a5bc8540..0e109c86 100644
--- a/src/com/base/Custom4exception.java
+++ b/src/com/base/Custom4exception.java
@@ -27,8 +27,11 @@ public class Custom4exception {
public final static String threadVolume_Thread_Except = "3001001002";
/**
- * 抽取汇总
+ * 抽取汇总--的-获取抽取动作异常
*/
public final static String threadVolume_Oracle_Except = "3002001002";
+ /** * SQL执行错误 */
+ public final static String OracleSQL_Except = "3002001002";
+
}
diff --git a/src/com/base/CustomException.java b/src/com/base/CustomException.java
index 08b75248..3a5663c2 100644
--- a/src/com/base/CustomException.java
+++ b/src/com/base/CustomException.java
@@ -44,7 +44,6 @@ public class CustomException extends Exception {
public CustomException(String code,Exception e,Object... obj) {
super(code);
StringBuffer sbuf= new StringBuffer();
- sbuf.append(msg);
this.code = code;
sbuf.append(code);
sbuf.append("\r\n");
@@ -56,6 +55,8 @@ public class CustomException extends Exception {
}
// 记录原始的异常
if (null != e) {
+ sbuf.append(e.getMessage());
+ sbuf.append("\r\n");
StackTraceElement[] array = e.getStackTrace();
cause = e.getCause();
for (StackTraceElement stackTraceElement : array) {
@@ -68,6 +69,7 @@ public class CustomException extends Exception {
Object[] array = obj;
sbuf.append("Object[] size : ");
sbuf.append(array.length);
+ sbuf.append("\r\n");
int forSize = 0;
if (Constant.CustomException_log_object_size < array.length) {
forSize = Constant.CustomException_log_object_size;
diff --git a/src/com/base/i18n.properties b/src/com/base/i18n.properties
index e69de29b..eee66963 100644
--- a/src/com/base/i18n.properties
+++ b/src/com/base/i18n.properties
@@ -0,0 +1,4 @@
+3001001001=ThreadVolume\u7C7B\u67E5\u8BE2 volume\u5F02\u5E38
+3001001002=ThreadVolume\u7C7B\u7EBF\u7A0B\u4F11\u7720\u5F02\u5E38
+3002001002= \u62BD\u53D6\u6C47\u603B--\u7684-\u83B7\u53D6\u62BD\u53D6\u52A8\u4F5C\u5F02\u5E38
+3002001002=SQL\u6267\u884C\u9519\u8BEF
\ No newline at end of file
diff --git a/src/com/dao/mapper/data-details-mapper.xml b/src/com/dao/mapper/data-details-mapper.xml
index 217885ca..bf5cf960 100644
--- a/src/com/dao/mapper/data-details-mapper.xml
+++ b/src/com/dao/mapper/data-details-mapper.xml
@@ -99,6 +99,14 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
LIMIT #{limit}
+
+
+