Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties

src/main/java/com/nis/domain/log/MmFileDigestLog.java

@@ -0,0 +1,70 @@
+package com.nis.domain.log;
+
+import com.wordnik.swagger.annotations.ApiModelProperty;
+
+/**
+ * @ClassName:MmFileDigestLog
+ * @author (wx)
+ * @date 2018年7月16日 下午2:54:23
+ * @version V1.0
+ */
+public class MmFileDigestLog  extends BaseLogEntity<MmFileDigestLog> {
+
+	private static final long serialVersionUID = -6177790560553329386L;
+	@ApiModelProperty(value="节目ID", required=true)
+    protected String pid;
+    @ApiModelProperty(value="节目访问地址", required=true)
+    protected String url;
+    @ApiModelProperty(value="封堵现场片段路径", required=true)
+    protected String logUri;
+    @ApiModelProperty(value="入口页面", required=true)
+    protected String referer;
+    @ApiModelProperty(value="有害级别", required=true)
+    protected Integer level;
+    @ApiModelProperty(value="封堵类型", required=true)
+    protected Integer fdType;
+    @ApiModelProperty(value="协议", required=true)
+    protected String protocol;
+	public String getPid() {
+		return pid;
+	}
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getLogUri() {
+		return logUri;
+	}
+	public void setLogUri(String logUri) {
+		this.logUri = logUri;
+	}
+	public String getReferer() {
+		return referer;
+	}
+	public void setReferer(String referer) {
+		this.referer = referer;
+	}
+	public Integer getLevel() {
+		return level;
+	}
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+	public Integer getFdType() {
+		return fdType;
+	}
+	public void setFdType(Integer fdType) {
+		this.fdType = fdType;
+	}
+	public String getProtocol() {
+		return protocol;
+	}
+	public void setProtocol(String protocol) {
+		this.protocol = protocol;
+	}
+}

src/main/java/com/nis/domain/log/NtcBGPLog.java

@@ -0,0 +1,28 @@
+package com.nis.domain.log;
+
+public class NtcBGPLog extends BaseLogEntity<NtcBGPLog> {
+
+	private static final long serialVersionUID = 4597407682545926823L;
+	private Integer type;
+	private String as;
+	private String route;
+	public Integer getType() {
+		return type;
+	}
+	public void setType(Integer type) {
+		this.type = type;
+	}
+	public String getAs() {
+		return as;
+	}
+	public void setAs(String as) {
+		this.as = as;
+	}
+	public String getRoute() {
+		return route;
+	}
+	public void setRoute(String route) {
+		this.route = route;
+	}
+	
+}

src/main/java/com/nis/domain/log/NtcIpLog.java

@@ -3,5 +3,4 @@ package com.nis.domain.log;
 public class NtcIpLog extends BaseLogEntity<NtcIpLog> {
 
 	private static final long serialVersionUID = 4597407682545926823L;
-
 }

src/main/java/com/nis/util/Constants.java

@@ -415,6 +415,7 @@ public final class Constants {
 	public static final String NTC_MMVOIP_LOG = Configurations.getStringProperty("mmVoipLog", "");
 	public static final String NTC_MMSAMPLE_VOIP_LOG = Configurations.getStringProperty("mmSampleVoipLog", "");
 	public static final String NTC_MMAVIP_LOG = Configurations.getStringProperty("mmAvIpLog", "");
+	public static final String NTC_MMFILEDIGEST_LOG = Configurations.getStringProperty("mmFileDigestLog", "");
 	public static final String NTC_MMPORNAUDIOSAMPLE_LOG = Configurations.getStringProperty("mmPornAudioLevelLog", "");
 	public static final String NTC_MMPORNVIDEOSAMPLE_LOG = Configurations.getStringProperty("mmPornVideoLevelLog", "");
 	public static final String NTC_MMAVURL_LOG = Configurations.getStringProperty("mmAvUrlLog", "");

src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java

@@ -95,7 +95,7 @@ public class DkBehaviorLogController extends BaseController{
 				logger.info("查询行为识别日志成功");
 			}
 		} catch (Exception e) {
-			logger.info("查询行为识别日志失败", e);
+			logger.error("查询行为识别日志失败", e);
 			addMessageLog(model, e.getMessage());
 		}
 		return "/log/manipulation/dkBehaviorList";

src/main/java/com/nis/web/controller/log/ntc/AppLogController.java

@@ -76,7 +76,7 @@ public class AppLogController extends BaseController{
 				logger.info("查询App日志成功");
 			}
 		} catch (Exception e) {
-			logger.info("查询App日志失败", e);
+			logger.error("查询App日志失败", e);
 			addMessageLog(model, e.getMessage());
 		}
 		return "/log/ntc/appList";

src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java

@@ -1,7 +1,5 @@
 package com.nis.web.controller.log.ntc;
 
-import java.io.File;
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -10,23 +8,18 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
-import org.aspectj.util.FileUtil;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import com.nis.domain.FunctionServiceDict;
-import com.nis.domain.Page;
 import com.nis.domain.PageLog;
-import com.nis.domain.log.NtcIpLog;
+import com.nis.domain.log.NtcBGPLog;
 import com.nis.domain.maat.LogRecvData;
