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

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

View File

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

View File

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

View File

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

View File

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

View File

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