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

修改是否记录日志默认值

Browse Source
This commit is contained in:
zhanghongqing
2018-08-21 10:25:23 +08:00
parent 0b6aaa3f9e
commit 049b2aa893
4 changed files with 5 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/util/Constants.java
View File

@@ -11,7 +11,7 @@ public final class Constants {
/** /**
* MaatConfig 默认值 * MaatConfig 默认值
*/ */
public static Integer MAAT_CFG_DOLOG_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_default", 1); public static Integer MAAT_CFG_DOLOG_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_default", 2);
public static Integer MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_doblacklist_default", 1); public static Integer MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_doblacklist_default", 1);
public static Integer MAAT_CFG_DOLOG_CONFIGPERCENT_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_configpercent_default", 100); public static Integer MAAT_CFG_DOLOG_CONFIGPERCENT_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_configpercent_default", 100);
public static Integer MAAT_CFG_DOLOG_CONFIGOPTION_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_configoption_default", 1); public static Integer MAAT_CFG_DOLOG_CONFIGOPTION_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_configoption_default", 1);

2
src/main/resources/nis.properties
View File

@@ -450,7 +450,7 @@ ipv6_default_ip_range_value=::-::
port_default=0 port_default=0
port_mask_default=0/65535 port_mask_default=0/65535
#MAAT CFG \u4e00\u4e9b\u9ed8\u8ba4\u503c #MAAT CFG \u4e00\u4e9b\u9ed8\u8ba4\u503c
maat_cfg_dolog_default=1 maat_cfg_dolog_default=2
maat_cfg_dolog_doblacklist_default=1 maat_cfg_dolog_doblacklist_default=1
maat_cfg_dolog_configpercent_default=100 maat_cfg_dolog_configpercent_default=100
maat_cfg_dolog_configoption_default=1 maat_cfg_dolog_configoption_default=1

20
src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp
View File

@@ -196,10 +196,8 @@
<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:if test="${empty _cfg.cfgId}">
<c:choose> <c:choose>
<c:when test="${dict.itemValue eq 'framework_log'}"> <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}"/>
</label> </label>
@@ -210,22 +208,6 @@
</label> </label>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</c:if>
<!-- 修改 -->
<c:if test="${!empty _cfg.cfgId}">
<c:choose>
<c:when test="${dict.itemCode == _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:if>
</c:forEach> </c:forEach>
</div> </div>
</div> </div>

21
src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
View File

@@ -199,10 +199,8 @@
<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:if test="${empty _cfg.cfgId}">
<c:choose> <c:choose>
<c:when test="${dict.itemValue eq 'framework_log'}"> <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}"/>
</label> </label>
@@ -213,22 +211,7 @@
</label> </label>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</c:if>
<!-- 修改 -->
<c:if test="${!empty _cfg.cfgId}">
<c:choose>
<c:when test="${dict.itemCode == _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:if>
</c:forEach> </c:forEach>
</div> </div>
</div> </div>