-import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
@@ -37,9 +30,9 @@ import com.nis.web.controller.BaseController;
 public class BgpLogController extends BaseController {
 	
 	@RequestMapping(value = {"list", ""})
-	public String list(@ModelAttribute("log") NtcIpLog log, Model model, HttpServletRequest request, HttpServletResponse response) {
+	public String list(@ModelAttribute("log") NtcBGPLog log, Model model, HttpServletRequest request, HttpServletResponse response) {
 		try {
-			PageLog<NtcIpLog> page = new PageLog<NtcIpLog>(request, response);
+			PageLog<NtcBGPLog> page = new PageLog<NtcBGPLog>(request, response);
 			Map<String, Object> params = new HashMap<String, Object>();
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
@@ -55,11 +48,11 @@ public class BgpLogController extends BaseController {
 			logger.info("查询结果:" + recv);
 			if (StringUtils.isNotBlank(recv)) {
 				Gson gson = new GsonBuilder().create();
-				LogRecvData<NtcIpLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcIpLog>>(){}.getType());
+				LogRecvData<NtcBGPLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcBGPLog>>(){}.getType());
 				if (fromJson.getStatus().intValue() == 200) {
 					page.setList(fromJson.getData().getList());
-					List<NtcIpLog> list = page.getList();
-					for (NtcIpLog l : list) {
+					List<NtcBGPLog> list = page.getList();
+					for (NtcBGPLog l : list) {
 						l.setFunctionId(log.getFunctionId());
 						setLogAction(l,serviceList);
 					}

src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java

@@ -91,7 +91,7 @@ public class DdosLogController extends BaseController{
 				logger.info("查询Ddos日志成功");
 			}
 		} catch (Exception e) {
-			logger.info("查询Ddos日志失败", e);
+			logger.error("查询Ddos日志失败", e);
 			addMessageLog(model, e.getMessage());
 		}
 		return "/log/ntc/ddosList";

src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java

@@ -78,7 +78,7 @@ public class FtpLogController extends BaseController{
 				logger.info("查询Ftp日志成功");
 			}
 		} catch (Exception e) {
-			logger.info("查询Ftp日志失败", e);
+			logger.error("查询Ftp日志失败", e);
 			addMessageLog(model, e.getMessage());
 		}
 		return "/log/ntc/ftpList";

src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java

@@ -76,7 +76,7 @@ public class IpsecLogController extends BaseController{
 				logger.info("查询Ipsec日志成功");
 			}
 		} catch (Exception e) {
-			logger.info("查询Ipsec日志失败", e);
+			logger.error("查询Ipsec日志失败", e);
 			addMessageLog(model, e.getMessage());
 		}
 		return "/log/ntc/ipsecList";

src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java

@@ -62,7 +62,7 @@ public class L2tpLogController extends BaseController {
 				model.addAttribute("page", page);
 			}
 		} catch (Exception e) {
-			logger.info("L2TP日志查询失败", e);
+			logger.error("L2TP日志查询失败", e);
 			addMessageLog(model, e.getMessage());
 		}
 		

src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java

@@ -76,7 +76,7 @@ public class MmAvIpLogController extends BaseController{
 				logger.info("查询音视频IP日志成功");
 			}
 		} catch (Exception e) {
-			logger.info("查询音视频IP日志失败", e);
+			logger.error("查询音视频IP日志失败", e);
 			addMessageLog(model, e.getMessage());
 		}
 		return "/log/ntc/mmAvIpList";

src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java

@@ -76,7 +76,7 @@ public class MmAvUrlLogController extends BaseController{
 				logger.info("查询音视频url日志成功");
 			}
 		} catch (Exception e) {
-			logger.info("查询音视频url日志失败", e);
+			logger.error("查询音视频url日志失败", e);
 			addMessageLog(model, e.getMessage());
 		}
 		return "/log/ntc/mmAvUrlList";

src/main/java/com/nis/web/controller/log/ntc/MmFileDigestLogController.java

@@ -0,0 +1,85 @@
+package com.nis.web.controller.log.ntc;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.http.client.ClientProtocolException;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
+import com.nis.domain.Page;
+import com.nis.domain.PageLog;
+import com.nis.domain.log.MmFileDigestLog;
+import com.nis.domain.maat.LogRecvData;
+import com.nis.util.Constants;
+import com.nis.util.DictUtils;
+import com.nis.util.httpclient.HttpClientUtil;
+import com.nis.web.controller.BaseController;
+
+@Controller
+@RequestMapping(value = "${adminPath}/log/ntc/mmFileDigestLogs")
+public class MmFileDigestLogController extends BaseController{
+
+	/**
+	 * 音视频url日志
+	 * @param model
+	 * @param entry
+	 * @param request
+	 * @param response
+	 * @return
+	 * @throws ClientProtocolException
+	 * @throws IOException
+	 */
+	@RequestMapping(value={"list",""})
+	public String list(Model model,@ModelAttribute("log")MmFileDigestLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
+		
+		try {
+			
+			PageLog<MmFileDigestLog> page = new PageLog<MmFileDigestLog>(request, response);
+			Map<String, Object> params=new HashMap<>();
+			params.put("pageSize", page.getPageSize());
+			params.put("pageNo", page.getPageNo());
+			//查询值判断
+			initLogSearchValue(entry,params);
+			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
+			String url = "";
+			url = Constants.LOG_BASE_URL+Constants.NTC_MMFILEDIGEST_LOG;
+			String jsonString = HttpClientUtil.getMsg(url,params,request);
+			
+			Gson gson = new GsonBuilder().create();
+			//gson泛型支持
+			LogRecvData<MmFileDigestLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<MmFileDigestLog>>(){}.getType());
+			
+			if (fromJson.getStatus().intValue() == 200) {
+				Page<MmFileDigestLog> data = fromJson.getData();
+				page.setList(data.getList());
+				List<MmFileDigestLog> list = page.getList();
+				for (MmFileDigestLog l : list) {
+					l.setFunctionId(entry.getFunctionId());
+					setLogAction(l,serviceList);
+				}
+				model.addAttribute("page", page);
+				logger.info("查询文件摘要日志成功");
+			}
+		} catch (Exception e) {
+			logger.error("查询文件摘要日志失败", e);
+			addMessageLog(model, e.getMessage());
+		}
+		return "/log/ntc/mmFileDigestList";
+	}
+	
+}

src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java

@@ -61,7 +61,7 @@ public class MmPicIpLogController extends BaseController {
 				logger.info("音视频图片IP日志查询成功！");
 			}
 		} catch (Exception e) {
-			logger.info("音视频图片IP日志查询失败！", e);
+			logger.error("音视频图片IP日志查询失败！", e);
 			addMessageLog(model, e.getMessage());
 		}
 		

src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java

@@ -61,7 +61,7 @@ public class MmPicUrlController extends BaseController{
 				logger.info("音视频图片URL日志查询成功！");
 			}
 		} catch (Exception e) {
-			logger.info("音视频图片URL日志查询失败！", e);
+			logger.error("音视频图片URL日志查询失败！", e);
 			addMessageLog(model, e.getMessage());
 		}
 		

src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java

@@ -63,7 +63,7 @@ public class MmPornAvSampleController extends BaseController {
 				logger.info("查询音频色情样例日志成功");
 			}
 		} catch (Exception e) {
-			logger.info("查询音频色情样例日志失败", e);
+			logger.error("查询音频色情样例日志失败", e);
 			addMessageLog(model, e.getMessage());
 		}
 		return "/log/ntc/mmPornAudioSampleList";
@@ -104,7 +104,7 @@ public class MmPornAvSampleController extends BaseController {
 				logger.info("查询视频色情样例日志成功");
 			}
 		} catch (Exception e) {
-			logger.info("查询视频色情样例日志失败", e);
+			logger.error("查询视频色情样例日志失败", e);
 			addMessageLog(model, e.getMessage());
 		}
 		return "/log/ntc/mmPornVideoSampleList";

