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

Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

Browse Source
This commit is contained in:
tanghao
2019-01-15 18:20:16 +08:00
parent b5fd91b75c 7051eb10d0
commit d0d2eb9e2a
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,7 +173,7 @@ public class CheckIpFormatThread implements Callable<String>{
String userRegion1 = baseIpCfg.getUserRegion1(); String userRegion1 = baseIpCfg.getUserRegion1();
if (StringUtils.isNotBlank(userRegion1)) { if (StringUtils.isNotBlank(userRegion1)) {
Object val = DictUtils.getDictLabel("INTERCEPT_REPLACE_ZONE", userRegion1); Object val = DictUtils.getDictLabel("INTERCEPT_REPLACE_ZONE", userRegion1);
if (StringUtils.isBlank(val.toString())) { if (StringUtils.isBlank(val.toString())||"默认".equals(val.toString())) {
errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("replace_zone")) errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("replace_zone"))
+ ";"); + ";");
} }

14
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -2491,6 +2491,20 @@ public abstract class BaseService {
}else if(regionDict.getFunctionId()==214) { }else if(regionDict.getFunctionId()==214) {
String userRegion="nat_type="+_cfg.getUserRegion1()+";spoofing_ip_pool="+_cfg.getUserRegion3(); String userRegion="nat_type="+_cfg.getUserRegion1()+";spoofing_ip_pool="+_cfg.getUserRegion3();
maatCfg.setUserRegion(userRegion); maatCfg.setUserRegion(userRegion);
}else if(regionDict.getFunctionId()==212) {
String userRegion=Constants.REPLACE_ZONE_KEY+"="+_cfg.getUserRegion1();
String substitute="";
String userRegion2=StringUtil.isEmpty(_cfg.getUserRegion2()) ? "":_cfg.getUserRegion2();
substitute="/";
userRegion2 = BaseService.replaceContentEscape(userRegion2);
substitute=substitute+userRegion2;
String userRegion3=StringUtil.isEmpty(_cfg.getUserRegion3()) ? "":_cfg.getUserRegion3();
userRegion3 = BaseService.replaceContentEscape(userRegion3);
substitute=substitute+"/"+userRegion3;
userRegion=userRegion+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute;
maatCfg.setUserRegion(userRegion);
} }
configCompileList.add(maatCfg); configCompileList.add(maatCfg);

2
src/main/webapp/WEB-INF/tags/sys/delRow.tag
View File

@@ -382,7 +382,7 @@ function cancelPassOpt(url){
function validateIsDelete(checkboxes){ function validateIsDelete(checkboxes){
var flag = false; var flag = false;
$(checkboxes).filter(":checked").each(function(){ $(checkboxes).filter(":checked").each(function(){
alert($(this).val()); //alert($(this).val());
if($(this).val()!=0 && $(this).val()!=3){//状态为3的配置为取消审核的配置，可删除 if($(this).val()!=0 && $(this).val()!=3){//状态为3的配置为取消审核的配置，可删除
flag = true; flag = true;
return; return;