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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source 
Conflicts:
	src/main/resources/messages/message_en.properties
修改国际化文件；
修改dns和account的匹配方式为多种匹配方式
app和asn的监测配置都默认为记录全日志
样例的level修改时未展示正确的level值
This commit is contained in:
duandongmei
2018-09-17 15:36:06 +08:00
parent 26856ab612 fe68f75c1b
commit a7c617cd2b
13 changed files with 58 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp
View File

@@ -234,25 +234,28 @@ $(function(){
<div for="action"></div>
</div>
</div>
<div class="col-md-6" hidden="true">
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doLog}">
<label class="radio-inline">
<input type="radio" name="doLog" checked value="0" ><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:if test="${dict.itemCode eq 1}">
<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}">
<label class="radio-inline">
<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>
</div>
</div>
</div>
<!-- WEBSITE -->
<div class="col-md-6">
<div class="form-group">