src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java

@@ -61,7 +61,7 @@ public class MmSampleAudioController extends BaseController{
 				logger.info("音频样例日志查询成功！");
 			}
 		} catch (Exception e) {
-			logger.info("音频样例日志查询失败！", e);
+			logger.error("音频样例日志查询失败！", e);
 			addMessageLog(model, e.getMessage());
 		}
 		

src/main/java/com/nis/web/controller/log/ntc/MmSampleFaceController.java

@@ -61,7 +61,7 @@ public class MmSampleFaceController extends BaseController{
 				logger.info("人脸识别日志查询成功！");
 			}
 		} catch (Exception e) {
-			logger.info("人脸识别日志查询失败！", e);
+			logger.error("人脸识别日志查询失败！", e);
 			addMessageLog(model, e.getMessage());
 		}
 		

src/main/java/com/nis/web/controller/log/ntc/MmSampleLogoController.java

@@ -61,7 +61,7 @@ public class MmSampleLogoController extends BaseController{
 				logger.info("台标识别日志查询成功！");
 			}
 		} catch (Exception e) {
-			logger.info("台标识别日志查询失败！", e);
+			logger.error("台标识别日志查询失败！", e);
 			addMessageLog(model, e.getMessage());
 		}
 		

src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java

@@ -61,7 +61,7 @@ public class MmSamplePicController extends BaseController{
 				logger.info("图片样例日志查询成功！");
 			}
 		} catch (Exception e) {
-			logger.info("图片样例日志查询失败！", e);
+			logger.error("图片样例日志查询失败！", e);
 			addMessageLog(model, e.getMessage());
 		}
 		

src/main/java/com/nis/web/controller/log/ntc/MmSampleSpeakerController.java

@@ -61,7 +61,7 @@ public class MmSampleSpeakerController extends BaseController{
 				logger.info("说话人识别日志查询成功！");
 			}
 		} catch (Exception e) {
-			logger.info("说话人识别日志查询失败！", e);
+			logger.error("说话人识别日志查询失败！", e);
 			addMessageLog(model, e.getMessage());
 		}
 		

src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java

@@ -61,7 +61,7 @@ public class MmSampleVideoController extends BaseController{
 				logger.info("视频样例日志查询成功！");
 			}
 		} catch (Exception e) {
-			logger.info("视频样例日志查询失败！", e);
+			logger.error("视频样例日志查询失败！", e);
 			addMessageLog(model, e.getMessage());
 		}
 		

src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java

@@ -68,7 +68,7 @@ public class MmSampleVoipLogController extends BaseController {
 				logger.info("查询Voip样例日志成功");
 			}
 		} catch (Exception e) {
-			logger.info("查询Voip日志失败", e);
+			logger.error("查询Voip日志失败", e);
 			addMessageLog(model, e.getMessage());
 		}
 		return "/log/ntc/mmSampleVoipList";

src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java

@@ -75,7 +75,7 @@ public class MmVoipAccountLogController extends BaseController{
 				logger.info("查询mmVoipAccount日志成功");
 			}
 		} catch (Exception e) {
-			logger.info("查询mmVoipAccount日志失败", e);
+			logger.error("查询mmVoipAccount日志失败", e);
 			addMessageLog(model, e.getMessage());
 		}
 		return "/log/ntc/mmVoipAccountList";

src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java

@@ -75,7 +75,7 @@ public class MmVoipIpLogController extends BaseController{
 				logger.info("查询VoipIp日志成功");
 			}
 		} catch (Exception e) {
-			logger.info("查询VoipIp日志失败", e);
+			logger.error("查询VoipIp日志失败", e);
 			addMessageLog(model, e.getMessage());
 		}
 		return "/log/ntc/mmVoipIpList";

src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java

@@ -75,7 +75,7 @@ public class MmVoipLogController extends BaseController{
 				logger.info("查询Voip日志成功");
 			}
 		} catch (Exception e) {
-			logger.info("查询Voip日志失败", e);
+			logger.error("查询Voip日志失败", e);
 			addMessageLog(model, e.getMessage());
 		}
 		return "/log/ntc/mmVoipList";

src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java

@@ -77,7 +77,7 @@ public class OpenVpnLogController extends BaseController{
 				logger.info("查询OpenVpn日志成功");
 			}
 		} catch (Exception e) {
-			logger.info("查询OpenVpn日志失败", e);
+			logger.error("查询OpenVpn日志失败", e);
 			addMessageLog(model, e.getMessage());
 		}
 		return "/log/ntc/openVpnList";

src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java

@@ -42,7 +42,7 @@ public class P2pLogController extends BaseController {
 			
 			String url = Constants.LOG_BASE_URL + Constants.NTC_P2P_LOG;
 			String recv = HttpClientUtil.getMsg(url, params, request);			
-			logger.info("查询结果:" + recv);
+			logger.error("查询结果:" + recv);
 			if (StringUtils.isNotBlank(recv)) {
 				Gson gson = new GsonBuilder().create();
 				LogRecvData<NtcP2pLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcP2pLog>>(){}.getType());

src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java

@@ -62,7 +62,7 @@ public class PptpLogController extends BaseController {
 				model.addAttribute("page", page);
 			}
 		} catch (Exception e) {
-			logger.info("PPTP日志查询失败", e);
+			logger.error("PPTP日志查询失败", e);
 			addMessageLog(model, e.getMessage());
 		}
 		

src/main/java/com/nis/web/controller/log/ntc/SshLogController.java

@@ -77,7 +77,7 @@ public class SshLogController extends BaseController{
 				logger.info("查询Ssh日志成功");
 			}
 		} catch (Exception e) {
-			logger.info("查询Ssh日志失败", e);
+			logger.error("查询Ssh日志失败", e);
 			addMessageLog(model, e.getMessage());
 		}
 		return "/log/ntc/sshList";

src/main/java/com/nis/web/controller/log/ntc/SslLogController.java

@@ -66,7 +66,7 @@ public class SslLogController extends BaseController {
 				model.addAttribute("page", page);
 			}
 		} catch (Exception e) {
-			logger.info("SSL日志查询失败", e);
+			logger.error("SSL日志查询失败", e);
 			addMessageLog(model, e.getMessage());
 		}
 			

src/main/java/com/nis/web/service/basics/SysDictInfoService.java

