diff options
| author | wangwei <[email protected]> | 2019-06-26 09:05:24 +0800 |
|---|---|---|
| committer | wangwei <[email protected]> | 2019-06-26 09:05:24 +0800 |
| commit | 8db3eca2e0361fc1cc5f56bbf9efefa62d515232 (patch) | |
| tree | d32e4d22c2b362a58928b53cdcccf14b65ab5578 | |
| parent | 8fb4f6e5b5a014de0ab28da0e0810a608ce4a2e4 (diff) | |
修正interceptPolicy默认值：MirrorClientVersions
4 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index 7ae98eef6..01c00ef47 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -859,7 +859,7 @@ public class ExportExcel { //fail_method if("ssl_ver_mirror_client".equals(headerStr)) { commentStr=""; - defaultValue="0"; + defaultValue="1"; commentStr=msgProp.getProperty("select")+":\n"+commentStr; index++; commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n"; diff --git a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java index fb87581be..785a3bce5 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java @@ -730,8 +730,8 @@ public class CheckIpFormatThread implements Callable<String>{ map=new HashMap<>();
if(mirrorClient==null) {
- mirrorClient=0;
- map.put("mirror_client", 0);
+ mirrorClient=1;
+ map.put("mirror_client", 1);
}else {
if(mirrorClient!=0&&mirrorClient!=1) {
errInfo.append(String.format(prop.getProperty("is_incorrect"),
diff --git a/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java index e39119226..ec9880ff2 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java @@ -676,8 +676,8 @@ public class CheckStringFormatThread implements Callable<String>{ map=new HashMap<>();
if(mirrorClient==null) {
- mirrorClient=0;
- map.put("mirror_client", 0);
+ mirrorClient=1;
+ map.put("mirror_client", 1);
}else {
if(mirrorClient!=0&&mirrorClient!=1) {
errInfo.append(String.format(prop.getProperty("is_incorrect"),
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp index 726c9d1f7..e2f524f86 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp @@ -860,14 +860,14 @@ legend{padding:.5em;border:0;width:auto;font-family: "Open Sans", sans-serif;col <div class="col-md-6">
<div class="bootstrap-switch">
<input type="checkbox" id="mirror_client" name="mirror_client" class="switch userRegion"
- value="${_cfg.userRegion.ssl_ver.mirror_client }" <c:if test="${_cfg.userRegion.ssl_ver.mirror_client eq 1}">checked</c:if>/>
+ value="${_cfg.userRegion.ssl_ver.mirror_client eq null?1:_cfg.userRegion.ssl_ver.mirror_client}" <c:if test="${_cfg.cfgId eq null or _cfg.userRegion.ssl_ver.mirror_client eq 1}">checked</c:if>/>
</div>
</div>
<div for="mirror_client"></div>
</div>
</div>
</div>
- <div class="row ssl_version <c:if test="${_cfg.userRegion.ssl_ver.mirror_client eq 1}">hidden</c:if>">
+ <div class="row ssl_version <c:if test="${_cfg.userRegion.ssl_ver.mirror_client ne 0}">hidden</c:if>">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">
|