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

Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

Browse Source
This commit is contained in:
duandongmei
2019-01-10 13:32:54 +06:00
parent 2706901ea2 95a867a1b4
commit 00140e3c0d
21 changed files with 735 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/webapp/WEB-INF/include/excel/importModal.jsp
View File

@@ -95,10 +95,12 @@
<div for="action"></div>
</div>
<!-- 600 asn ip、 3：IP白名单、 405：APP协议IP、 403：APP域名特征、 563 APP Payload、 565 APP HTTP、 564 APP DNS、 566 APP SSL -->
<c:if test="${(cfg.functionId eq 600) || (cfg.functionId eq 3) || (cfg.functionId eq 405) || (cfg.functionId eq 403) || (cfg.functionId eq 563) || (cfg.functionId eq 565) || (cfg.functionId eq 564) || (cfg.functionId eq 566) }">
<c:if test="${(cfg.functionId eq 600) || (cfg.functionId eq 3) || (cfg.functionId eq 405) || (cfg.functionId eq 403) || (cfg.functionId eq 563) || (cfg.functionId eq 565) || (cfg.functionId eq 564) || (cfg.functionId eq 566) ||
(cfg.functionId eq 560) }">
<div class="row hidden requestIdSel">
</c:if>
<c:if test="${(cfg.functionId ne 600) && (cfg.functionId ne 3) && (cfg.functionId ne 405) && (cfg.functionId ne 403) && (cfg.functionId ne 563) && (cfg.functionId ne 565) && (cfg.functionId ne 564) && (cfg.functionId ne 566)}">
<c:if test="${(cfg.functionId ne 600) && (cfg.functionId ne 3) && (cfg.functionId ne 405) && (cfg.functionId ne 403) && (cfg.functionId ne 563) && (cfg.functionId ne 565) && (cfg.functionId ne 564) && (cfg.functionId ne 566) &&
(cfg.functionId ne 560) }">
<div class="row requestIdSel">
</c:if>
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="letter"/></label>

26
src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
View File

@@ -56,7 +56,25 @@
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/app/topicDomainCfgForm?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
<spring:message code="add"></spring:message></button>
<c:set var="serviceImport" value="false"></c:set>
<c:set var="regionImport" value="false"></c:set>
<c:forEach items="${serviceList}" var="service" >
<c:if test="${(cfg.functionId eq service.functionId) && service.isImport eq 1}">
<c:set var="serviceImport" value="true"></c:set>
</c:if>
</c:forEach>
<c:forEach items="${regionList}" var="region" >
<c:if test="${(cfg.functionId eq region.functionId) && region.isImport eq 1}">
<c:set var="regionImport" value="true"></c:set>
</c:if>
</c:forEach>
<c:if test="${serviceImport eq 'true' && regionImport eq 'true'}">
<button type="button" class="btn btn-primary import" >
<i class="fa fa-plus"></i>
<spring:message code="import"></spring:message></button>
</c:if>
</shiro:hasPermission>
</div>
@@ -476,7 +494,9 @@
</div>
</div>
</div>
</div>
</div>
<c:set var="importPath" value="/app/topicDomainCfgList?functionId=${cfg.functionId}"/>
<!-- 模板导入，start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
</body>
</html>

4
src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
View File

@@ -286,7 +286,7 @@
<div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code='Web'/>：</label>
<label class="control-label"><spring:message code="domain_name"/>：</label>
<select id="webSelect" name="webId" title="<spring:message code="select"/>" class="selectpicker form-control" data-max-options="10" data-selected-text-format="count > 3" multiple data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
<c:forEach items="${webList}" var="web" >
<option value="${web.code}"><spring:message code="${web.item}"></spring:message></option>
@@ -360,7 +360,7 @@
<th class="sort-column app_id" column="APP">APP</th>
<th class="sort-column proto_id" column="application_layer_protocol"><spring:message code="application_layer_protocol"/></th>
<th class="sort-column web_id" column="Web"><spring:message code="domain_name"/></th>
<th class="sort-column web_id" column="domain_name"><spring:message code="domain_name"/></th>
<th class="sort-column cap_ip" column="clj_ip"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto" column="transport_layer_protocol" isVisible="false"><spring:message code="transport_layer_protocol"/></th>

3
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
View File

@@ -84,6 +84,7 @@
config_sync_tip:"The system is being maintained and temporarily inaccessible.",
ipMaskSole:"IP already exists.",
noStrategyCheck:"No effective spoofing IP configuration",
keywordLength:"Please enter a value between 4 and 1024 characters long."
keywordLength:"Please enter a value between 4 and 1024 characters long.",
arbitrary:"Arbitrarily"
});
}(jQuery));

3
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
View File

@@ -84,6 +84,7 @@
config_sync_tip:"Система находится под техническим обслуживанием и временно недоступна.",
ipMaskSole:"IP уже существует.",
noStrategyCheck:"No effective spoofing IP configuration",
keywordLength:"Введите между 4 и 1024 символов длинной."
keywordLength:"Введите между 4 и 1024 символов длинной.",
arbitrary:"Любой"
});
}(jQuery));

3
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
View File

@@ -84,6 +84,7 @@
config_sync_tip:"系统正在维护中，暂时不可访问！",
ipMaskSole:"IP已存在",
noStrategyCheck:"策略组下无有效的欺骗IP配置",
keywordLength:"请输入一个长度介于4 和1024 之间的字符串"
keywordLength:"请输入一个长度介于4 和1024 之间的字符串",
arbitrary:"任意"
});
}(jQuery));