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

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

Browse Source
This commit is contained in:
duandongmei
2019-04-25 15:18:43 +08:00
parent b50d324303 26097409d6
commit 65d3f5013f
124 changed files with 1174 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/nis/quartz/ScheduleStatusJob.java
View File

@@ -69,6 +69,7 @@ public class ScheduleStatusJob implements Job{
try {
scheduleService.issueCompileInfo(cfg, isValid?1:0);
} catch (Exception e) {
e.printStackTrace();
log.error("定时任务"+cfg.getId()+"执行失败",e);
}finally {
log.debug(String.format("任务执行完成，compileId:%s,isValid:%s",compileId,isValid ));

256
src/main/java/com/nis/util/ConfigConvertUtil.java
View File

@@ -395,13 +395,10 @@ public class ConfigConvertUtil {
*/
public static List<IpCfg> ipConvert(IpCfg dstIp, BaseIpCfg srcIp) {
List<IpCfg> ipConvertList = Lists.newArrayList();
boolean isRange = (((srcIp.getSrcIpPattern() != null && srcIp.getSrcIpPattern() == 2)||(srcIp.getDestIpPattern()) != null && srcIp.getDestIpPattern() == 2)
|| (srcIp.getSrcIpAddress() != null && srcIp.getSrcIpAddress().indexOf("-") > -1)
|| (srcIp.getDestIpAddress() != null && srcIp.getDestIpAddress().indexOf("-") > -1));
if (isRange) {
List<IpCfg> tempList = Lists.newArrayList();
List<IpCfg> tempList1 = Lists.newArrayList();
if (srcIp.getIpType().intValue() == 4) {
if (srcIp.getIpType().equals(4)) {// IP V4
if(srcIp.getSrcIpPattern().equals(2)) {//源IP范围
if (srcIp.getSrcIpAddress() != null) {
String startIpPart = srcIp.getSrcIpAddress().split("-")[0];
String endIpPart = srcIp.getSrcIpAddress().split("-")[1];
@@ -414,12 +411,29 @@ public class ConfigConvertUtil {
tempIp.setSrcIpMask("255.255.255.255");
tempList.add(tempIp);
}
} else {
}else {
dstIp.setSrcIp("0.0.0.0");
dstIp.setSrcIpMask("255.255.255.255");
tempList.add(dstIp);
}
}else if(srcIp.getSrcIpPattern().equals(1)){
Integer srcMaskNum = Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]);
if (srcMaskNum == 0) {
dstIp.setSrcIpMask("0.0.0.0");
} else {
dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum));
}
dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
tempList.add(dstIp);
}else if(srcIp.getSrcIpPattern().equals(3)){
dstIp.setSrcIp(srcIp.getSrcIpAddress());
dstIp.setSrcIpMask("255.255.255.255");
tempList.add(dstIp);
}else {
throw new RuntimeException("Unsupported IP Pattern " + srcIp.getSrcIpPattern());
}
if (srcIp.getDestIpAddress() != null) {
if(srcIp.getDestIpPattern().equals(2)) {
String startIpPart = srcIp.getDestIpAddress().split("-")[0];
String endIpPart = srcIp.getDestIpAddress().split("-")[1];
Integer startNum = Integer.parseInt(startIpPart.split("\\.")[3]);
@@ -439,7 +453,39 @@ public class ConfigConvertUtil {
}
}
tempList.clear();
}else if(srcIp.getDestIpPattern().equals(1)) {
Integer dstMaskNum = Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]);
for (IpCfg _cfg : tempList) {
IpCfg tempIp = new IpCfg();
BeanUtils.copyProperties(_cfg, tempIp);
if (dstMaskNum == 0) {
tempIp.setDstIpMask("0.0.0.0");
} else {
tempIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));
}
tempIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
if (!tempIp.getSrcIp().equals(tempIp.getDstIp())) {
// 处理
convertPortValues(tempIp, srcIp);
tempList1.add(tempIp);
}
}
tempList.clear();
}else {
for (IpCfg _cfg : tempList) {
IpCfg tempIp = new IpCfg();
BeanUtils.copyProperties(_cfg, tempIp);
tempIp.setDstIp(srcIp.getDestIpAddress());
if (!tempIp.getSrcIp().equals(tempIp.getDstIp())) {
tempIp.setDstIpMask("255.255.255.255");
// 处理
convertPortValues(tempIp, srcIp);
tempList1.add(tempIp);
}
}
tempList.clear();
}
}else {
for (IpCfg _cfg : tempList) {
_cfg.setDstIp("0.0.0.0");
_cfg.setSrcIpMask("255.255.255.255");
@@ -451,206 +497,50 @@ public class ConfigConvertUtil {
} else {
ipConvertList.addAll(tempList);
}
} else if (srcIp.getIpType().intValue() == 6) {
}else if(srcIp.getIpType().equals(6)){// IP V6
if (srcIp.getSrcIpAddress() != null) {
if(srcIp.getSrcIpPattern().equals(2)) {
IPv6Address address1 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[0]);
IPv6Address address2 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[1]);
IPv6Network network = IPv6Network.fromTwoAddresses(address1, address2);
dstIp.setSrcIp(address1.toString());
dstIp.setSrcIpMask(network.getNetmask().asAddress().toString());
}else if(srcIp.getSrcIpPattern().equals(1)){// IP/掩码
IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getSrcIpAddress());
dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString());
}else {// IP
dstIp.setSrcIp(srcIp.getSrcIpAddress());
dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}
} else {
dstIp.setSrcIp("::");
dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}
if (srcIp.getDestIpAddress() != null) {
if(srcIp.getDestIpPattern().equals(2)) {
IPv6Address address1 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[0]);
IPv6Address address2 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[1]);
IPv6Network network = IPv6Network.fromTwoAddresses(address1, address2);
dstIp.setDstIp(address1.toString());
dstIp.setDstIpMask(network.getNetmask().asAddress().toString());
}else if(srcIp.getDestIpPattern().equals(1)) {// IP/掩码
IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getDestIpAddress());
dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString());
}else {// IP
dstIp.setDstIp(srcIp.getDestIpAddress());
dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}
} else {
dstIp.setDstIp("::");
dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}
convertPortValues(dstIp, srcIp);
ipConvertList.add(dstIp);
} else {
}else {
throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
}
} else {
if (srcIp.getSrcIpAddress() != null) {
if (srcIp.getSrcIpAddress().indexOf("/") != -1) {
if (srcIp.getIpType() == 4 /* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
Integer srcMaskNum = Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]);
if (srcMaskNum == 0) {
dstIp.setSrcIpMask("0.0.0.0");
} else {
dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum));
}
dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getSrcIpAddress());
dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString());
} /*
* else { Pattern
* patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); Pattern
* patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); Matcher
* matchernV4Subnet=patternV4Subnet.matcher(srcIp.getSrcIpAddress()); Matcher
* matcherV6Subnet=patternV6Subnet.matcher(srcIp.getSrcIpAddress());
* if(matchernV4Subnet.matches()) { Integer srcMaskNum =
* Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]); if(srcMaskNum==0){
* dstIp.setSrcIpMask("0.0.0.0"); }else{
* dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum)); }
* dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); }else
* if(matcherV6Subnet.matches()){ IPv6Network strangeNetwork =
* IPv6Network.fromString(srcIp.getSrcIpAddress());
* dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
* dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString()); }else
* { throw new RuntimeException("Invalid IP/subnet mask format"); } }
*/
else {
throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
}
} else {
if (srcIp.getIpType() == 4/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
dstIp.setSrcIp(srcIp.getSrcIpAddress());
dstIp.setSrcIpMask("255.255.255.255");
} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
dstIp.setSrcIp(srcIp.getSrcIpAddress());
dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
} /*
* else {//all Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP);
* Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); Matcher
* matcherV4=patternV4.matcher(srcIp.getSrcIpAddress()); Matcher
* matcherV6=patternV6.matcher(srcIp.getSrcIpAddress()); if(matcherV4.matches())
* { dstIp.setSrcIp(srcIp.getSrcIpAddress());
* dstIp.setSrcIpMask("255.255.255.255"); }else if(matcherV6.matches()) {
* dstIp.setSrcIp(srcIp.getSrcIpAddress());
* dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); }else { throw
* new RuntimeException("Invalid IP format"); } }
*/
else {
throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
}
}
} else {
if (srcIp.getIpType() == 4/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
dstIp.setSrcIp(srcIp.getSrcIpAddress());
dstIp.setSrcIpMask("255.255.255.255");
} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
dstIp.setSrcIp(srcIp.getSrcIpAddress());
dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
} /*
* else {//all dstIp.setSrcIp(srcIp.getSrcIpAddress());
* dstIp.setSrcIpMask("255.255.255.255"); }
*/
else {
throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
}
}
if (srcIp.getDestIpAddress() != null) {
if (srcIp.getDestIpAddress().indexOf("/") != -1) {
if (srcIp.getIpType() == 4/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
Integer dstMaskNum = Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]);
if (dstMaskNum == 0) {
dstIp.setDstIpMask("0.0.0.0");
} else {
dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));
;
}
dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getDestIpAddress());
dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString());
} /*
* else { Pattern
* patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); Pattern
* patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); Matcher
* matchernV4Subnet=patternV4Subnet.matcher(srcIp.getDestIpAddress()); Matcher
* matcherV6Subnet=patternV6Subnet.matcher(srcIp.getDestIpAddress());
* if(matchernV4Subnet.matches()) { Integer dstMaskNum =
* Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]); if(dstMaskNum==0){
* dstIp.setDstIpMask("0.0.0.0"); }else{
* dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));; }
* dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); }else
* if(matcherV6Subnet.matches()){ IPv6Network strangeNetwork =
* IPv6Network.fromString(srcIp.getDestIpAddress());
* dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
* dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString()); }else
* { throw new RuntimeException("Invalid IP/subnet mask format"); } }
*/
else {
throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
}
} else {
if (srcIp.getIpType() == 4/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
dstIp.setDstIp(srcIp.getDestIpAddress());
dstIp.setDstIpMask("255.255.255.255");
} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
dstIp.setDstIp(srcIp.getDestIpAddress());
dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
} /*
* else {//all Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP);
* Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); Matcher
* matcherV4=patternV4.matcher(srcIp.getDestIpAddress()); Matcher
* matcherV6=patternV6.matcher(srcIp.getDestIpAddress());
* if(matcherV4.matches()) { dstIp.setDstIp(srcIp.getDestIpAddress());
* dstIp.setDstIpMask("255.255.255.255"); }else if(matcherV6.matches()) {
* dstIp.setDstIp(srcIp.getDestIpAddress());
* dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); }else { throw
* new RuntimeException("invalid ip format"); } }
*/
else {
throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
}
}
} else {
if (srcIp.getIpType() == 4/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
dstIp.setDstIp(srcIp.getDestIpAddress());
dstIp.setDstIpMask("255.255.255.255");
} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
dstIp.setDstIp(srcIp.getDestIpAddress());
dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
} /*
* else {//all dstIp.setDstIp(srcIp.getDestIpAddress());
* dstIp.setDstIpMask("255.255.255.255"); }
*/
else {
throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
}
}
if (srcIp.getSrcPort() != null) {
if (srcIp.getSrcPort().indexOf("/") != -1) {
String srcMaskNum = srcIp.getSrcPort().split("/")[1];
dstIp.setSrcPortMask(srcMaskNum);
dstIp.setSrcPort(srcIp.getSrcPort().split("/")[0]);
} else {
dstIp.setSrcPort(srcIp.getSrcPort());
dstIp.setSrcPortMask("65535");
}
} else {
dstIp.setSrcPort("0");
dstIp.setSrcPortMask("65535");
}
if (srcIp.getDestPort() != null) {
if (srcIp.getDestPort().indexOf("/") != -1) {
String dstMaskNum = srcIp.getDestPort().split("/")[1];
dstIp.setDstPortMask(dstMaskNum);
dstIp.setDstPort(srcIp.getDestPort().split("/")[0]);
} else {
dstIp.setDstPort(srcIp.getDestPort());
dstIp.setDstPortMask("65535");
}
} else {
dstIp.setDstPort("0");
dstIp.setDstPortMask("65535");
}
ipConvertList.add(dstIp);
}
return ipConvertList;
}
/**

37
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -3818,15 +3818,16 @@ public class BaseController {
cfg.setIsAudit(entity.getIsAudit());
cfg.setAuditTime(entity.getAuditTime());
cfg.setAuditorId(entity.getAuditorId());
auditList.add(BaseService.convertCallBackIp(cfg,cfg.getGroupId()));
//auditList.add(BaseService.convertCallBackIp(cfg,cfg.getGroupId())); // 移至下发前处理
auditList.add(cfg);
}else {
//定时任务审核通过，配置已经失效，则
cfg.setIsValid(entity.getIsValid());
cfg.setIsAudit(entity.getIsAudit());
cfg.setAuditTime(entity.getAuditTime());
cfg.setAuditorId(entity.getAuditorId());
notAuditList.add(BaseService.convertCallBackIp(cfg,cfg.getGroupId()));
//notAuditList.add(BaseService.convertCallBackIp(cfg,cfg.getGroupId())); // 移至下发前处理
notAuditList.add(cfg);
}
}
@@ -3883,14 +3884,16 @@ public class BaseController {
cfg.setIsAudit(entity.getIsAudit());
cfg.setAuditTime(entity.getAuditTime());
cfg.setAuditorId(entity.getAuditorId());
auditList.add(BaseService.convertCallBackProxyObjKeyring(cfg));
//auditList.add(BaseService.convertCallBackProxyObjKeyring(cfg)); // 移至下发前处理
auditList.add(cfg);
}else {
//定时任务审核通过，配置已经失效，则
cfg.setIsValid(entity.getIsValid());
cfg.setIsAudit(entity.getIsAudit());
cfg.setAuditTime(entity.getAuditTime());
cfg.setAuditorId(entity.getAuditorId());
notAuditList.add(BaseService.convertCallBackProxyObjKeyring(cfg));
//notAuditList.add(BaseService.convertCallBackProxyObjKeyring(cfg)); // 移至下发前处理
notAuditList.add(cfg);
}
}
}else if(className.equals("PxyObjTrustedCaCert")){
@@ -3903,14 +3906,16 @@ public class BaseController {
cfg.setIsAudit(entity.getIsAudit());
cfg.setAuditTime(entity.getAuditTime());
cfg.setAuditorId(entity.getAuditorId());
auditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(cfg,null));
//auditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(cfg,null)); // 移至下发前处理
auditList.add(cfg);
}else {
//定时任务审核通过，配置已经失效，则
cfg.setIsValid(entity.getIsValid());
cfg.setIsAudit(entity.getIsAudit());
cfg.setAuditTime(entity.getAuditTime());
cfg.setAuditorId(entity.getAuditorId());
notAuditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(cfg,null));
//notAuditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(cfg,null)); // 移至下发前处理
notAuditList.add(cfg);
}
}
if(!StringUtil.isEmpty(ids)) {
@@ -3923,14 +3928,16 @@ public class BaseController {
cfg.setIsAudit(entity.getIsAudit());
cfg.setAuditTime(entity.getAuditTime());
cfg.setAuditorId(entity.getAuditorId());
auditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(null,cfg));
//auditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(null,cfg)); // 移至下发前处理
auditList.add(cfg);
}else {
//定时任务审核通过，配置已经失效，则
cfg.setIsValid(entity.getIsValid());
cfg.setIsAudit(entity.getIsAudit());
cfg.setAuditTime(entity.getAuditTime());
cfg.setAuditorId(entity.getAuditorId());
notAuditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(null,cfg));
//notAuditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(null,cfg)); // 移至下发前处理
notAuditList.add(cfg);
}
}
}
@@ -3952,14 +3959,16 @@ public class BaseController {
cfg.setIsAudit(entity.getIsAudit());
cfg.setAuditTime(entity.getAuditTime());
cfg.setAuditorId(entity.getAuditorId());
auditList.add(BaseService.convertCallBackDnsResStrategy(cfg));
//auditList.add(BaseService.convertCallBackDnsResStrategy(cfg)); // 移至下发前处理
auditList.add(cfg);
}else {
//定时任务审核通过，配置已经失效，则
cfg.setIsValid(entity.getIsValid());
cfg.setIsAudit(entity.getIsAudit());
cfg.setAuditTime(entity.getAuditTime());
cfg.setAuditorId(entity.getAuditorId());
notAuditList.add(BaseService.convertCallBackDnsResStrategy(cfg));
//notAuditList.add(BaseService.convertCallBackDnsResStrategy(cfg)); // 移至下发前处理
notAuditList.add(cfg);
}
}
}else if(className.equals("DnsIpCfg")){
@@ -3972,14 +3981,16 @@ public class BaseController {
cfg.setIsAudit(entity.getIsAudit());
cfg.setAuditTime(entity.getAuditTime());
cfg.setAuditorId(entity.getAuditorId());
auditList.add(BaseService.convertCallBackIp(cfg,cfg.getDnsStrategyId()));
//auditList.add(BaseService.convertCallBackIp(cfg,cfg.getDnsStrategyId())); // 移至下发前处理
auditList.add(cfg);
}else {
//定时任务审核通过，配置已经失效，则
cfg.setIsValid(entity.getIsValid());
cfg.setIsAudit(entity.getIsAudit());
cfg.setAuditTime(entity.getAuditTime());
cfg.setAuditorId(entity.getAuditorId());
notAuditList.add(BaseService.convertCallBackIp(cfg,cfg.getDnsStrategyId()));
//notAuditList.add(BaseService.convertCallBackIp(cfg,cfg.getDnsStrategyId()));
notAuditList.add(cfg);
}
}
}else if(className.equals("IpPortCfg")){

5
src/main/java/com/nis/web/controller/LoginController.java
View File

@@ -29,6 +29,7 @@ import com.google.gson.reflect.TypeToken;
import com.nis.util.Configurations;
import com.nis.util.Constants;
import com.nis.util.CookieUtil;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils;
import com.nis.util.httpclient.HttpClientUtil;
@@ -87,6 +88,7 @@ public class LoginController extends BaseController {
CookieUtil.addCookie(response, "LOGINED", "false");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
LogUtils.saveLog(request, null, e, null);
}
}
@@ -173,6 +175,7 @@ public class LoginController extends BaseController {
}
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
LogUtils.saveLog(request, null, e, null);
}
@@ -212,6 +215,7 @@ public class LoginController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
LogUtils.saveLog(request, null, e, null);
}
return "redirect:"+request.getParameter("url");
@@ -230,6 +234,7 @@ public class LoginController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
LogUtils.saveLog(request, null, e, null);
}
return "redirect:"+request.getParameter("url");

6
src/main/java/com/nis/web/controller/SystemController.java
View File

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import com.nis.domain.SysMenu;
import com.nis.domain.configuration.HelpInfo;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils;
import com.nis.web.security.UserUtils;
@@ -106,6 +107,7 @@ public class SystemController extends BaseController{
}
} catch (Exception e) {
logger.error("help error",e);
LogUtils.saveLog(request, null, e, null);
}
logger.info("menuSize:"+newList.size());
model.addAttribute("menuList",newList);
@@ -139,6 +141,7 @@ public class SystemController extends BaseController{
}
} catch (Exception e) {
logger.error("save helpInfo error",e);
LogUtils.saveLog(request, null, e, null);
}
return false;
}
@@ -167,6 +170,7 @@ public class SystemController extends BaseController{
}
} catch (Exception e) {
logger.error("view helpInfo error",e);
LogUtils.saveLog(request, null, e, null);
}
return null;
}
@@ -195,6 +199,7 @@ public class SystemController extends BaseController{
}
} catch (Exception e) {
logger.error("view helpBakInfo error",e);
LogUtils.saveLog(request, null, e, null);
}
return null;
}
@@ -209,6 +214,7 @@ public class SystemController extends BaseController{
return true;
} catch (Exception e) {
logger.error("Clear Policies Error",e);
LogUtils.saveLog(request, null, e, null);
}
return false;
}

7
src/main/java/com/nis/web/controller/basics/AsnGroupController.java
View File

@@ -18,6 +18,7 @@ import com.nis.domain.Page;
import com.nis.domain.basics.AsnGroupInfo;
import com.nis.domain.basics.AsnIpCfg;
import com.nis.domain.specific.ConfigGroupInfo;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
/**
@@ -67,7 +68,7 @@ public class AsnGroupController extends BaseController {
//@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR)
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(AsnGroupInfo cfg,Model model,
RedirectAttributes redirectAttributes,String itType) {
RedirectAttributes redirectAttributes,String itType,HttpServletRequest request) {
try {
AsnGroupInfo asnGroup=asnGroupInfoService.getGroupIdByNameAndASNId(cfg.getOrganization().trim(), cfg.getCountry().trim(), cfg.getAsnId());
@@ -80,6 +81,7 @@ public class AsnGroupController extends BaseController {
} catch (Exception e) {
logger.error("新增失败",e);
addMessage(redirectAttributes,"error","save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/asnGroup/asnGroupList";
@@ -94,13 +96,14 @@ public class AsnGroupController extends BaseController {
*/
//@RequiresPermissions(value={"basics:classification:del","basics:attribute:del","basics:label:del"},logical=Logical.OR)
@RequestMapping(value={"delete"})
public String delete(RedirectAttributes redirectAttributes,String ids,String asnIds) {
public String delete(RedirectAttributes redirectAttributes,String ids,String asnIds,HttpServletRequest request) {
try {
asnGroupInfoService.delete(ids,asnIds);
addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) {
logger.error("删除失败",e);
addMessage(redirectAttributes,"error","delete_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/asnGroup/asnGroupList";
}

10
src/main/java/com/nis/web/controller/basics/AsnIpController.java
View File

@@ -32,6 +32,7 @@ import com.nis.exceptions.MaatConvertException;
//import com.nis.util.AsnCacheUtils;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -89,9 +90,11 @@ public class AsnIpController extends BaseController{
} catch (MaatConvertException e) {
logger.error("ASN IP配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("ASN IP配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath +"/basics/asn/list?functionId="+cfg.getFunctionId();
@@ -112,9 +115,11 @@ public class AsnIpController extends BaseController{
} catch (MaatConvertException e) {
logger.error("ASN IP配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("ASN IP配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath +"/basics/asn/list?functionId="+cfg.getFunctionId();
@@ -160,8 +165,10 @@ public class AsnIpController extends BaseController{
logger.error("配置下发失败：",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -187,8 +194,10 @@ public class AsnIpController extends BaseController{
logger.error("Delete failed",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error",e.getMessage());
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error","delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -277,6 +286,7 @@ public class AsnIpController extends BaseController{
} catch (Exception e) {
logger.error("asnIp export failed",e);
addMessage(redirectAttributes,"error","export_failed");
LogUtils.saveLog(request, null, e, null);
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

7
src/main/java/com/nis/web/controller/basics/InnerProtectionListController.java
View File

@@ -15,6 +15,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.basics.ProtectionListInfo;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
@@ -49,25 +50,27 @@ public class InnerProtectionListController extends BaseController{
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(ProtectionListInfo cfg,Model model,String itType,Integer groupType,
RedirectAttributes redirectAttributes) {
RedirectAttributes redirectAttributes,HttpServletRequest request) {
try {
innerProtectionListService.saveOrUpdate(cfg);
addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) {
logger.error("新增失败",e);
addMessage(redirectAttributes,"error","save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/innerProtectionList/list";
}
@RequestMapping(value={"delete"})
public String delete(RedirectAttributes redirectAttributes,String ids,int isValid) {
public String delete(RedirectAttributes redirectAttributes,String ids,int isValid,HttpServletRequest request) {
try {
innerProtectionListService.deldete(ids,isValid);
addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) {
logger.error("删除失败",e);
addMessage(redirectAttributes,"error","delete_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/innerProtectionList/list";
}

7
src/main/java/com/nis/web/controller/basics/IpReuseIpCfgController.java
View File

@@ -20,6 +20,7 @@ import com.nis.domain.basics.IpReuseIpCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.web.controller.BaseController;
@Controller
@RequestMapping(value = "${adminPath}/basics/vpn")
@@ -75,6 +76,7 @@ public class IpReuseIpCfgController extends BaseController{
logger.error("信息保存失败",e);
e.printStackTrace();
addMessage(redirectAttributes,"error","save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath +"/basics/vpn/list?functionId="+entity.getFunctionId();
}
@@ -91,6 +93,7 @@ public class IpReuseIpCfgController extends BaseController{
logger.error("信息保存失败",e);
e.printStackTrace();
addMessage(redirectAttributes,"error","save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath +"/basics/vpn/list?functionId="+cfg.getFunctionId();
}
@@ -98,7 +101,7 @@ public class IpReuseIpCfgController extends BaseController{
@RequiresPermissions(value={"asn:ip:config"})
public String delete(Integer isValid
,String ids,Integer functionId
,RedirectAttributes redirectAttributes){
,RedirectAttributes redirectAttributes,HttpServletRequest request){
try{
ipReuseIpCfgService.delete(isValid,ids);
addMessage(redirectAttributes,"success","delete_success");
@@ -106,8 +109,10 @@ public class IpReuseIpCfgController extends BaseController{
logger.error("Delete failed",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error",e.getMessage());
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error","delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}

8
src/main/java/com/nis/web/controller/basics/PolicyGroupController.java
View File

@@ -21,6 +21,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.util.Constants;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
/**
@@ -71,7 +72,7 @@ public class PolicyGroupController extends BaseController {
//@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR)
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(PolicyGroupInfo cfg,Model model,
RedirectAttributes redirectAttributes,String itType,Integer groupType) {
RedirectAttributes redirectAttributes,String itType,Integer groupType,HttpServletRequest request) {
try {
policyGroupInfoService.saveOrUpdate(cfg);
@@ -79,6 +80,7 @@ public class PolicyGroupController extends BaseController {
} catch (Exception e) {
logger.error("新增失败",e);
addMessage(redirectAttributes,"error","save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList?groupType="+groupType;
@@ -93,13 +95,14 @@ public class PolicyGroupController extends BaseController {
*/
//@RequiresPermissions(value={"basics:classification:del","basics:attribute:del","basics:label:del"},logical=Logical.OR)
@RequestMapping(value={"delete"})
public String delete(RedirectAttributes redirectAttributes, Integer groupType,String ids,int isValid) {
public String delete(RedirectAttributes redirectAttributes, Integer groupType,String ids,int isValid,HttpServletRequest request) {
try {
policyGroupInfoService.deldete(ids,isValid);
addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) {
logger.error("删除失败",e);
addMessage(redirectAttributes,"error","delete_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList?groupType="+groupType;
}
@@ -194,6 +197,7 @@ public class PolicyGroupController extends BaseController {
} catch (Exception e) {
logger.error("Group export failed",e);
addMessage(redirectAttributes,"error","export_failed");
LogUtils.saveLog(request, null, e, null);
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

14
src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
View File

@@ -29,6 +29,7 @@ import com.nis.util.ConfigDictUtils;
import com.nis.util.Configurations;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils;
import com.nis.web.controller.BaseController;
@@ -52,7 +53,7 @@ public class ServiceDictInfoController extends BaseController {
@ResponseBody
@RequestMapping(value="requestCancleInfoAjax", method = RequestMethod.POST)
public String requestCancleInfoAjax(Integer cancelRequestId,String ids,String indexTable){
public String requestCancleInfoAjax(Integer cancelRequestId,String ids,String indexTable,HttpServletRequest request){
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
for(String id :idArray){
@@ -61,6 +62,7 @@ public class ServiceDictInfoController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
logger.error("审核添加取消来函信息失败",e);
LogUtils.saveLog(request, null, e, null);
return "false";
}
}
@@ -76,7 +78,7 @@ public class ServiceDictInfoController extends BaseController {
*/
@ResponseBody
@RequestMapping(value="requestCancleInfoNumber")
public Map requestCancleInfoNumber(String ids,String indexTable){
public Map requestCancleInfoNumber(String ids,String indexTable,HttpServletRequest request){
List list = new ArrayList();
String requestTitle="";
Map map=new HashMap();
@@ -94,6 +96,7 @@ public class ServiceDictInfoController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
logger.error("查询取消审核来函信息失败",e);
LogUtils.saveLog(request, null, e, null);
return map;
}
// }
@@ -207,7 +210,7 @@ public class ServiceDictInfoController extends BaseController {
*/
@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:vpn_ip:add","basics:classification:edit","basics:attribute:edit","basics:label:edit","basics:vpn_ip:edit"},logical=Logical.OR)
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(ServiceDictInfo serviceDictInfo,Model model, RedirectAttributes redirectAttributes,String itType) {
public String saveOrUpdate(ServiceDictInfo serviceDictInfo,Model model, RedirectAttributes redirectAttributes,String itType,HttpServletRequest request) {
try {
serviceDictInfoService.saveOrUpdate(serviceDictInfo);
@@ -215,6 +218,7 @@ public class ServiceDictInfoController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes,"error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/serviceDictInfo/list?itType="+itType;
@@ -231,7 +235,7 @@ public class ServiceDictInfoController extends BaseController {
*/
@RequiresPermissions(value={"basics:classification:del","basics:attribute:del","basics:label:del","basics:vpn_ip:del"},logical=Logical.OR)
@RequestMapping(value={"delete"})
public String delete(ServiceDictInfo serviceDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) {
public String delete(ServiceDictInfo serviceDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId,HttpServletRequest request) {
try {
String exIp="";
String id="";
@@ -266,6 +270,7 @@ public class ServiceDictInfoController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes,"error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/serviceDictInfo/list?itType="+itType;
}
@@ -586,6 +591,7 @@ public class ServiceDictInfoController extends BaseController {
} catch (Exception e) {
logger.error("dict white export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

7
src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
View File

@@ -25,6 +25,7 @@ import com.nis.domain.basics.ServiceDictInfo;
import com.nis.domain.basics.SysDictInfo;
import com.nis.util.ConfigDictUtils;
import com.nis.util.Configurations;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils;
import com.nis.web.controller.BaseController;
@@ -151,7 +152,7 @@ public class SysDictInfoController extends BaseController {
*/
@RequiresPermissions(value={"basics:area:add","basics:isp:add","basics:scope:add","basics:area:edit","basics:isp:edit","basics:scope:edit"},logical=Logical.OR)
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(SysDictInfo sysDictInfo,Model model, RedirectAttributes redirectAttributes, String itType) {
public String saveOrUpdate(SysDictInfo sysDictInfo,Model model, RedirectAttributes redirectAttributes, String itType,HttpServletRequest request) {
try {
sysDictInfoService.saveOrUpdate(sysDictInfo);
@@ -159,6 +160,7 @@ public class SysDictInfoController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes,"error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/sysDictInfo/list?itType="+itType;
@@ -172,13 +174,14 @@ public class SysDictInfoController extends BaseController {
*/
@RequiresPermissions(value={"basics:area:del","basics:isp:del","basics:scope:del"},logical=Logical.OR)
@RequestMapping(value={"delete"})
public String delete(SysDictInfo sysDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) {
public String delete(SysDictInfo sysDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId,HttpServletRequest request) {
try {
sysDictInfoService.deleteDict(mulitId);
addMessage(redirectAttributes,"success", "delete_success");
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes,"error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/sysDictInfo/list?itType="+itType;
}

3
src/main/java/com/nis/web/controller/basics/TaskInfoController.java
View File

@@ -24,6 +24,7 @@ import com.nis.domain.configuration.RequestInfo;
import com.nis.domain.configuration.TaskInfo;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.excel.ExcelField;
import com.nis.web.controller.BaseController;
@@ -90,6 +91,7 @@ public class TaskInfoController extends BaseController{
logger.error(e.getMessage());
e.printStackTrace();
addMessage(redirectAttributes,"error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basics/taskInfo/list?functionId="+taskInfo.getFunctionId()+"&repage";
}
@@ -233,6 +235,7 @@ public class TaskInfoController extends BaseController{
} catch (Exception e) {
logger.error("ip addr export failed",e);
addMessage(redirectAttributes,"error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

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

@@ -56,6 +56,7 @@ import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.FileUtils;
import com.nis.util.JsonMapper;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -230,9 +231,11 @@ public class AppCfgController extends BaseController {
} catch (MaatConvertException e) {
logger.error("app 协议配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("app 协议配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/app/policyCfgList?functionId=" + entity.getFunctionId();
@@ -270,8 +273,10 @@ public class AppCfgController extends BaseController {
logger.error("app策略配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -287,8 +292,10 @@ public class AppCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -324,8 +331,10 @@ public class AppCfgController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -407,9 +416,11 @@ public class AppCfgController extends BaseController {
}catch (MaatConvertException e) {
logger.error("APP IP配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("APP IP配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/app/ipCfgList?functionId=" + entity.getFunctionId();
@@ -457,8 +468,10 @@ public class AppCfgController extends BaseController {
logger.error("app协议IP配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -474,8 +487,10 @@ public class AppCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -511,8 +526,10 @@ public class AppCfgController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -592,8 +609,10 @@ public class AppCfgController extends BaseController {
logger.error("saveAppHttpCfg failed", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -633,8 +652,10 @@ public class AppCfgController extends BaseController {
logger.error("app http配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -650,8 +671,10 @@ public class AppCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -751,9 +774,11 @@ public class AppCfgController extends BaseController {
} catch (MaatConvertException e) {
logger.error("APP域名配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("APP域名配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/app/domainCfgList?functionId=" + entity.getFunctionId();
@@ -790,8 +815,10 @@ public class AppCfgController extends BaseController {
logger.error("app协议domain配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -807,8 +834,10 @@ public class AppCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -843,8 +872,10 @@ public class AppCfgController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -922,8 +953,10 @@ public class AppCfgController extends BaseController {
logger.error("saveAppByteCfg failed", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -943,7 +976,7 @@ public class AppCfgController extends BaseController {
@RequestMapping(value = { "auditAppByteCfg" })
// @RequiresPermissions(value={"app:byte:confirm"})
public String auditAppByteCfg(Integer isAudit, Integer isValid, String ids, Integer functionId,
RedirectAttributes redirectAttributes) {
RedirectAttributes redirectAttributes,HttpServletRequest request) {
AppByteCfg entity = new AppByteCfg();
String[] idArray = ids.split(",");
for (String id : idArray) {
@@ -961,8 +994,10 @@ public class AppCfgController extends BaseController {
logger.error("app协议byte配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -1055,8 +1090,10 @@ public class AppCfgController extends BaseController {
logger.error("saveAppSslCfg failed", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -1095,8 +1132,10 @@ public class AppCfgController extends BaseController {
logger.error("app SSL配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -1112,8 +1151,10 @@ public class AppCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -1210,8 +1251,10 @@ public class AppCfgController extends BaseController {
logger.error("saveAppTcpCfg failed", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -1246,7 +1289,7 @@ public class AppCfgController extends BaseController {
@RequestMapping(value = { "auditAppTcpCfg" })
@RequiresPermissions(value = { "app:tcp:confirm" })
public String auditAppTcpCfg(Integer isAudit, Integer isValid, String ids, Integer functionId,
RedirectAttributes redirectAttributes) {
RedirectAttributes redirectAttributes,HttpServletRequest request) {
AppTcpCfg entity = new AppTcpCfg();
String[] idArray = ids.split(",");
for (String id : idArray) {
@@ -1263,8 +1306,10 @@ public class AppCfgController extends BaseController {
logger.error("app SSL配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -1342,8 +1387,10 @@ public class AppCfgController extends BaseController {
logger.error("saveAppHeaderCfg failed", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -1363,7 +1410,7 @@ public class AppCfgController extends BaseController {
@RequestMapping(value = { "auditAppHeaderCfg" })
@RequiresPermissions(value = { "app:header:confirm" })
public String auditAppHeaderCfg(Integer isAudit, Integer isValid, String ids, Integer functionId,
RedirectAttributes redirectAttributes) {
RedirectAttributes redirectAttributes,HttpServletRequest request) {
AppHeaderCfg entity = new AppHeaderCfg();
String[] idArray = ids.split(",");
for (String id : idArray) {
@@ -1381,8 +1428,10 @@ public class AppCfgController extends BaseController {
logger.error("app Header配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -1524,9 +1573,11 @@ public class AppCfgController extends BaseController {
} catch (MaatConvertException e) {
logger.error("APP主题网站配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("APP主题网站配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/app/topicDomainCfgList?functionId=" + entity.getFunctionId();
@@ -1562,8 +1613,10 @@ public class AppCfgController extends BaseController {
logger.error("app主题网站配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -1579,8 +1632,10 @@ public class AppCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -1615,10 +1670,13 @@ public class AppCfgController extends BaseController {
logger.error("app主题网站删除失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else if (e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes, "error", "call_external_procedures_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
return "redirect:" + adminPath + "/app/topicDomainCfgList?functionId=" + functionId;
@@ -1685,8 +1743,10 @@ public class AppCfgController extends BaseController {
logger.error("appBuiltinFeatureFileSaveOrUpdate failed", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -1717,7 +1777,7 @@ public class AppCfgController extends BaseController {
@RequestMapping(value = { "/audit" })
@RequiresPermissions(value = { "app:built_in_file:confirm" })
public String audit(Integer isAudit, Integer isValid, String ids, Integer functionId,
RedirectAttributes redirectAttributes) {
RedirectAttributes redirectAttributes,HttpServletRequest request) {
if (!StringUtil.isEmpty(ids)) {
String[] idArray = ids.split(",");
Date auditTime = new Date();
@@ -1730,8 +1790,10 @@ public class AppCfgController extends BaseController {
logger.error("appBuiltinFeature audit failed", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -1893,6 +1955,7 @@ public class AppCfgController extends BaseController {
} catch (Exception e) {
logger.error("ip addr export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -1965,6 +2028,7 @@ public class AppCfgController extends BaseController {
} catch (Exception e) {
logger.error("top export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -2031,6 +2095,7 @@ public class AppCfgController extends BaseController {
} catch (Exception e) {
logger.error("appIp export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -2105,6 +2170,7 @@ public class AppCfgController extends BaseController {
} catch (Exception e) {
logger.error("http export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -2177,6 +2243,7 @@ public class AppCfgController extends BaseController {
} catch (Exception e) {
logger.error("Domain export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -2250,6 +2317,7 @@ public class AppCfgController extends BaseController {
} catch (Exception e) {
logger.error("App ssl export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

10
src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java
View File

@@ -58,6 +58,7 @@ import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.FileUtils;
import com.nis.util.JsonMapper;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -152,9 +153,11 @@ public class AppFeatureCfgController extends BaseController {
} catch (MaatConvertException e) {
logger.error("APP 特征配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("APP 特征配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/app/feature/multiFeatureCfgList?functionId=" + entity.getFunctionId();
@@ -189,10 +192,12 @@ public class AppFeatureCfgController extends BaseController {
e.printStackTrace();
logger.error("app 特征配置下发失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
e.printStackTrace();
logger.error("app 特征配置下发失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
} else {
@@ -207,8 +212,10 @@ public class AppFeatureCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -243,8 +250,10 @@ public class AppFeatureCfgController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -436,6 +445,7 @@ public class AppFeatureCfgController extends BaseController {
} catch (Exception e) {
logger.error("Appfeature export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

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

@@ -36,6 +36,7 @@ import com.nis.exceptions.CallExternalProceduresException;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -168,12 +169,15 @@ public class BasicProtocolController extends BaseController {
} catch (MaatConvertException e) {
logger.error("基础协议配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (CallExternalProceduresException e) {
logger.error("调用外部程序出错：",e);
addMessage(redirectAttributes, "error", "call_external_procedures_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("基础协议配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/basicprotocol/list?functionId=" + entity.getFunctionId();
@@ -212,10 +216,12 @@ public class BasicProtocolController extends BaseController {
logger.info("app策略配置下发失败：" + e.getMessage());
;
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
e.printStackTrace();
logger.error("app策略配置下发失败", e);
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -232,8 +238,10 @@ public class BasicProtocolController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -269,8 +277,10 @@ public class BasicProtocolController extends BaseController {
addMessage(redirectAttributes, "error", "request_service_failed");
} else if (e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes, "error", "call_external_procedures_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
return "redirect:" + adminPath + "/basicprotocol/list?functionId=" + functionId;
@@ -397,6 +407,7 @@ public class BasicProtocolController extends BaseController {
} catch (Exception e) {
logger.error("ip addr export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

10
src/main/java/com/nis/web/controller/configuration/ConfigSynchronizationController.java
View File

@@ -29,6 +29,7 @@ import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.service.BaseService;
@@ -78,6 +79,7 @@ public class ConfigSynchronizationController extends BaseController {
Thread.sleep(60000);
} catch (InterruptedException e) {
e.printStackTrace();
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -101,19 +103,26 @@ public class ConfigSynchronizationController extends BaseController {
status = 1;
} catch (NoSuchFieldException e) {
e.printStackTrace();
LogUtils.saveLog(request, null, e, null);
} catch (SecurityException e) {
e.printStackTrace();
LogUtils.saveLog(request, null, e, null);
} catch (IllegalArgumentException e) {
e.printStackTrace();
LogUtils.saveLog(request, null, e, null);
} catch (IllegalAccessException e) {
e.printStackTrace();
LogUtils.saveLog(request, null, e, null);
} catch (ClassNotFoundException e) {
e.printStackTrace();
LogUtils.saveLog(request, null, e, null);
}catch(MaatConvertException e){
e.printStackTrace();
LogUtils.saveLog(request, null, e, null);
status = -1;
}catch (Exception e) {
e.printStackTrace();
LogUtils.saveLog(request, null, e, null);
}finally{
if(status!=1){
SysDataDictionaryName sysDictName = new SysDataDictionaryName();
@@ -172,6 +181,7 @@ public class ConfigSynchronizationController extends BaseController {
Thread.sleep(60000);
} catch (InterruptedException e) {
e.printStackTrace();
LogUtils.saveLog(request, null, e, null);
}
}

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

@@ -35,6 +35,7 @@ import com.nis.exceptions.CallExternalProceduresException;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -189,12 +190,15 @@ public class EncryptedTunnelBehaviorController extends BaseController {
} catch (MaatConvertException e) {
logger.error("加密隧道行为配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (CallExternalProceduresException e) {
logger.error("调用外部程序出错：",e);
addMessage(redirectAttributes, "error", "call_external_procedures_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("加密隧道行为配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/encryptedtunnelbehav/list?functionId=" + entity.getFunctionId();
@@ -235,10 +239,12 @@ public class EncryptedTunnelBehaviorController extends BaseController {
logger.info("加密隧道配置下发失败：" + e.getMessage());
;
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
e.printStackTrace();
logger.error("加密隧道配置下发失败", e);
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -255,8 +261,10 @@ public class EncryptedTunnelBehaviorController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -292,10 +300,13 @@ public class EncryptedTunnelBehaviorController extends BaseController {
logger.error("加密隧道协议保存失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else if (e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes, "error", "call_external_procedures_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
return "redirect:" + adminPath + "/encryptedtunnelbehav/list?functionId=" + functionId;
@@ -443,6 +454,7 @@ public class EncryptedTunnelBehaviorController extends BaseController {
} catch (Exception e) {
logger.error("TunnelBehavior export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

10
src/main/java/com/nis/web/controller/configuration/GroupAreaController.java
View File

@@ -2,6 +2,7 @@ package com.nis.web.controller.configuration;
import java.util.List;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -16,6 +17,7 @@ import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.configuration.GroupAreaInfo;
import com.nis.exceptions.CallExternalProceduresException;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.service.configuration.GroupAreaService;
@@ -65,7 +67,7 @@ public class GroupAreaController extends BaseController {
}
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(GroupAreaInfo cfg,Model model,RedirectAttributes redirectAttributes) {
public String saveOrUpdate(GroupAreaInfo cfg,Model model,RedirectAttributes redirectAttributes,HttpServletRequest request) {
try {
groupAreaService.saveOrUpdate(cfg);
addMessage(redirectAttributes,"success","save_success");
@@ -73,23 +75,27 @@ public class GroupAreaController extends BaseController {
logger.error("新增失败",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
LogUtils.saveLog(request, null, e, null);
}else if(e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","call_external_procedures_failed");
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error","save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
return "redirect:" + adminPath + "/cfg/groupArea/groupAreaList";
}
@RequestMapping(value={"delete"})
public String delete(RedirectAttributes redirectAttributes, String ids,int isValid) {
public String delete(RedirectAttributes redirectAttributes, String ids,int isValid,HttpServletRequest request) {
try {
groupAreaService.deldete(ids,isValid);
addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) {
logger.error("删除失败",e);
addMessage(redirectAttributes,"error","delete_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/cfg/groupArea/groupAreaList";
}

4
src/main/java/com/nis/web/controller/configuration/LogSearchController.java
View File

@@ -23,6 +23,7 @@ import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.nis.domain.log.BaseLogEntity;
import com.nis.util.Constants;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -73,7 +74,7 @@ public class LogSearchController extends BaseController{
@RequestMapping(value="actionLogTrend")
@ResponseBody
public List actionTrans(String cfgId,String beginDate,String endDate,String serviceId){
public List actionTrans(String cfgId,String beginDate,String endDate,String serviceId,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List resultList = new ArrayList();
String url = Constants.LOG_BASE_URL+Constants.NTC_PZ_REPORT;
@@ -96,6 +97,7 @@ public class LogSearchController extends BaseController{
} catch (Exception e) {
e.printStackTrace();
resultList.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return resultList;
}

3
src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
View File

@@ -26,6 +26,7 @@ import com.nis.domain.configuration.TaskInfo;
import com.nis.domain.log.BaseLogEntity;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.excel.ExcelField;
import com.nis.web.controller.BaseController;
@@ -124,6 +125,7 @@ public class RequestInfoController extends BaseController{
logger.error(e.getMessage());
e.printStackTrace();
addMessage(model,"error","save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/cfg/request/list?functionId="+requestInfo.getFunctionId()+"&repage";
}
@@ -286,6 +288,7 @@ public class RequestInfoController extends BaseController{
} catch (Exception e) {
logger.error("ip addr export failed",e);
addMessage(redirectAttributes,"error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

15
src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java
View File

@@ -24,6 +24,7 @@ import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.configuration.DnsIpCfg;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
@@ -69,7 +70,7 @@ public class DnsIpCfgController extends BaseController {
*/
@ResponseBody
@RequestMapping(value = { "initSpoofingIp" })
public String initSpoofingIp() {
public String initSpoofingIp(HttpServletRequest request) {
Properties msg = getMsgProp();
try {
DnsIpCfg entity = new DnsIpCfg();
@@ -84,8 +85,10 @@ public class DnsIpCfgController extends BaseController {
logger.error("初始化Spoofing ip失败", e);
e.printStackTrace();
if (e instanceof MaatConvertException) {
LogUtils.saveLog(request, null, e, null);
return msg.getProperty("request_service_failed");
} else {
LogUtils.saveLog(request, null, e, null);
return msg.getProperty("save_failed");
}
}
@@ -108,9 +111,11 @@ public class DnsIpCfgController extends BaseController {
} catch (MaatConvertException e) {
logger.error("DNS欺骗ip配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("DNS欺骗ip配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/cfg/dnsIp/list?functionId=" + cfg.getFunctionId();
@@ -133,8 +138,10 @@ public class DnsIpCfgController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -157,10 +164,12 @@ public class DnsIpCfgController extends BaseController {
e.printStackTrace();
logger.info("dns fake ip配置下发失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
e.printStackTrace();
logger.info("dns fake ip配置下发失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -177,8 +186,10 @@ public class DnsIpCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -271,8 +282,10 @@ public class DnsIpCfgController extends BaseController {
logger.error("DnsIp export failed", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
// return "redirect:" + adminPath

11
src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java
View File

@@ -28,6 +28,7 @@ import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.specific.SpecificServiceCfg;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
@@ -90,9 +91,11 @@ public class DnsResStrategyController extends BaseController {
} catch (MaatConvertException e) {
logger.error("DNS响应策略配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("DNS响应策略配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/maintenance/dnsResStrategy/list?functionId=" + cfg.getFunctionId();
@@ -126,8 +129,10 @@ public class DnsResStrategyController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -148,8 +153,10 @@ public class DnsResStrategyController extends BaseController {
addMessage(redirectAttributes, "success", "audit_success");
} catch (MaatConvertException e) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -165,8 +172,10 @@ public class DnsResStrategyController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -250,8 +259,10 @@ public class DnsResStrategyController extends BaseController {
logger.error("Dns export failed", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
// return "redirect:" + adminPath

9
src/main/java/com/nis/web/controller/configuration/maintenance/IpAddrPoolController.java
View File

@@ -24,6 +24,7 @@ import com.nis.domain.configuration.IpAddrPoolCfg;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils;
import com.nis.web.controller.BaseController;
@@ -81,8 +82,10 @@ public class IpAddrPoolController extends BaseController{
e.printStackTrace();
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -91,7 +94,7 @@ public class IpAddrPoolController extends BaseController{
@RequestMapping(value = {"/snatAudit"})
@RequiresPermissions(value={"ip:mulitiplex:pool:confirm"})
public String snataudit(Integer isAudit,Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) {
public String snataudit(Integer isAudit,Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes,HttpServletRequest request) {
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
Date auditTime=new Date();
@@ -104,8 +107,10 @@ public class IpAddrPoolController extends BaseController{
logger.error("SNAT地址池配置下发失败："+e.getMessage());
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -138,6 +143,7 @@ public class IpAddrPoolController extends BaseController{
}catch(Exception e){
logger.error(e);
addMessage(redirectAttributes,"error","delete_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+functionId;
}
@@ -282,6 +288,7 @@ public class IpAddrPoolController extends BaseController{
} catch (Exception e) {
logger.error("ip white export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

9
src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java
View File

@@ -24,6 +24,7 @@ import com.nis.domain.configuration.IpMultiplexPoolCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.service.basics.SysDictInfoService;
@@ -72,8 +73,10 @@ public class IpMultiplexPoolCfgController extends BaseController {
e.printStackTrace();
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -103,6 +106,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
} catch (Exception e) {
logger.error(e);
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/maintenance/ipMultiplexPoolCfg/list?functionId=" + functionId;
}
@@ -110,7 +114,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
@RequestMapping(value = { "/audit" })
@RequiresPermissions(value = { "ip:mulitiplex:pool:confirm" })
public String audit(Integer isAudit, Integer isValid, String ids, Integer functionId,
RedirectAttributes redirectAttributes) {
RedirectAttributes redirectAttributes,HttpServletRequest request) {
if (!StringUtil.isEmpty(ids)) {
String[] idArray = ids.split(",");
Date auditTime = new Date();
@@ -126,6 +130,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
e.printStackTrace();
logger.info("IP复用地址池配置下发失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -309,6 +314,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
} catch (Exception e) {
logger.error("snat export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -370,6 +376,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
} catch (Exception e) {
logger.error("dnat export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

19
src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
View File

@@ -30,6 +30,7 @@ import com.nis.domain.configuration.UserManage;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils;
import com.nis.web.controller.BaseController;
@@ -110,10 +111,12 @@ public class UserManageController extends BaseController{
} catch (MaatConvertException e) {
message=msgProp.getProperty("user")+" "+user.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("delete_failed");
logger.error("用户vpn新增失败",e);
LogUtils.saveLog(request, null, e, null);
throw e;
}catch (Exception e) {
message=msgProp.getProperty("user")+" "+user.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("delete_failed");
logger.error("用户vpn新增失败",e);
LogUtils.saveLog(request, null, e, null);
throw e;
}
}
@@ -134,8 +137,10 @@ public class UserManageController extends BaseController{
}
if(!StringUtil.isEmpty(e.getMessage())) {
addMessage(redirectAttributes,"error",e.getMessage());
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error",message);
LogUtils.saveLog(request, null, e, null);
}
}
@@ -181,10 +186,12 @@ public class UserManageController extends BaseController{
} catch (MaatConvertException e) {
message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("save_failed");
logger.error("用户vpn新增失败",e);
LogUtils.saveLog(request, null, e, null);
throw e;
}catch (Exception e) {
message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("save_failed");
logger.error("用户vpn新增失败",e);
LogUtils.saveLog(request, null, e, null);
throw e;
}
}
@@ -208,10 +215,12 @@ public class UserManageController extends BaseController{
} catch (MaatConvertException e) {
message=msgProp.getProperty("user")+" "+entity.getUserName()+msgProp.getProperty("password")+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("update_failed");
logger.error("用户vpn密码修改失败",e);
LogUtils.saveLog(request, null, e, null);
throw e;
}catch (Exception e) {
message=msgProp.getProperty("user")+" "+entity.getUserName()+msgProp.getProperty("password")+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("update_failed");
logger.error("用户vpn密码修改失败",e);
LogUtils.saveLog(request, null, e, null);
throw e;
}
}
@@ -243,10 +252,12 @@ public class UserManageController extends BaseController{
} catch (MaatConvertException e) {
message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("save_failed");
logger.error("用户vpn新增失败",e);
LogUtils.saveLog(request, null, e, null);
throw e;
}catch (Exception e) {
message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("save_failed");
logger.error("用户vpn新增失败",e);
LogUtils.saveLog(request, null, e, null);
throw e;
}
}
@@ -263,10 +274,12 @@ public class UserManageController extends BaseController{
} catch (MaatConvertException e) {
message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("save_failed");
logger.error("用户vpn删除失败",e);
LogUtils.saveLog(request, null, e, null);
throw e;
}catch (Exception e) {
message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("save_failed");
logger.error("用户vpn删除失败",e);
LogUtils.saveLog(request, null, e, null);
throw e;
}
}
@@ -277,15 +290,19 @@ public class UserManageController extends BaseController{
} catch (MaatConvertException e) {
if(!StringUtil.isEmpty(e.getMessage())) {
addMessage(redirectAttributes,"error",e.getMessage());
LogUtils.saveLog(request, null, e, null);
}else{
addMessage(redirectAttributes,"error",message);
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath +"/maintenance/userManage/list";
} catch (Exception e) {
if(!StringUtil.isEmpty(e.getMessage())) {
addMessage(redirectAttributes,"error",e.getMessage());
LogUtils.saveLog(request, null, e, null);
}else{
addMessage(redirectAttributes,"error",message);
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath +"/maintenance/userManage/list";
}
@@ -375,6 +392,7 @@ public class UserManageController extends BaseController{
message+=","+ip;
}
logger.error("查询失败", e);
LogUtils.saveLog(request, null, e, null);
}
}
mess.put("message", message);
@@ -450,6 +468,7 @@ public class UserManageController extends BaseController{
} catch (Exception e) {
logger.error("user export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

10
src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java
View File

@@ -34,6 +34,7 @@ import com.nis.domain.configuration.DdosIpCfg;
import com.nis.domain.configuration.RequestInfo;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -81,9 +82,11 @@ public class DdosCfgController extends BaseController {
} catch (MaatConvertException e) {
logger.error("DDOS配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("DDOS配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/manipulation/ddos/list?functionId=" + cfg.getFunctionId();
@@ -106,8 +109,10 @@ public class DdosCfgController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -130,10 +135,12 @@ public class DdosCfgController extends BaseController {
e.printStackTrace();
logger.info("dns fake ip配置下发失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
e.printStackTrace();
logger.info("dns fake ip配置下发失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -149,8 +156,10 @@ public class DdosCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -262,6 +271,7 @@ public class DdosCfgController extends BaseController {
} catch (Exception e) {
logger.error("ddos export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

19
src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java
View File

@@ -44,6 +44,7 @@ import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.configuration.CommonController;
import com.nis.web.service.configuration.IpMultiplexService;
@@ -181,8 +182,10 @@ public class IpMultiplexController extends CommonController {
e.printStackTrace();
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -202,6 +205,7 @@ public class IpMultiplexController extends CommonController {
} catch (Exception e) {
logger.error(e);
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/manipulation/ipmulitiplex/snatPolicyList?functionId=" + functionId;
@@ -210,7 +214,7 @@ public class IpMultiplexController extends CommonController {
@RequestMapping(value = { "/auditSnat" })
@RequiresPermissions("snat_policy:confirm")
public String auditSnat(String ids, Integer isAudit, Integer isValid, Integer functionId,
RedirectAttributes redirectAttributes) {
RedirectAttributes redirectAttributes,HttpServletRequest request) {
if (!StringUtil.isEmpty(ids)) {
String[] idArray = ids.split(",");
@@ -224,8 +228,10 @@ public class IpMultiplexController extends CommonController {
logger.error("SNAT策略配置下发失败：" + e.getMessage());
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -367,8 +373,10 @@ public class IpMultiplexController extends CommonController {
e.printStackTrace();
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
return "redirect:" + adminPath + "/manipulation/ipmulitiplex/dnatPolicyList?functionId=" + cfg.getFunctionId();
@@ -376,7 +384,7 @@ public class IpMultiplexController extends CommonController {
@RequestMapping(value = { "/dnatDelete" })
@RequiresPermissions("dnat_policy:config")
public String dnatDelete(String ids, Integer isValid, Integer functionId, RedirectAttributes redirectAttributes) {
public String dnatDelete(String ids, Integer isValid, Integer functionId, RedirectAttributes redirectAttributes,HttpServletRequest request) {
// this._deleteIp(cfgName,ids, compileIds, functionId, model);
try {
@@ -387,6 +395,7 @@ public class IpMultiplexController extends CommonController {
} catch (Exception e) {
logger.error(e);
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/manipulation/ipmulitiplex/dnatPolicyList?functionId=" + functionId;
@@ -395,7 +404,7 @@ public class IpMultiplexController extends CommonController {
@RequestMapping(value = { "/auditDnat" })
@RequiresPermissions("dnat_policy:confirm")
public String auditDnat(String ids, Integer isAudit, Integer isValid, Integer functionId,
RedirectAttributes redirectAttributes) {
RedirectAttributes redirectAttributes,HttpServletRequest request) {
// this._auditIp(cfgName,ids, cfg, redirectAttributes);
if (!StringUtil.isEmpty(ids)) {
@@ -410,8 +419,10 @@ public class IpMultiplexController extends CommonController {
logger.error("DNAT策略配置下发失败：" + e.getMessage());
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -530,6 +541,7 @@ public class IpMultiplexController extends CommonController {
} catch (Exception e) {
logger.error("snat export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -636,6 +648,7 @@ public class IpMultiplexController extends CommonController {
} catch (Exception e) {
logger.error("dnat export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

3
src/main/java/com/nis/web/controller/configuration/ntc/AsnPolicyCfgController.java
View File

@@ -17,6 +17,7 @@ import com.nis.domain.Page;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.specific.ConfigGroupInfo;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
@@ -61,8 +62,10 @@ public class AsnPolicyCfgController extends BaseController {
e.printStackTrace();
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}

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

@@ -38,6 +38,7 @@ import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.excel.ExportExcel;
import com.nis.web.controller.BaseController;
@@ -103,10 +104,12 @@ public class AvContentController extends BaseController {
e.printStackTrace();
logger.error("voip 信息保存失败", e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
e.printStackTrace();
logger.error("voip 信息保存失败", e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
return "redirect:" + adminPath + "/ntc/av/voipList?functionId=" + cfg.getFunctionId();
@@ -174,9 +177,11 @@ public class AvContentController extends BaseController {
if (e instanceof MaatConvertException) {
logger.error("voip 信息审核失败", e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
logger.error("voip 信息审核失败", e);
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
return "redirect:" + adminPath + "/ntc/av/voipList?functionId=" + functionId;
@@ -226,10 +231,12 @@ public class AvContentController extends BaseController {
logger.error("VOIP配置下发失败：" + e.getMessage());
;
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
e.printStackTrace();
logger.error("VOIP配置下发失败", e);
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -247,8 +254,10 @@ public class AvContentController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -398,8 +407,10 @@ public class AvContentController extends BaseController {
e.printStackTrace();
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -419,7 +430,7 @@ public class AvContentController extends BaseController {
@RequestMapping(value = { "/auditAvContIp" })
@RequiresPermissions(value = { "avContIp:confirm" })
public String auditContIp(Integer isAudit, Integer isValid, String ids, String compileIds, Integer functionId,
RedirectAttributes redirectAttributes) {
RedirectAttributes redirectAttributes,HttpServletRequest request) {
if (!StringUtil.isEmpty(compileIds)) {
String[] idArray = compileIds.split(",");
Date auditTime = new Date();
@@ -430,9 +441,11 @@ public class AvContentController extends BaseController {
} catch (MaatConvertException e) {
logger.error("Cont Ip配置下发失败", e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("Cont Ip配置下发失败", e);
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -507,8 +520,10 @@ public class AvContentController extends BaseController {
e.printStackTrace();
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -525,10 +540,19 @@ public class AvContentController extends BaseController {
}
// 修改CONTIP配置审核
/**
* @param isAudit
* @param isValid
* @param ids
* @param compileIds
* @param functionId
* @param redirectAttributes
* @return
*/
@RequestMapping(value = { "/auditPicIp" })
@RequiresPermissions(value = { "avPicIp:confirm" })
public String auditPicIp(Integer isAudit, Integer isValid, String ids, String compileIds, Integer functionId,
RedirectAttributes redirectAttributes) {
RedirectAttributes redirectAttributes,HttpServletRequest request) {
if (!StringUtil.isEmpty(compileIds)) {
String[] idArray = compileIds.split(",");
Date auditTime = new Date();
@@ -540,10 +564,12 @@ public class AvContentController extends BaseController {
e.printStackTrace();
logger.error("Pic Ip配置下发失败", e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
e.printStackTrace();
logger.error("Pic Ip配置下发失败", e);
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -640,10 +666,12 @@ public class AvContentController extends BaseController {
e.printStackTrace();
logger.error("Stream Media 信息保存失败", e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
e.printStackTrace();
logger.error("Stream Media 信息保存失败", e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
return "redirect:" + adminPath + "/ntc/av/contUrlList?functionId=" + cfg.getFunctionId();
@@ -667,8 +695,10 @@ public class AvContentController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -700,8 +730,10 @@ public class AvContentController extends BaseController {
logger.info("Cont Url配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -718,8 +750,10 @@ public class AvContentController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -813,8 +847,10 @@ public class AvContentController extends BaseController {
logger.error("信息保存失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -834,7 +870,7 @@ public class AvContentController extends BaseController {
@RequestMapping(value = { "/auditAvPicUrl" })
@RequiresPermissions(value = { "avPicUrl:confirm" })
public String auditPicUrl(Integer isAudit, Integer isValid, String ids, String compileIds, Integer functionId,
RedirectAttributes redirectAttributes) {
RedirectAttributes redirectAttributes,HttpServletRequest request) {
if (!StringUtil.isEmpty(compileIds)) {
String[] idArray = compileIds.split(",");
Date auditTime = new Date();
@@ -847,8 +883,10 @@ public class AvContentController extends BaseController {
logger.info("Pic Url配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -957,6 +995,7 @@ public class AvContentController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/ntc/av/picUrlList?functionId=" + entity.getFunctionId();
@@ -1089,6 +1128,7 @@ public class AvContentController extends BaseController {
} catch (Exception e) {
logger.error("stream export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -1222,6 +1262,7 @@ public class AvContentController extends BaseController {
} catch (Exception e) {
logger.error("voip export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

33
src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
View File

@@ -59,6 +59,7 @@ import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.FileUtils;
import com.nis.util.JsonMapper;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils;
import com.nis.web.controller.BaseController;
@@ -315,12 +316,16 @@ public class AvController extends BaseController {
e.printStackTrace();
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else if (e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes, "error", "call_external_procedures_failed");
LogUtils.saveLog(request, null, e, null);
} else if (e instanceof MultiPartNewException) {
addMessage(redirectAttributes, "error", e.getMessage());
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -339,10 +344,13 @@ public class AvController extends BaseController {
e.printStackTrace();
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else if (e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes, "error", "call_external_procedures_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
return "redirect:" + adminPath + "/ntc/av/sample/audioSignSampleList?functionId=" + entity.getFunctionId();
@@ -365,8 +373,10 @@ public class AvController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -453,9 +463,11 @@ public class AvController extends BaseController {
if (e instanceof MaatConvertException) {
logger.info("音视频文件样例配置下发失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
logger.error("auditAvFileSample failed", e);
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -471,8 +483,10 @@ public class AvController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -501,7 +515,7 @@ public class AvController extends BaseController {
*/
@RequestMapping(value = { "/sample/auditAvAudioSignSample" })
public String auditAvAudioSignSample(Integer isAudit, Integer isValid, String ids, Integer functionId,
RedirectAttributes redirectAttributes) {
RedirectAttributes redirectAttributes,HttpServletRequest request) {
// avCfgService.auditAvSignSample(isAudit,isValid,ids);
AvSignSampleCfg entity = new AvSignSampleCfg();
String[] idArray = ids.split(",");
@@ -518,9 +532,11 @@ public class AvController extends BaseController {
if (e instanceof MaatConvertException) {
logger.error("音视频标识样例配置下发失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
logger.error("auditAvAudioSignSample failed", e);
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -539,7 +555,7 @@ public class AvController extends BaseController {
*/
@RequestMapping(value = { "/sample/auditAvSignSample" })
public String auditAvSignSample(Integer preset, AvSignSampleCfgModel cfg, Integer functionId,
RedirectAttributes redirectAttributes) {
RedirectAttributes redirectAttributes,HttpServletRequest request) {
// 预置配置
try {
if (preset != null && 1 == preset) {// 预置信息需要在数据库中插入一条记录
@@ -553,9 +569,11 @@ public class AvController extends BaseController {
if (e1 instanceof MaatConvertException) {
logger.error("预置失败", e1);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e1, null);
} else {
logger.error("auditAvSignSample failed", e1);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e1, null);
}
}
// 修改下发配置
@@ -578,9 +596,11 @@ public class AvController extends BaseController {
if (e instanceof MaatConvertException) {
logger.error("下发失败", e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
logger.error("auditAvSignSample failed", e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -686,6 +706,7 @@ public class AvController extends BaseController {
} catch (Exception e) {
logger.error("ysp export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -725,7 +746,7 @@ public class AvController extends BaseController {
*/
@ResponseBody
@RequestMapping(value = { "/sample/videoToPicture" })
public Map videoToPicture(Model model, @RequestParam("srcFile") CommonsMultipartFile srcFile) {
public Map videoToPicture(Model model, @RequestParam("srcFile") CommonsMultipartFile srcFile,HttpServletRequest request) {
String sep = System.getProperty("file.separator");
String random = UUID.randomUUID() + "";
@@ -796,14 +817,17 @@ public class AvController extends BaseController {
e.printStackTrace();
map.put("status", 0);
map.put("msg", e.getMessage());
LogUtils.saveLog(request, null, e, null);
} catch (InputFormatException e) {
e.printStackTrace();
map.put("status", 0);
map.put("msg", e.getMessage());
LogUtils.saveLog(request, null, e, null);
} catch (EncoderException e) {
e.printStackTrace();
map.put("status", 0);
map.put("msg", e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return map;
}
@@ -819,7 +843,7 @@ public class AvController extends BaseController {
@ResponseBody
@RequestMapping(value = { "/sample/faceToPicture" })
public Map faceToPicture(Model model, @RequestParam("srcFile") CommonsMultipartFile[] srcFile,
@RequestParam("faceFilePath") String faceFilePath) {
@RequestParam("faceFilePath") String faceFilePath,HttpServletRequest request) {
String sep = System.getProperty("file.separator");
String random = UUID.randomUUID() + "";
// String srcFilePath =
@@ -842,6 +866,7 @@ public class AvController extends BaseController {
} catch (IOException e) {
logger.error(e);
e.printStackTrace();
LogUtils.saveLog(request, null, e, null);
}
}

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

@@ -29,6 +29,7 @@ import com.nis.domain.configuration.NtcBgpAsCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils;
import com.nis.web.controller.BaseController;
@@ -84,9 +85,11 @@ public class BgpCfgController extends BaseController {
} catch (MaatConvertException e) {
logger.error("ip白名单配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("ip白名单配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/ntc/other/bgpList?functionId=" + entity.getFunctionId();
}
@@ -152,8 +155,10 @@ public class BgpCfgController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -182,10 +187,12 @@ public class BgpCfgController extends BaseController {
e.printStackTrace();
logger.error("bgp配置下发失败", e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
e.printStackTrace();
logger.error("bgp配置下发失败", e);
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
} else {
@@ -200,8 +207,10 @@ public class BgpCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -340,6 +349,7 @@ public class BgpCfgController extends BaseController {
} catch (Exception e) {
logger.error("bgp export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

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

@@ -44,6 +44,7 @@ import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.FileUtils;
import com.nis.util.JsonMapper;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -99,10 +100,12 @@ public class FileTransferCfgController extends BaseController {
e.printStackTrace();
logger.error("ftp信息保存失败", e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
e.printStackTrace();
logger.error("ftp信息保存失败", e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
return "redirect:" + adminPath + "/ntc/fileTransfer/ftpList?functionId=" + entity.getFunctionId();
@@ -171,9 +174,11 @@ public class FileTransferCfgController extends BaseController {
if (e instanceof MaatConvertException) {
logger.error("ftp配置删除失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
logger.error("ftp配置删除失败", e);
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
return "redirect:" + adminPath + "/ntc/fileTransfer/ftpList?functionId=" + functionId;
@@ -203,10 +208,12 @@ public class FileTransferCfgController extends BaseController {
logger.error("ftp配置下发失败：" + e.getMessage());
;
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
e.printStackTrace();
logger.error("ftp配置下发失败", e);
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -222,8 +229,10 @@ public class FileTransferCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -302,9 +311,11 @@ public class FileTransferCfgController extends BaseController {
} catch (MaatConvertException e) {
logger.error("文件摘要配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("文件摘要配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/ntc/fileTransfer/fileDigestList?functionId=" + entity.getFunctionId();
}
@@ -326,9 +337,11 @@ public class FileTransferCfgController extends BaseController {
if (e instanceof MaatConvertException) {
logger.error("文件摘要配置删除失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
logger.error("文件摘要配置删除失败", e);
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -350,11 +363,14 @@ public class FileTransferCfgController extends BaseController {
logger.error("File Digest配置下发失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else if (e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes, "error", "call_external_procedures_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -372,8 +388,10 @@ public class FileTransferCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -503,10 +521,12 @@ public class FileTransferCfgController extends BaseController {
e.printStackTrace();
logger.error("P2P信息保存失败", e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
e.printStackTrace();
logger.error("P2P信息保存失败", e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
return "redirect:" + adminPath + "/ntc/fileTransfer/p2pList?functionId=" + entity.getFunctionId();
@@ -529,9 +549,11 @@ public class FileTransferCfgController extends BaseController {
if (e instanceof MaatConvertException) {
logger.error("P2P配置删除失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
logger.error("P2P配置删除失败", e);
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
return "redirect:" + adminPath + "/ntc/fileTransfer/p2pList?functionId=" + functionId;
@@ -606,11 +628,14 @@ public class FileTransferCfgController extends BaseController {
logger.info("p2p配置下发失败：" + e.getMessage());
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else if (e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes, "error", "call_external_procedures_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -626,8 +651,10 @@ public class FileTransferCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -771,6 +798,7 @@ public class FileTransferCfgController extends BaseController {
} catch (Exception e) {
logger.error("ftp export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -915,6 +943,7 @@ public class FileTransferCfgController extends BaseController {
} catch (Exception e) {
logger.error("p2p export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -1014,6 +1043,7 @@ public class FileTransferCfgController extends BaseController {
} catch (Exception e) {
logger.error("file export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

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

@@ -68,6 +68,7 @@ import com.nis.domain.configuration.template.TopicWebsiteTemplate;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.excel.ExportExcel;
import com.nis.web.controller.BaseController;
@@ -118,9 +119,11 @@ public class IpController extends BaseController{
} catch (MaatConvertException e) {
logger.error("ip地址配置下发失败：",e);
addMessage(model, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("ip地址配置保存失败：",e);
addMessage(model, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}
@@ -179,8 +182,10 @@ public class IpController extends BaseController{
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -233,8 +238,10 @@ public class IpController extends BaseController{
logger.info("ip配置下发失败："+e.getMessage());
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -251,8 +258,10 @@ public class IpController extends BaseController{
logger.error("配置下发失败：",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -337,6 +346,7 @@ public class IpController extends BaseController{
} catch (Exception e) {
logger.error("export_failed", e);
addMessage(redirectAttributes,"error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -715,6 +725,7 @@ public class IpController extends BaseController{
} catch (Exception e) {
logger.error("ip addr export failed",e);
addMessage(redirectAttributes,"error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

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

@@ -40,6 +40,7 @@ import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.FileUtils;
import com.nis.util.JsonMapper;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -116,11 +117,14 @@ public class MailCfgController extends BaseController {
} catch (Exception e) {
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else if (e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes, "error", "call_external_procedures_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -190,8 +194,10 @@ public class MailCfgController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -221,11 +227,14 @@ public class MailCfgController extends BaseController {
logger.error("mail配置下发失败：" + e.getMessage());
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else if (e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes, "error", "call_external_procedures_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -241,8 +250,10 @@ public class MailCfgController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -396,6 +407,7 @@ public class MailCfgController extends BaseController {
} catch (Exception e) {
logger.error("mail export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

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

@@ -37,6 +37,7 @@ import com.nis.exceptions.CallExternalProceduresException;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -198,9 +199,11 @@ public class WebsiteController extends BaseController {
} catch (MaatConvertException e) {
logger.error("ip白名单配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("ip白名单配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/ntc/website/httpList?functionId=" + entity.getFunctionId();
}
@@ -230,8 +233,10 @@ public class WebsiteController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -259,9 +264,11 @@ public class WebsiteController extends BaseController {
} catch (MaatConvertException e) {
logger.error("http配置下发失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("http配置下发失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
} else {// 条件下所有配置审核
@@ -276,8 +283,10 @@ public class WebsiteController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -327,9 +336,11 @@ public class WebsiteController extends BaseController {
} catch (MaatConvertException e) {
logger.error("ip白名单配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("ip白名单配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/ntc/website/sslList?functionId=" + entity.getFunctionId();
}
@@ -393,8 +404,10 @@ public class WebsiteController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -424,11 +437,14 @@ public class WebsiteController extends BaseController {
logger.error("ssl配置下发失败：" + e.getMessage());
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else if (e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes, "error", "call_external_procedures_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -444,8 +460,10 @@ public class WebsiteController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -487,9 +505,11 @@ public class WebsiteController extends BaseController {
} catch (MaatConvertException e) {
logger.error("ip白名单配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("ip白名单配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/ntc/website/dnsList?functionId=" + entity.getFunctionId();
}
@@ -548,8 +568,10 @@ public class WebsiteController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -578,10 +600,12 @@ public class WebsiteController extends BaseController {
e.printStackTrace();
logger.info("dns配置下发失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
e.printStackTrace();
logger.info("dns配置下发失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
} else {// 条件下所有配置审核
@@ -596,8 +620,10 @@ public class WebsiteController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -867,6 +893,7 @@ public class WebsiteController extends BaseController {
} catch (Exception e) {
logger.error("http export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/website/httpList?functionId="+entity.getFunctionId();
@@ -1015,6 +1042,7 @@ public class WebsiteController extends BaseController {
} catch (Exception e) {
logger.error("dns export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -1161,6 +1189,7 @@ public class WebsiteController extends BaseController {
} catch (Exception e) {
logger.error("http export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/website/httpList?functionId="+entity.getFunctionId();

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

@@ -27,6 +27,7 @@ import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.configuration.CommonController;
@@ -108,9 +109,11 @@ public class WhiteListController extends CommonController {
} catch (MaatConvertException e) {
logger.error("ip白名单配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("ip白名单配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/ntc/whitelist/ip/list?functionId=" + entity.getFunctionId();
}
@@ -132,11 +135,13 @@ public class WhiteListController extends CommonController {
ipCfgService.auditIpCfg(entity, isAudit,Constants.INSERT_ACTION);
addMessage(redirectAttributes, "success", "audit_success");
} catch (MaatConvertException e) {
logger.info("ip配置下发失败：" + e.getMessage());
logger.error("ip配置下发失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.info("ip配置下发失败：" + e.getMessage());
logger.error("ip配置下发失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
} else {
@@ -151,8 +156,10 @@ public class WhiteListController extends CommonController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -180,8 +187,10 @@ public class WhiteListController extends CommonController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -259,9 +268,11 @@ public class WhiteListController extends CommonController {
} catch (MaatConvertException e) {
logger.error("ip白名单配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("ip白名单配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/ntc/whitelist/domain/list?functionId=" + entity.getFunctionId();
}
@@ -311,8 +322,10 @@ public class WhiteListController extends CommonController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -321,13 +334,14 @@ public class WhiteListController extends CommonController {
@RequestMapping(value = { "domain/delete" })
@RequiresPermissions("whitelist:domain:config")
public String deleteDomain(String ids, Integer functionId, RedirectAttributes model) {
public String deleteDomain(String ids, Integer functionId, RedirectAttributes model,HttpServletRequest request) {
try {
domainService.deleteWhiteDomain(ids);
addMessage(model, "success", "delete_success");
} catch (Exception e) {
logger.error("删除失败", e);
addMessage(model, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/ntc/whitelist/domain/list?functionId=" + functionId;
}
@@ -354,10 +368,12 @@ public class WhiteListController extends CommonController {
e.printStackTrace();
logger.error("domain配置下发失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
e.printStackTrace();
logger.error("domain配置下发失败：" + e.getMessage());
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
} else {// 条件下所有配置审核
@@ -372,8 +388,10 @@ public class WhiteListController extends CommonController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -497,6 +515,7 @@ public class WhiteListController extends CommonController {
} catch (Exception e) {
logger.error("ip white export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -607,6 +626,7 @@ public class WhiteListController extends CommonController {
} catch (Exception e) {
logger.error("ip white export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

5
src/main/java/com/nis/web/controller/configuration/ntc/XmppController.java
View File

@@ -29,6 +29,7 @@ import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.LogUtils;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -72,7 +73,7 @@ public class XmppController extends BaseController {
}
@RequestMapping(value = {"auditXmppCfg"})
@RequiresPermissions(value={"other:xmpp:confirm"})
public String auditXmppCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
public String auditXmppCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes,HttpServletRequest request) {
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
@@ -90,8 +91,10 @@ public class XmppController extends BaseController {
logger.info("http配置下发失败："+e.getMessage());
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error","audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}

10
src/main/java/com/nis/web/controller/configuration/proxy/CachePolicyController.java
View File

@@ -27,6 +27,7 @@ import com.nis.domain.configuration.IpPortCfg;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -117,8 +118,10 @@ public class CachePolicyController extends BaseController{
logger.error("信息保存失败",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error","save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -177,8 +180,10 @@ public class CachePolicyController extends BaseController{
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -213,8 +218,10 @@ public class CachePolicyController extends BaseController{
logger.info("代理缓存策略下发失败："+e.getMessage());
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error","audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -230,8 +237,10 @@ public class CachePolicyController extends BaseController{
logger.error("配置下发失败：",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -327,6 +336,7 @@ public class CachePolicyController extends BaseController{
} catch (Exception e) {
logger.error("ip white export failed",e);
addMessage(redirectAttributes,"error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}

14
src/main/java/com/nis/web/controller/configuration/proxy/ControlPolicyController.java
View File

@@ -3,6 +3,7 @@ package com.nis.web.controller.configuration.proxy;
import java.util.Date;
import java.util.List;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -24,6 +25,7 @@ import com.nis.domain.configuration.HttpUrlCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
@@ -79,9 +81,11 @@ public class ControlPolicyController extends BaseController{
} catch (MaatConvertException e) {
logger.error("HTTPS配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("HTTPS配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath +"/proxy/control/httpReqReplace/list?functionId="+cfg.getFunctionId();
@@ -97,7 +101,7 @@ public class ControlPolicyController extends BaseController{
}
@RequestMapping(value = {"httpReqReplace/audit"})
public String reqAudit(Integer isAudit,Integer isValid,String ids
,Integer functionId, RedirectAttributes redirectAttributes) {
,Integer functionId, RedirectAttributes redirectAttributes,HttpServletRequest request) {
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
Date auditTime=new Date();
@@ -109,8 +113,10 @@ public class ControlPolicyController extends BaseController{
logger.error("配置下发失败",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error","audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -156,8 +162,10 @@ public class ControlPolicyController extends BaseController{
logger.error("信息保存失败",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error","save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -174,7 +182,7 @@ public class ControlPolicyController extends BaseController{
}
@RequestMapping(value = {"httpResReplace/audit"})
public String resAudit(Integer isAudit,Integer isValid,String ids
,Integer functionId, RedirectAttributes redirectAttributes) {
,Integer functionId, RedirectAttributes redirectAttributes,HttpServletRequest request) {
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
Date auditTime=new Date();
@@ -187,8 +195,10 @@ public class ControlPolicyController extends BaseController{
logger.error("配置下发失败",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error","audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}

3
src/main/java/com/nis/web/controller/configuration/proxy/FileStrategyController.java
View File

@@ -32,6 +32,7 @@ import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.FileUtils;
import com.nis.util.JsonMapper;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.configuration.CommonController;
@@ -122,8 +123,10 @@ public class FileStrategyController extends CommonController {
logger.error("信息保存失败",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error","save_failed");
LogUtils.saveLog(request, null, e, null);
}
}finally {
if(file != null) {

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

@@ -38,6 +38,7 @@ import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -200,8 +201,10 @@ public class HttpRedirectPolicyController extends BaseController {
logger.error("save_failed", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -236,8 +239,10 @@ public class HttpRedirectPolicyController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -269,8 +274,10 @@ public class HttpRedirectPolicyController extends BaseController {
logger.info("http重定向配置下发失败：" + e.getMessage());
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -286,8 +293,10 @@ public class HttpRedirectPolicyController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -517,6 +526,7 @@ public class HttpRedirectPolicyController extends BaseController {
} catch (Exception e) {
logger.error("http export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
/*
* return "redirect:" + adminPath

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

@@ -32,6 +32,7 @@ import com.nis.domain.configuration.PxyObjSpoofingIpPool;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.configuration.CommonController;
import com.nis.web.security.UserUtils;
@@ -122,8 +123,10 @@ public class InterceptController extends CommonController {
logger.error("save_failed", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
return "redirect:" + adminPath + "/proxy/intercept/ip/list?functionId=" + entity.getFunctionId();
@@ -188,8 +191,10 @@ public class InterceptController extends CommonController {
logger.error("intercept ip audit failed", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}
@@ -204,8 +209,10 @@ public class InterceptController extends CommonController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -229,6 +236,7 @@ public class InterceptController extends CommonController {
} catch (Exception e) {
logger.error("intercept ip delete failed", e);
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/proxy/intercept/ip/list?functionId=" + functionId;
}
@@ -449,6 +457,7 @@ public class InterceptController extends CommonController {
} catch (Exception e) {
logger.error("ip addr export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

39
src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
View File

@@ -57,6 +57,7 @@ import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.FileUtils;
import com.nis.util.JsonMapper;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
@@ -122,10 +123,13 @@ public class PxyObjKeyringController extends BaseController {
logger.error("证书文件校验失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else if (e instanceof MultiPartNewException) {
addMessage(redirectAttributes, "error", e.getMessage());
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -181,10 +185,13 @@ public class PxyObjKeyringController extends BaseController {
logger.error("证书文件校验失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else if (e instanceof MultiPartNewException) {
addMessage(redirectAttributes, "error", e.getMessage());
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
try {
@@ -250,12 +257,15 @@ public class PxyObjKeyringController extends BaseController {
} catch (MultiPartNewException e) {
logger.error("证书文件上传失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (MaatConvertException e) {
logger.error("拦截策略配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("拦截策略配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/proxy/intercept/strateagy/list?functionId=" + cfg.getFunctionId();
@@ -349,8 +359,10 @@ public class PxyObjKeyringController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -373,9 +385,11 @@ public class PxyObjKeyringController extends BaseController {
} catch (MaatConvertException e) {
logger.error(e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error(e);
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -391,8 +405,10 @@ public class PxyObjKeyringController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -474,6 +490,7 @@ public class PxyObjKeyringController extends BaseController {
} catch (Exception e) {
logger.error("pxyObjKeyring export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -539,6 +556,7 @@ public class PxyObjKeyringController extends BaseController {
} catch (Exception e) {
logger.error("pxyObjKeyring export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -593,10 +611,13 @@ public class PxyObjKeyringController extends BaseController {
logger.error("证书文件校验失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", e.getMessage());
LogUtils.saveLog(request, null, e, null);
} else if (e instanceof MultiPartNewException) {
addMessage(redirectAttributes, "error", e.getMessage());
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -619,6 +640,7 @@ public class PxyObjKeyringController extends BaseController {
validFlag = false;
logger.error("证书信息获取失败", e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
try {
if (validFlag) {
@@ -659,12 +681,15 @@ public class PxyObjKeyringController extends BaseController {
} catch (MultiPartNewException e) {
logger.error("可信证书上传失败：",e);
addMessage(redirectAttributes, "error", e.getMessage());
LogUtils.saveLog(request, null, e, null);
} catch (MaatConvertException e) {
logger.error("可信证书单配置下发失败：",e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("可信证书配置保存失败：",e);
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
return "redirect:" + adminPath + "/proxy/intercept/strateagy/trustedCertList?functionId=" + cfg.getFunctionId();
@@ -694,10 +719,13 @@ public class PxyObjKeyringController extends BaseController {
logger.error("证书文件校验失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else if (e instanceof MultiPartNewException) {
addMessage(redirectAttributes, "error", e.getMessage());
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -729,8 +757,10 @@ public class PxyObjKeyringController extends BaseController {
logger.error("crl issuer比对失败", e);
if (e instanceof MultiPartNewException) {
addMessage(redirectAttributes, "error", e.getMessage());
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
try {
@@ -767,10 +797,13 @@ public class PxyObjKeyringController extends BaseController {
logger.error("crl上传失败", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else if (e instanceof MultiPartNewException) {
addMessage(redirectAttributes, "error", e.getMessage());
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -903,8 +936,10 @@ public class PxyObjKeyringController extends BaseController {
logger.error("配置删除失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "delete_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -926,10 +961,12 @@ public class PxyObjKeyringController extends BaseController {
e.printStackTrace();
logger.error(e);
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
e.printStackTrace();
logger.error(e);
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -945,8 +982,10 @@ public class PxyObjKeyringController extends BaseController {
logger.error("配置下发失败：", e);
if (e instanceof MaatConvertException) {
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
} else {
addMessage(redirectAttributes, "error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}

6
src/main/java/com/nis/web/controller/configuration/proxy/PxyObjSpoofingIpPoolController.java
View File

@@ -56,6 +56,7 @@ import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.FileUtils;
import com.nis.util.JsonMapper;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
@@ -119,8 +120,10 @@ public class PxyObjSpoofingIpPoolController extends BaseController {
e.printStackTrace();
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
LogUtils.saveLog(request, null, e, null);
}else {
addMessage(redirectAttributes,"error","save_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -171,9 +174,11 @@ public class PxyObjSpoofingIpPoolController extends BaseController {
} catch (MaatConvertException e) {
logger.error(e);
addMessage(redirectAttributes,"error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
}catch (Exception e) {
logger.error(e);
addMessage(redirectAttributes,"error", "audit_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -255,6 +260,7 @@ public class PxyObjSpoofingIpPoolController extends BaseController {
} catch (Exception e) {
logger.error("ip white export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "redirect:" + adminPath
// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

45
src/main/java/com/nis/web/controller/dashboard/DashboardController.java
View File

@@ -45,6 +45,7 @@ import com.nis.util.CodeDicUtils;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.excel.ExportExcel;
import com.nis.util.httpclient.HttpClientUtil;
@@ -80,7 +81,7 @@ public class DashboardController extends BaseController{
*/
@RequestMapping(value="portActive")
@ResponseBody
public List portActive(){
public List portActive(HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List list = new ArrayList();
try {
@@ -94,6 +95,7 @@ public class DashboardController extends BaseController{
e.printStackTrace();
logger.error("活跃端口数据错误"+e);
list.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return list;
}
@@ -103,7 +105,7 @@ public class DashboardController extends BaseController{
*/
@RequestMapping(value="portActiveChart")
@ResponseBody
public List portActiveChart(String beginDate,String endDate){
public List portActiveChart(String beginDate,String endDate,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List list = new ArrayList();
try {
@@ -120,6 +122,7 @@ public class DashboardController extends BaseController{
// TODO Auto-generated catch block
e.printStackTrace();
logger.error("活跃端口详情界面数据获取错误"+e);
LogUtils.saveLog(request, null, e, null);
}
return list;
}
@@ -145,7 +148,7 @@ public class DashboardController extends BaseController{
*/
@RequestMapping(value="ipActive")
@ResponseBody
public List ipActive(String beginDate,String endDate){
public List ipActive(String beginDate,String endDate,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List list = new ArrayList();
try {
@@ -161,6 +164,7 @@ public class DashboardController extends BaseController{
e.printStackTrace();
logger.error("活跃IP错误"+e);
list.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return list;
}
@@ -169,7 +173,7 @@ public class DashboardController extends BaseController{
*/
@RequestMapping(value="ipActiveMinuteList")
@ResponseBody
public List ipActiveMinuteList(String beginDate,String endDate,Integer entranceId){
public List ipActiveMinuteList(String beginDate,String endDate,Integer entranceId,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List list = new ArrayList();
try {
@@ -188,6 +192,7 @@ public class DashboardController extends BaseController{
e.printStackTrace();
logger.error("活跃IP数据获取错误"+e);
list.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return list;
}
@@ -238,6 +243,7 @@ public class DashboardController extends BaseController{
e.printStackTrace();
logger.error("活跃IP统计错误"+e);
addMessage(redirectAttributes,"error","request_service_failed");
LogUtils.saveLog(request, null, e, null);
}
return "/dashboard/trafficIpActiveList";
@@ -247,7 +253,7 @@ public class DashboardController extends BaseController{
*/
@RequestMapping(value="ajaxIpActiveList")
@ResponseBody
public List ajaxIpActiveList(String beginDate,String endDate,Integer entranceId){
public List ajaxIpActiveList(String beginDate,String endDate,Integer entranceId,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List<TrafficIpActiveStatistic> list = new ArrayList<TrafficIpActiveStatistic>();
try {
@@ -294,6 +300,7 @@ public class DashboardController extends BaseController{
} catch (Exception e) {
e.printStackTrace();
logger.error("活跃IP数据获取错误"+e);
LogUtils.saveLog(request, null, e, null);
//list.add(Maps.newHashMap("error","request_service_failed"));
}
return list;
@@ -341,6 +348,7 @@ public class DashboardController extends BaseController{
e.printStackTrace();
logger.error("IPActive export failed",e);
addMessage(redirectAttributes,"error","export_failed");
LogUtils.saveLog(request, null, e, null);
}
// return "/dashboard/trafficIpActiveList";
}
@@ -349,7 +357,7 @@ public class DashboardController extends BaseController{
*/
@RequestMapping(value="protocol")
@ResponseBody
public List protocolChart(){
public List protocolChart(HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List<Map> list = new ArrayList<Map>();
List<Map> resultList = new ArrayList<Map>();
@@ -389,6 +397,7 @@ public class DashboardController extends BaseController{
e.printStackTrace();
logger.error("协议统计错误"+e);
resultList.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return resultList;
}
@@ -397,7 +406,7 @@ public class DashboardController extends BaseController{
*/
@RequestMapping(value="app")
@ResponseBody
public List appChart(){
public List appChart(HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List<Map> list = new ArrayList<Map>();
List<Map> resultList = new ArrayList<Map>();
@@ -428,6 +437,7 @@ public class DashboardController extends BaseController{
e.printStackTrace();
logger.error("app流量分析错误"+e);
resultList.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return resultList;
}
@@ -436,7 +446,7 @@ public class DashboardController extends BaseController{
*/
@RequestMapping(value="osList")
@ResponseBody
public List osList(){
public List osList(HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List<Map> list = new ArrayList<Map>();
List<Map> resultList = new ArrayList<Map>();
@@ -467,6 +477,7 @@ public class DashboardController extends BaseController{
e.printStackTrace();
logger.error("终端用户-获取操作系统列表错误"+e);
resultList.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return resultList;
}
@@ -475,7 +486,7 @@ public class DashboardController extends BaseController{
*/
@RequestMapping(value="browserChart")
@ResponseBody
public List browserChart(@RequestParam("osType") String osType){
public List browserChart(@RequestParam("osType") String osType,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List<Map> list = new ArrayList<Map>();
List<Map> resultList = new ArrayList<Map>();
@@ -524,6 +535,7 @@ public class DashboardController extends BaseController{
e.printStackTrace();
logger.error("终端用户-获取操作系统下浏览器类型错误"+e);
resultList.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return resultList;
}
@@ -532,7 +544,7 @@ public class DashboardController extends BaseController{
*/
@RequestMapping(value="bsList")
@ResponseBody
public List bsList(){
public List bsList(HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List<Map> list = new ArrayList<Map>();
List<Map> resultList = new ArrayList<Map>();
@@ -563,6 +575,7 @@ public class DashboardController extends BaseController{
e.printStackTrace();
logger.error("终端用户-获取浏览器列表错误"+e);
resultList.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return resultList;
}
@@ -571,7 +584,7 @@ public class DashboardController extends BaseController{
*/
@RequestMapping(value="systemChart")
@ResponseBody
public List systemChart(@RequestParam("bsType") String bsType){
public List systemChart(@RequestParam("bsType") String bsType,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List<Map> list = new ArrayList<Map>();
List<Map> resultList = new ArrayList<Map>();
@@ -620,6 +633,7 @@ public class DashboardController extends BaseController{
e.printStackTrace();
logger.error("终端用户-获取浏览器下操作系统类型错误"+e);
resultList.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return resultList;
}
@@ -628,7 +642,7 @@ public class DashboardController extends BaseController{
*/
@RequestMapping(value="websiteList")
@ResponseBody
public List websiteList(){
public List websiteList(HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List<Map> list = new ArrayList<Map>();
List<Map> resultList = new ArrayList<Map>();
@@ -665,6 +679,7 @@ public class DashboardController extends BaseController{
e.printStackTrace();
logger.error("http网站流量分析数据错误："+e);
resultList.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return resultList;
}
@@ -673,7 +688,7 @@ public class DashboardController extends BaseController{
*/
@RequestMapping(value="webTypeChart")
@ResponseBody
public List webTypeChart(@RequestParam("websiteServiceId") String websiteServiceId){
public List webTypeChart(@RequestParam("websiteServiceId") String websiteServiceId,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List<Map> list = new ArrayList<Map>();
List<Map> resultList = new ArrayList<Map>();
@@ -715,6 +730,7 @@ public class DashboardController extends BaseController{
e.printStackTrace();
logger.error("http某个网站子域名流量统计错误"+e);
resultList.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return resultList;
}
@@ -724,7 +740,7 @@ public class DashboardController extends BaseController{
*/
@RequestMapping(value="topicAndDomainList")
@ResponseBody
public List topicAndDomainList(){
public List topicAndDomainList(HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List<Map> list = new ArrayList<Map>();
List<Map> resultList = new ArrayList<Map>();
@@ -782,6 +798,7 @@ public class DashboardController extends BaseController{
e.printStackTrace();
logger.error("http网站主题流量分析数据错误："+e);
resultList.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return resultList;
}

40
src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
View File

@@ -46,6 +46,7 @@ import com.nis.util.Constants;
import com.nis.util.DateUtil;
import com.nis.util.DateUtils;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils;
import com.nis.util.httpclient.HttpClientUtil;
@@ -64,7 +65,7 @@ public class TrafficStatisticsInfoController extends BaseController {
*/
@RequestMapping(value="info")
@ResponseBody
public Map ipActive(){
public Map ipActive(HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
HashMap<String, Object> m = new HashMap<String, Object>();
List list = new ArrayList();
@@ -114,6 +115,7 @@ public class TrafficStatisticsInfoController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
logger.error("统计流量信息数据错误"+e);
LogUtils.saveLog(request, null, e, null);
}
return m;
}
@@ -149,7 +151,7 @@ public class TrafficStatisticsInfoController extends BaseController {
*/
@RequestMapping(value="actionEntranceTrans")
@ResponseBody
public List actionTrans(String beginDate,String endDate,@RequestParam("searchAction")String searchAction){
public List actionTrans(String beginDate,String endDate,@RequestParam("searchAction")String searchAction,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List resultList = new ArrayList();
String url = Constants.DASHBOARD_URL+Constants.NTC_ACTION_ENTRANCE_REPORT;
@@ -165,6 +167,7 @@ public class TrafficStatisticsInfoController extends BaseController {
e.printStackTrace();
logger.error(searchAction+"动作详情数据获取错误"+e);
resultList.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return resultList;
}
@@ -196,7 +199,7 @@ public class TrafficStatisticsInfoController extends BaseController {
*/
@RequestMapping(value="bandwidthTrans")
@ResponseBody
public Map bandwidthTrans(String beginDate,String endDate,@RequestParam("addrType")String addrType,@RequestParam("transType")Integer transType){
public Map bandwidthTrans(String beginDate,String endDate,@RequestParam("addrType")String addrType,@RequestParam("transType")Integer transType,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
Map map = new HashMap();
String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_BANDWIDTH_TRANS;
@@ -221,6 +224,7 @@ public class TrafficStatisticsInfoController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
logger.error("带宽详情数据获取错误"+e);
LogUtils.saveLog(request, null, e, null);
}
return map;
}
@@ -229,7 +233,7 @@ public class TrafficStatisticsInfoController extends BaseController {
*/
@RequestMapping(value="bandwidthTransTwo")
@ResponseBody
public Map bandwidthTransTwo(String beginDate,String endDate,@RequestParam("addrType")String addrType,@RequestParam("transType")Integer transType){
public Map bandwidthTransTwo(String beginDate,String endDate,@RequestParam("addrType")String addrType,@RequestParam("transType")Integer transType,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
Map map = new HashMap();
String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_BANDWIDTH_TRANS_TWO;
@@ -254,6 +258,7 @@ public class TrafficStatisticsInfoController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
logger.error("带宽详情数据获取错误"+e);
LogUtils.saveLog(request, null, e, null);
}
return map;
}
@@ -262,7 +267,7 @@ public class TrafficStatisticsInfoController extends BaseController {
*/
@RequestMapping(value="bandwidthTransThree")
@ResponseBody
public Map bandwidthTransThree(String beginDate,String endDate,String searchQuotaType,String searchDirection,Model model){
public Map bandwidthTransThree(String beginDate,String endDate,String searchQuotaType,String searchDirection,Model model,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
Map map = new HashMap();
//String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_BANDWIDTH_TRANS_TWO;
@@ -285,6 +290,7 @@ public class TrafficStatisticsInfoController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
logger.error("带宽详情数据获取错误"+e);
LogUtils.saveLog(request, null, e, null);
}
return map;
}
@@ -307,7 +313,7 @@ public class TrafficStatisticsInfoController extends BaseController {
*/
@RequestMapping(value="protocolList")
@ResponseBody
public List protocolList(Model model,Integer entranceId,Integer[] protoType,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate,@RequestParam(required=false)String searchDirection){
public List protocolList(Model model,Integer entranceId,Integer[] protoType,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate,@RequestParam(required=false)String searchDirection,HttpServletRequest request){
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List list = new ArrayList();
@@ -377,6 +383,7 @@ public class TrafficStatisticsInfoController extends BaseController {
e.printStackTrace();
logger.error("协议详情数据获取错误"+e);
list.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return list;
}
@@ -399,7 +406,7 @@ public class TrafficStatisticsInfoController extends BaseController {
*/
@RequestMapping(value="appList")
@ResponseBody
public List appList(Integer entranceId,@RequestParam(value="appType",required=false)Integer[] appType,@RequestParam(value="beginDate",required=false)String beginDate,@RequestParam(value="endDate",required=false)String endDate){
public List appList(Integer entranceId,@RequestParam(value="appType",required=false)Integer[] appType,@RequestParam(value="beginDate",required=false)String beginDate,@RequestParam(value="endDate",required=false)String endDate,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List list = new ArrayList();
String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_APP_LIST;
@@ -457,6 +464,7 @@ public class TrafficStatisticsInfoController extends BaseController {
e.printStackTrace();
logger.error("app详情数据获取错误"+e);
list.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return list;
}
@@ -495,7 +503,7 @@ public class TrafficStatisticsInfoController extends BaseController {
}
@RequestMapping("ajaxAppTrend")
@ResponseBody
public Map ajaxAppTrend(String beginDate,String endDate,Integer appType,Integer entranceId,String searchQuotaType,Integer[] searchIspCode,Model model){
public Map ajaxAppTrend(String beginDate,String endDate,Integer appType,Integer entranceId,String searchQuotaType,Integer[] searchIspCode,Model model,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
Map list = new HashMap();
try {
@@ -533,12 +541,13 @@ public class TrafficStatisticsInfoController extends BaseController {
e.printStackTrace();
logger.error("app趋势图数据获取错误"+e);
list.put("error","request_service_failed");
LogUtils.saveLog(request, null, e, null);
}
return list;
}
@RequestMapping("ajaxAppTopList")
@ResponseBody
public List ajaxAppTopList(String beginDate,String endDate,Integer appType,Integer entranceId,Integer searchQuota,Integer[] searchIspCode,Model model){
public List ajaxAppTopList(String beginDate,String endDate,Integer appType,Integer entranceId,Integer searchQuota,Integer[] searchIspCode,Model model,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List<Map> list = new ArrayList<Map>();
try {
@@ -584,6 +593,7 @@ public class TrafficStatisticsInfoController extends BaseController {
e.printStackTrace();
logger.error("app列表Top100"+e);
list.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return list;
}
@@ -616,7 +626,7 @@ public class TrafficStatisticsInfoController extends BaseController {
}
@RequestMapping("ajaxDomainTrans")
@ResponseBody
public List ajaxDomainTrans(String beginDate,String endDate,Integer domain,Integer entranceId,Model model){
public List ajaxDomainTrans(String beginDate,String endDate,Integer domain,Integer entranceId,Model model,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List list = new ArrayList();
try {
@@ -638,6 +648,7 @@ public class TrafficStatisticsInfoController extends BaseController {
e.printStackTrace();
logger.error("活跃域名数据获取错误"+e);
list.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return list;
}
@@ -646,7 +657,7 @@ public class TrafficStatisticsInfoController extends BaseController {
*/
@RequestMapping(value="websiteList")
@ResponseBody
public List websiteList(Integer entranceId,Integer[] domain,Model model,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate){
public List websiteList(Integer entranceId,Integer[] domain,Model model,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List list = new ArrayList();
String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_WEBSITELIST_NOTIME;
@@ -742,6 +753,7 @@ public class TrafficStatisticsInfoController extends BaseController {
e.printStackTrace();
logger.error("网站域名数据获取错误"+e);
list.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return list;
}
@@ -751,7 +763,7 @@ public class TrafficStatisticsInfoController extends BaseController {
*/
@RequestMapping(value="statisticList")
@ResponseBody
public List statisticList(Model model,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate){
public List statisticList(Model model,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List list = new ArrayList();
String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_TOPICLIST;
@@ -816,6 +828,7 @@ public class TrafficStatisticsInfoController extends BaseController {
e.printStackTrace();
logger.error("协议详情数据获取错误"+e);
list.add(Maps.newHashMap("error","request_service_failed"));
LogUtils.saveLog(request, null, e, null);
}
return list;
}
@@ -836,7 +849,7 @@ public class TrafficStatisticsInfoController extends BaseController {
}
@RequestMapping("ajaxNtcTotalReportDetail")
@ResponseBody
public Map ajaxNtcTotalReportDetail(String beginDate,String endDate,Model model,String searchAction){
public Map ajaxNtcTotalReportDetail(String beginDate,String endDate,Model model,String searchAction,HttpServletRequest request){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
Map map = new HashMap();
try {
@@ -882,6 +895,7 @@ public class TrafficStatisticsInfoController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
logger.error("动作详情统计一小时数据获取错误"+e);
LogUtils.saveLog(request, null, e, null);
}
return map;
}

4
src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java
View File

@@ -30,6 +30,7 @@ import com.nis.domain.dashboard.PageDashboard;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -203,6 +204,7 @@ public class TrafficStatisticsReportController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
}
return "/dashboard/trafficUserBehavior";
}
@@ -283,6 +285,7 @@ public class TrafficStatisticsReportController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
}
return null;
}
@@ -503,6 +506,7 @@ public class TrafficStatisticsReportController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "error", "request_service_failed");
LogUtils.saveLog(request, null, e, null);
}
}

3
src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java
View File

@@ -31,6 +31,7 @@ import com.nis.domain.maat.LogRecvData;
import com.nis.util.CodeDicUtils;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -107,6 +108,7 @@ public class DkBehaviorLogController extends BaseController{
} catch (Exception e) {
logger.error("查询行为识别日志失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/manipulation/dkBehaviorList";
}
@@ -208,6 +210,7 @@ public class DkBehaviorLogController extends BaseController{
} catch (Exception e) {
logger.error(name +" export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

2
src/main/java/com/nis/web/controller/log/ntc/AppLogController.java
View File

@@ -27,6 +27,7 @@ import com.nis.domain.maat.LogRecvData;
import com.nis.util.CodeDicUtils;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.dao.dashboard.codedic.CodeResult;
@@ -90,6 +91,7 @@ public class AppLogController extends BaseController{
} catch (Exception e) {
logger.error("查询App日志失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/appList";
}

3
src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java
View File

@@ -29,6 +29,7 @@ import com.nis.domain.log.NtcCollectRadiusLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -76,6 +77,7 @@ public class BgpLogController extends BaseController {
} catch (Exception e) {
logger.error("查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/bgpList";
@@ -146,6 +148,7 @@ public class BgpLogController extends BaseController {
} catch (Exception e) {
logger.error("bgp_control export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}

3
src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java
View File

@@ -43,6 +43,7 @@ import com.nis.util.CodeDicUtils;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.dao.dashboard.codedic.CodeResult;
@@ -168,6 +169,7 @@ public class CollectVoipLogController extends BaseController {
} catch (Exception e) {
logger.error("查询VoIP泛收日志失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/collectVoipList";
}
@@ -293,6 +295,7 @@ public class CollectVoipLogController extends BaseController {
} catch (Exception e) {
logger.error("collect_voip export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

3
src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java
View File

@@ -34,6 +34,7 @@ import com.nis.domain.log.NtcDdosLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -108,6 +109,7 @@ public class DdosLogController extends BaseController{
} catch (Exception e) {
logger.error("查询Ddos日志失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/ddosList";
}
@@ -187,6 +189,7 @@ public class DdosLogController extends BaseController{
} catch (Exception e) {
logger.error("DDOS export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

3
src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java
View File

@@ -29,6 +29,7 @@ import com.nis.domain.log.NtcDnsLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -75,6 +76,7 @@ public class DnsLogController extends BaseController {
} catch (Exception e) {
logger.error("查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/dnsList";
@@ -146,6 +148,7 @@ public class DnsLogController extends BaseController {
} catch (Exception e) {
logger.error("DNS export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}

3
src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java
View File

@@ -32,6 +32,7 @@ import com.nis.domain.log.NtcOpenVpnLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -93,6 +94,7 @@ public class FtpLogController extends BaseController {
} catch (Exception e) {
logger.error("查询Ftp日志失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/ftpList";
}
@@ -162,6 +164,7 @@ public class FtpLogController extends BaseController {
} catch (Exception e) {
logger.error("ftp_control export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}

3
src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java
View File

@@ -31,6 +31,7 @@ import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.Encodes;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -83,6 +84,7 @@ public class HttpKeyLogController extends BaseController {
} catch (Exception e) {
logger.error("查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/httpKeyList";
@@ -160,6 +162,7 @@ public class HttpKeyLogController extends BaseController {
} catch (Exception e) {
logger.error("http_keyword export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}

3
src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java
View File

@@ -28,6 +28,7 @@ import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.Encodes;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -80,6 +81,7 @@ public class HttpLogController extends BaseController {
} catch (Exception e) {
logger.error("查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/httpList";
@@ -156,6 +158,7 @@ public class HttpLogController extends BaseController {
} catch (Exception e) {
logger.error("HTTP export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}

3
src/main/java/com/nis/web/controller/log/ntc/HttpRecordLogController.java
View File

@@ -29,6 +29,7 @@ import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.Encodes;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -91,6 +92,7 @@ public class HttpRecordLogController extends BaseController {
} catch (Exception e) {
logger.error("查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/httpRecordList";
@@ -178,6 +180,7 @@ public class HttpRecordLogController extends BaseController {
} catch (Exception e) {
logger.error("http_record export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}

4
src/main/java/com/nis/web/controller/log/ntc/IpLogController.java
View File

@@ -24,6 +24,7 @@ import com.nis.domain.log.NtcIpLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -73,6 +74,7 @@ public class IpLogController extends BaseController {
} catch (Exception e) {
logger.error("查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/ipList";
@@ -110,6 +112,7 @@ public class IpLogController extends BaseController {
} catch (Exception e) {
logger.error("查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/ipList";
@@ -181,6 +184,7 @@ public class IpLogController extends BaseController {
} catch (Exception e) {
logger.error("Ip" + " export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

3
src/main/java/com/nis/web/controller/log/ntc/IpWhiteLogController.java
View File

@@ -24,6 +24,7 @@ import com.nis.domain.log.NtcIpLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -77,6 +78,7 @@ public class IpWhiteLogController extends BaseController {
} catch (Exception e) {
logger.error("查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/ipWhiteList";
@@ -152,6 +154,7 @@ public class IpWhiteLogController extends BaseController {
} catch (Exception e) {
logger.error("Ip" + " export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

2
src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java
View File

@@ -27,6 +27,7 @@ import com.nis.domain.log.NtcIpsecLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -82,6 +83,7 @@ public class IpsecLogController extends BaseController{
} catch (Exception e) {
logger.error("查询Ipsec日志失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/ipsecList";
}

3
src/main/java/com/nis/web/controller/log/ntc/IrDnatLogController.java
View File

@@ -26,6 +26,7 @@ import com.nis.domain.log.IrDnatLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -68,6 +69,7 @@ public class IrDnatLogController extends BaseController {
} catch (Exception e) {
logger.error("查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/irDnatLogList";
@@ -135,6 +137,7 @@ public class IrDnatLogController extends BaseController {
} catch (Exception e) {
logger.error("dnat_multiplex export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

3
src/main/java/com/nis/web/controller/log/ntc/IrSnatLogController.java
View File

@@ -26,6 +26,7 @@ import com.nis.domain.log.IrSnatLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -69,6 +70,7 @@ public class IrSnatLogController extends BaseController {
} catch (Exception e) {
logger.error("查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/irSnatLogList";
@@ -136,6 +138,7 @@ public class IrSnatLogController extends BaseController {
} catch (Exception e) {
logger.error("snat_multiplex export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

2
src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java
View File

@@ -25,6 +25,7 @@ import com.nis.domain.log.NtcL2tpLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -67,6 +68,7 @@ public class L2tpLogController extends BaseController {
} catch (Exception e) {
logger.error("L2TP日志查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/l2tpLogList";

3
src/main/java/com/nis/web/controller/log/ntc/MailLogController.java
View File

@@ -30,6 +30,7 @@ import com.nis.domain.log.NtcMailLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -105,6 +106,7 @@ public class MailLogController extends BaseController {
} catch (Exception e) {
logger.error("查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/mailList";
@@ -203,6 +205,7 @@ public class MailLogController extends BaseController {
} catch (Exception e) {
logger.error("mail_control export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}

3
src/main/java/com/nis/web/controller/log/ntc/MailRecordLogController.java
View File

@@ -30,6 +30,7 @@ import com.nis.domain.log.NtcMailLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -86,6 +87,7 @@ public class MailRecordLogController extends BaseController {
} catch (Exception e) {
logger.error("查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/mailRecordList";
@@ -166,6 +168,7 @@ public class MailRecordLogController extends BaseController {
} catch (Exception e) {
logger.error("mail_record export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}

2
src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java
View File

@@ -26,6 +26,7 @@ import com.nis.domain.log.NtcMailLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -82,6 +83,7 @@ public class MmAvIpLogController extends BaseController{
} catch (Exception e) {
logger.error("查询音视频IP日志失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/mmAvIpList";
}

3
src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java
View File

@@ -31,6 +31,7 @@ import com.nis.domain.log.NtcStreamMediaLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -94,6 +95,7 @@ public class MmAvUrlLogController extends BaseController {
} catch (Exception e) {
logger.error("查询音视频url日志失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/ntcStreamMedia";
}
@@ -164,6 +166,7 @@ public class MmAvUrlLogController extends BaseController {
} catch (Exception e) {
logger.error("streaming_media export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

3
src/main/java/com/nis/web/controller/log/ntc/MmFileDigestLogController.java
View File

@@ -29,6 +29,7 @@ import com.nis.domain.log.NtcStreamMediaLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -91,6 +92,7 @@ public class MmFileDigestLogController extends BaseController {
} catch (Exception e) {
logger.error("查询文件摘要日志失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/mmFileDigestList";
}
@@ -158,6 +160,7 @@ public class MmFileDigestLogController extends BaseController {
} catch (Exception e) {
logger.error("FileDiges export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}

2
src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java
View File

@@ -24,6 +24,7 @@ import com.nis.domain.log.MmPicIpLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -67,6 +68,7 @@ public class MmPicIpLogController extends BaseController {
} catch (Exception e) {
logger.error("音视频图片IP日志查询失败！", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/mmPicIpList";

2
src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java
View File

@@ -24,6 +24,7 @@ import com.nis.domain.log.MmPicUrlLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -67,6 +68,7 @@ public class MmPicUrlController extends BaseController{
} catch (Exception e) {
logger.error("音视频图片URL日志查询失败！", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/mmPicUrlList";

4
src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java
View File

@@ -28,6 +28,7 @@ import com.nis.domain.log.MmSampleVideoLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -74,6 +75,7 @@ public class MmPornAvSampleController extends BaseController {
} catch (Exception e) {
logger.error("查询音频色情样例日志失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/mmPornAudioSampleList";
}
@@ -117,6 +119,7 @@ public class MmPornAvSampleController extends BaseController {
} catch (Exception e) {
logger.error("查询视频色情样例日志失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/mmPornVideoSampleList";
}
@@ -182,6 +185,7 @@ public class MmPornAvSampleController extends BaseController {
} catch (Exception e) {
logger.error("Video export failed",e);
addMessage(redirectAttributes,"error","export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

3
src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java
View File

@@ -27,6 +27,7 @@ import com.nis.domain.log.MmSampleAudioLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -72,6 +73,7 @@ public class MmSampleAudioController extends BaseController{
} catch (Exception e) {
logger.error("音频样例日志查询失败！", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/mmSampleAudioList";
@@ -139,6 +141,7 @@ public class MmSampleAudioController extends BaseController{
} catch (Exception e) {
logger.error("SampleAudio export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

2
src/main/java/com/nis/web/controller/log/ntc/MmSampleFaceController.java
View File

@@ -24,6 +24,7 @@ import com.nis.domain.log.MmSamplePicLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -67,6 +68,7 @@ public class MmSampleFaceController extends BaseController{
} catch (Exception e) {
logger.error("人脸识别日志查询失败！", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/mmSampleFaceList";

2
src/main/java/com/nis/web/controller/log/ntc/MmSampleLogoController.java
View File

@@ -23,6 +23,7 @@ import com.nis.domain.log.MmSamplePicLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -66,6 +67,7 @@ public class MmSampleLogoController extends BaseController{
} catch (Exception e) {
logger.error("台标识别日志查询失败！", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/mmSampleLogoList";

3
src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java
View File

@@ -27,6 +27,7 @@ import com.nis.domain.log.MmSamplePicLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -72,6 +73,7 @@ public class MmSamplePicController extends BaseController{
} catch (Exception e) {
logger.error("图片样例日志查询失败！", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/mmSamplePicList";
@@ -137,6 +139,7 @@ public class MmSamplePicController extends BaseController{
} catch (Exception e) {
logger.error("SamplePic export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}

2
src/main/java/com/nis/web/controller/log/ntc/MmSampleSpeakerController.java
View File

@@ -23,6 +23,7 @@ import com.nis.domain.log.MmSamplePicLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -66,6 +67,7 @@ public class MmSampleSpeakerController extends BaseController{
} catch (Exception e) {
logger.error("说话人识别日志查询失败！", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/mmSampleSpeakerList";

3
src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java
View File

@@ -24,6 +24,7 @@ import com.nis.domain.log.MmSampleVideoLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -68,6 +69,7 @@ public class MmSampleVideoController extends BaseController{
} catch (Exception e) {
logger.error("视频样例日志查询失败！", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/mmSampleVideoList";
@@ -135,6 +137,7 @@ public class MmSampleVideoController extends BaseController{
} catch (Exception e) {
logger.error("SampleVideo export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

3
src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java
View File

@@ -29,6 +29,7 @@ import com.nis.domain.log.MmVoipLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -76,6 +77,7 @@ public class MmSampleVoipLogController extends BaseController {
} catch (Exception e) {
logger.error("查询Voip日志失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/mmSampleVoipList";
}
@@ -144,6 +146,7 @@ public class MmSampleVoipLogController extends BaseController {
} catch (Exception e) {
logger.error("voip export failed",e);
addMessage(redirectAttributes,"error","export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}

2
src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java
View File

@@ -26,6 +26,7 @@ import com.nis.domain.log.MmVoipLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -86,6 +87,7 @@ public class MmVoipAccountLogController extends BaseController{
} catch (Exception e) {
logger.error("查询mmVoipAccount日志失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/mmVoipAccountList";
}

3
src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java
View File

@@ -30,6 +30,7 @@ import com.nis.domain.log.MmVoipLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -93,6 +94,7 @@ public class MmVoipIpLogController extends BaseController {
} catch (Exception e) {
logger.error("查询Voip日志失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/mmVoipIpList";
}
@@ -165,6 +167,7 @@ public class MmVoipIpLogController extends BaseController {
} catch (Exception e) {
logger.error("av_voip_control export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

2
src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java
View File

@@ -25,6 +25,7 @@ import com.nis.domain.log.MmVoipLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -80,6 +81,7 @@ public class MmVoipLogController extends BaseController{
} catch (Exception e) {
logger.error("查询Voip日志失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/mmVoipList";
}

3
src/main/java/com/nis/web/controller/log/ntc/NtcCollectRadiusLogController.java
View File

@@ -24,6 +24,7 @@ import com.nis.domain.log.NtcCollectRadiusLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -75,6 +76,7 @@ public class NtcCollectRadiusLogController extends BaseController {
} catch (Exception e) {
logger.error("查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/radiusLogList";
@@ -139,6 +141,7 @@ public class NtcCollectRadiusLogController extends BaseController {
} catch (Exception e) {
logger.error("radius export failed",e);
addMessage(redirectAttributes,"error","export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

5
src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java
View File

@@ -30,6 +30,7 @@ import com.nis.exceptions.MaatConvertException;
import com.nis.util.CodeDicUtils;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -148,6 +149,7 @@ public class NtcConnRecordLogController extends BaseController {
} catch (Exception e) {
logger.error("查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/connRecordLogList";
@@ -179,9 +181,11 @@ public class NtcConnRecordLogController extends BaseController {
} catch (MaatConvertException e) {
logger.error("ajaxConnRecordPercent检索失败", e);
result.put("error", msgProp.get("request_service_failed"));
LogUtils.saveLog(request, null, e, null);
} catch (Exception e) {
logger.error("ajaxConnRecordPercent检索失败", e);
result.put("error", msgProp.get("search_error"));
LogUtils.saveLog(request, null, e, null);
}
return result;
}
@@ -317,6 +321,7 @@ public class NtcConnRecordLogController extends BaseController {
} catch (Exception e) {
logger.error("conn_record export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

3
src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java
View File

@@ -33,6 +33,7 @@ import com.nis.domain.log.NtcOpenVpnLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -97,6 +98,7 @@ public class OpenVpnLogController extends BaseController{
} catch (Exception e) {
logger.error("查询OpenVpn日志失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/openVpnList";
}
@@ -171,6 +173,7 @@ public class OpenVpnLogController extends BaseController{
} catch (Exception e) {
logger.error(name+" export failed",e);
addMessage(redirectAttributes,"error","export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

3
src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java
View File

@@ -29,6 +29,7 @@ import com.nis.domain.log.NtcP2pLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -78,6 +79,7 @@ public class P2pLogController extends BaseController {
} catch (Exception e) {
logger.error("查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/p2pList";
@@ -151,6 +153,7 @@ public class P2pLogController extends BaseController {
} catch (Exception e) {
logger.error("p2p_control export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

2
src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java
View File

@@ -25,6 +25,7 @@ import com.nis.domain.log.NtcPptpLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -67,6 +68,7 @@ public class PptpLogController extends BaseController {
} catch (Exception e) {
logger.error("PPTP日志查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/pptpLogList";

2
src/main/java/com/nis/web/controller/log/ntc/SshLogController.java
View File

@@ -27,6 +27,7 @@ import com.nis.domain.log.NtcSshLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -82,6 +83,7 @@ public class SshLogController extends BaseController{
} catch (Exception e) {
logger.error("查询Ssh日志失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/sshList";
}

3
src/main/java/com/nis/web/controller/log/ntc/SslLogController.java
View File

@@ -29,6 +29,7 @@ import com.nis.domain.log.NtcSslLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -79,6 +80,7 @@ public class SslLogController extends BaseController {
} catch (Exception e) {
logger.error("SSL日志查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/sslLogList";
@@ -151,6 +153,7 @@ public class SslLogController extends BaseController {
} catch (Exception e) {
logger.error("ssl_control export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}

3
src/main/java/com/nis/web/controller/log/ntc/SslRecordLogController.java
View File

@@ -29,6 +29,7 @@ import com.nis.domain.log.NtcSslRecordLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -80,6 +81,7 @@ public class SslRecordLogController extends BaseController {
} catch (Exception e) {
logger.error("SSL泛收日志查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/ntc/sslRecordLogList";
@@ -153,6 +155,7 @@ public class SslRecordLogController extends BaseController {
} catch (Exception e) {
logger.error("ssl_record export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
}

3
src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java
View File

@@ -32,6 +32,7 @@ import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.Encodes;
import com.nis.util.LogUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -86,6 +87,7 @@ public class PxyHttpLogController extends BaseController {
} catch (Exception e) {
logger.error("查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/log/pxy/pxyHttpList";
@@ -190,6 +192,7 @@ public class PxyHttpLogController extends BaseController {
} catch (Exception e) {
logger.error("pxyHttp export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}

2
src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
View File

@@ -21,6 +21,7 @@ import com.nis.domain.report.NtcDestIpReport;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.web.controller.BaseController;
import net.sf.json.JSONArray;
@@ -122,6 +123,7 @@ public class NtcDestIpReportController extends BaseController {
// TODO: handle exception
logger.error("查询失败", e);
addMessageLog(model, null);
LogUtils.saveLog(request, null, e, null);
}
// HashMap<String,List<Long>> showData=new LinkedHashMap<>();//构造数据展示集合
// List<Long> line= new ArrayList<Long>();

2
src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
View File

@@ -22,6 +22,7 @@ import com.nis.domain.report.NtcEntranceReport;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.web.controller.BaseController;
import net.sf.json.JSONArray;
@@ -120,6 +121,7 @@ public class NtcEntranceReportController extends BaseController {
// TODO: handle exception
logger.error("查询失败", e);
addMessageLog(model, null);
LogUtils.saveLog(request, null, e, null);
}
// HashMap<String,List<Long>> showData=new LinkedHashMap<>();//构造数据展示集合
// List<Long> line= new ArrayList<Long>();

4
src/main/java/com/nis/web/controller/report/NtcEventBlockController.java
View File

@@ -33,6 +33,7 @@ import com.nis.domain.configuration.TaskInfo;
import com.nis.domain.maat.LogRecvData;
import com.nis.domain.report.NtcEventMonitorOrBlockReport;
import com.nis.util.Constants;
import com.nis.util.LogUtils;
import com.nis.util.TimeConstants;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -124,6 +125,7 @@ public class NtcEventBlockController extends BaseController {
} catch (Exception e) {
logger.error("查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/report/eventBlockList";
@@ -249,6 +251,7 @@ public class NtcEventBlockController extends BaseController {
} catch (Exception e) {
logger.error("ntc_event_block_report export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -425,6 +428,7 @@ public class NtcEventBlockController extends BaseController {
} catch (Exception e) {
logger.error("ntc_event_block_report print failed", e);
addMessage(redirectAttributes, "error", "print_failed");
LogUtils.saveLog(request, null, e, null);
}
return null;
}

4
src/main/java/com/nis/web/controller/report/NtcEventKeyProtectionController.java
View File

@@ -33,6 +33,7 @@ import com.nis.domain.configuration.TaskInfo;
import com.nis.domain.maat.LogRecvData;
import com.nis.domain.report.NtcEventKeyProtectionReport;
import com.nis.util.Constants;
import com.nis.util.LogUtils;
import com.nis.util.TimeConstants;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -122,6 +123,7 @@ public class NtcEventKeyProtectionController extends BaseController {
} catch (Exception e) {
logger.error("查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/report/eventKeyProtectionList";
@@ -242,6 +244,7 @@ public class NtcEventKeyProtectionController extends BaseController {
} catch (Exception e) {
logger.error("ntc_event_key_protection_report export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -414,6 +417,7 @@ public class NtcEventKeyProtectionController extends BaseController {
} catch (Exception e) {
logger.error("ntc_event_key_protection_report print failed", e);
addMessage(redirectAttributes, "error", "print_failed");
LogUtils.saveLog(request, null, e, null);
}
return null;
}

5
src/main/java/com/nis/web/controller/report/NtcEventMonitorController.java
View File

@@ -33,6 +33,7 @@ import com.nis.domain.configuration.TaskInfo;
import com.nis.domain.maat.LogRecvData;
import com.nis.domain.report.NtcEventMonitorOrBlockReport;
import com.nis.util.Constants;
import com.nis.util.LogUtils;
import com.nis.util.TimeConstants;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -56,6 +57,7 @@ public class NtcEventMonitorController extends BaseController {
* @param response
* @return
*/
@SuppressWarnings("null")
@RequestMapping(value = { "/eventMonitorList", "" })
public String eventMonitorList(@ModelAttribute("log") NtcEventMonitorOrBlockReport log, Model model,
HttpServletRequest request, HttpServletResponse response) {
@@ -123,6 +125,7 @@ public class NtcEventMonitorController extends BaseController {
} catch (Exception e) {
logger.error("查询失败", e);
addMessageLog(model, e.getMessage());
LogUtils.saveLog(request, null, e, null);
}
return "/report/eventMonitorList";
@@ -247,6 +250,7 @@ public class NtcEventMonitorController extends BaseController {
} catch (Exception e) {
logger.error("ntc_event_monitor_report export failed", e);
addMessage(redirectAttributes, "error", "export_failed");
LogUtils.saveLog(request, null, e, null);
}
}
@@ -423,6 +427,7 @@ public class NtcEventMonitorController extends BaseController {
} catch (Exception e) {
logger.error("ntc_event_monitor_report print failed", e);
addMessage(redirectAttributes, "error", "print_failed");
LogUtils.saveLog(request, null, e, null);
}
return null;
}

2
src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
View File

@@ -22,6 +22,7 @@ import com.nis.domain.report.NtcLwhhReport;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.web.controller.BaseController;
import net.sf.json.JSONArray;
@@ -118,6 +119,7 @@ public class NtcLwhhReportController extends BaseController {
// TODO: handle exception
logger.error("查询失败", e);
addMessageLog(model, null);
LogUtils.saveLog(request, null, e, null);
}
// HashMap<String,List<Long>> showData=new LinkedHashMap<>();//构造数据展示集合
// for(RequestInfo requestInfo:requestInfos){

2
src/main/java/com/nis/web/controller/report/NtcPzReportController.java
View File

@@ -35,6 +35,7 @@ import com.nis.domain.report.NtcPzReport;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.web.controller.BaseController;
import net.sf.json.JSONArray;
@@ -162,6 +163,7 @@ public class NtcPzReportController extends BaseController{
// TODO: handle exception
logger.error("查询失败", e);
addMessageLog(model, null);
LogUtils.saveLog(request, null, e, null);
}
return "/report/pz";
}

2
src/main/java/com/nis/web/controller/report/NtcServiceReportController.java
View File

@@ -23,6 +23,7 @@ import com.nis.domain.report.NtcServiceReport;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.web.controller.BaseController;
import net.sf.json.JSONArray;
@@ -87,6 +88,7 @@ public class NtcServiceReportController extends BaseController {
// TODO Auto-generated catch block
logger.error("查询失败", e);
addMessageLog(model, null);
LogUtils.saveLog(request, null, e, null);
}
// if(bean.getAction()!=null){
// data.put(bean.getAction().toString(), 66666666l);

2
src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java
View File

@@ -22,6 +22,7 @@ import com.nis.domain.report.NtcSrcipDomesticReport;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.LogUtils;
import com.nis.web.controller.BaseController;
import net.sf.json.JSONArray;
@@ -160,6 +161,7 @@ public class NtcSrcipDomesticReportController extends BaseController {
// TODO: handle exception
logger.error("查询失败", e);
addMessageLog(model, null);
LogUtils.saveLog(request, null, e, null);
}
// HashMap<String,List<Long>> showData=new LinkedHashMap<>();//构造数据展示集合
// long total=0;

Some files were not shown because too many files have changed in this diff Show More