@@ -2,7 +2,9 @@ package com.nis.web.service.basics;
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -222,104 +224,80 @@ public class SysDictInfoService extends BaseService{
 		return sysDictInfoDao.getDistrictDict(tableName);
 	}
 	
-	// 组织区域、运营商配置下发格式
+	
+	/**
+	 * 组织区域、运营商配置下发格式
+	 * @param areaEffectiveIds
+	 * @return
+	 */
 	public String setEffectiveRange(String areaEffectiveIds){
-		EffectiveRangeCfg rangeCfg = new EffectiveRangeCfg();
-		List<List<AreaIsp>> effectiveRangeList = new ArrayList();
-		
-		List<String> locaValueList = new ArrayList();
-		List<String> ispValueList = new ArrayList();
-		
+		HashMap<String, List<String>> map = new HashMap<String,List<String>>();
+		List<String> ispList = new ArrayList();
 		for (String areaEffectiveId : StringUtils.split(areaEffectiveIds, ",")) {
-			List<AreaIsp> areaIspList = new ArrayList();
-			
-			AreaIsp area = new AreaIsp();
-			area.setTag(Constants.AREA_TAG);
-			AreaIsp isp = new AreaIsp();
-			isp.setTag(Constants.ISP_TAG);
-			String areaStr = "";
-			// 区域和运营商
 			if(areaEffectiveId.contains(":")) {
-				
+				// 区域和运营商
 				int index = areaEffectiveId.indexOf(":");
 				String areaCode = areaEffectiveId.substring(0, index);
 				String ispCode = areaEffectiveId.substring(index+1);
-				// 查询该区域信息及其所有父节点信息
-				List<SysDictInfo> list = sysDictInfoDao.getEffectiveArea(areaCode);
-				for (SysDictInfo sysDictInfo : list) {
-					areaStr += sysDictInfo.getItemValue();
-					while(sysDictInfo.getParent().getSysDictId() != 0) {
-						sysDictInfo = sysDictInfoDao.getDictById(sysDictInfo.getParent().getSysDictId());
-						areaStr += "/"+sysDictInfo.getItemValue();
+				
+				if(!map.containsKey(areaCode)){
+					ispList = new ArrayList();
+					ispList.add(ispCode);
+					map.put(areaCode, ispList);
+				}else{
+					if(!ispList.contains(ispCode)){
+						ispList.add(ispCode);
 					}
+					map.replace(areaCode, ispList);
 				}
-				String areaItemValue = StringUtils.revertStr(areaStr, "/");
-				if(!locaValueList.contains(areaItemValue)) {
-					
-					locaValueList = new ArrayList();
-					ispValueList = new ArrayList();
-					
-					locaValueList.add(areaItemValue);
-					
-				}else {
-					// 区域相同就只加运营商信息
-					SysDictInfo ispStr = sysDictInfoDao.getDictByItemCode(ispCode);
-					if(!ispValueList.contains(ispStr.getItemValue())) {
-						ispValueList.add(ispStr.getItemValue());
-						if(ispValueList.size() < 2) {
-							
-							isp.setValue(ispValueList);
-							areaIspList.add(isp);
-							effectiveRangeList.add(areaIspList);
-						}
-					}
-					continue;
-				}
-				
-				// 查询运营商信息
-				SysDictInfo ispStr = sysDictInfoDao.getDictByItemCode(ispCode);
-				if(!ispValueList.contains(ispStr.getItemValue())) {
-					ispValueList.add(ispStr.getItemValue());
-				}
-				
-				area.setValue(locaValueList);
-				isp.setValue(ispValueList);
-				
-				areaIspList.add(area);
-				areaIspList.add(isp);
-				effectiveRangeList.add(areaIspList);
 			}else {
 				// 区域
-				SysDictInfo dict = sysDictInfoDao.getDictByItemCode(areaEffectiveId);
-				
-				// 查询所有父节点区域信息
-				areaStr += dict.getItemValue();
-				while(dict.getParent().getSysDictId() != 0) {
-					dict = sysDictInfoDao.getDictById(dict.getParent().getSysDictId());
-					areaStr += "/"+dict.getItemValue();
-				}
-				String areaItemValue = StringUtils.revertStr(areaStr, "/");
-				if(!locaValueList.contains(areaItemValue)) {
-					locaValueList = new ArrayList();
-					locaValueList.add(areaItemValue);
-					area.setValue(locaValueList);
-					areaIspList.add(area);
-					effectiveRangeList.add(areaIspList);
+				if(!map.containsKey(areaEffectiveId)){
+					map.put(areaEffectiveId, null);
 				}
 				
 			}
 			
 		}
 
+		EffectiveRangeCfg rangeCfg = new EffectiveRangeCfg();
+		List<List<AreaIsp>> effectiveRangeList = new ArrayList();
+		Set<String> keySet = map.keySet();
+		for (String key : keySet) {
+			AreaIsp area = new AreaIsp();
+			area.setTag(Constants.AREA_TAG);
+			AreaIsp isp = new AreaIsp();
+			isp.setTag(Constants.ISP_TAG);
+			List<String> locaValueList = new ArrayList();
+			List<String> ispValueList = new ArrayList();
+			List<AreaIsp> areaIspList = new ArrayList();
+			// 获取区域信息
+			String areaStr = "";
+			SysDictInfo areaDict = sysDictInfoDao.getDictByItemCode(key);
+			areaStr += areaDict.getItemValue();
+			while(areaDict.getParent().getSysDictId() != 0) {
+				areaDict = sysDictInfoDao.getDictById(areaDict.getParent().getSysDictId());
+				areaStr += "/"+areaDict.getItemValue();
+			}
+			locaValueList.add(StringUtils.revertStr(areaStr, "/"));
+			area.setValue(locaValueList);
+			areaIspList.add(area);
+			
+			// 获取运营商信息
+			if(map.get(key) != null){
+				for (String ispCode : map.get(key)) {
+					SysDictInfo ispDict = sysDictInfoDao.getDictByItemCode(ispCode);
+					ispValueList.add(ispDict.getItemValue());
+				}
+				isp.setValue(ispValueList);
+				areaIspList.add(isp);
+			}
+			effectiveRangeList.add(areaIspList);
+			
+		}
 		rangeCfg.setEffectiveRangeList(effectiveRangeList);
 		return gsonToJson(rangeCfg);
-	}
 		
-	public static void main(String[] args) {
-		SysDictInfoService service = new SysDictInfoService();
-		String json = service.setEffectiveRange("7182:4,7182:5");
-		
-		System.err.println(json);
 	}
 	
 }

src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java

@@ -121,14 +121,18 @@ public class AppMultiFeatureCfgService extends BaseService {
 			}
 			if(entity.getStrList()!=null){
 				for(AppStringFeatureCfg cfg:entity.getStrList()){
+					if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
 					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
 					appMultiFeatureCfgDao.insertAppStringFeatureCfg(cfg);
+					}
 				}
 			}
 			if(entity.getComplexList()!=null){
 				for(AppComplexFeatureCfg cfg:entity.getComplexList()){
+					if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
 					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
 					appMultiFeatureCfgDao.insertAppComplexFeatureCfg(cfg);
+					}
 				}
 			}
 		}

