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

拦截内置配置：允许修改、不允许删除。

Browse Source 
keyring内置配置：允许修改，不允许删除。
可信证书内置配置：不允许修改，允许删除(未被引用)。
This commit is contained in:
段冬梅
2019-06-14 11:16:54 +08:00
parent 7ce70a10f8
commit 1c4308e536
6 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml
View File

@@ -176,6 +176,7 @@
<!-- 判断是否批量操作 -->
<when test="batchValidValue != null and batchValidValue != ''">
AND r.IS_VALID in (${batchValidValue})
AND r.compile_id not in(0,1)
</when>
<otherwise>
<if test="isValid != null">
@@ -278,7 +279,6 @@
<!-- 判断是否批量操作 -->
<when test="batchValidValue != null and batchValidValue != ''">
AND r.IS_VALID in (${batchValidValue})
AND r.built_in !=1
</when>
<otherwise>
<if test="isValid != null">

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

@@ -1640,4 +1640,5 @@ url_group=URL Group
subscribe_id_group=Subscribe Id Group
at_least_one_group=Please choose at least one group
most_eight_group=At most 8 groups you can choose
#---------------------------Object List Group Manage------------------------------------
#---------------------------Object List Group Manage------------------------------------
built_in_tip=Forbidden

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

@@ -1642,4 +1642,5 @@ url_group=URL Group
subscribe_id_group=Subscribe Id Group
at_least_one_group=Please choose at least one group
most_eight_group=At most 8 groups you can choose
#---------------------------Object List Group Manage------------------------------------
#---------------------------Object List Group Manage------------------------------------
built_in_tip=Forbidden

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

@@ -1640,4 +1640,5 @@ url_group=URL\u7EC4
subscribe_id_group=\u8D26\u53F7\u7EC4
at_least_one_group=\u8FB7\u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u7EC4
most_eight_group=\u81F3\u591A\u53EF\u9009\u62E9\u0038\u4E2A\u7EC4
#---------------------------Object List Group Manage------------------------------------
#---------------------------Object List Group Manage------------------------------------
built_in_tip=\u7981\u6B62\u64CD\u4F5C

15
src/main/webapp/WEB-INF/tags/sys/delRow.tag
View File

@@ -178,7 +178,7 @@ function del(url){
});
if(builtInCompile){
top.$.jBox.tip('<spring:message code="intercept_built_in"/>');
top.$.jBox.tip('<spring:message code="built_in_tip"/>');
canDel=false;
}
if(canDel){
@@ -247,6 +247,13 @@ function update(url){
return;
}
}
if(cked.attr("built-in")){
top.$.jBox.tip("<spring:message code='built_in_tip'/>", "<spring:message code='info'/>");
return;
}
doAll(checkboxes,url);
}else{
top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
@@ -321,7 +328,7 @@ function noPassOpt(url){
});
if(builtInCompile){
top.$.jBox.tip('<spring:message code="intercept_built_in"/>');
top.$.jBox.tip('<spring:message code="built_in_tip"/>');
}else{
doAll(checkboxes,url);
}
@@ -393,7 +400,7 @@ function cancelPassOpt(url){
if(typeof serviceId != "undefined" && serviceIdJudge && typeof compileId != "undefined"){
compileIds.push(compileId);
}
if(compileId == 0){
if((compileId == 0) || (compileId==1 && serviceId==250)){
builtInCompile=true;
}
});
@@ -432,7 +439,7 @@ function cancelPassOpt(url){
/***拦截内置配置不允许删除***/
if(builtInCompile){
top.$.jBox.tip('<spring:message code="intercept_built_in"/>');
top.$.jBox.tip('<spring:message code="built_in_tip"/>');
canCancel=false;
}
if(canCancel){

4
src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertList.jsp
View File

@@ -397,9 +397,7 @@
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr>
<td>
<c:if test="${cfg.builtIn==0}">
<input type="checkbox" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}">
</c:if>
<input type="checkbox" built-in="${cfg.builtIn==0}" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}">
</td>
<td>
<c:set var="crlFile" value="${fns:getTrustedCrlByCerId(cfg.compileId) }"></c:set>