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

修正intercept Policy菜单keyring默认值为1

Browse Source
This commit is contained in:
wangwei
2019-06-17 16:46:50 +08:00
parent 889d58ca11
commit 25a5cc802e
6 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/util/ConfigConvertUtil.java
View File

@@ -830,7 +830,7 @@ public class ConfigConvertUtil {
}else if(serviceId.equals(512)){ }else if(serviceId.equals(512)){
if(userRegionMap.isEmpty()){ if(userRegionMap.isEmpty()){
//keyring //keyring
userRegionMap.put("keyring", 0); userRegionMap.put("keyring", 1);
Map<String,Object> map = new HashMap(); Map<String,Object> map = new HashMap();
//exclusions //exclusions
map.put("ev_cert", 0); map.put("ev_cert", 0);

2
src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java
View File

@@ -603,7 +603,7 @@ public class CheckIpFormatThread implements Callable<String>{
prop.getProperty("pxy_intercept_monit_keyring") + " ") + ";"); prop.getProperty("pxy_intercept_monit_keyring") + " ") + ";");
} }
}else { }else {
userRegionMap.put("keyring", 0); userRegionMap.put("keyring", 1);
} }
if(evCet!=null) { if(evCet!=null) {
if(evCet!=0&&evCet!=1) { if(evCet!=0&&evCet!=1) {

2
src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java
View File

@@ -549,7 +549,7 @@ public class CheckStringFormatThread implements Callable<String>{
prop.getProperty("pxy_intercept_monit_keyring") + " ") + ";"); prop.getProperty("pxy_intercept_monit_keyring") + " ") + ";");
} }
}else { }else {
userRegionMap.put("keyring", 0); userRegionMap.put("keyring", 1);
} }
if(evCet!=null) { if(evCet!=null) {
if(evCet!=0&&evCet!=1) { if(evCet!=0&&evCet!=1) {

2
src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
View File

@@ -133,7 +133,7 @@ public class InterceptController extends CommonController {
if(StringUtils.isNotBlank(keyring)) { if(StringUtils.isNotBlank(keyring)) {
entity.getUserRegion().put("keyring", Long.parseLong(keyring)); entity.getUserRegion().put("keyring", Long.parseLong(keyring));
}else { }else {
entity.getUserRegion().put("keyring", 0); entity.getUserRegion().put("keyring", 1);
} }
Map<String,Object> map = new HashMap(); Map<String,Object> map = new HashMap();
//exclusions //exclusions

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

@@ -395,7 +395,7 @@
<![CDATA[AND r.keyring_type <> 'end-entity']]> <![CDATA[AND r.keyring_type <> 'end-entity']]>
</if> </if>
<if test="compileIds != null"> <if test="compileIds != null">
AND r.COMPILE_ID in(#{compileIds}) AND r.COMPILE_ID in(${compileIds})
</if> </if>
</where> </where>
</select> </select>

7
src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
View File

@@ -96,11 +96,8 @@
if(userregion.length>0&&userregion.indexOf("{")==0){ if(userregion.length>0&&userregion.indexOf("{")==0){
var jsonObj=JSON.parse(userregion); var jsonObj=JSON.parse(userregion);
var obj=$(this); var obj=$(this);
$(obj).parent().find("td[data-column='keyring']").text(jsonObj.keyring==0?"":jsonObj.keyring); $(obj).parent().find("td[data-column='keyring']").text(jsonObj.keyring);
if(jsonObj.keyring){ keyringArr.push(jsonObj.keyring);
keyringArr.push(jsonObj.keyring);
}
$(obj).parent().find("td[data-column='ev_cert']").text(jsonObj.exclusions.ev_cert==1?"<spring:message code='yes'/>":"<spring:message code='no'/>"); $(obj).parent().find("td[data-column='ev_cert']").text(jsonObj.exclusions.ev_cert==1?"<spring:message code='yes'/>":"<spring:message code='no'/>");
$(obj).parent().find("td[data-column='cert_transparency']").text(jsonObj.exclusions.cert_transparency==1?"<spring:message code='yes'/>":"<spring:message code='no'/>"); $(obj).parent().find("td[data-column='cert_transparency']").text(jsonObj.exclusions.cert_transparency==1?"<spring:message code='yes'/>":"<spring:message code='no'/>");
$(obj).parent().find("td[data-column='client_cert_req']").text(jsonObj.exclusions.client_cert_req==1?"<spring:message code='yes'/>":"<spring:message code='no'/>"); $(obj).parent().find("td[data-column='client_cert_req']").text(jsonObj.exclusions.client_cert_req==1?"<spring:message code='yes'/>":"<spring:message code='no'/>");