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

(1)域名拦截提交

Browse Source 
(2)IP类配置列表分类性质来函显示调整
(3)配置文件keyword_expr字段调整,java中*有正则表达式含义，这里用双斜杠转义一下
This commit is contained in:
wangxin
2018-06-22 16:30:59 +08:00
parent b6d0ece058
commit 1b456bec41
14 changed files with 1020 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,13 +43,13 @@ public class IpController extends BaseController{
}
@RequestMapping(value = {"form"})
@RequiresPermissions(value={"iplist:config"})
public String form(Model model,String ids,BaseIpCfg entity) {
public String form(Model model,String ids,Integer functionId,BaseIpCfg entity) {
if(StringUtils.isNotBlank(ids)){
entity = ipCfgService.getIpCfgById(IpPortCfg.getTablename(),Long.parseLong(ids));
}
if(entity.getCfgId()!=null){
List<BaseIpCfg> areaCfg=ipCfgService.getListByComileId(AreaIpCfg.getTablename(), String.valueOf(entity.getCompileId()));
model.addAttribute("areaCfgs", areaCfg);
// List<BaseIpCfg> areaCfg=ipCfgService.getListByComileId(AreaIpCfg.getTablename(),functionId.intValue(), String.valueOf(entity.getCompileId()));
// model.addAttribute("areaCfgs", areaCfg);
model.addAttribute("_cfg", entity);
initUpdateFormCondition(model,entity);
}else{
@@ -106,7 +106,7 @@ public class IpController extends BaseController{
for(String id:ids.split(",")){
Long.parseLong(id);
}
List<BaseIpCfg> beans=ipCfgService.getListByCfgId(IpPortCfg.getTablename(),ids);
List<BaseIpCfg> beans=ipCfgService.getListByCfgId(IpPortCfg.getTablename(),cfg.getFunctionId().intValue(),ids);
Date date=new Date();
for(BaseIpCfg bean:beans){
bean.setTableName(IpPortCfg.getTablename());

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

@@ -170,7 +170,7 @@ public class WhiteListController extends BaseController{
for(String id:ids.split(",")){
Long.parseLong(id);
}
List<BaseIpCfg> beans=ipCfgService.getListByCfgId(IpPortCfg.getTablename(),ids);
List<BaseIpCfg> beans=ipCfgService.getListByCfgId(IpPortCfg.getTablename(),cfg.getFunctionId().intValue(),ids);
Date date=new Date();
for(BaseIpCfg bean:beans){
bean.setTableName(IpPortCfg.getTablename());

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

@@ -43,15 +43,25 @@ public class InterceptController extends BaseController{
initPageCondition(model,cfg);
return "/cfg/proxy/ipList";
}
@RequestMapping(value = {"/domain/list"})
@RequiresPermissions(value={"intercept:domain:config","intercept:domain:audit"},logical=Logical.OR)
public String domainList(Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) {
cfg.setTableName(HttpUrlCfg.getTablename());
Page<BaseStringCfg> searchPage=new Page<BaseStringCfg>(request,response,"r");
Page<BaseStringCfg> page = stringCfgService.findPage(searchPage, cfg);
model.addAttribute("page", page);
initPageCondition(model,cfg);
return "/cfg/proxy/domainList";
}
@RequestMapping(value = {"/ip/form"})
@RequiresPermissions(value={"intercept:ip:config"})
public String ipForm(Model model,String ids,BaseIpCfg entity) {
public String ipForm(Model model,String ids,Integer functionId,BaseIpCfg entity) {
if(StringUtils.isNotBlank(ids)){
entity = ipCfgService.getIpCfgById(IpPortCfg.getTablename(),Long.parseLong(ids));
}
if(entity.getCfgId()!=null){
List<BaseIpCfg> areaCfg=ipCfgService.getListByComileId(AreaIpCfg.getTablename(), String.valueOf(entity.getCompileId()));
model.addAttribute("areaCfgs", areaCfg);
// List<BaseIpCfg> areaCfg=ipCfgService.getListByComileId(AreaIpCfg.getTablename(),functionId.intValue(), String.valueOf(entity.getCompileId()));
// model.addAttribute("areaCfgs", areaCfg);
model.addAttribute("_cfg", entity);
initUpdateFormCondition(model,entity);
}else{
@@ -65,6 +75,27 @@ public class InterceptController extends BaseController{
return "/cfg/proxy/ipForm";
}
@RequestMapping(value = {"/domain/form"})
@RequiresPermissions(value={"intercept:domain:config"})
public String domainForm(Model model,String ids,Integer functionId,BaseStringCfg entity) {
if(StringUtils.isNotBlank(ids)){
entity = stringCfgService.getStringCfgById(HttpUrlCfg.getTablename(),Long.parseLong(ids));
}
if(entity.getCfgId()!=null){
// List<BaseIpCfg> areaCfg=ipCfgService.getListByComileId(AreaIpCfg.getTablename(),functionId.intValue(), String.valueOf(entity.getCompileId()));
// model.addAttribute("areaCfgs", areaCfg);
model.addAttribute("_cfg", entity);
initUpdateFormCondition(model,entity);
}else{
HttpUrlCfg cfg=new HttpUrlCfg();
cfg.initDefaultValue();
cfg.setFunctionId(entity.getFunctionId());
model.addAttribute("_cfg", cfg);
initFormCondition(model,entity);
}
return "/cfg/proxy/domainForm";
}
@RequestMapping(value = {"/ip/saveOrUpdate"})
public String saveOrUpdateIp(RedirectAttributes model, IpPortCfg cfg) {
Date date=new Date();
@@ -89,8 +120,32 @@ public class InterceptController extends BaseController{
}
return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+cfg.getFunctionId();
}
@RequestMapping(value = {"/domain/saveOrUpdate"})
public String saveOrUpdateDomain(RedirectAttributes model, HttpUrlCfg cfg) {
cfg.setTableName(HttpUrlCfg.getTablename());
logger.info("saveOrUpdateDomain loaded");
try{
Date date=new Date();
cfg.setIsValid(Constants.VALID_NO);
cfg.setIsAudit(Constants.AUDIT_NOT_YET);
if(cfg.getCfgId()==null){//新增
cfg.setCreatorId(cfg.getCurrentUser().getId());
cfg.setCreateTime(date);
stringCfgService.addStringCfg((BaseStringCfg)cfg);
}else{//修改
cfg.setEditorId(cfg.getCurrentUser().getId());
cfg.setEditTime(new Date());
stringCfgService.updateStringCfg((BaseStringCfg)cfg);
}
addMessage(model,"save_success");
}catch(Exception e){
logger.error("保存失败",e);
addMessage(model,"save_failed");
}
return "redirect:" + adminPath +"/proxy/intercept/domain/list?functionId="+cfg.getFunctionId();
}
@RequestMapping(value = {"/ip/delete"})
@RequiresPermissions("iplist:config")
@RequiresPermissions("intercept:ip:config")
public String deleteIp(String ids,String compileIds,Integer functionId,RedirectAttributes model) {
try{
ipCfgService.deleteIp(ids,compileIds,functionId.intValue());
@@ -101,6 +156,18 @@ public class InterceptController extends BaseController{
}
return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+functionId;
}
@RequestMapping(value = {"/domain/delete"})
@RequiresPermissions("intercept:domain:config")
public String deleteDomain(String ids,String compileIds,Integer functionId,RedirectAttributes model) {
try{
stringCfgService.deleteDomain(ids,compileIds,functionId.intValue());
addMessage(model,"delete_success");
}catch(Exception e){
logger.error("删除失败", e);
addMessage(model,"delete_failed");
}
return "redirect:" + adminPath +"/proxy/intercept/domain/list?functionId="+functionId;
}
@RequestMapping(value = {"/ip/audit"})
// @RequiresPermissions("intercept:ip:audit")
public String auditIp(String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) {
@@ -108,7 +175,7 @@ public class InterceptController extends BaseController{
for(String id:ids.split(",")){
Long.parseLong(id);
}
List<BaseIpCfg> beans=ipCfgService.getListByCfgId(IpPortCfg.getTablename(),ids);
List<BaseIpCfg> beans=ipCfgService.getListByCfgId(IpPortCfg.getTablename(),cfg.getFunctionId().intValue(),ids);
Date date=new Date();
for(BaseIpCfg bean:beans){
bean.setTableName(IpPortCfg.getTablename());
@@ -121,11 +188,38 @@ public class InterceptController extends BaseController{
addMessage(redirectAttributes,"audit_success");
}catch(MaatConvertException e){
logger.error("审核失败", e);
addMessage(redirectAttributes, e.getMessage());
addMessage(redirectAttributes, e.getPrefix()+e.getResult().getReason());
}catch(Exception e){
logger.error("审核失败", e);
addMessage(redirectAttributes, "audit_failed");
}
return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+cfg.getFunctionId();
}
@RequestMapping(value = {"/domain/audit"})
// @RequiresPermissions("intercept:domain:audit")
public String auditDomain(String ids,HttpUrlCfg cfg,RedirectAttributes redirectAttributes) {
try{
for(String id:ids.split(",")){
Long.parseLong(id);
}
List<BaseStringCfg> beans=stringCfgService.getListByCfgId(HttpUrlCfg.getTablename(),ids);
Date date=new Date();
for(BaseStringCfg bean:beans){
bean.setTableName(HttpUrlCfg.getTablename());
bean.setAuditorId(bean.getCurrentUser().getId());
bean.setAuditTime(date);
bean.setIsAudit(cfg.getIsAudit());
bean.setIsValid(cfg.getIsValid());
stringCfgService.auditDomain(bean);
}
addMessage(redirectAttributes,"audit_success");
}catch(MaatConvertException e){
logger.error("审核失败", e);
addMessage(redirectAttributes, e.getPrefix()+e.getResult().getReason());
}catch(Exception e){
logger.error("审核失败", e);
addMessage(redirectAttributes, "audit_failed");
}
return "redirect:" + adminPath +"/proxy/intercept/domain/list?functionId="+cfg.getFunctionId();
}
}

4
src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
View File

@@ -18,8 +18,8 @@ public interface IpCfgDao extends CrudDao<BaseIpCfg>{
public BaseIpCfg getById(@Param("tableName")String tableName,@Param("cfgId")Long id) ;
public BaseIpCfg get(BaseIpCfg entity) ;
public List<BaseIpCfg> findList(BaseIpCfg entity) ;
public List<BaseIpCfg> getListByCfgId(@Param("tableName")String tableName,@Param("ids")String ids) ;
public List<BaseIpCfg> getListByComileId(@Param("tableName")String tableName,@Param("ids")String ids) ;
public List<BaseIpCfg> getListByCfgId(@Param("tableName")String tableName,@Param("functionId")int functionId,@Param("ids")String ids) ;
public List<BaseIpCfg> getListByComileId(@Param("tableName")String tableName,@Param("functionId")int functionId,@Param("ids")String ids) ;
public int insert(BaseIpCfg entity) ;
public int update(BaseIpCfg entity) ;
public int updateValid(BaseIpCfg entity) ;

4
src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
View File

@@ -118,12 +118,12 @@
<select id="getListByComileId" resultMap="BaseIpMap" >
SELECT
<include refid="BaseIpCfg_Column_List_with_id" />
FROM ${tableName} WHERE IS_VALID!=-1 AND COMPILE_ID in (${ids})
FROM ${tableName} WHERE IS_VALID!=-1 AND FUNCTION_ID=#{functionId,jdbcType=INTEGER} AND COMPILE_ID in (${ids})
</select>
<select id="getListByCfgId" resultMap="BaseIpMap" >
SELECT
<include refid="BaseIpCfg_Column_List_with_id" />
FROM ${tableName} WHERE IS_VALID!=-1 AND CFG_ID in (${ids})
FROM ${tableName} WHERE IS_VALID!=-1 AND FUNCTION_ID=#{functionId,jdbcType=INTEGER} AND CFG_ID in (${ids})
</select>
<select id="getList" resultMap="BaseIpMap" >
SELECT

11
src/main/java/com/nis/web/dao/configuration/StringCfgDao.java
View File

@@ -29,4 +29,15 @@ public interface StringCfgDao extends CrudDao<BaseStringCfg>{
public int deleteByCompileId(BaseStringCfg entity);
public List<BaseStringCfg> getListByCfgId(@Param("tableName")String tableName, @Param("ids")String ids);
public List<BaseStringCfg> getListByCompileId(@Param("tableName")String tableName, @Param("ids")String ids);
/**
* deleteByCompileIds(这里用一句话描述这个方法的作用)
* (这里描述这个方法适用条件 – 可选)
* @param id
* @param tablename
* @param compileIds
*void
* @exception
* @since 1.0.0
*/
public void deleteByCompileIds(@Param("user")long user,@Param("tableName")String tableName,@Param("compileIds")String compileIds);
}

5
src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
View File

@@ -54,7 +54,7 @@
${page.alias}.CFG_ID as cfgId, ${page.alias}.CFG_DESC as cfgDesc, ${page.alias}.CFG_KEYWORDS as cfgKeywords,${page.alias}.CFG_TYPE as cfgType,${page.alias}.ACTION as action,${page.alias}.IS_VALID as isValid,${page.alias}.IS_AUDIT as isAudit,
${page.alias}.CREATOR_ID as creatorId,${page.alias}.CREATE_TIME AS createTime,${page.alias}.EDITOR_ID as editorId,${page.alias}.EDIT_TIME AS editTime,${page.alias}.AUDITOR_ID as auditorId,${page.alias}.AUDIT_TIME AS auditTime,
${page.alias}.SERVICE_ID as serviceId,${page.alias}.REQUEST_ID AS requestId,${page.alias}.COMPILE_ID AS compileId,${page.alias}.IS_AREA_EFFECTIVE as isAreaEffective,${page.alias}.classify,
${page.alias}.ATTRIBUTE AS attribute,${page.alias}.LABLE AS lable,${page.alias}.AREA_EFFECTIVE_IDS AS areaEffectiveIds,${page.alias}.FUNCTION_ID AS functionId,${page.alias}.CFG_REGION_CODE as cfgRegionCode
${page.alias}.ATTRIBUTE AS attribute,${page.alias}.LABLE AS lable,${page.alias}.EXPR_TYPE as exprType,${page.alias}.MATCH_METHOD as matchMethod,${page.alias}.IS_HEXBIN as isHexbin,${page.alias}.AREA_EFFECTIVE_IDS AS areaEffectiveIds,${page.alias}.FUNCTION_ID AS functionId,${page.alias}.CFG_REGION_CODE as cfgRegionCode
</when>
<otherwise>
r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.CFG_KEYWORDS as cfgKeywords,r.CFG_TYPE as cfgType, r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit,
@@ -457,4 +457,7 @@
</if>
</trim>
</update>
<update id="deleteByCompileIds" parameterType="com.nis.domain.configuration.BaseStringCfg" >
update ${tableName} set is_valid = -1, editor_id = #{user,jdbcType=INTEGER} , edit_time = NOW() where compile_id in (${compileIds})
</update>
</mapper>

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

@@ -405,13 +405,13 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
public Integer getIsAudit(String tableName, long id){
return ipCfgDao.getIsAudit(tableName,id);
}
public List<AreaIpCfg> getAreaCfgByCompileId(int compileId){
public List<AreaIpCfg> getAreaCfgByCompileId(/*int functionId,*/int compileId){
return areaIpCfgDao.getByCompileId(compileId);
}
public List<BaseIpCfg> getListByComileId(String tableName,String ids){
return ipCfgDao.getListByComileId(tableName,ids);
public List<BaseIpCfg> getListByComileId(String tableName,int functionId,String ids){
return ipCfgDao.getListByComileId(tableName,functionId,ids);
}
public List<BaseIpCfg> getListByCfgId(String tableName,String ids){
return ipCfgDao.getListByCfgId(tableName,ids);
public List<BaseIpCfg> getListByCfgId(String tableName,int functionId,String ids){
return ipCfgDao.getListByCfgId(tableName,functionId,ids);
}
}

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

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.HttpUrlCfg;
@@ -26,6 +27,7 @@ import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.AreaIpCfgDao;
import com.nis.web.dao.configuration.StringCfgDao;
import com.nis.web.service.CrudService;
@@ -38,6 +40,8 @@ import com.nis.web.service.CrudService;
public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
@Autowired
protected StringCfgDao stringCfgDao;
@Autowired
protected AreaIpCfgDao areaIpCfgDao;
/**
*
* addStringCfg(新增IP类配置)
@@ -73,6 +77,39 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
}
// baseStringCfg.setCompileId(0);
// return stringCfgDao.insert(baseStringCfg);
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void addStringCfg(BaseStringCfg cfg){
//调用服务接口获取compileId
Integer compileId = 0;
try {
List<Integer> compileIds = ConfigServiceUtil.getId(1,1);
if(!StringUtil.isEmpty(compileIds)){
compileId = compileIds.get(0);
}
} catch (Exception e) {
e.printStackTrace();
logger.info("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
if(compileId!=0){
cfg.setCompileId(compileId);
setAreaEffectiveIds(cfg);
if(cfg.getAreaCfg()!=null&&cfg.getAreaCfg().size()>0){
for(AreaIpCfg c:cfg.getAreaCfg()){
c.initDefaultValue();
BeanUtils.copyProperties(cfg, c,new String[]{"cfgId","ipType","direction",
"protocol","protocolId","areaEffectiveIds","cfgRegionCode",
"cfgType","ipPattern","srcIpAddress","portPattern","srcPort","destIpAddress","destPort"});
c.setTableName(AreaIpCfg.getTablename());
}
this.saveIpBatch(cfg.getAreaCfg());
}
stringCfgDao.insert(cfg);
}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
}
/**
*
@@ -97,6 +134,29 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
}
return stringCfgDao.update(baseStringCfg);
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void updateStringCfg(BaseStringCfg cfg){
AreaIpCfg area=new AreaIpCfg();
area.setCompileId(cfg.getCompileId());
area.setFunctionId(cfg.getFunctionId());
areaIpCfgDao.deleteAreaIpCfg(area);
//区域IPsetAreaEffectiveIds设置
setAreaEffectiveIds(cfg);
Date date=new Date();
if(cfg.getAreaCfg()!=null&&cfg.getAreaCfg().size()>0){
for(AreaIpCfg c:cfg.getAreaCfg()){
c.initDefaultValue();
BeanUtils.copyProperties(cfg, c,new String[]{"cfgId","ipType","direction",
"protocol","protocolId","areaEffectiveIds","cfgRegionCode",
"cfgType","ipPattern","srcIpAddress","portPattern","srcPort","destIpAddress","destPort"});
c.setTableName(AreaIpCfg.getTablename());
c.setCreatorId(cfg.getCurrentUser().getId());
c.setCreateTime(date);
}
this.saveIpBatch(cfg.getAreaCfg());
}
stringCfgDao.update(cfg);
}
public void auditWhiteDomain(BaseStringCfg cfg) throws Exception{
List<BaseStringCfg> beans=new ArrayList<>();
beans.add(cfg);
@@ -169,6 +229,105 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
}
}
}
public void auditDomain(BaseStringCfg cfg) throws Exception{
List<BaseStringCfg> beans=new ArrayList<>();
beans.add(cfg);
this.auditBatch(beans, StringCfgDao.class);
List<BaseIpCfg> beans1=new ArrayList<>();
List<AreaIpCfg> areaIpCfgList=areaIpCfgDao.getByCompileId(cfg.getCompileId());
for(AreaIpCfg area:areaIpCfgList){
BeanUtils.copyProperties(cfg,area ,new String[]{"cfgRegionCode"
,"cfgType"
,"cfgId"
,"ipType"
,"ipPattern"
,"srcIpAddress"
,"portPattern"
,"srcPort"
,"destPort"
,"protocol"
,"direction"
,"protocolId"
});
beans1.add(area);
}
this.auditIpBatch(beans1);
List<MaatCfg> configCompileList = new ArrayList<>();
List<GroupCfg> groupRelationList = new ArrayList<>();
List<IpCfg> ipRegionList = new ArrayList<>();
List<StringCfg> strRegionList = new ArrayList<>();
List<NumBoundaryCfg> numRegionList = new ArrayList<>();
List<DigestCfg> digestRegionList = new ArrayList<>();
List<IpCfg> areaIpRegionList = new ArrayList<>();
ToMaatBean maatBean = new ToMaatBean();
MaatCfg maatCfg = new MaatCfg();
maatCfg.initDefaultValue();
BeanUtils.copyProperties(cfg, maatCfg);
if(cfg.getIsAudit()==1){
maatBean.setOpAction(Constants.INSERT_ACTION);
Map<String,List> map = cfgConvert(strRegionList,beans,2,cfg,groupRelationList);
groupRelationList=map.get("groupList");
strRegionList=map.get("dstList");
numRegionList=map.get("numRegionList")==null?new ArrayList<>():map.get("numRegionList");
Map<String,List> areaMap = cfgConvert(areaIpRegionList,beans1,1,cfg,groupRelationList);
groupRelationList=areaMap.get("groupList");
areaIpRegionList=areaMap.get("dstList");
maatCfg.setAreaEffectiveIds(StringUtils.isBlank(cfg.getAreaEffectiveIds())?"0":cfg.getAreaEffectiveIds());
String userRegion=cfg.getCfgKeywords().replaceAll(Constants.KEYWORD_EXPR , "&");
maatCfg.setUserRegion(Constants.USER_REGION_SPLIT+userRegion+Constants.USER_REGION_SPLIT);
maatCfg.setAction(cfg.getAction());
maatCfg.setAuditTime(cfg.getAuditTime());
maatCfg.setIpRegionList(ipRegionList);
maatCfg.setStrRegionList(strRegionList);
maatCfg.setNumRegionList(numRegionList);
maatCfg.setAreaIpRegionList(areaIpRegionList);
maatCfg.setDigestRegionList(digestRegionList);
maatCfg.setGroupRelationList(groupRelationList);
maatCfg.setGroupNum(groupRelationList.size());
maatCfg.setAreaIpRegionList(areaIpRegionList);
configCompileList.add(maatCfg);
maatBean.setOpAction(Constants.INSERT_ACTION);
maatBean.setConfigCompileList(configCompileList);
maatBean.setAuditTime(cfg.getAuditTime());
maatBean.setCreatorName(cfg.getCurrentUser().getName());
maatBean.setVersion(Constants.MAAT_VERSION);
//调用服务接口下发配置数据
String json=gsonToJson(maatBean);
logger.info("域名配置："+json);
//调用服务接口下发配置
try {
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
logger.info("域名配置下发响应信息："+result.getMsg());
} catch (Exception e) {
e.printStackTrace();
logger.info("域名配置下发失败");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
}else if(cfg.getIsAudit()==3){
maatCfg.setCompileId(cfg.getCompileId());
maatCfg.setServiceId(cfg.getServiceId());
maatCfg.setIsValid(0);//无效
configCompileList.add(maatCfg);
maatBean.setConfigCompileList(configCompileList);
maatBean.setAuditTime(cfg.getAuditTime());
maatBean.setCreatorName(cfg.getCurrentUser().getName());
maatBean.setVersion(Constants.MAAT_VERSION);
maatBean.setOpAction(Constants.UPDATE_ACTION);
//调用服务接口取消配置
String json=gsonToJson(maatBean);
logger.info("域名配置参数："+json);
//调用服务接口取消配置
try {
ToMaatResult result = ConfigServiceUtil.put(json, 1);
logger.info("域名取消配置响应信息："+result.getMsg());
} catch (Exception e) {
e.printStackTrace();
logger.info("域名取消配置失败");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
}
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void deleteWhiteDomain(String ids){
@@ -189,6 +348,31 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
}
this.deleteBatch(cfgs, StringCfgDao.class);
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void deleteDomain(String ids,String compileIds,int functionId){
if(StringUtils.isNotBlank(compileIds)){
for(String compileId:compileIds.split(",")){//强转数字，防止注入
Integer.parseInt(compileId);
}
stringCfgDao.deleteByCompileIds(new BaseStringCfg().getCurrentUser().getId(),AreaIpCfg.getTablename(),compileIds);
}
List<BaseStringCfg> stringCfgs=new ArrayList<BaseStringCfg>();
Date date =new Date();
if(StringUtils.isNotBlank(ids)){
for(String idStr:ids.split(",")){
if(StringUtils.isNotBlank(idStr)){
BaseStringCfg cfg=new BaseStringCfg();
cfg.setCfgId(Long.parseLong(idStr));
cfg.setTableName(HttpUrlCfg.getTablename());
cfg.setEditorId(cfg.getCurrentUser().getId());
cfg.setEditTime(date);
cfg.setIsValid(Constants.VALID_DEL);
stringCfgs.add(cfg);
}
}
}
this.deleteBatch(stringCfgs, StringCfgDao.class);
}
/**
*
* deleteStringCfg(删除IP类配置)