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

http-url 界面调整

Browse Source
This commit is contained in:
leijun
2018-10-11 15:02:24 +08:00
parent 8cc18a96a7
commit 2dc6975467
3 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/nis/web/service/configuration/DomainService.java
View File

@@ -425,11 +425,12 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
}
public void saveDomainCfg(CfgIndexInfo entity){
if(entity.getAction()==128){
entity.setRequestId(0);
entity.setClassify("0");
entity.setAttribute("0");
entity.setLable("0");
entity.setIsAreaEffective(0);
entity.setCfgType("WHITE_LIST_DOMAIN");
if(entity.getHttpUrlList().size()>0){
for (int i = 0; i < entity.getHttpUrlList().size(); i++) {
entity.getHttpUrlList().get(i).setCfgType("WHITE_LIST_DOMAIN");
}
}
}
//设置区域运营商信息
setAreaEffectiveIds(entity);

14
src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
View File

@@ -16,7 +16,7 @@
$(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId"));
if($(this).val()!=128){
/* if($(this).val()!=128){
$("#http_url").removeClass("hidden");
$(".httpurlCfg").removeClass("hidden").removeClass("disabled");
$(".httpwhite").addClass("hidden").addClass("disabled");
@@ -24,7 +24,7 @@
$(".httpwhite").removeClass("hidden").removeClass("disabled");
$(".httpurlCfg").addClass("hidden").addClass("disabled");
$("#http_url").addClass("hidden");
}
} */
});
$("#serviceId").val($(".action:checked").attr("serviceId"));
$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -89,7 +89,7 @@
},
errorContainer : "#messageBox",
});
var actions=$("input[name='action']:checked").val();
/* var actions=$("input[name='action']:checked").val();
if(actions!=128){
$("#http_url").removeClass("hidden");
$(".httpurlCfg").removeClass("hidden").removeClass("disabled");
@@ -98,7 +98,7 @@
$(".httpwhite").removeClass("hidden").removeClass("disabled");
$(".httpurlCfg").addClass("hidden").addClass("disabled");
$("#http_url").addClass("hidden");
}
} */
});
//业务窗口打开
@@ -215,7 +215,7 @@
<c:set var="strCfgIndex" value="0"></c:set>
<c:set var="subscribeIdIndex" value="0"></c:set>
<c:forEach items="${regionList}" var="region" varStatus="status">
<c:if test="${region.configRegionValue eq 'WHITE_LIST_DOMAIN' }">
<%-- <c:if test="${region.configRegionValue eq 'WHITE_LIST_DOMAIN' }">
<div class="httpwhite">
<c:set var="tabName" value="httpUrlTab"></c:set>
<c:forEach items="${_cfg.httpUrlList}" var="cfg"
@@ -238,7 +238,7 @@
</div>
</c:forEach>
</div>
</c:if>
</c:if> --%>
<c:if test="${region.configRegionValue eq _cfg.httpUrl.cfgType }">
<div class="httpurlCfg">
@@ -304,10 +304,8 @@
</c:if> --%>
</c:forEach>
<br>
<div id="http_url">
<%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
</div>
<div class="form-actions">
<div class="row">
<div class="col-md-6">

7
src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
View File

@@ -114,7 +114,7 @@
</c:if>
<c:if test="${(region[0] eq 2) && (fn:length(_cfg.httpUrlList) >0)}">
<c:forEach items="${_cfg.httpUrlList}" var="cfg">
<c:if test="${'WHITE_LIST_DOMAIN' eq cfg.cfgType }">
<%-- <c:if test="${'WHITE_LIST_DOMAIN' eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
@@ -123,9 +123,7 @@
</div>
</div>
</div>
</c:if>
<c:if test="${'NTC_HTTP_URL' eq cfg.cfgType }">
</c:if> --%>
<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
<div class="row">
<div class="col-md-8">
@@ -226,7 +224,6 @@
</div>
</c:if>
</div>
</c:if>
</c:forEach>
</c:if>
<c:if test="${(region[0] eq 2) && (fn:length(_cfg.ntcSubscribeIdCfgList) >0)}">