src/main/webapp/WEB-INF/include/form/basicInfo.jsp

@@ -39,9 +39,9 @@
 				    </c:if>           			
 		        </c:forEach>
            		<sys:treeselect id="classify" name="classify" value="${empty _cfg.classify?0:_cfg.classify}" labelName="classifyName" extId="0"
-				labelValue="${classifyValue}"
-					title="classification" url="/basics/serviceDictInfo/treeData?itType=1&isShowLeaf=true" notAllowSelectRoot="true" allowClear="true" notAllowSelectParent="false"
-					checked="true" cssClass="form-control" checkedPS="" unCheckedPS=""/>
+				labelValue="${classifyValue}" labelEmptyValue="0"
+					title="classification" url="/basics/serviceDictInfo/treeData?itType=1&isShowLeaf=true" notAllowSelectRoot="false" allowClear="true" notAllowSelectParent="false"
+					checked="true" cssClass="form-control" checkedPS="ps" unCheckedPS="s"/>
            	 <%-- <select name="classify" multiple class="selectpicker form-control" title=<spring:message code="select"/>>
                	
                	<c:forEach items="${fls}" var="fl">
@@ -89,9 +89,9 @@
 				    </c:if>           			
 		        </c:forEach>
            		<sys:treeselect id="attribute" name="attribute" value="${empty _cfg.attribute?0:_cfg.attribute}" labelName="attributeName" extId="0"
-				labelValue="${attributeValue}"
-					title="attribute" url="/basics/serviceDictInfo/treeData?itType=2&isShowLeaf=true" notAllowSelectRoot="true" allowClear="true" notAllowSelectParent="false"
-					checked="true" cssClass="form-control" checkedPS="" unCheckedPS=""/>
+				labelValue="${attributeValue}" labelEmptyValue="0"
+					title="attribute" url="/basics/serviceDictInfo/treeData?itType=2&isShowLeaf=true" notAllowSelectRoot="false" allowClear="true" notAllowSelectParent="false"
+					checked="true" cssClass="form-control" checkedPS="ps" unCheckedPS="s"/>
                <%--  <select name="attribute" multiple class="selectpicker form-control" title=<spring:message code="select"/>>
                		<c:forEach items="${xzs}" var="xz">
 	               		<c:choose>
@@ -134,9 +134,9 @@
 				    </c:if>           			
 		        </c:forEach>
            		<sys:treeselect id="lable" name="lable" value="${empty _cfg.lable?0:_cfg.lable}" labelName="lableName" extId="0"
-				labelValue="${lableValue}"
-					title="label" url="/basics/serviceDictInfo/treeData?itType=3&isShowLeaf=true" notAllowSelectRoot="true" allowClear="true" notAllowSelectParent="false"
-					checked="true" cssClass="form-control" checkedPS="" unCheckedPS=""/>
+				labelValue="${lableValue}" labelEmptyValue="0"
+					title="label" url="/basics/serviceDictInfo/treeData?itType=3&isShowLeaf=true" notAllowSelectRoot="false" allowClear="true" notAllowSelectParent="false"
+					checked="true" cssClass="form-control" checkedPS="ps" unCheckedPS="s"/>
                 <%-- <select name="lable" multiple class="selectpicker form-control" title=<spring:message code="select"/>>
                		<c:forEach items="${lables}" var="lable">
 	               		<c:choose>

src/main/webapp/WEB-INF/tags/sys/treeselect.tag

@@ -28,6 +28,7 @@
 <%@ attribute name="unCheckedPS" type="java.lang.String" required="false" description="复选框取消选中时是否关联父子节点，ps关联父子，p关联父，s关联子,都不关联为空"%>
 <%@ attribute name="enableAddBtn" type="java.lang.Boolean" required="false" description="节点是否可编辑"%>
 <%@ attribute name="enableSearch" type="java.lang.Boolean" required="false" description="是否开启节点搜索功能"%>
+<%@ attribute name="labelEmptyValue" type="java.lang.String" required="false" description="标签不能为空的时候当清空选择时补填的值"%>
 <div class="input-group">
 	<input id="${id}Id" name="${name}" class="${cssClass} singleClass" type="hidden" value="${value}" />
 	<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'} type="text" value="<spring:message code='${empty value?"":labelValue}'/>" data-msg-required="${dataMsgRequired}" placeholder="${(empty value or value eq extId)?labelValue:value}"
@@ -45,7 +46,7 @@
 			return true;
 		}
 		// 正常打开	
-		top.$.jBox.open("iframe:${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&selectIds="+$("#${id}Id").val()+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}&title=${title}&enableAddBtn=${enableAddBtn}&enableSearch=${enableSearch}", "<spring:message code='choose'/> <spring:message code='${title}'/>", 320, 420, {
+		top.$.jBox.open("iframe:${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&selectIds="+$("#${id}Id").val()+"&module=${module}&checked=${checked}&checkedPS=${checkedPS}&unCheckedPS=${unCheckedPS}&extId=${extId}&isAll=${isAll}&title=${title}&enableAddBtn=${enableAddBtn}&enableSearch=${enableSearch}", "<spring:message code='choose'/> <spring:message code='${title}'/>", 320, 420, {
 			ajaxData:{selectIds: $("#${id}Id").val()},buttons:{"<spring:message code='ok'/>":"ok", "<spring:message code='clear'/>":"clear","<spring:message code='close'/>":true}, submit:function(v, h, f){
 				if (v == "ok"){
 					var tree = h.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents();
@@ -90,6 +91,11 @@
 							top.$.jBox.tip("<spring:message code='no_node'/>（"+nodes[i].name+"）<spring:message code='reselect'/>");
 							return false;
 						}//</c:if>
+						if("${labelEmptyValue}"&&""!="${labelEmptyValue}"){
+							if("${extId}"==nodes[i].id){
+								continue;
+							}
+						}
 						ids.push(nodes[i].id);
 						//<c:if test="${showParentName}">
 						if (nodes[i].id != null ){
@@ -109,7 +115,7 @@
 									names.push(nodes[i].name);
 								} 
 								
-						});
+							});
 						 
 						}//</c:if>
 						//<c:if test="${!showParentName}">
