diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml
index d17546146..066831f04 100644
--- a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml
@@ -176,6 +176,7 @@
AND r.IS_VALID in (${batchValidValue})
+ AND r.compile_id not in(0,1)
@@ -278,7 +279,6 @@
AND r.IS_VALID in (${batchValidValue})
- AND r.built_in !=1
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index f01e1780a..0c203a014 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -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------------------------------------
\ No newline at end of file
+#---------------------------Object List Group Manage------------------------------------
+built_in_tip=Forbidden
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index cab51e778..adf3bf827 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -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------------------------------------
\ No newline at end of file
+#---------------------------Object List Group Manage------------------------------------
+built_in_tip=Forbidden
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 7382633c5..207cd4fff 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -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------------------------------------
\ No newline at end of file
+#---------------------------Object List Group Manage------------------------------------
+built_in_tip=\u7981\u6B62\u64CD\u4F5C
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
index 71db369ff..ee45509a6 100644
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -178,7 +178,7 @@ function del(url){
});
if(builtInCompile){
- top.$.jBox.tip('');
+ top.$.jBox.tip('');
canDel=false;
}
if(canDel){
@@ -247,6 +247,13 @@ function update(url){
return;
}
}
+
+ if(cked.attr("built-in")){
+ top.$.jBox.tip("", "");
+ return;
+ }
+
+
doAll(checkboxes,url);
}else{
top.$.jBox.tip("", "");
@@ -321,7 +328,7 @@ function noPassOpt(url){
});
if(builtInCompile){
- top.$.jBox.tip('');
+ top.$.jBox.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('');
+ top.$.jBox.tip('');
canCancel=false;
}
if(canCancel){
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertList.jsp
index 9f7b4a5d0..49a6df540 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertList.jsp
@@ -397,9 +397,7 @@