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

（1）调整拦截action 为2

Browse Source 
（2）修复导出bug
This commit is contained in:
wangxin
2019-05-23 19:12:37 +08:00
parent 672d76b046
commit 8261647a35
10 changed files with 66 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2861,8 +2861,8 @@ public class ExportExcel {
/**
* 构造函数
* @param msgProp 国际化配置
* @param title sheet名称
* @param cls 实体对象，通过annotation.ExportField获取标题
* @param titleList sheet名称
* @param clsMap 实体对象，通过annotation.ExportField获取标题
* @param type 导出类型（1:导出数据；2：导出模板）
* @param groups 导入分组
* @return

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

@@ -121,7 +121,7 @@ public class CheckIpFormatThread implements Callable<String>{
String direction = regionDict.getConfigDirection();
StringBuffer errTip = new StringBuffer();
// 因IP拦截 监测
if(regionDict.getFunctionId().equals(200) && serviceDict.getAction().equals(1)){
if(regionDict.getFunctionId().equals(200) && serviceDict.getAction().equals(2)){
protocol="6";
}
List<SysDataDictionaryItem> sslversions = new ArrayList<>();
@@ -150,7 +150,7 @@ public class CheckIpFormatThread implements Callable<String>{
}
if(regionDict.getFunctionId().equals(200)) {
if(!serviceDict.getAction().equals(1)) {
if(!serviceDict.getAction().equals(2)) {
baseIpCfg.setDoLog(0);
}
}

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

@@ -124,7 +124,7 @@ public class CheckStringFormatThread implements Callable<String>{
}
if(regionDict.getFunctionId().equals(200)) {
if(!serviceDict.getAction().equals(1)) {
if(!serviceDict.getAction().equals(2)) {
baseStringCfg.setDoLog(0);
}
}
@@ -151,7 +151,7 @@ public class CheckStringFormatThread implements Callable<String>{
}
// 代理-域名拦截
if (regionDict.getFunctionId().equals(200) && "intercept_domain".equals(regionDict.getConfigServiceType())) {
if(serviceDict.getAction().equals(1)) {
/*if(serviceDict.getAction().equals(1)) {
if(StringUtils.isBlank(baseStringCfg.getUserRegion5())) {
baseStringCfg.setUserRegion5("1");
}
@@ -171,7 +171,7 @@ public class CheckStringFormatThread implements Callable<String>{
}
}
}else if(serviceDict.getAction().equals(64)) {
}else*/ if(serviceDict.getAction().equals(64)) {
baseStringCfg.setUserRegion1("0");// limit_rate_type（限速方式默认值）
if(StringUtils.isBlank(baseStringCfg.getUserRegion2())) {
baseStringCfg.setUserRegion2("0.1");