diff --git a/src/main/java/com/nis/restful/RestBusinessCode.java b/src/main/java/com/nis/restful/RestBusinessCode.java
index 583db7a..a028abc 100644
--- a/src/main/java/com/nis/restful/RestBusinessCode.java
+++ b/src/main/java/com/nis/restful/RestBusinessCode.java
@@ -316,9 +316,9 @@ public enum RestBusinessCode {
 	 */
 	FatherCfgIdIsWrongRange(20004, "Maat配置的fatherCfgId值不在有效范围"),
 	/**
-	 * 编译配置的service与action不匹配
+	 * 配置的service与action不匹配
 	 */
-	ServiceUnmatchAction(20005, "Maat配置的service与action不匹配"),
+	ServiceUnmatchAction(20005, "配置的service与action不匹配"),
 	/**
 	 * 编译配置的的startTime不能晚于endTime
 	 */
diff --git a/src/main/java/com/nis/util/HiveJDBC.java b/src/main/java/com/nis/util/HiveJDBC.java
index 4adb739..b611268 100644
--- a/src/main/java/com/nis/util/HiveJDBC.java
+++ b/src/main/java/com/nis/util/HiveJDBC.java
@@ -181,26 +181,25 @@ public class HiveJDBC {
 		Integer startNum = (page.getPageNo() - 1) * page.getPageSize();
 		Integer endNum = startNum - 1 + page.getPageSize() + 1;
 		if (listString.size() >= startNum) {
-//			if (listString.size() >= endNum) {
-//				mapList.put("str", listString.subList(startNum, endNum));
-//			} else {
-//				mapList.put("str", listString.subList(startNum, listString.size()));
-//			}
+			if (listString.size() >= endNum) {
+				mapList.put("str", listString.subList(startNum, endNum));
+			} else {
+				mapList.put("str", listString.subList(startNum, listString.size()));
+			}
 			
-			mapList.put("str", listString);
 		} else {
 			mapList.put("str", new ArrayList());
 		}
 		if (listObject.size() >= startNum) {
-//			if (listObject.size() >= endNum) {
-//				mapList.put("obj", listObject.subList(startNum, endNum));
-//			} else {
-//				mapList.put("obj", listObject.subList(startNum, listObject.size()));
-//			}
-			mapList.put("str", listObject);
+			if (listObject.size() >= endNum) {
+				mapList.put("obj", listObject.subList(startNum, endNum));
+			} else {
+				mapList.put("obj", listObject.subList(startNum, listObject.size()));
+			}
 		} else {
 			mapList.put("obj", new ArrayList());
 		}
+		System.out.println(mapList.get("obj").size());
 		return mapList;
 	}
 
diff --git a/src/main/java/com/nis/web/controller/restful/LogController.java b/src/main/java/com/nis/web/controller/restful/LogController.java
index 6f2dbb7..196ae62 100644
--- a/src/main/java/com/nis/web/controller/restful/LogController.java
+++ b/src/main/java/com/nis/web/controller/restful/LogController.java
@@ -93,11 +93,12 @@ public class LogController extends BaseRestController {
 				ntcIpLogPage.setList(new ArrayList());
 			} else {
 				List list = new ArrayList();
-				if (tableMapping.get("obj").size() > page.getPageSize()) {
-					list = tableMapping.get("obj").subList(0, page.getPageSize());
-				} else {
-					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
-				}
+				list = tableMapping.get("obj");
+//				if (tableMapping.get("obj").size() > page.getPageSize()) {
+//					list = tableMapping.get("obj").subList(0, page.getPageSize());
+//				} else {
+//					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
+//				}
 				if (list.size() > 0) {
 					String jsonString = JsonMapper.toJsonString(list);
 					List<NtcIpLog> List = (java.util.List<NtcIpLog>) JsonMapper.fromJsonList(jsonString,
@@ -157,12 +158,12 @@ public class LogController extends BaseRestController {
 			if (tableMapping == null) {
 				ntcHttpLogPage.setList(new ArrayList());
 			} else {
-				List list = new ArrayList();
-				if (tableMapping.get("obj").size() > page.getPageSize()) {
-					list = tableMapping.get("obj").subList(0, page.getPageSize());
-				} else {
-					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
-				}
+				List list = tableMapping.get("obj");
+//				if (tableMapping.get("obj").size() > page.getPageSize()) {
+//					list = tableMapping.get("obj").subList(0, page.getPageSize());
+//				} else {
+//					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
+//				}
 				if (list.size() > 0) {
 					String jsonString = JsonMapper.toJsonString(list);
 					List<NtcHttpLog> List = (java.util.List<NtcHttpLog>) JsonMapper.fromJsonList(jsonString,
@@ -217,12 +218,12 @@ public class LogController extends BaseRestController {
 			if (tableMapping == null) {
 				ntcDnsLogPage.setList(new ArrayList());
 			} else {
-				List list = new ArrayList();
-				if (tableMapping.get("obj").size() > page.getPageSize()) {
-					list = tableMapping.get("obj").subList(0, page.getPageSize());
-				} else {
-					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
-				}
+				List list = tableMapping.get("obj");
+//				if (tableMapping.get("obj").size() > page.getPageSize()) {
+//					list = tableMapping.get("obj").subList(0, page.getPageSize());
+//				} else {
+//					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
+//				}
 				if (list.size() > 0) {
 					String jsonString = JsonMapper.toJsonString(list);
 					List<NtcDnsLog> List = (java.util.List<NtcDnsLog>) JsonMapper.fromJsonList(jsonString,
@@ -277,12 +278,12 @@ public class LogController extends BaseRestController {
 			if (tableMapping == null) {
 				ntcMailLogPage.setList(new ArrayList());
 			} else {
-				List list = new ArrayList();
-				if (tableMapping.get("obj").size() > page.getPageSize()) {
-					list = tableMapping.get("obj").subList(0, page.getPageSize());
-				} else {
-					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
-				}
+				List list = tableMapping.get("obj");
+//				if (tableMapping.get("obj").size() > page.getPageSize()) {
+//					list = tableMapping.get("obj").subList(0, page.getPageSize());
+//				} else {
+//					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
+//				}
 				if (list.size() > 0) {
 					String jsonString = JsonMapper.toJsonString(list);
 					List<NtcMailLog> List = (java.util.List<NtcMailLog>) JsonMapper.fromJsonList(jsonString,
@@ -337,12 +338,12 @@ public class LogController extends BaseRestController {
 			if (tableMapping == null) {
 				ntcSslLogPage.setList(new ArrayList());
 			} else {
-				List list = new ArrayList();
-				if (tableMapping.get("obj").size() > page.getPageSize()) {
-					list = tableMapping.get("obj").subList(0, page.getPageSize());
-				} else {
-					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
-				}
+				List list = tableMapping.get("obj");
+//				if (tableMapping.get("obj").size() > page.getPageSize()) {
+//					list = tableMapping.get("obj").subList(0, page.getPageSize());
+//				} else {
+//					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
+//				}
 				if (list.size() > 0) {
 					String jsonString = JsonMapper.toJsonString(list);
 					List<NtcSslLog> List = (java.util.List<NtcSslLog>) JsonMapper.fromJsonList(jsonString,
@@ -397,12 +398,12 @@ public class LogController extends BaseRestController {
 			if (tableMapping == null) {
 				ntcPptpLogPage.setList(new ArrayList());
 			} else {
-				List list = new ArrayList();
-				if (tableMapping.get("obj").size() > page.getPageSize()) {
-					list = tableMapping.get("obj").subList(0, page.getPageSize());
-				} else {
-					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
-				}
+				List list = tableMapping.get("obj");
+//				if (tableMapping.get("obj").size() > page.getPageSize()) {
+//					list = tableMapping.get("obj").subList(0, page.getPageSize());
+//				} else {
+//					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
+//				}
 				if (list.size() > 0) {
 					String jsonString = JsonMapper.toJsonString(list);
 					List<NtcPptpLog> List = (java.util.List<NtcPptpLog>) JsonMapper.fromJsonList(jsonString,
@@ -456,12 +457,12 @@ public class LogController extends BaseRestController {
 			if (tableMapping == null) {
 				ntcL2tpLogPage.setList(new ArrayList());
 			} else {
-				List list = new ArrayList();
-				if (tableMapping.get("obj").size() > page.getPageSize()) {
-					list = tableMapping.get("obj").subList(0, page.getPageSize());
-				} else {
-					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
-				}
+				List list = tableMapping.get("obj");
+//				if (tableMapping.get("obj").size() > page.getPageSize()) {
+//					list = tableMapping.get("obj").subList(0, page.getPageSize());
+//				} else {
+//					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
+//				}
 				if (list.size() > 0) {
 					String jsonString = JsonMapper.toJsonString(list);
 					List<NtcL2tpLog> List = (java.util.List<NtcL2tpLog>) JsonMapper.fromJsonList(jsonString,
@@ -516,12 +517,12 @@ public class LogController extends BaseRestController {
 			if (tableMapping == null) {
 				ntcOpenvpnLogPage.setList(new ArrayList());
 			} else {
-				List list = new ArrayList();
-				if (tableMapping.get("obj").size() > page.getPageSize()) {
-					list = tableMapping.get("obj").subList(0, page.getPageSize());
-				} else {
-					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
-				}
+				List list = tableMapping.get("obj");
+//				if (tableMapping.get("obj").size() > page.getPageSize()) {
+//					list = tableMapping.get("obj").subList(0, page.getPageSize());
+//				} else {
+//					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
+//				}
 				if (list.size() > 0) {
 					String jsonString = JsonMapper.toJsonString(list);
 					List<NtcOpenvpnLog> List = (java.util.List<NtcOpenvpnLog>) JsonMapper.fromJsonList(jsonString,
@@ -576,12 +577,12 @@ public class LogController extends BaseRestController {
 			if (tableMapping == null) {
 				ntcIpsecLogPage.setList(new ArrayList());
 			} else {
-				List list = new ArrayList();
-				if (tableMapping.get("obj").size() > page.getPageSize()) {
-					list = tableMapping.get("obj").subList(0, page.getPageSize());
-				} else {
-					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
-				}
+				List list = tableMapping.get("obj");
+//				if (tableMapping.get("obj").size() > page.getPageSize()) {
+//					list = tableMapping.get("obj").subList(0, page.getPageSize());
+//				} else {
+//					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
+//				}
 				if (list.size() > 0) {
 					String jsonString = JsonMapper.toJsonString(list);
 					List<NtcIpsecLog> List = (java.util.List<NtcIpsecLog>) JsonMapper.fromJsonList(jsonString,
@@ -636,12 +637,12 @@ public class LogController extends BaseRestController {
 			if (tableMapping == null) {
 				ntcSshLogPage.setList(new ArrayList());
 			} else {
-				List list = new ArrayList();
-				if (tableMapping.get("obj").size() > page.getPageSize()) {
-					list = tableMapping.get("obj").subList(0, page.getPageSize());
-				} else {
-					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
-				}
+				List list = tableMapping.get("obj");
+//				if (tableMapping.get("obj").size() > page.getPageSize()) {
+//					list = tableMapping.get("obj").subList(0, page.getPageSize());
+//				} else {
+//					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
+//				}
 				if (list.size() > 0) {
 					String jsonString = JsonMapper.toJsonString(list);
 					List<NtcSshLog> List = (java.util.List<NtcSshLog>) JsonMapper.fromJsonList(jsonString,
@@ -696,12 +697,12 @@ public class LogController extends BaseRestController {
 			if (tableMapping == null) {
 				ntcFtpLogPage.setList(new ArrayList());
 			} else {
-				List list = new ArrayList();
-				if (tableMapping.get("obj").size() > page.getPageSize()) {
-					list = tableMapping.get("obj").subList(0, page.getPageSize());
-				} else {
-					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
-				}
+				List list = tableMapping.get("obj");
+//				if (tableMapping.get("obj").size() > page.getPageSize()) {
+//					list = tableMapping.get("obj").subList(0, page.getPageSize());
+//				} else {
+//					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
+//				}
 				if (list.size() > 0) {
 					String jsonString = JsonMapper.toJsonString(list);
 					List<NtcFtpLog> List = (java.util.List<NtcFtpLog>) JsonMapper.fromJsonList(jsonString,
@@ -754,12 +755,12 @@ public class LogController extends BaseRestController {
 			if (tableMapping == null) {
 				ntcAppLogPage.setList(new ArrayList());
 			} else {
-				List list = new ArrayList();
-				if (tableMapping.get("obj").size() > page.getPageSize()) {
-					list = tableMapping.get("obj").subList(0, page.getPageSize());
-				} else {
-					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
-				}
+				List list = tableMapping.get("obj");
+//				if (tableMapping.get("obj").size() > page.getPageSize()) {
+//					list = tableMapping.get("obj").subList(0, page.getPageSize());
+//				} else {
+//					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
+//				}
 				if (list.size() > 0) {
 					String jsonString = JsonMapper.toJsonString(list);
 					List<NtcAppLog> List = (java.util.List<NtcAppLog>) JsonMapper.fromJsonList(jsonString,
@@ -812,12 +813,12 @@ public class LogController extends BaseRestController {
 			if (tableMapping == null) {
 				ntcDdosLogPage.setList(new ArrayList());
 			} else {
-				List list = new ArrayList();
-				if (tableMapping.get("obj").size() > page.getPageSize()) {
-					list = tableMapping.get("obj").subList(0, page.getPageSize());
-				} else {
-					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
-				}
+				List list = tableMapping.get("obj");
+//				if (tableMapping.get("obj").size() > page.getPageSize()) {
+//					list = tableMapping.get("obj").subList(0, page.getPageSize());
+//				} else {
+//					list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
+//				}
 				if (list.size() > 0) {
 					String jsonString = JsonMapper.toJsonString(list);
 					List<NtcDdosLog> List = (java.util.List<NtcDdosLog>) JsonMapper.fromJsonList(jsonString,
@@ -861,6 +862,10 @@ public class LogController extends BaseRestController {
 				ntcPzReportPage, 0);
 	}
 
+	
+	
+	
+	
 	/**
 	 *判断开始和结束时间是否为null,如果为null则初始化时间
 	 * @param entity
diff --git a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
index d3357a8..bba4888 100644
--- a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
+++ b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
@@ -2947,6 +2947,8 @@ public class ConfigSourcesService extends BaseService {
 				// 获取IP类型
 				Integer ipType = null;
 				String ipTypeName = "";
+				
+				Integer action = null;
 				for (CommonSourceFieldCfg commonSourceFieldCfg : commonSourceFieldCfgList) {
 					if (commonSourceFieldCfg.getDstName().equals("ip_type")) {
 						String dstVal = srcMap.get(
@@ -2975,6 +2977,24 @@ public class ConfigSourcesService extends BaseService {
 						}
 						ipType = Integer.parseInt(dstVal);
 					}
+					//验证service与action是否匹配
+					if (commonSourceFieldCfg.getDstName().equals("action")) {
+						String dstVal = srcMap.get(
+								commonSourceFieldCfg.getSrcName()).toString().trim();
+						if (Integer.valueOf(dstVal).compareTo(ServiceAndRDBIndexReal.getActionByService(Integer.valueOf(srcMap.get("service")
+								.toString().trim())))!=0) {
+							logger1.error(RestBusinessCode.ServiceUnmatchAction
+									.getErrorReason());
+							thread.setExceptionInfo(RestBusinessCode.ServiceUnmatchAction
+									.getErrorReason());
+							throw new RestServiceException(thread,
+									System.currentTimeMillis() - start,
+									RestBusinessCode.ServiceUnmatchAction
+											.getErrorReason(),
+									RestBusinessCode.ServiceUnmatchAction
+											.getValue());
+						}
+					}
 				}
 				for (CommonSourceFieldCfg commonSourceFieldCfg : commonSourceFieldCfgList) {
 					// 是否必填