多媒体、国家代理do_log调整

framework_log国际化改为c_log

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

@@ -228,6 +228,7 @@ $(function(){
 									</div>
 								</div>
 							</div>
+							
 							<div class="row hidden">
 								    <div class="col-md-6">
 								        <div class="form-group">
@@ -237,10 +238,11 @@ $(function(){
 													varStatus="satus">
 													<label class="radio-inline"> <c:if
 															test="${_cfg.functionId eq service.functionId}">
-															<input type="radio" name="action"
+															<input type="radio" name="action"  class="action"
 																serviceId="${service.serviceId }"
 																protocolId="${service.protocolId }"
 																regionCode="${service.regionCode}"
+																configDolog="${service.configDoLog }"
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">

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

@@ -216,9 +216,10 @@ $(function(){
 															varStatus="satus">
 															<label class="radio-inline"> <c:if
 																	test="${_cfg.functionId eq service.functionId}">
-																	<input type="radio" name="action"
+																	<input type="radio" name="action"  class="action"
 																		serviceId="${service.serviceId }"
 																		protocolId="${service.protocolId }"
+																		configDolog="${service.configDoLog }"
 																		value="${service.action }" class="required action"
 																		<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 																		<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">

src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp

@@ -390,7 +390,7 @@
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-											<c:if test="${dict.itemCode eq cfg.doLog }">
+											<c:if test="${dict.itemCode eq cfg.doLog  and cfg.action!=64 }">
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp

@@ -209,9 +209,10 @@
 													varStatus="satus">
 													<label class="radio-inline"> <c:if
 															test="${_cfg.functionId eq service.functionId}">
-															<input type="radio" name="action"
+															<input type="radio" name="action"  class="action"
 																serviceId="${service.serviceId }"
 																protocolId="${service.protocolId }"
+																configDolog="${service.configDoLog }"
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 															<c:forEach items="${fns:getDictList('SERVICE_ACTION') }"
@@ -274,27 +275,31 @@
 								    </div>
 
 								</div>
-								<%-- <div class="row">
-									<div class="col-md-6"  hidden="true" >
+									<!-- dolog begin-->
+								
+								<div class="row doLog">
+									<div class="col-md-6 " hidden="true" >
 										<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="0" ><spring:message code="${dict.itemValue}"/>
-														</label>
-													</c:otherwise>
-												</c:choose>
+													<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> --%>
+								</div>
+								
+								<!-- dolog end-->
 								<!-- subscribeId配置 -->
 								<c:set var="subscribeIdCfgIndex" value="0"></c:set>
 								<c:forEach items="${regionList}" var="region" varStatus="status">

src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp

@@ -507,7 +507,7 @@
 													varStatus="satus">
 													<label class="radio-inline"> <c:if
 															test="${_cfg.functionId eq service.functionId}">
-															<input type="radio" name="action"
+															<input type="radio" name="action"   class="action"
 																serviceId="${service.serviceId }"
 																protocolId="${service.protocolId }"
 																configDoLog="${service.configDoLog }"

src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp

@@ -626,7 +626,7 @@
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-											<c:if test="${dict.itemCode eq indexCfg.doLog }">
+											<c:if test="${dict.itemCode eq indexCfg.doLog   and indexCfg.action!=64 }">
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>

src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp

@@ -146,9 +146,10 @@ $(function(){
 																		varStatus="satus">
 																		<label class="radio-inline"> <c:if
 																				test="${_cfg.functionId eq service.functionId}">
-																				<input type="radio" name="action"
+																				<input type="radio" name="action"   class="action"
 																					serviceId="${service.serviceId }"
 																					protocolId="${service.protocolId }"
+																					configDolog="${service.configDoLog }"
 																					value="${service.action }" class="required action"
 																					<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -164,6 +165,31 @@ $(function(){
 								       </div>
 								   </div>
 								</div>
+								
+							  <!-- dolog begin-->
+									<!-- <div class="row doLog"> -->
+										<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="${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> -->
+									<!-- dolog end-->
+								
 								<div class="row">
 								    <div class="col-md-6">
 								        <div class="form-group">

src/main/webapp/WEB-INF/views/cfg/proxy/cache/form.jsp

@@ -362,10 +362,11 @@
 													varStatus="satus">
 													<label class="radio-inline"> <c:if
 															test="${_cfg.functionId eq service.functionId}">
-															<input type="radio" name="action"
+															<input type="radio" name="action" class="action"
 																serviceId="${service.serviceId }"
 																protocolId="${service.protocolId }"
 																regionCode="${service.regionCode }"
+																configDolog="${service.configDoLog }"
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 																<spring:message code="${service.actionCode }"/>
@@ -384,7 +385,7 @@
 									</div>
 								</div>
 								<!-- 记录日志begin -->
-								<%-- <div class="row">
+								<div class="row doLog">
 									<div class="col-md-6">
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
@@ -404,7 +405,7 @@
 											</c:forEach>
 										</div>
 									</div>
-								</div> --%>
+								</div>
 								<!-- 记录日志end -->
 								<h4 class="form-section cacheAction">
 									<spring:message code="action_region" />

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp

@@ -171,9 +171,10 @@
 													<label class="radio-inline"> <c:if
 															test="${_cfg.functionId eq service.functionId}">
 															<input type="radio" name="action"
-																serviceId="${service.serviceId }"
+																serviceId="${service.serviceId }"  class="action"
 																protocolId="${service.protocolId }"
 																regionCode="${service.regionCode }"
+																configDolog="${service.configDoLog }"
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -198,7 +199,7 @@
 										<c:set var="doLog" value="${_cfg.doLog }"/>
 									</c:if>
 									<!-- 记录日志begin -->
-									<div class="row">
+									<div class="row doLog">
 										<div class="col-md-6">
 											<div class="form-group">
 												<label class="control-label col-md-3"><spring:message code="do_log" /></label>

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp

@@ -695,7 +695,7 @@
 									<c:if test="${action ne 128}">
 										<td>
 											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-												<c:if test="${dict.itemCode eq indexCfg.doLog }">
+												<c:if test="${dict.itemCode eq indexCfg.doLog   and indexCfg.action!=64 }">
 													<spring:message code="${dict.itemValue }"/>
 												</c:if>
 											</c:forEach>