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

(1)修改function_service_dict region_code字段为varchar,支持多个code

Browse Source 
(2)http,ssl,邮件IP调整
This commit is contained in:
wangxin
2018-08-21 02:25:03 +08:00
parent 23f2910e7c
commit 557be23566
14 changed files with 169 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,6 +62,7 @@ $(function(){
portPattern="${region.configPortPattern}"
direction="${region.configDirection}"
protocol="${region.configProtocol}"
regionType="${region.regionType}"
value="${region.configRegionCode}">
</c:if>
</c:forEach>

1
src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp
View File

@@ -61,6 +61,7 @@ $(function(){
portPattern="${region.configPortPattern}"
direction="${region.configDirection}"
protocol="${region.configProtocol}"
regionType="${region.regionType}"
value="${region.configRegionCode}">
</c:if>
</c:forEach>

1
src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp
View File

@@ -61,6 +61,7 @@ $(function(){
portPattern="${region.configPortPattern}"
direction="${region.configDirection}"
protocol="${region.configProtocol}"
regionType="${region.regionType}"
value="${region.configRegionCode}">
</c:if>
</c:forEach>

1
src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
View File

@@ -82,6 +82,7 @@ $(function(){
portPattern="${region.configPortPattern}"
direction="${region.configDirection}"
protocol="${region.configProtocol}"
regionType="${region.regionType}"
value="${region.configRegionCode}">
</c:forEach>
<div class="form-body">

13
src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
View File

@@ -4,7 +4,6 @@
<head>
<title></title>
<script type="text/javascript">
</script>
</head>
<%-- <c:forEach items="${regionList}" var="regionDistrict">
@@ -12,7 +11,17 @@
test="${ipPort.functionId eq regionDistrict.functionId and regionDistrict.regionType eq 1}"> --%>
<!-- regionDistrict.regionType==1表示IP类配置 -->
<input type="hidden" name="${cfgName}.cfgType" value="${region.configRegionValue }">
<input type="hidden" name="${cfgName}.cfgRegionCode" value="${region.configRegionCode }">
<input type="hidden" name="${cfgName}.cfgRegionCode"
isMaat="${region.isMaat}"
serviceType="${region.configServiceType}"
ipPortShow="${region.configIpPortShow}"
ipType="${region.configIpType}"
ipPattern="${region.configIpPattern}"
portPattern="${region.configPortPattern}"
direction="${region.configDirection}"
protocol="${region.configProtocol}"
regionType="${region.regionType}"
value="${region.configRegionCode }">
<%-- </c:if>
</c:forEach> --%>
<input type="hidden" name="${cfgName}.protocolId" id="protocolId" value="">

6
src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
View File

@@ -13,13 +13,14 @@
$(document)
.ready(
function() {
$("#cancel").on("click", function() {
initCommIpVal();
/* $("#cancel").on("click", function() {
window.history.back();
});
$(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId"));
});
}); */
$("#fileInfo").on('click',function(){
$("#file").trigger("click");
});
@@ -180,6 +181,7 @@
<input type="radio" name="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
regionCode="${service.regionCode }"
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">

16
src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
View File

@@ -13,13 +13,14 @@
$(document)
.ready(
function() {
$("#cancel").on("click", function() {
window.history.back();
});
$(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId"));
});
initCommIpVal();
//$("#cancel").on("click", function() {
// window.history.back();
//});
//$(".action").on("change", function() {
// $("#serviceId").val($(this).attr("serviceId"));
// $("#protocolId").val($(this).attr("protocolId"));
//});
$("#serviceId").val($(".action:checked").attr("serviceId"));
$("#protocolId").val($(".action:checked").attr("protocolId"));
if($("#cfgId").val()!=""){
@@ -241,6 +242,7 @@
<input type="radio" name="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
regionCode="${service.regionCode }"
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">

6
src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
View File

@@ -13,13 +13,14 @@
$(document)
.ready(
function() {
$("#cancel").on("click", function() {
initCommIpVal();
/* $("#cancel").on("click", function() {
window.history.back();
});
$(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId"));
});
}); */
$("#serviceId").val($(".action:checked").attr("serviceId"));
$("#protocolId").val($(".action:checked").attr("protocolId"));
$("#cfgFrom").validate(
@@ -174,6 +175,7 @@
<input type="radio" name="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
regionCode="${service.regionCode }"
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">

1
src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
View File

@@ -69,6 +69,7 @@ $(function(){
portPattern="${region.configPortPattern}"
direction="${region.configDirection}"
protocol="${region.configProtocol}"
regionType="${region.regionType}"
value="${region.configRegionCode}">
</c:if>
</c:forEach>