diff --git a/src/main/java/com/nis/domain/log/MmFileDigestLog.java b/src/main/java/com/nis/domain/log/MmFileDigestLog.java new file mode 100644 index 000000000..e9c896b73 --- /dev/null +++ b/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 { + + 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; + } +} diff --git a/src/main/java/com/nis/domain/log/NtcBGPLog.java b/src/main/java/com/nis/domain/log/NtcBGPLog.java new file mode 100644 index 000000000..785d76219 --- /dev/null +++ b/src/main/java/com/nis/domain/log/NtcBGPLog.java @@ -0,0 +1,28 @@ +package com.nis.domain.log; + +public class NtcBGPLog extends BaseLogEntity { + + 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; + } + +} diff --git a/src/main/java/com/nis/domain/log/NtcIpLog.java b/src/main/java/com/nis/domain/log/NtcIpLog.java index a3eb3bfde..c8d5b8983 100644 --- a/src/main/java/com/nis/domain/log/NtcIpLog.java +++ b/src/main/java/com/nis/domain/log/NtcIpLog.java @@ -3,5 +3,4 @@ package com.nis.domain.log; public class NtcIpLog extends BaseLogEntity { private static final long serialVersionUID = 4597407682545926823L; - } diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index b4cb584ec..0ed1cbe7d 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/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", ""); diff --git a/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java b/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java index 5e1ca4dc4..af57149ac 100644 --- a/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java +++ b/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"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/AppLogController.java b/src/main/java/com/nis/web/controller/log/ntc/AppLogController.java index 5b6868afd..8d86aeb92 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/AppLogController.java +++ b/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"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java index 0fb1daed2..b34fbab6e 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java +++ b/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 page = new PageLog(request, response); + PageLog page = new PageLog(request, response); Map params = new HashMap(); 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 fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); + LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { page.setList(fromJson.getData().getList()); - List list = page.getList(); - for (NtcIpLog l : list) { + List list = page.getList(); + for (NtcBGPLog l : list) { l.setFunctionId(log.getFunctionId()); setLogAction(l,serviceList); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java b/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java index 215869857..65eeb3f7a 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java +++ b/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"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java index aece04557..6abd9c11f 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java +++ b/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"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java b/src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java index 6062f4cde..04ccf1512 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java +++ b/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"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java index 5173fc4f4..d93356c1a 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java +++ b/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()); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java index 31f09221c..8340a38fb 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java +++ b/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"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java index d4ac8011f..80f30463d 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java +++ b/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"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmFileDigestLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmFileDigestLogController.java new file mode 100644 index 000000000..8f0152036 --- /dev/null +++ b/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 page = new PageLog(request, response); + Map params=new HashMap<>(); + params.put("pageSize", page.getPageSize()); + params.put("pageNo", page.getPageNo()); + //查询值判断 + initLogSearchValue(entry,params); + + List 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 fromJson = gson.fromJson(jsonString, new TypeToken>(){}.getType()); + + if (fromJson.getStatus().intValue() == 200) { + Page data = fromJson.getData(); + page.setList(data.getList()); + List 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"; + } + +} diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java index 48316189b..d9a05491e 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java +++ b/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()); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java b/src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java index 03520430e..4360e12d5 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java +++ b/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()); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java b/src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java index 78aa4ea7d..94691404a 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java +++ b/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"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java index b05a2ef81..2db7f11a4 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java +++ b/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()); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleFaceController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleFaceController.java index 3a399ecb9..1095da20c 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleFaceController.java +++ b/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()); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleLogoController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleLogoController.java index 0d4b26f08..8b8dcf3a0 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleLogoController.java +++ b/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()); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java index 88c5db172..9ea88dfef 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java +++ b/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()); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleSpeakerController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleSpeakerController.java index b53fb7c78..6ba4a1af5 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleSpeakerController.java +++ b/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()); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java index 5257af016..f671733c3 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java +++ b/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()); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java index c62b5809c..f5ecf8c56 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java +++ b/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"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java index 0e097e2d8..62f29d105 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java +++ b/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"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java index 6aaad7f08..d158b243d 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java +++ b/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"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java index 68b0351b3..6a137d576 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java +++ b/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"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java b/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java index 805a49285..439796879 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java +++ b/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"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java b/src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java index c4efc33f9..c1f255789 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java +++ b/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 fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java index cdc659651..d67398d9f 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java +++ b/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()); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/SshLogController.java b/src/main/java/com/nis/web/controller/log/ntc/SshLogController.java index 8f2583de0..96eda247a 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/SshLogController.java +++ b/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"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java b/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java index 9ab408e0d..a5f55f8b7 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java +++ b/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()); } diff --git a/src/main/java/com/nis/web/service/basics/SysDictInfoService.java b/src/main/java/com/nis/web/service/basics/SysDictInfoService.java index 74737892e..3b0fb65df 100644 --- a/src/main/java/com/nis/web/service/basics/SysDictInfoService.java +++ b/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> effectiveRangeList = new ArrayList(); - - List locaValueList = new ArrayList(); - List ispValueList = new ArrayList(); - + HashMap> map = new HashMap>(); + List ispList = new ArrayList(); for (String areaEffectiveId : StringUtils.split(areaEffectiveIds, ",")) { - List 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 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> effectiveRangeList = new ArrayList(); + Set 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 locaValueList = new ArrayList(); + List ispValueList = new ArrayList(); + List 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); } } diff --git a/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java b/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java index 6a93aa6f0..a7a3fbac9 100644 --- a/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java +++ b/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); + } } } } diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp index 4771854fe..f03ca7ae7 100644 --- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp @@ -39,9 +39,9 @@ + 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"/> <%-- > @@ -134,9 +134,9 @@ + 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"/> <%-- " 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}", " ", 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}", " ", 320, 420, { ajaxData:{selectIds: $("#${id}Id").val()},buttons:{"":"ok", "":"clear","":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("("+nodes[i].name+")"); return false; }// + if("${labelEmptyValue}"&&""!="${labelEmptyValue}"){ + if("${extId}"==nodes[i].id){ + continue; + } + } ids.push(nodes[i].id); // if (nodes[i].id != null ){ @@ -109,7 +115,7 @@ names.push(nodes[i].name); } - }); + }); }// // @@ -119,7 +125,9 @@ break; // 如果为非复选框选择,则返回第一个选择 // } - + 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",""); diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp index c2859f844..1cfc57e5d 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp @@ -194,9 +194,18 @@ label.errorShow {
- - + + + + + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileList.jsp index f0d6d4215..bbc6c222b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileList.jsp @@ -82,7 +82,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp index ee6e8a50b..e618ad7bb 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp @@ -102,7 +102,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp index 134752304..576250e34 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp @@ -102,7 +102,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp index 90cde6cb1..15a127b64 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp @@ -155,7 +155,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp index 784c90e69..3ff188f03 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp @@ -102,7 +102,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp index 685129e76..029a3b07d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp @@ -106,7 +106,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp index c612de0b6..8175767d2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp @@ -271,8 +271,10 @@ var delContent = function(contentClassName, addBtnClassName) { - diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp index 457e473fe..2dba7d4f3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -155,7 +155,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp index 269d4222b..3d9a746b0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp @@ -102,7 +102,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp index eca71de5d..cfe14a6d1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp @@ -100,7 +100,7 @@ <%-- --%> - + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp index c8c8e5084..aff972f42 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp @@ -99,7 +99,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp index 6232a7630..4271e4598 100644 --- a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp @@ -136,7 +136,7 @@ --%> - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp index ea58abaea..53e327c26 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp @@ -152,7 +152,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp index ec6d86d06..d3c0e000d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp @@ -149,7 +149,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp index 1b0cc6419..e0d8381a8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp @@ -98,7 +98,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp index fef1e37fc..1f5ae62f3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp @@ -152,7 +152,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp index 4a15b2b1d..5dd3ca497 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp @@ -150,7 +150,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp index cbd09113d..30e1c587e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp @@ -107,7 +107,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp index d6c28f047..28d83fdc3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp @@ -159,7 +159,7 @@ - + @@ -338,8 +338,8 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp index b641f38d6..f4852604c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp @@ -159,7 +159,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp index 91b437d50..16e97b555 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp @@ -101,7 +101,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp index 33dfb3ea1..9dec4f315 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp @@ -159,7 +159,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp index e0bb7d55f..d3fdf547d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp @@ -109,7 +109,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp index 4efc5650c..151bf7ce0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp @@ -104,7 +104,7 @@ <%-- --%> - + diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp index b6d1f1cb8..c62827cd6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp @@ -156,7 +156,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp index 0c257815e..ed1f6f4e3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp @@ -136,7 +136,7 @@ - + @@ -359,7 +359,7 @@ ${fns:abbr(indexCfg.digest,20)} - + - + <%--
${indexCfg.rawLen }${indexCfg.rawLen }(B) ${indexCfg.cfdsLevel } --%> - + diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp index 567a1edf7..359dc6a31 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp @@ -133,7 +133,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp index 03542ce2c..cf28e930c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp @@ -145,7 +145,7 @@ --%> - + diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp index 7511846b3..54daeab07 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp @@ -85,7 +85,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp index 91d518f49..5fdf8455c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp @@ -100,7 +100,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp index 4c191ec6f..9e634473d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp @@ -133,7 +133,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp index b08572408..0386bc4d2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp @@ -138,7 +138,7 @@ --%> - + diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp index f379418b2..0a71c944a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp @@ -89,7 +89,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp index 6a192ddfc..78e07b957 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp @@ -90,7 +90,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp index 52933690c..90188fe15 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp @@ -90,7 +90,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp index 3412b2168..fbd5da063 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp @@ -89,7 +89,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp index c1bf8b7fd..a37de124a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp @@ -89,7 +89,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp index 5b6197b83..2bcca89a0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp @@ -139,7 +139,7 @@ --%> - + diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp index ed34092c1..a6ef80955 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp @@ -139,7 +139,7 @@ --%> - + diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp index 44f517280..cd8498592 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp @@ -324,7 +324,7 @@ --%> - + diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp index 4623b466d..0ef4498c8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp @@ -86,7 +86,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp index fe80e7827..1737b894b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp @@ -87,7 +87,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp index 38d574aac..ae5181b7b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp @@ -92,7 +92,7 @@
- +
@@ -304,7 +304,7 @@
${indexCfg.compileId } ${indexCfg.fileDesc } ${indexCfg.contentType }${indexCfg.contentLength }${indexCfg.contentLength }(B) diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp index 4be2a026d..89be6f1b9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp @@ -137,7 +137,7 @@ --%> - + diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp index f064da8c1..8c94a4e88 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp @@ -295,7 +295,7 @@ --%> - + diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp index aea2f55f3..37e0c04c6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp @@ -136,7 +136,7 @@ --%> - + diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp index 0639b44e4..5185501c6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp @@ -137,7 +137,7 @@ --%> - + diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp index e10b507ed..09b9a556d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp @@ -136,7 +136,7 @@ --%> - + diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index 116397fff..7adfa54ce 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -2,6 +2,7 @@ <%@ include file="/WEB-INF/include/taglib.jsp"%> +