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

修改所有多域的ip详情和str详情的展示，以及单域的hex拆分两列

Browse Source
This commit is contained in:
duandongmei
2018-08-30 19:09:39 +08:00
parent 50735c734a
commit d200aeb034
37 changed files with 2811 additions and 770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/configuration/AppCfgController.java
View File

@@ -141,7 +141,7 @@ public class AppCfgController extends BaseController {
model.addAttribute("_cfg", cfg);
model.addAttribute("index", index);
model.addAttribute("tabList", tabList);
return "/cfg/app/appPolicyIpList";
return "/cfg/app/appPolicySubList";
}
/**
* 策略配置表单

2
src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java
View File

@@ -86,7 +86,7 @@ public class BasicProtocolController extends BaseController {
model.addAttribute("_cfg", cfg);
model.addAttribute("index", index);
model.addAttribute("tabList", tabList);
return "/cfg/basicprotocol/ipList";
return "/cfg/basicprotocol/basicProtocolSubList";
}
/**
* 策略配置表单

2
src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java
View File

@@ -110,7 +110,7 @@ public class EncryptedTunnelBehaviorController extends BaseController {
model.addAttribute("_cfg", cfg);
model.addAttribute("index", index);
model.addAttribute("tabList", tabList);
return "/cfg/encryptedtunnelbehav/ipList";
return "/cfg/encryptedtunnelbehav/encrypedTunnelSubList";
}
/**
* 策略配置表单

9
src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
View File

@@ -246,16 +246,17 @@ public class FileTransferCfgController extends BaseController{
fileMap.put("checksum", md5);
result = ConfigServiceUtil.getFileDigest(null, uploadFile, JsonMapper.toJsonString(fileMap));
if((result.getData().getRawLen() == null) || (result.getData().getDigest() == null)) {
logger.info("文件摘要信息获取有误！");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+null);
logger.error("文件摘要信息获取有误！");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
logger.info("获取文件摘要响应信息："+result);
}
fileTransferCfgService.saveOrUpdateFileDigestCfg(entity,result,areaCfgIds);
addMessage(redirectAttributes, "save_success");
} catch (MaatConvertException e) {
addMessage(redirectAttributes, e.getMessage());
addMessage(redirectAttributes, "request_service_failed");
} catch (IOException e) {
e.printStackTrace();
addMessage(redirectAttributes, "save_failed");
}
return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+entity.getFunctionId();
}