gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.解决APP策略SubscribeId修改问题 2.APP特征dolog为0

Browse Source
This commit is contained in:
zhangwenqing
2018-08-24 12:15:19 +08:00
parent 0ea0db2369
commit 85e813a5d7
10 changed files with 35 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/domain/configuration/AppPolicyCfg.java
View File

@@ -69,17 +69,17 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
@Expose @Expose
@ExcelField(title="expression_type") @ExcelField(title="expression_type")
@SerializedName("exprType") @SerializedName("exprType")
private Integer exprType ; protected Integer exprType ;
@Expose @Expose
@ExcelField(title="match_method") @ExcelField(title="match_method")
@SerializedName("matchMethod") @SerializedName("matchMethod")
private Integer matchMethod ; protected Integer matchMethod ;
@Expose @Expose
@ExcelField(title="whether_hexbinary") @ExcelField(title="whether_hexbinary")
@SerializedName("isHexbin") @SerializedName("isHexbin")
private Integer isHexbin; protected Integer isHexbin;
private List<IpPortCfg> ipPortList; private List<IpPortCfg> ipPortList;
private IpPortCfg ipPort; private IpPortCfg ipPort;

1
src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
View File

@@ -246,6 +246,7 @@ public class FileTransferCfgController extends BaseController{
fileMap.put("checksum", md5); fileMap.put("checksum", md5);
result = ConfigServiceUtil.getFileDigest(null, uploadFile, JsonMapper.toJsonString(fileMap)); result = ConfigServiceUtil.getFileDigest(null, uploadFile, JsonMapper.toJsonString(fileMap));
if((result.getData().getRawLen() == null) || (result.getData().getDigest() == null)) { if((result.getData().getRawLen() == null) || (result.getData().getDigest() == null)) {
logger.info("文件摘要信息获取有误！");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+null); throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+null);
} }
logger.info("获取文件摘要响应信息："+result); logger.info("获取文件摘要响应信息："+result);

4
src/main/java/com/nis/web/service/configuration/AppCfgService.java
View File

