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

修改配置中记录日志默认值为2，流媒体跟VoIP，缓存策略，拦截策略默认为1，修改httpclient gson转换时错误

Browse Source
This commit is contained in:
zhanghongqing
2018-11-23 19:23:57 +08:00
parent c1ee4468d4
commit 966bf52b36
19 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,7 +143,7 @@ $(function(){
<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="${dict.itemCode eq 1}">
<c:if test="${dict.itemCode eq 2}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>

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

@@ -143,7 +143,7 @@ $(function(){
<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="${dict.itemCode eq 1}">
<c:if test="${dict.itemCode eq 2}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>

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

@@ -176,7 +176,7 @@ $(function(){
<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="${dict.itemCode eq 1}">
<c:if test="${dict.itemCode eq 2}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>

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

@@ -174,7 +174,7 @@ $(function(){
<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="${dict.itemCode eq 1}">
<c:if test="${dict.itemCode eq 2}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>

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

@@ -221,7 +221,7 @@ $(function(){
<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="${dict.itemCode eq 1}">
<c:if test="${dict.itemCode eq 2}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>

2
src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp
View File

@@ -125,7 +125,7 @@ var delContent = function(contentClassName, addBtnClassName) {
<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="doLog" name="doLog" value="1">
<input type="hidden" id="doLog" name="doLog" value="2">
<!-- 配置域类型 -->
<div class="form-body">
<div class="row">

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

@@ -175,7 +175,7 @@ $(function(){
<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="${dict.itemCode eq 1}">
<c:if test="${dict.itemCode eq 2}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
<%-- <c:choose>

2
src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
View File

@@ -163,7 +163,7 @@ $(function(){
<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="${dict.itemCode eq 1}">
<c:if test="${dict.itemCode eq 2}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
<%-- <c:choose>

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

@@ -238,7 +238,7 @@ $(function(){
<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="${dict.itemCode eq 1}">
<c:if test="${dict.itemCode eq 2}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
<%-- <c:choose>

3
src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
View File

@@ -13,6 +13,9 @@
$(document)
.ready(
function() {
if($("input[name='compileId']").val()==null||$("input[name='compileId']").val()==''){
$("input[name=doLog][value=1]").prop("checked",true);
}
/* $(".glyphicon-plus").first().click(); */
/* $("#cancel").on("click", function() {
window.history.back();

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

@@ -13,6 +13,9 @@
$(document)
.ready(
function() {
if($("input[name='compileId']").val()==null||$("input[name='compileId']").val()==''){
$("input[name=doLog][value=1]").prop("checked",true);
}
$(".glyphicon-plus").first().click();
/* $("#cancel").on("click", function() {
window.history.back();

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

@@ -13,6 +13,9 @@
$(document)
.ready(
function() {
if($("input[name='compileId']").val()==null||$("input[name='compileId']").val()==''){
$("input[name=doLog][value=1]").prop("checked",true);
}
$(".action").on("change", function() {
switchAction($("input[name=action]:checked").val());
//拦截根据action切换动作部分
@@ -454,7 +457,7 @@
</div>
</div>
<!-- dolog begin-->
<div class="row interceptDoLog hidden">
<div class="row interceptDoLog">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>

9
src/main/webapp/WEB-INF/views/cfg/proxy/cache/form.jsp vendored
View File

@@ -13,6 +13,9 @@
$(document)
.ready(
function() {
if($("input[name='compileId']").val()==null||$("input[name='compileId']").val()==''){
$("input[name=doLog][value=1]").prop("checked",true);
}
$(".switch").bootstrapSwitch({
/* onText:"<spring:message code='ON'/>",
offText:"<spring:message code='OFF'/>", */
@@ -78,11 +81,11 @@
$("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId"));
if($(this).val()==128){
$("#doLog").val(0);
$("input:radio[name='doLog']").attr("disabled",true);
// $("#doLog").val(0);
// $("input:radio[name='doLog']").attr("disabled",true);
$(".cacheAction").hide();
}else{
$("input:radio[name='doLog']").attr("disabled",false);
// $("input:radio[name='doLog']").attr("disabled",false);
$(".cacheAction").show();
}
});

1
src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
View File

@@ -48,6 +48,7 @@
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction}"/>
<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<div class="pull-left">

4
src/main/webapp/static/global/scripts/common.js
View File

@@ -864,7 +864,7 @@ var switchAction=function(action){
/*************************action切换时，隐藏白名单和drop的是否记录日志*****************************/
//drop whitelist
if(action == 32 || action==128 || action==96){
/* if(action == 32 || action==128 || action==96){
$(".doLog").addClass("hidden");
$("input[name=doLog][value=0]").prop("checked",true);
$(".interceptDoLog").find("input[name=doLog][value=0]").prop("checked",true);
@@ -890,7 +890,7 @@ var switchAction=function(action){
}
if(action !=128 && action !=32 &&action !=96){
$(".doLog").removeClass("hidden");
}
}*/
}
//ipType、ipPattern、portPattern选项变化时调用此方法，添加默认值
var switchIpInfo=function(obj){