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

增加区域IP验证处理：由于接口源IP目的IP不能相同，且区域IP只能输入源IP.所以对于IP默认值加入了限制。

Browse Source
This commit is contained in:
wangxin
2018-06-25 11:10:55 +08:00
parent 98016b5232
commit b2c3f09a95
7 changed files with 73 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/nis/web/service/configuration/IpCfgService.java
View File

@@ -161,15 +161,15 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
ipList.add(ip);
//调用服务接口下发配置数据
json=gsonToJson(ipList);
logger.info("IP管控下发配置参数："+json);
logger.info("IP配置下发配置参数："+json);
//调用服务接口下发配置
try {
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
if(result!=null){
logger.info("IP管控配置下发响应信息："+result.getMsg());
logger.info("IP配置配置下发响应信息："+result.getMsg());
}
} catch (Exception e) {
logger.error("IP管控配置下发失败",e);
logger.error("IP配置配置下发失败",e);
throw e;
}
}else{
@@ -199,15 +199,15 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
maatBean.setVersion(Constants.MAAT_VERSION);
//调用服务接口下发配置数据
json=gsonToJson(maatBean);
logger.info("IP管控下发配置参数："+json);
logger.info("IP配置下发配置参数："+json);
//调用服务接口下发配置
try {
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
if(result!=null){
logger.info("IP管控配置下发响应信息："+result.getMsg());
logger.info("IP配置配置下发响应信息："+result.getMsg());
}
} catch (Exception e) {
logger.error("IP管控配置下发失败",e);
logger.error("IP配置配置下发失败",e);
throw e;
}
}
@@ -222,10 +222,10 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
//调用服务接口取消配置
try {
ToMaatResult result = ConfigServiceUtil.put(json, 2);
logger.info("IP管控取消配置响应信息："+result.getMsg());
logger.info("IP配置取消配置响应信息："+result.getMsg());
} catch (Exception e) {
e.printStackTrace();
logger.info("IP管控取消配置失败");
logger.info("IP配置取消配置失败");
throw e;
}
}else{

8
src/main/java/com/nis/web/service/configuration/StringCfgService.java
View File

@@ -202,7 +202,7 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
} catch (Exception e) {
e.printStackTrace();
logger.info("域名白名单配置下发失败");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
throw e;
}
}else if(cfg.getIsAudit()==3){
maatCfg.setCompileId(cfg.getCompileId());
@@ -224,7 +224,7 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
} catch (Exception e) {
e.printStackTrace();
logger.info("域名白名单取消配置失败");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
throw e;
}
}
}
@@ -302,7 +302,7 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
} catch (Exception e) {
e.printStackTrace();
logger.info("域名配置下发失败");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
throw e;
}
}else if(cfg.getIsAudit()==3){
maatCfg.setCompileId(cfg.getCompileId());
@@ -324,7 +324,7 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
} catch (Exception e) {
e.printStackTrace();
logger.info("域名取消配置失败");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
throw e;
}
}
}