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

修正interceptPolicy默认值：MirrorClientVersions

Browse Source
This commit is contained in:
wangwei
2019-06-26 09:05:24 +08:00
parent 8fb4f6e5b5
commit 8db3eca2e0
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -859,7 +859,7 @@ public class ExportExcel {
//fail_method //fail_method
if("ssl_ver_mirror_client".equals(headerStr)) { if("ssl_ver_mirror_client".equals(headerStr)) {
commentStr=""; commentStr="";
defaultValue="0"; defaultValue="1";
commentStr=msgProp.getProperty("select")+":\n"+commentStr; commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++; index++;
commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n"; commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n";

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

@@ -730,8 +730,8 @@ public class CheckIpFormatThread implements Callable<String>{
map=new HashMap<>(); map=new HashMap<>();
if(mirrorClient==null) { if(mirrorClient==null) {
mirrorClient=0; mirrorClient=1;
map.put("mirror_client", 0); map.put("mirror_client", 1);
}else { }else {
if(mirrorClient!=0&&mirrorClient!=1) { if(mirrorClient!=0&&mirrorClient!=1) {
errInfo.append(String.format(prop.getProperty("is_incorrect"), errInfo.append(String.format(prop.getProperty("is_incorrect"),

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

@@ -676,8 +676,8 @@ public class CheckStringFormatThread implements Callable<String>{
map=new HashMap<>(); map=new HashMap<>();
if(mirrorClient==null) { if(mirrorClient==null) {
mirrorClient=0; mirrorClient=1;
map.put("mirror_client", 0); map.put("mirror_client", 1);
}else { }else {
if(mirrorClient!=0&&mirrorClient!=1) { if(mirrorClient!=0&&mirrorClient!=1) {
errInfo.append(String.format(prop.getProperty("is_incorrect"), errInfo.append(String.format(prop.getProperty("is_incorrect"),

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

@@ -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="col-md-6">
<div class="bootstrap-switch"> <div class="bootstrap-switch">
<input type="checkbox" id="mirror_client" name="mirror_client" class="switch userRegion" <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> </div>
<div for="mirror_client"></div> <div for="mirror_client"></div>
</div> </div>
</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="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"> <label class="control-label col-md-3">