@@ -119,7 +125,9 @@
 						break; // 如果为非复选框选择，则返回第一个选择  
 						//</c:if>
 					}
-					
+					if(ids.length==0&&"${labelEmptyValue}"&&""!="${labelEmptyValue}"){
+						ids.push("${labelEmptyValue}");
+					}
 					$("#${id}Id").val(ids.join(",").replace(/u_/ig,""));
 					$("#${id}Id").change();//手动触发change事件，使Id的值得变化可以被监听到
 					$("#${id}Name").val(names.join(","));
@@ -127,7 +135,11 @@
 						$("#${id}Name").attr("placeholder","");
 					}
 				}else if (v == "clear"){
-					$("#${id}Id").val("");
+					if("${labelEmptyValue}"&&""!="${labelEmptyValue}"){
+						$("#${id}Id").val("${labelEmptyValue}");
+					}else{
+						$("#${id}Id").val("");
+					}
 					$("#${id}Id").change();//手动触发change事件，使Id的值得变化可以被监听到
 					$("#${id}Name").val("");
 					$("#${id}Name").attr("placeholder","");

src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp

@@ -194,9 +194,18 @@ label.errorShow {
 							<div class="form-group">
 								<label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>
 								<div class="col-md-4">
-                                    <c:set var="fatherName"><spring:message code="root_node"/></c:set>
-					                <sys:treeselect id="serviceDictInfo" name="parent.serviceDictId" value="${serviceDictInfo.parent.serviceDictId}" labelName="parent.itemValue"  labelValue="${serviceDictInfo.parent.serviceDictId eq '0'?fatherName:fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}"
-										title="${title }" url="/basics/serviceDictInfo/treeData?itType=${itType}" cssClass="required form-control"/>	
+									<c:if test="${itType==1 }">
+										<c:set var="fatherName"><spring:message code="classification"/></c:set>
+									</c:if>
+									<c:if test="${itType==2 }">
+										<c:set var="fatherName"><spring:message code="attribute"/></c:set>
+									</c:if>
+									<c:if test="${itType==3 }">
+										<c:set var="fatherName"><spring:message code="label"/></c:set>
+									</c:if>
+					                <sys:treeselect id="serviceDictInfo" name="parent.serviceDictId" value="${serviceDictInfo.parent.serviceDictId}" labelName="parent.itemValue"  
+					                labelValue="${serviceDictInfo.parent.serviceDictId eq '0'?fatherName:fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}"
+									title="${title }" url="/basics/serviceDictInfo/treeData?itType=${itType}" cssClass="required form-control"/>	
  								<label  class="errorShow" style="display: none;"><spring:message code="isLevelNoSure"/></label>
 								</div>
 							</div>

src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileList.jsp

@@ -82,7 +82,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="desc"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp

@@ -102,7 +102,7 @@
 												<form:option value="bytes"><spring:message code="bytes"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp

@@ -102,7 +102,7 @@
 												<form:option value="domain"><spring:message code="domain"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp

@@ -155,7 +155,7 @@
 												<form:option value="cfgKeywords"><spring:message code="keywords"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp

@@ -102,7 +102,7 @@
 												<form:option value="cfgKeywords"><spring:message code="keywords"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp

@@ -106,7 +106,7 @@
 												<form:option value="destPort"><spring:message code="server_port"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 											
                                            </div>

src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp

@@ -271,8 +271,10 @@ var delContent = function(contentClassName, addBtnClassName) {
 													</c:choose>
 												</c:forEach>
 												<c:if test="${!isBreak}">
-													<div
-														class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+														<input type="hidden" name="cfgRegionValue" value="${region.configRegionValue }">
+														<input type="hidden" name="cfgRegionType" value="${region.regionType }">
+														<input type="hidden" name="cfgRegionCode1" value="${region.configRegionCode }">
 														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
 													<c:set var="complexCfgIndex" value="${complexCfgIndex+1 }"></c:set>

src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp

@@ -152,7 +152,7 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp

@@ -155,7 +155,7 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp

@@ -102,7 +102,7 @@
 												<form:option value="cfgKeywords"><spring:message code="keywords"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp

@@ -100,7 +100,7 @@
 <%-- 												<form:option value="bytes"><spring:message code="bytes"></spring:message></form:option>
  --%>												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 													<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-													<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+													<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp

@@ -99,7 +99,7 @@
 												<form:option value="domain"><spring:message code="domain"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp

@@ -136,7 +136,7 @@
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp

@@ -152,7 +152,7 @@
 												<form:option value="srcIpAddress"><spring:message code="client_ip"></spring:message></form:option>
 												<form:option value="srcPort"><spring:message code="client_port"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp

@@ -149,7 +149,7 @@
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgKeywords"><spring:message code="URL"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp

@@ -98,7 +98,7 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp

@@ -152,7 +152,7 @@
 												<form:option value="srcIpAddress"><spring:message code="client_ip"></spring:message></form:option>
 												<form:option value="srcPort"><spring:message code="client_port"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp

@@ -150,7 +150,7 @@
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgKeywords"><spring:message code="URL"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp

@@ -107,7 +107,7 @@
 												<form:option value="description"><spring:message code="sample_sign"></spring:message></form:option>
 												<form:option value="level"><spring:message code="harm_level"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp

@@ -159,7 +159,7 @@
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="av_voip_account_control"/></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 												<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="NTC_SUBSCRIBE_ID"/></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
@@ -338,8 +338,8 @@
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
 					</div>
-					<div class="table-responsive">
 					<sys:message content="${message}" />
+					<div class="table-responsive">
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>

src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp

@@ -159,7 +159,7 @@
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 												<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="APP_SUBSCRIBE_ID"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp

@@ -101,7 +101,7 @@
                                         		<form:option value="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp

@@ -159,7 +159,7 @@
 													<form:option value="destPort"><spring:message code="server_port"></spring:message></form:option>
 													<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 													<form:option value="action"><spring:message code="action"></spring:message></form:option>
-													<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+													<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp

@@ -109,7 +109,7 @@
 												<form:option value="destPort"><spring:message code="server_port"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp

@@ -104,7 +104,7 @@
 												<form:option value="destIpAddress"><spring:message code="IP"></spring:message></form:option>
 												<%-- <form:option value="destPort"><spring:message code="port"></spring:message></form:option> --%>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp

@@ -156,7 +156,7 @@
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="APP_SUBSCRIBE_ID"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp

@@ -136,7 +136,7 @@
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfdsLevel"><spring:message code="cfds_level"/></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
@@ -359,7 +359,7 @@
 											${fns:abbr(indexCfg.digest,20)}
 										</a>
 								    </td>
-								    <td>${indexCfg.rawLen }</td>
+								    <td>${indexCfg.rawLen }（B）</td>
 								    <td>${indexCfg.cfdsLevel }</td>
 								    <td>
 								    	<a href="${indexCfg.fileUrl }" target="_blank" data-original-title="${indexCfg.fileUrl }"

src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp

@@ -142,7 +142,7 @@
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp

@@ -133,7 +133,7 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp

@@ -145,7 +145,7 @@
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp

@@ -85,7 +85,7 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="keyring_name"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp

@@ -100,7 +100,7 @@
 													<form:option value="dstIp"><spring:message code="server_ip"></spring:message></form:option>
 													<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 													<form:option value="action"><spring:message code="action"></spring:message></form:option>
-													<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+													<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp

@@ -133,7 +133,7 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp

@@ -138,7 +138,7 @@
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp

@@ -89,7 +89,7 @@
 												<form:option value="cfgDesc"><spring:message code="policy_name"></spring:message></form:option>
 												<form:option value="group1Name"><spring:message code="group"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp

@@ -90,7 +90,7 @@
 												<form:option value="destIpAddress"><spring:message code="ip"></spring:message></form:option>
 												<form:option value="groupName"><spring:message code="group"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp

@@ -90,7 +90,7 @@
 												<form:option value="destIpAddress"><spring:message code="ip"></spring:message></form:option>
 												<form:option value="groupName"><spring:message code="group"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp

@@ -89,7 +89,7 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp

@@ -89,7 +89,7 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp

@@ -139,7 +139,7 @@
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp

@@ -139,7 +139,7 @@
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp

@@ -324,7 +324,7 @@
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp

@@ -86,7 +86,7 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp

@@ -87,7 +87,7 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp

@@ -92,7 +92,7 @@
                                          <div class="input-group-btn">
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="fileDesc"><spring:message code="file_desc"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
@@ -304,7 +304,7 @@
 									<td>${indexCfg.compileId }</td>
 								    <td><a href="${indexCfg.url }" target="_blank">${indexCfg.fileDesc }</a></td>
 								    <td>${indexCfg.contentType }</td>
-								    <td>${indexCfg.contentLength }</td>
+								    <td>${indexCfg.contentLength }（B）</td>
 								    <%-- <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.action }">

src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp

@@ -137,7 +137,7 @@
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp

@@ -295,7 +295,7 @@
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp

@@ -136,7 +136,7 @@
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp

@@ -137,7 +137,7 @@
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp

@@ -136,7 +136,7 @@
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
-												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
                                          </div>

src/main/webapp/WEB-INF/views/index.jsp

@@ -2,6 +2,7 @@
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <html>
 <head>
+<meta name="format-detection" content="telephone=no,email=no,address=no"> 
 	<style type="text/css">
 	.statisticsRequest{
 		padding:10px 0px 0px 10px;

src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp

@@ -189,6 +189,9 @@
 								<th><spring:message code='s_subscribe_id'/></th>
 								<th><spring:message code='d_subscribe_id'/></th>
 								<th><spring:message code='scene_file'/></th>
+								<th><spring:message code='message_type'/></th>
+								<th><spring:message code='as'/></th>
+								<th><spring:message code='route'/></th>
 							</tr>
 						</thead>
 						<tbody>
@@ -245,7 +248,9 @@
 									<td>${log.dAsn}</td>
 									<td>${log.sSubscribeId}</td>
 									<td>${log.dSubscribeId}</td>
-									<td>${log.sceneFile}</td>
+									<td>${log.type}</td>
+									<td>${log.as}</td>
+									<td>${log.route}</td>
 								</tr>
 							</c:forEach>
 						</tbody>

src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp

@@ -0,0 +1,304 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+
+<script type="text/javascript">
+$(document).ready(function(){
+	//筛选功能
+	filterActionInit();
+	//reset
+	$("#resetBtn").on("click",function(){
+		$("select.selectpicker").each(function(){
+			$(this).selectpicker('val',$(this).find('option:first').val());
+			$(this).find("option").attr("selected",false);
+			$(this).find("option:first").attr("selected",true);
+		});
+		$(".Wdate").attr("value",'');
+		$(':input','#searchForm')
+		.not(':button,:submit,:reset,:hidden')
+		.attr("value",'');
+		$("#searchForm")[0].reset();
+	});
+	
+});
+
+</script>
+</head>
+<body>
+
+<div class="page-content">
+	<div class="theme-panel hidden-xs hidden-sm">
+	</div>
+	<h3 class="page-title">
+		<spring:message code="file_digest_control"/>
+	</h3>
+	<h5 class="page-header"></h5>
+		<div class="col-md-12">
+			<div class="portlet">
+				<div class="portlet-body">
+					<div class="row"  >
+						<form:form id="searchForm" modelAttribute="log" action="${ctx}/log/ntc/mmFileDigestLogs" method="post" class="form-search">
+							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
+							<!-- 筛选按钮展开状态-->
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
+							
+							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
+							
+							<!-- 搜索内容与操作按钮栏 -->
+							<div class="col-md-12">
+								<div class="pull-left">
+									<form:select path="action" class="selectpicker select2 input-small">
+									<form:option value=""><spring:message code="action"/></form:option>
+									<c:forEach items="${serviceList}" var="service"
+											varStatus="satus">
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32) && (service.action ne 96)  }">  
+												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+								</form:select>
+							</div>
+							<div class="pull-left">	
+				 				  <div class="input-group">
+	                                 <div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
+	                             	</div>
+	                                 	<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
+											value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+                        		</div>
+							<div class="pull-left">	
+				 				  <div class="input-group">
+	                                 <div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
+	                             	</div>
+	                                 	<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
+											value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+                        		</div>
+	                               
+	                               <div class="pull-left">
+	                               		 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+										 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+	                                     <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
+									</div>
+
+									<div class="pull-right">
+                                        <a class="btn  btn-icon-only btn-default setfields tooltips" 
+                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
+                                             <i class="icon-wrench"></i>
+                                     </a>
+                                    </div>
+							</div>
+							
+							<!-- 筛选搜索内容栏默认隐藏-->
+							<div class="col-md-12 filter-action-select-panle hide" >
+								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+										<label><spring:message code="protocol_type"/>：</label>
+										<c:set var="select"><spring:message code='select'/></c:set>
+                                            <form:select path="transProto" class="selectpicker form-control" >
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
+										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
+							             		</c:forEach>
+											</form:select>
+										</div>
+									</div>
+									
+									<%-- <div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="direct"/>：</label>
+											<form:select path="direction" class="selectpicker select2 form-control">
+	                                        <form:option value=""><spring:message code="select"/></form:option>
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+								             </c:forEach>
+	                                    	</form:select>
+									</div>
+									</div> --%>
+									<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="entrance"/>：</label>
+										<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
+												<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
+									</div>
+									</div>
+									<div class="col-md-2">
+											<div class="form-group">
+	                                            <label><spring:message code="clj_ip"/>：</label>
+	                                            <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
+	                                        </div>
+										</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="clientip"/>：</label>
+											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
+									</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="serverip"/>：</label>
+											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
+									</div>
+									</div>
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
+								</div>
+									
+							</div>
+							<!-- /筛选搜索内容栏    结束-->
+						</form:form>
+					</div> 
+					<sys:message content="${message}"/>
+					<div class="table-responsive">
+					
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
+							<thead>
+								<tr>
+									<th><spring:message code='cfg_id'/></th>
+									<th><spring:message code="action"/></th>
+									<th><spring:message code='found_time'/></th>
+									<th><spring:message code='entrance'/></th>
+									
+									<th><spring:message code='pid'/></th>
+									<th><spring:message code='access_url'/></th>
+									<th><spring:message code='log_uri'/></th>
+									<th><spring:message code='referer'/></th>
+									<th><spring:message code='harm_level'/></th>
+									<th><spring:message code='fd_type'/></th>
+<%-- 									<th><spring:message code='av_protocol'/></th> --%>
+									
+									<th><spring:message code='clj_ip'/></th>
+									<th><spring:message code='protocol'/></th>
+									<th><spring:message code='addr_type'/></th>
+									<th><spring:message code='serverip'/></th>
+									<th><spring:message code='clientip'/></th>
+									<th><spring:message code='serverport'/></th>
+									<th><spring:message code='clientport'/></th>
+<%-- 									<th><spring:message code='deviceid'/></th> --%>
+<%-- 									<th><spring:message code='direct'/></th> --%>
+									<th><spring:message code='stream_type'/></th>
+<%-- 									<th><spring:message code='nest_addr_list'/></th> --%>
+									<th><spring:message code='server_locate'/></th>
+									<th><spring:message code='client_locate'/></th>
+									<th><spring:message code='s_asn'/></th>
+									<th><spring:message code='d_asn'/></th>
+									<th><spring:message code='s_subscribe_id'/></th>
+									<th><spring:message code='d_subscribe_id'/></th>
+									<th><spring:message code='scene_file'/></th>
+									
+								</tr>
+							</thead>
+							<tbody>
+							<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
+								<tr>
+									<td>${log.cfgId } <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a></td> 
+									<td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
+											<c:if test="${dict.itemCode eq log.action}">
+												<spring:message code="${dict.itemValue}"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									<td>${log.foundTime}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+											<c:if test="${dict.itemCode eq log.entranceId}">
+												<spring:message code="${dict.itemValue}"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									
+									<td>${log.pid}</td>
+									<td>
+										<c:if test="${fn:startsWith(log.url, 'http://')}">
+											 ${fn:substring(log.url,7,-1)}  
+										</c:if>
+										<c:if test="${!fn:startsWith(log.url, 'http://') and !empty log.url}">
+											${log.url}
+										</c:if>
+									</td>
+									<td>
+										<c:if test="${fn:startsWith(log.logUri, 'http')}">
+											<a href="${log.logUri}" data-original-title="${log.logUri}" target="_blank"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fn:substring(log.logUri,0,20) }
+										</a>
+										</c:if>
+									
+										<c:if test="${!fn:startsWith(log.logUri, 'http') and !empty log.logUri}">
+										<a href="http://${log.logUri}" data-original-title="http://${log.logUri}" target="_blank"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											http://${fn:substring(log.logUri,0,20) }
+										</a>
+										</c:if>	
+									</td>
+									<td>
+										${log.referer}
+									</td>
+									<td>${log.level}</td>
+									<!--0：动态黑名单FD；1：静态配置FD；2：首次分析命中 -->
+									<td>
+										<c:if test="${log.fdType eq 0 }"><spring:message code="black_block_list"/></c:if>
+										<c:if test="${log.fdType eq 1 }"><spring:message code="static_cfg_block"/></c:if>
+										<c:if test="${log.fdType eq 2 }"><spring:message code="first_hit"/></c:if>
+									</td>
+<%-- 									<td>${log.protocol}</td> --%>
+									
+									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td>${log.transProto}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="dic">
+											<c:if test="${log.addrType==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td>${log.dPort}</td>
+									<td>${log.sPort}</td>
+									<%-- <td>${log.deviceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
+											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td> --%>
+									<td>
+										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
+											<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<%-- <td>
+										${log.addrList}
+									</td> --%>
+									<td>${log.serverLocate}</td>
+									<td>${log.clientLocate}</td>
+									<td>${log.sAsn}</td>
+									<td>${log.dAsn}</td>
+									<td>${log.sSubscribeId}</td>
+									<td>${log.dSubscribeId}</td>
+									<td>${log.sceneFile}</td>
+								</tr>
+							</c:forEach>
+							</tbody>
+						</table>
+						<div class="page">${page}</div>
+					</div>
+			</div>
+		</div>
+	</div>
+	</div>
+</body>
+</html>

src/main/webapp/static/global/scripts/common.js

@@ -539,11 +539,11 @@ $(function(){
 	   }
 	   
    });
-   $("#classifyId,#attributeId,#lableId").on("change",function(){
+   /*$("#classifyId,#attributeId,#lableId").on("change",function(){
 	   if($(this).val()==0 || $(this).val()==''){
 		   $(this).val(0);
 	   }
-   });
+   });*/
    //配置修改时已经展开的域上的加号隐藏
    $(".boxSolid:visible").each(function(){
 	   $(this).prev("h4").find(".glyphicon-plus").addClass("hidden");