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

多域的日志增加可查看配置详情，隐藏日志中的查看详情，提供可以复制日志过长title功能

Browse Source
This commit is contained in:
zhanghongqing
2018-11-28 19:23:38 +08:00
parent 7ab1a38131
commit 1fbc899269
75 changed files with 869 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,8 +135,8 @@ public class AppCfgController extends BaseController {
* @return
*/
@RequestMapping(value = {"ajaxAppPolicyIpList"})
public String ajaxSslSubList(Model model,Long cfgId,Integer index) {
AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId);
public String ajaxSslSubList(Model model,Long cfgId,Integer index,Integer compileId) {
AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId,compileId);
List<String[]> tabList = new ArrayList();
if(cfg.getIpPortList()!=null){
String cfgType = null;
@@ -172,7 +172,7 @@ public class AppCfgController extends BaseController {
@RequiresPermissions(value={"app:policy:config"})
public String policyCfgForm(Model model,String ids,AppPolicyCfg entity) {
if(StringUtils.isNotBlank(ids)){
entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids));
entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids),entity.getCompileId());
initUpdateFormCondition(model,entity);
}else{
initFormCondition(model,entity);
@@ -227,7 +227,7 @@ public class AppCfgController extends BaseController {
AppPolicyCfg entity = new AppPolicyCfg();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = appCfgService.getAppPolicyCfg(Long.parseLong(id));
entity = appCfgService.getAppPolicyCfg(Long.parseLong(id),entity.getCompileId());
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());

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

@@ -71,8 +71,8 @@ public class BasicProtocolController extends BaseController {
* @return
*/
@RequestMapping(value = {"ajaxIpList"})
public String ajaxSslSubList(Model model,Long cfgId,Integer index) {
AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId);
public String ajaxSslSubList(Model model,Long cfgId,Integer index,Integer compileId) {
AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId,compileId);
List<String[]> tabList = new ArrayList();
if(cfg.getIpPortList()!=null){
String cfgType = null;
@@ -108,7 +108,7 @@ public class BasicProtocolController extends BaseController {
@RequiresPermissions(value={"basicprotocol:config"})
public String policyCfgForm(Model model,String ids,AppPolicyCfg entity) {
if(StringUtils.isNotBlank(ids)){
entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids));
entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids),entity.getCompileId());
initUpdateFormCondition(model,entity);
}else{
initFormCondition(model,entity);
@@ -166,7 +166,7 @@ public class BasicProtocolController extends BaseController {
AppPolicyCfg entity = new AppPolicyCfg();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = appCfgService.getAppPolicyCfg(Long.parseLong(id));
entity = appCfgService.getAppPolicyCfg(Long.parseLong(id),entity.getCompileId());
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());

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

@@ -93,8 +93,8 @@ public class EncryptedTunnelBehaviorController extends BaseController {
* @return
*/
@RequestMapping(value = {"ajaxIpList"})
public String ajaxSslSubList(Model model,Long cfgId,Integer index) {
AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId);
public String ajaxSslSubList(Model model,Long cfgId,Integer index,Integer compileId) {
AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId,compileId);
List<String[]> tabList = new ArrayList();
if(cfg.getIpPortList()!=null){
String cfgType = null;
@@ -130,7 +130,7 @@ public class EncryptedTunnelBehaviorController extends BaseController {
@RequiresPermissions(value={"encryptedtunnelbehav:config"})
public String policyCfgForm(Model model,String ids,AppPolicyCfg entity) {
if(StringUtils.isNotBlank(ids)){
entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids));
entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids),entity.getCompileId());
initUpdateFormCondition(model,entity);
}else{
initFormCondition(model,entity);
@@ -187,7 +187,7 @@ public class EncryptedTunnelBehaviorController extends BaseController {
AppPolicyCfg entity = new AppPolicyCfg();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = appCfgService.getAppPolicyCfg(Long.parseLong(id));
entity = appCfgService.getAppPolicyCfg(Long.parseLong(id),entity.getCompileId());
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());

6
src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
View File

@@ -279,9 +279,10 @@ public class AvContentController extends BaseController {
* @return
*/
@RequestMapping(value = {"/ajaxVoipIpInfo"})
public String getVoipIpInfo(Model model,Long cfgId,Integer index) {
public String getVoipIpInfo(Model model,Long cfgId,Integer index,Integer compileId) {
CfgIndexInfo cfgIndexInfo = new CfgIndexInfo();
cfgIndexInfo.setCfgId(cfgId);
cfgIndexInfo.setCompileId(compileId);
CfgIndexInfo cfg = avContentCfgService.getCfgIndexInfo(cfgIndexInfo);
List<String[]> tabList = new ArrayList();
//获取voipIpCfg信息
@@ -663,9 +664,10 @@ public class AvContentController extends BaseController {
}
// 获取域配置信息
@RequestMapping(value = {"ajaxAvContUrlList"})
public String ajaxAvContUrlList(Model model,Long cfgId,Integer index) {
public String ajaxAvContUrlList(Model model,Long cfgId,Integer index,Integer compileId) {
CfgIndexInfo cfgIndexInfo = new CfgIndexInfo();
cfgIndexInfo.setCfgId(cfgId);
cfgIndexInfo.setCompileId(compileId);
CfgIndexInfo cfg = avContentCfgService.getUrlCfgIndexInfo(cfgIndexInfo);
List<String[]> tabList = new ArrayList();
if(cfg.getIpPortList()!=null){

8
src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java
View File

@@ -55,7 +55,7 @@ public class BgpCfgController extends BaseController{
@RequiresPermissions(value={"other:bgp:config"})
public String bgpForm(Model model,String ids,CfgIndexInfo entity,RedirectAttributes redirectAttributes) {
if(StringUtils.isNotBlank(ids)){
entity = bgpCfgService.getBgpCfg(Long.parseLong(ids));
entity = bgpCfgService.getBgpCfg(Long.parseLong(ids),entity.getCompileId());
initUpdateFormCondition(model,entity);
}else{
initFormCondition(model,entity);
@@ -74,8 +74,8 @@ public class BgpCfgController extends BaseController{
}
@RequestMapping(value = {"ajaxBgpSubList"})
public String ajaxBgpSubList(Model model,Long cfgId,Integer index) {
CfgIndexInfo cfg = bgpCfgService.getBgpCfg(cfgId);
public String ajaxBgpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
CfgIndexInfo cfg = bgpCfgService.getBgpCfg(cfgId,compileId);
List<String[]> tabList = new ArrayList();
if(cfg.getIpPortList()!=null){
String cfgType = null;
@@ -134,7 +134,7 @@ public class BgpCfgController extends BaseController{
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = bgpCfgService.getBgpCfg(Long.parseLong(id));
entity = bgpCfgService.getBgpCfg(Long.parseLong(id),entity.getCompileId());
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());

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

@@ -66,7 +66,7 @@ public class FileTransferCfgController extends BaseController{
@RequiresPermissions(value={"fileTransfer:ftp:config"})
public String ftpForm(Model model,String compileIds,String ids,CfgIndexInfo entity) {
if(StringUtils.isNotBlank(ids)){
entity = fileTransferCfgService.getFtpCfg(Long.parseLong(ids));
entity = fileTransferCfgService.getFtpCfg(Long.parseLong(ids),entity.getCompileId());
initUpdateFormCondition(model,entity);
}else{
initFormCondition(model,entity);
@@ -95,8 +95,8 @@ public class FileTransferCfgController extends BaseController{
return "redirect:" + adminPath +"/ntc/fileTransfer/ftpList?functionId="+entity.getFunctionId();
}
@RequestMapping(value = {"ajaxFtpSubList"})
public String ajaxFtpSubList(Model model,Long cfgId,Integer index) {
CfgIndexInfo cfg = fileTransferCfgService.getFtpCfg(cfgId);
public String ajaxFtpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
CfgIndexInfo cfg = fileTransferCfgService.getFtpCfg(cfgId,compileId);
List<String[]> tabList = new ArrayList();
if(cfg.getIpPortList()!=null){
String cfgType = null;
@@ -163,7 +163,7 @@ public class FileTransferCfgController extends BaseController{
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = fileTransferCfgService.getFtpCfg(Long.parseLong(id));
entity = fileTransferCfgService.getFtpCfg(Long.parseLong(id),entity.getCompileId());
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());
@@ -203,7 +203,7 @@ public class FileTransferCfgController extends BaseController{
@RequiresPermissions(value={"fileTransfer:fileDigest:config"})
public String fileDigestForm(Model model,String ids,FileDigestCfg entity,RedirectAttributes redirectAttributes) {
if(StringUtils.isNotBlank(ids)){
entity = fileTransferCfgService.getFileDigestCfg(Long.parseLong(ids));
entity = fileTransferCfgService.getFileDigestCfg(Long.parseLong(ids),entity.getCompileId());
initUpdateFormCondition(model,entity);
}else{
initFormCondition(model,entity);
@@ -302,8 +302,8 @@ public class FileTransferCfgController extends BaseController{
return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+functionId;
}
@RequestMapping(value = {"ajaxFileDigestSubIdList"})
public String ajaxFileDigestSubIdList(Model model,Long cfgId,Integer index) {
FileDigestCfg cfg = fileTransferCfgService.getFileDigestSubIdCfg(cfgId);
public String ajaxFileDigestSubIdList(Model model,Long cfgId,Integer index,Integer compileId) {
FileDigestCfg cfg = fileTransferCfgService.getFileDigestSubIdCfg(cfgId,compileId);
List<String[]> tabList = new ArrayList();
//查询SubscribeId域配置
if(cfg.getNtcSubscribeIdCfgList()!=null){
@@ -335,7 +335,7 @@ public class FileTransferCfgController extends BaseController{
public String p2pForm(Model model,String ids,CfgIndexInfo entity) {
// 跳转操作页面（根据ids判断是新增 or 修改）
if(StringUtils.isNotBlank(ids)){
entity = fileTransferCfgService.getP2pCfg(Long.parseLong(ids));
entity = fileTransferCfgService.getP2pCfg(Long.parseLong(ids),entity.getCompileId());
// 添加配置域Key,用于修改页面区分各域配置
P2pHashCfg hashCfg = new P2pHashCfg();
@@ -403,8 +403,8 @@ public class FileTransferCfgController extends BaseController{
}
@RequestMapping(value = {"ajaxP2pSubList"})
public String ajaxP2pSubList(Model model,Long cfgId,Integer index) {
CfgIndexInfo cfg = fileTransferCfgService.getP2pCfg(cfgId);
public String ajaxP2pSubList(Model model,Long cfgId,Integer index,Integer compileId) {
CfgIndexInfo cfg = fileTransferCfgService.getP2pCfg(cfgId,compileId);
List<String[]> tabList = new ArrayList();
if(cfg.getIpPortList()!=null){
String cfgType = null;
@@ -454,7 +454,7 @@ public class FileTransferCfgController extends BaseController{
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = fileTransferCfgService.getP2pCfg(Long.parseLong(id));
entity = fileTransferCfgService.getP2pCfg(Long.parseLong(id),entity.getCompileId());
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());

8
src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
View File

@@ -73,7 +73,7 @@ public class IpController extends BaseController{
@RequiresPermissions(value={"iplist:config"})
public String form(Model model,String ids,CfgIndexInfo entity) {
if(StringUtils.isNotBlank(ids)){
entity = ipCfgService.getIpPortCfg(Long.parseLong(ids));
entity = ipCfgService.getIpPortCfg(Long.parseLong(ids),entity.getCompileId());
initUpdateFormCondition(model,entity);
}else{
initFormCondition(model,entity);
@@ -89,8 +89,8 @@ public class IpController extends BaseController{
return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}
@RequestMapping(value = {"ajaxSubList"})
public String ajaxIpPortSubList(Model model,Long cfgId,Integer index) {
CfgIndexInfo cfg = ipCfgService.getIpPortCfg(cfgId);
public String ajaxIpPortSubList(Model model,Long cfgId,Integer index,Integer compileId) {
CfgIndexInfo cfg = ipCfgService.getIpPortCfg(cfgId,compileId);
/*List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(cfg.getFunctionId());
model.addAttribute("regionList", regionList);*/
List<String[]> tabList = new ArrayList();
@@ -133,7 +133,7 @@ public class IpController extends BaseController{
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = ipCfgService.getIpPortCfg(Long.parseLong(id));
entity = ipCfgService.getIpPortCfg(Long.parseLong(id),entity.getCompileId());
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());

8
src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java
View File

@@ -61,7 +61,7 @@ public class MailCfgController extends BaseController{
@RequiresPermissions(value={"mail:config"})
public String mailForm(Model model,String ids,CfgIndexInfo entity) {
if(StringUtils.isNotBlank(ids)){
entity = mailCfgService.getMailCfg(Long.parseLong(ids));
entity = mailCfgService.getMailCfg(Long.parseLong(ids),entity.getCompileId());
initUpdateFormCondition(model,entity);
}else{
initFormCondition(model,entity);
@@ -112,8 +112,8 @@ public class MailCfgController extends BaseController{
return "redirect:" + adminPath +"/ntc/mail/mailList?functionId="+entity.getFunctionId();
}
@RequestMapping(value = {"ajaxMailSubList"})
public String ajaxMailSubList(Model model,Long cfgId,Integer index) {
CfgIndexInfo cfg = mailCfgService.getMailCfg(cfgId);
public String ajaxMailSubList(Model model,Long cfgId,Integer index,Integer compileId) {
CfgIndexInfo cfg = mailCfgService.getMailCfg(cfgId,compileId);
List<String[]> tabList = new ArrayList();
if(cfg.getIpPortList()!=null){
String cfgType = null;
@@ -168,7 +168,7 @@ public class MailCfgController extends BaseController{
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = mailCfgService.getMailCfg(Long.parseLong(id));
entity = mailCfgService.getMailCfg(Long.parseLong(id),entity.getCompileId());
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());

24
src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java
View File

@@ -80,7 +80,7 @@ public class WebsiteController extends BaseController{
@RequiresPermissions(value={"website:http:config"})
public String httpForm(Model model,String ids,CfgIndexInfo entity) {
if(StringUtils.isNotBlank(ids)){
entity = websiteCfgService.getHttpCfg(Long.parseLong(ids));
entity = websiteCfgService.getHttpCfg(Long.parseLong(ids),entity.getCompileId());
//设置http各类配置的配置域类型
IpPortCfg ipCfg = new IpPortCfg();
@@ -194,8 +194,8 @@ public class WebsiteController extends BaseController{
return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId();
}
@RequestMapping(value = {"ajaxHttpSubList"})
public String ajaxHttpSubList(Model model,Long cfgId,Integer index) {
CfgIndexInfo cfg = websiteCfgService.getHttpCfg(cfgId);
public String ajaxHttpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
CfgIndexInfo cfg = websiteCfgService.getHttpCfg(cfgId,compileId);
model.addAttribute("_cfg", cfg);
model.addAttribute("index", index);
return "/cfg/website/httpSubList";
@@ -212,7 +212,7 @@ public class WebsiteController extends BaseController{
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = websiteCfgService.getHttpCfg(Long.parseLong(id));
entity = websiteCfgService.getHttpCfg(Long.parseLong(id),entity.getCompileId());
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());
@@ -243,7 +243,7 @@ public class WebsiteController extends BaseController{
@RequiresPermissions(value={"website:ssl:config"})
public String sslForm(Model model,String ids,CfgIndexInfo entity) {
if(StringUtils.isNotBlank(ids)){
entity = websiteCfgService.getSslCfg(Long.parseLong(ids));
entity = websiteCfgService.getSslCfg(Long.parseLong(ids),entity.getCompileId());
initUpdateFormCondition(model,entity);
}else{
initFormCondition(model,entity);
@@ -258,8 +258,8 @@ public class WebsiteController extends BaseController{
return "redirect:" + adminPath +"/ntc/website/sslList?functionId="+entity.getFunctionId();
}
@RequestMapping(value = {"ajaxSslSubList"})
public String ajaxSslSubList(Model model,Long cfgId,Integer index) {
CfgIndexInfo cfg = websiteCfgService.getSslCfg(cfgId);
public String ajaxSslSubList(Model model,Long cfgId,Integer index,Integer compileId) {
CfgIndexInfo cfg = websiteCfgService.getSslCfg(cfgId,compileId);
/*List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(cfg.getFunctionId());
model.addAttribute("regionList", regionList);*/
List<String[]> tabList = new ArrayList();
@@ -307,7 +307,7 @@ public class WebsiteController extends BaseController{
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = websiteCfgService.getSslCfg(Long.parseLong(id));
entity = websiteCfgService.getSslCfg(Long.parseLong(id),entity.getCompileId());
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());
@@ -335,7 +335,7 @@ public class WebsiteController extends BaseController{
@RequiresPermissions(value={"website:dns:config"})
public String dnsForm(Model model,String ids,CfgIndexInfo entity) {
if(StringUtils.isNotBlank(ids)){
entity = websiteCfgService.getDnsCfg(Long.parseLong(ids));
entity = websiteCfgService.getDnsCfg(Long.parseLong(ids),entity.getCompileId());
initUpdateFormCondition(model,entity);
}else{
initFormCondition(model,entity);
@@ -353,8 +353,8 @@ public class WebsiteController extends BaseController{
return "redirect:" + adminPath +"/ntc/website/dnsList?functionId="+entity.getFunctionId();
}
@RequestMapping(value = {"ajaxDnsSubList"})
public String ajaxDnsSubList(Model model,Long cfgId,Integer index) {
CfgIndexInfo cfg = websiteCfgService.getDnsCfg(cfgId);
public String ajaxDnsSubList(Model model,Long cfgId,Integer index,Integer compileId) {
CfgIndexInfo cfg = websiteCfgService.getDnsCfg(cfgId,compileId);
List<String[]> tabList = new ArrayList();
if(cfg.getIpPortList()!=null){
String cfgType = null;
@@ -400,7 +400,7 @@ public class WebsiteController extends BaseController{
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = websiteCfgService.getDnsCfg(Long.parseLong(id));
entity = websiteCfgService.getDnsCfg(Long.parseLong(id),entity.getCompileId());
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());

16
src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
View File

@@ -50,8 +50,8 @@ public class WhiteListController extends CommonController{
return "/cfg/whitelist/ipList";
}
@RequestMapping(value = {"ajaxIpSubList"})
public String ajaxIpSubList(Model model,Long cfgId,Integer index) {
CfgIndexInfo cfg = ipCfgService.getIpPortCfg(cfgId);
public String ajaxIpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
CfgIndexInfo cfg = ipCfgService.getIpPortCfg(cfgId,compileId);
List<String[]> tabList = new ArrayList();
if(cfg.getIpPortList()!=null){
String cfgType = null;
@@ -81,7 +81,7 @@ public class WhiteListController extends CommonController{
public String ipForm(Model model,String ids,CfgIndexInfo entity) {
if(StringUtils.isNotBlank(ids)){
entity = this.ipCfgService.getIpPortCfg(Long.parseLong(ids));
entity = this.ipCfgService.getIpPortCfg(Long.parseLong(ids),entity.getCompileId());
initUpdateFormCondition(model,entity);
}else{
initFormCondition(model,entity);
@@ -100,7 +100,7 @@ public class WhiteListController extends CommonController{
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = ipCfgService.getIpPortCfg(Long.parseLong(id));
entity = ipCfgService.getIpPortCfg(Long.parseLong(id),entity.getCompileId());
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());
@@ -157,7 +157,7 @@ public class WhiteListController extends CommonController{
@RequiresPermissions(value={"whitelist:domain:config"})
public String domainForm(Model model,String ids,CfgIndexInfo entity) {
if(StringUtils.isNotBlank(ids)){
entity = domainService.getDomainCfg(Long.parseLong(ids));
entity = domainService.getDomainCfg(Long.parseLong(ids),entity.getCompileId());
HttpUrlCfg urlCfg = new HttpUrlCfg();
urlCfg.setCfgType(Constants.HTTP_URL_REGION);
entity.setHttpUrl(urlCfg);
@@ -183,8 +183,8 @@ public class WhiteListController extends CommonController{
return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+entity.getFunctionId();
}
@RequestMapping(value = {"domain/ajaxSubList"})
public String ajaxDomainSubList(Model model,Long cfgId,Integer index) {
CfgIndexInfo cfg = domainService.getDomainCfg(cfgId);
public String ajaxDomainSubList(Model model,Long cfgId,Integer index,Integer compileId) {
CfgIndexInfo cfg = domainService.getDomainCfg(cfgId,compileId);
List<String[]> tabList = new ArrayList();
if(cfg.getHttpUrlList()!=null){
String cfgType = null;
@@ -234,7 +234,7 @@ public class WhiteListController extends CommonController{
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = domainService.getDomainCfg(Long.parseLong(id));
entity = domainService.getDomainCfg(Long.parseLong(id),entity.getCompileId());
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());

8
src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
View File

@@ -70,7 +70,7 @@ public class HttpRedirectPolicyController extends BaseController{
,logical=Logical.OR)
public String form(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")CfgIndexInfo entity){
if(StringUtils.isNotBlank(ids)){
entity = httpRedirectCfgService.getHttpCfg(Long.parseLong(ids));
entity = httpRedirectCfgService.getHttpCfg(Long.parseLong(ids),entity.getCompileId());
HttpUrlCfg urlCfg = new HttpUrlCfg();
urlCfg.setCfgType(Constants.HTTP_REDIRECT_URL_REGION);
@@ -199,8 +199,8 @@ public class HttpRedirectPolicyController extends BaseController{
return "redirect:" + adminPath +"/proxy/control/httpRedirect/httpRedirectList?functionId="+cfg.getFunctionId();
}
@RequestMapping(value = {"ajaxHttpSubList"})
public String ajaxHttpSubList(Model model,Long cfgId,Integer index) {
CfgIndexInfo cfg = httpRedirectCfgService.getHttpCfg(cfgId);
public String ajaxHttpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
CfgIndexInfo cfg = httpRedirectCfgService.getHttpCfg(cfgId,compileId);
model.addAttribute("_cfg", cfg);
model.addAttribute("index", index);
return "/cfg/proxy/control/httpRedirectSubList";
@@ -227,7 +227,7 @@ public class HttpRedirectPolicyController extends BaseController{
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = httpRedirectCfgService.getHttpCfg(Long.parseLong(id));
entity = httpRedirectCfgService.getHttpCfg(Long.parseLong(id),entity.getCompileId());
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());

8
src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
View File

@@ -63,7 +63,7 @@ public class InterceptController extends CommonController{
@RequestMapping(value = {"/interceptIpForm","interceptDomainForm","interceptIpPayloadForm"})
public String interceptIpForm(Model model,String ids,CfgIndexInfo entity) {
if(StringUtils.isNotBlank(ids)){
entity = interceptCfgService.getInterceptCfg(Long.parseLong(ids));
entity = interceptCfgService.getInterceptCfg(Long.parseLong(ids),null);
initUpdateFormCondition(model,entity);
}else{
initFormCondition(model,entity);
@@ -98,8 +98,8 @@ public class InterceptController extends CommonController{
}
@RequestMapping(value = {"/ajaxInterceptIpSubList","/ajaxInterceptDomainSubList","/ajaxInterceptIpPayloadSubList"})
public String ajaxInterceptIpSubList(Model model,Long cfgId,Integer index) {
CfgIndexInfo cfg = interceptCfgService.getInterceptCfg(cfgId);
public String ajaxInterceptIpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
CfgIndexInfo cfg = interceptCfgService.getInterceptCfg(cfgId,compileId);
List<String[]> tabList = new ArrayList();
if(cfg.getIpPortList()!=null){
String cfgType = null;
@@ -139,7 +139,7 @@ public class InterceptController extends CommonController{
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = interceptCfgService.getInterceptCfg(Long.parseLong(id));
entity = interceptCfgService.getInterceptCfg(Long.parseLong(id),null);
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());