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:
tanghao
2019-01-10 17:51:21 +08:00
parent 8fadfd8254 f9a39c7801
commit f04fb1090c
7 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/service/configuration/AppCfgService.java
View File

@@ -1021,8 +1021,8 @@ public class AppCfgService extends BaseService {
userRegion+=Constants.USER_REGION_SPLIT +Constants.INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY+"="+entity.getUserRegion3();
}
}
//VIGNORE=1
if(StringUtil.isEmpty(entity.getUserRegion4())){
//DKC=8
if(!StringUtil.isEmpty(entity.getUserRegion4())){
userRegion+=Constants.USER_REGION_SPLIT +Constants.APP_VIGNORE_USER_REGION_KEY+"=1";
}
userRegion+=Constants.USER_REGION_SPLIT+"config_id="+entity.getCompileId();

2
src/main/resources/messages/message_en.properties
View File

@@ -1312,7 +1312,7 @@ dns_sub=DNS Security
action_cache=Cache
action_cache_whitelist=Cache Bypass
crl_issuer_null=Issuer of CRL file is empty
block_by_app_server_ip=Block by application server ip
block_by_app_server_ip=DNS Spoofing
certificate_file=Certificate File
crl_file=Crl File
vpn_ip=VPN Server IP

2
src/main/resources/messages/message_ru.properties
View File

@@ -1323,7 +1323,7 @@ address_pool_id=ID \u043f\u0443\u043b \u0430\u0434\u0440\u0435\u0441\u043e\u0432
outgoing_unicast_total_size=\u0417\u0430\u043a\u0430\u0447\u0430\u0442\u044c \u0431\u0430\u0439\u0442\u044b
voip_sample_reject=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043e\u0431\u0440\u0430\u0437\u0446\u043e\u0432 VOIP \u0430\u0443\u0434\u0438\u043e
available_ip=\u0414\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0439 IP
block_by_app_server_ip=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u0432 IP \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439
block_by_app_server_ip=DNS Spoofing
certificate_file=\u0424\u0430\u0439\u043b \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430
address_pool=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043f\u0443\u043b\u0430 \u0430\u0434\u0440\u0435\u0441\u043e\u0432
transfer_bytes=\u041f\u0435\u0440\u0435\u0434\u0430\u0447\u0430 \u0431\u0430\u0439\u0442\u043e\u0432

2
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1310,7 +1310,7 @@ dns_sub=DNS\u5b89\u5168\u673a\u5236
action_cache=\u7f13\u5b58
action_cache_whitelist=\u7f13\u5b58\u767d\u540d\u5355
crl_issuer_null=CRL\u6587\u4ef6\u7684\u9881\u53d1\u8005\u4e3a\u7a7a
block_by_app_server_ip=Block by application server ip
block_by_app_server_ip=DNS Spoofing
certificate_file=\u8bc1\u4e66\u6587\u4ef6
crl_file=Crl\u6587\u4ef6
vpn_ip=VPN\u670d\u52a1\u5668IP

2
src/main/resources/nis.properties
View File

@@ -557,7 +557,7 @@ max_allowed_packet=1048576
http_max_connection=1000
default_max_perroute=100
poolcm_socket_timeout=3000
app_vignore_user_region_key=VIGNORE
app_vignore_user_region_key=DKC
#policies\u83dc\u5355\u7684\u83dc\u5355ID
policies_menu_id=86
userCreate=UserCreate

14
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
View File

@@ -8,6 +8,11 @@ $(function(){
$(".ratelimitAction").find("input[name='userRegion1']").on("change",function(){
switchRateLimitType();
});
if($(".action:checked").val()==16){
$(".dnsIpSpoofing").removeClass("hidden");
}else{
$(".dnsIpSpoofing").addClass("hidden");
}
$(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId"));
@@ -24,6 +29,11 @@ $(function(){
if($(this).val()==1){
$(".ipPortAdd").click();
}
if($(".action:checked").val()==16){
$(".dnsIpSpoofing").removeClass("hidden");
}else{
$(".dnsIpSpoofing").addClass("hidden");
}
switchAction($(this).val());
});
$("#serviceId").val($(".action:checked").attr("serviceId"));
@@ -316,10 +326,10 @@ var delContent = function(contentClassName, addBtnClassName) {
<div for="action"></div>
</div>
</div>
<div class="col-md-6 hidden">
<div class="col-md-6 dnsIpSpoofing hidden">
<div class="form-group">
<label class="control-label col-md-3">
<input type="checkbox" name="userRegion4" class="child-checks" <%-- <c:if test="${_cfg.userRegion4 eq '1' }"> --%>checked<%-- </c:if> --%> value="1">
<input type="checkbox" name="userRegion4" class="child-checks" <c:if test='${_cfg.userRegion4 eq "8" }'> checked</c:if> value="8">
</label>
<div class="col-md-6">
<label class="control-label">

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

@@ -384,7 +384,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th class="sort-column r.compile_id" style="display: none" column="cfg_id" ><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc" column="config_describe" ><spring:message code="config_describe"/></th>
<%-- <th><spring:message code="block_by_app_server_ip"/></th> --%>
<th column="user_region4" ><spring:message code="block_by_app_server_ip"/></th>
<th class="sort-column r.action" column="block_type" ><spring:message code="block_type"/></th>
<th column="ratelimit" ><spring:message code="ratelimit"/></th>
<th column="social_app" ><spring:message code="social_app"/></th>
@@ -415,14 +415,11 @@
</td>
<td>${cfg.compileId }</td>
<td>${cfg.cfgDesc }</td>
<%-- <td>
<c:if test="${cfg.userRegion4 eq '1'}">
<spring:message code="yes"/>
<td>
<c:if test="${cfg.userRegion4 eq '8'}">
<spring:message code="block_by_app_server_ip"/>
</c:if>
<c:if test="${empty cfg.userRegion4}">
<spring:message code="no"/>
</c:if>
</td> --%>
</td>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq cfg.action }">