From 049b2aa893f8ec371d99652b0ba2329244d93b0c Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Tue, 21 Aug 2018 10:25:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=AF=E5=90=A6=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=97=A5=E5=BF=97=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/util/Constants.java     |  2 +-
 src/main/resources/nis.properties             |  2 +-
 .../views/cfg/av/voip/voipAccountForm.jsp     | 20 +-----------------
 .../WEB-INF/views/cfg/av/voip/voipForm.jsp    | 21 ++-----------------
 4 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java
index 1d2ad842e..f419468d4 100644
--- a/src/main/java/com/nis/util/Constants.java
+++ b/src/main/java/com/nis/util/Constants.java
@@ -11,7 +11,7 @@ public final class Constants {
 	/**
 	 * 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_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);
diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties
index 8fd656a92..4b2166588 100644
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -450,7 +450,7 @@ ipv6_default_ip_range_value=::-::
 port_default=0
 port_mask_default=0/65535
 #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_configpercent_default=100
 maat_cfg_dolog_configoption_default=1
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp
index c96a01fc0..b381fd030 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp
@@ -196,10 +196,8 @@
 										<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:if test="${empty _cfg.cfgId}">
 														<c:choose>
-															<c:when test="${dict.itemValue eq 'framework_log'}">
+															<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>
@@ -210,22 +208,6 @@
 																</label>
 															</c:otherwise>
 														</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>
 										</div>
 									</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
index ebe38004c..6582ddbc7 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
@@ -199,10 +199,8 @@
 										<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:if test="${empty _cfg.cfgId}">
 														<c:choose>
-															<c:when test="${dict.itemValue eq 'framework_log'}">
+															<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>
@@ -213,22 +211,7 @@
 																</label>
 															</c:otherwise>
 														</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>
 										</div>
 									</div>