@@ -238,7 +238,7 @@ public class AppCfgService extends BaseService {
for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){ for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){
if(StringUtils.isNotBlank(cfg.getCfgKeywords())){ if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
entity.setCfgKeywords(cfg.getCfgKeywords()); entity.setCfgKeywords(cfg.getCfgKeywords());
BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"}); BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType","exprType","matchMethod","isHexbin"});
stringcfgDao.saveSubscribeIdCfg(cfg); stringcfgDao.saveSubscribeIdCfg(cfg);
} }
} }
@@ -1410,7 +1410,7 @@ public class AppCfgService extends BaseService {
if(entity.getNtcSubscribeIdCfgList()!=null&&entity.getNtcSubscribeIdCfgList().size()>0){ if(entity.getNtcSubscribeIdCfgList()!=null&&entity.getNtcSubscribeIdCfgList().size()>0){
NtcSubscribeIdCfg ntcSubscribeIdCfg = new NtcSubscribeIdCfg(); NtcSubscribeIdCfg ntcSubscribeIdCfg = new NtcSubscribeIdCfg();
BeanUtils.copyProperties(entity, ntcSubscribeIdCfg, new String[]{"cfgId"}); BeanUtils.copyProperties(entity, ntcSubscribeIdCfg, new String[]{"cfgId"});
stringcfgDao.deleteSubscribeIdCfg(ntcSubscribeIdCfg); stringcfgDao.updateSubscribeIdCfg(ntcSubscribeIdCfg);
} }
//保存区域IP信息 //保存区域IP信息
if(entity.getAreaCfg()!=null && entity.getAreaCfg().size()>0){ if(entity.getAreaCfg()!=null && entity.getAreaCfg().size()>0){

17
src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
View File

@@ -142,22 +142,13 @@ $(function(){
<div for="bytes"></div> <div for="bytes"></div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6 hidden">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label> <label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict"> <c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:choose> <c:if test="${dict.itemCode eq 0}">
<c:when test="${dict.itemCode eq _cfg.doLog}"> <input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
<label class="radio-inline"> </c:if>
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach> </c:forEach>
</div> </div>
</div> </div>

17
src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
View File

@@ -142,22 +142,13 @@ $(function(){
<div for="domain"></div> <div for="domain"></div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6 hidden">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label> <label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict"> <c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:choose> <c:if test="${dict.itemCode eq 0}">
<c:when test="${dict.itemCode eq _cfg.doLog}"> <input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
<label class="radio-inline"> </c:if>
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach> </c:forEach>
</div> </div>
</div> </div>

17
src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
View File

@@ -171,22 +171,13 @@ $(function(){
</div> </div>
</c:if> </c:if>
<!-- doLog --> <!-- doLog -->
<div class="col-md-6"> <div class="col-md-6 hidden">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label> <label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict"> <c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:choose> <c:if test="${dict.itemCode eq 0}">
<c:when test="${dict.itemCode eq _cfg.doLog}"> <input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
<label class="radio-inline"> </c:if>
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach> </c:forEach>
</div> </div>
</div> </div>

17
src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
View File

@@ -170,22 +170,13 @@ $(function(){
</div> </div>
</div> </div>
</c:if> </c:if>
<div class="col-md-6"> <div class="col-md-6 hidden">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label> <label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict"> <c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:choose> <c:if test="${dict.itemCode eq 0}">
<c:when test="${dict.itemCode eq _cfg.doLog}"> <input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
<label class="radio-inline"> </c:if>
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach> </c:forEach>
</div> </div>
</div> </div>

17
src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
View File

@@ -185,23 +185,14 @@ $(function(){
</div> </div>
</div> </div>
<!-- doLog --> <!-- doLog -->
<div class="row"> <div class="row hidden">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label> <label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict"> <c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:choose> <c:if test="${dict.itemCode eq 0}">
<c:when test="${dict.itemCode eq _cfg.doLog}"> <input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
<label class="radio-inline"> </c:if>
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach> </c:forEach>
</div> </div>
</div> </div>

9
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
View File

@@ -155,7 +155,8 @@ var delContent = function(contentClassName, addBtnClassName) {
</script> </script>
</head> </head>
<body> <body>
<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<div class="page-content"> <div class="page-content">
<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict"> <c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if> <c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
@@ -180,11 +181,7 @@ var delContent = function(contentClassName, addBtnClassName) {
<input type="hidden" name="compileId" value="${_cfg.compileId}"> <input type="hidden" name="compileId" value="${_cfg.compileId}">
<input type="hidden" name="functionId" value="${_cfg.functionId}"> <input type="hidden" name="functionId" value="${_cfg.functionId}">
<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}"> <input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
<%-- <input type="hidden" id="appCode" name="appCode" value="${_cfg.appCode}"> --%>
<%-- <input type="hidden" id="behavCode" name="behavCode" value="${_cfg.behavCode}"> --%>
<input type="hidden" id="exprType" name="exprType" value="0">
<input type="hidden" id="matchMethod" name="matchMethod" value="0">
<input type="hidden" id="isHexbin" name="isHexbin" value="0">
<div class="form-body"> <div class="form-body">
<!-- desc and action --> <!-- desc and action -->

9
src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
View File

@@ -170,11 +170,14 @@ $(function(){
</div> </div>
</c:if> </c:if>
<!-- doLog --> <!-- doLog -->
<div class="col-md-6"> <div class="col-md-6 hidden">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label> <label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict"> <c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:choose> <c:if test="${dict.itemCode eq 0}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
<%-- <c:choose>
<c:when test="${dict.itemCode eq _cfg.doLog}"> <c:when test="${dict.itemCode eq _cfg.doLog}">
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/> <input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
@@ -185,7 +188,7 @@ $(function(){
<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/> <input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label> </label>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose> --%>
</c:forEach> </c:forEach>
</div> </div>
</div> </div>