diff --git a/src/main/java/com/nis/util/ConfigConvertUtil.java b/src/main/java/com/nis/util/ConfigConvertUtil.java index 4d17ae576..c39e733ea 100644 --- a/src/main/java/com/nis/util/ConfigConvertUtil.java +++ b/src/main/java/com/nis/util/ConfigConvertUtil.java @@ -196,7 +196,7 @@ public class ConfigConvertUtil { BeanUtils.copyProperties(baseIpCfg, cfg); cfg.setGroupId(asnIpCfg.getAsnIpGroup()); cfg.setRegionId(asnIpCfg.getRegionId()); - String userRegion = "ASN_ID=" + asnIpCfg.getUserRegion1(); + String userRegion = "ASN_ID=AS" + asnIpCfg.getUserRegion1(); cfg.setUserRegion(userRegion); cfg.setIsValid(isValid); cfg.setAuditTime(opTime); diff --git a/src/main/java/com/nis/util/ConfigServiceUtil.java b/src/main/java/com/nis/util/ConfigServiceUtil.java index 3e8a717f1..914766f21 100644 --- a/src/main/java/com/nis/util/ConfigServiceUtil.java +++ b/src/main/java/com/nis/util/ConfigServiceUtil.java @@ -800,10 +800,11 @@ public class ConfigServiceUtil { } } catch (Exception e) { throw new MaatConvertException(""); - } + } + + bean = JSONObject.fromObject(result); if(response != null && response.getStatus() == 200){ logger.info("get result success"); - bean = JSONObject.fromObject(result); }else{ throw new MaatConvertException(":"+result); } @@ -830,7 +831,7 @@ public class ConfigServiceUtil { String result = null; String url = DictUtils.getDictLabel("config_sync_url", "get_sync_status"); //创建连接 - WebTarget wt = ClientUtil.getWebTarger(url); + /*WebTarget wt = ClientUtil.getWebTarger(url); logger.info("get_sync_status url:"+url); //获取响应结果 Builder header = wt.request(MediaType.APPLICATION_JSON) @@ -843,12 +844,13 @@ public class ConfigServiceUtil { } catch (Exception e) { throw new MaatConvertException(""); } - if(response != null && response.getStatus() == 200){ + if(response != null && response.getStatus() == 200){*/ logger.info("get result success"); + result="{\"status\": 201,\"businessCode\": 2001000,\"reason\":\"数据获取操作成功\",\"msg\": \"根据配置id获取对应的编译,组,域等信息成功\",\"fromuri\": \"/galaxy-service/service/cfg/v1/getAllKVByCompileId\",\"traceCode\": \"2019031211285044813363\",\"data\": [{\"service\":\"ntc\",\"status\":0,\"opTime\":\"2016-11-22 08:31:27\"}]}"; bean= JSONObject.fromObject(result); - }else{ + /*}else{ throw new MaatConvertException(":"+result); - } + }*/ } catch (Exception e) { throw e; }finally { diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 9c96d4a18..95173f20b 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -2955,6 +2955,8 @@ public class BaseController { /************************多域maat cfg_index_info 处理****************************************/ boolean hasData = true; while(hasData){ + page.setPageNo(1); + page.setLastPage(false); List list=getDataList(page,searchCfg,null,null,null); if(!StringUtil.isEmpty(list)){ //配置生效处理 复用全量下发 @@ -2971,9 +2973,6 @@ public class BaseController { } hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg, cfgIndexList, hasData); } - if(hasData) { - page.setPageNo(page.getNext()); - } }else{ hasData = false; } @@ -2982,6 +2981,9 @@ public class BaseController { /************************多域 maat 摘要处理****************************************/ boolean hasData = true; while(hasData){ + + page.setPageNo(1); + page.setLastPage(false); List list=getDataList(page,null,null,searchDigestCfg,null); if(!StringUtil.isEmpty(list)){ //配置生效处理 复用全量下发 @@ -2998,9 +3000,6 @@ public class BaseController { } hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,baseCfgList, hasData); } - if(hasData) { - page.setPageNo(page.getNext()); - } }else{ hasData = false; } @@ -3009,6 +3008,8 @@ public class BaseController { /************************多域 maat app策略处理****************************************/ boolean hasData = true; while(hasData){ + page.setPageNo(1); + page.setLastPage(false); List list=getDataList(page,null,searchAppCfg,null,null); if(!StringUtil.isEmpty(list)){ //配置生效处理 复用全量下发 @@ -3025,9 +3026,6 @@ public class BaseController { } hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,cfgAppList, hasData); } - if(hasData) { - page.setPageNo(page.getNext()); - } }else{ hasData = false; } @@ -3036,6 +3034,9 @@ public class BaseController { /************************多域 maat app特征处理****************************************/ boolean hasData = true; while(hasData){ + page.setPageNo(1); + page.setLastPage(false); + List list=getDataList(page,null,null,null,searchAppFeatureIndex); if(!StringUtil.isEmpty(list)){ //配置生效处理 复用全量下发 @@ -3052,9 +3053,6 @@ public class BaseController { } hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,cfgFeatrureList, hasData); } - if(hasData) { - page.setPageNo(page.getNext()); - } }else{ hasData = false; } @@ -3068,6 +3066,9 @@ public class BaseController { if("ddos_ip_cfg".equals(tableNameXml)){ boolean hasData = true; while(hasData){ + page.setPageNo(1); + page.setLastPage(false); + List list=ddosCfgService.findPage(page, searchDdosIpCfg).getList(); if(!StringUtil.isEmpty(list)){ if(auditBatchCfg.getIsValid().equals(1)) { @@ -3084,7 +3085,8 @@ public class BaseController { hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,newList, hasData); } if(hasData) { - page.setPageNo(page.getNext()); + page.setPageNo(1); + page.setLastPage(false); } }else{ hasData = false; @@ -3096,6 +3098,8 @@ public class BaseController { //所有已下发的ASN IP组 boolean hasData = true; while(hasData){ + page.setPageNo(1); + page.setLastPage(false); //已下发的ASN IP List list=asnIpCfgService.findPage(page, searchAsnIpCfg).getList(); @@ -3118,9 +3122,6 @@ public class BaseController { } hasData=commonPolicyService.auditReuseConfigData(page, auditBatchCfg,asnIpMap,hasData); } - if(hasData) { - page.setPageNo(page.getNext()); - } }else{ hasData = false; } @@ -3138,6 +3139,9 @@ public class BaseController { boolean hasData = true; while(hasData){ + page.setPageNo(1); + page.setLastPage(false); + //已下发的APP IP List list=appCfgService.findAppIpList(page, searchAppIpCfg).getList(); @@ -3164,9 +3168,6 @@ public class BaseController { } hasData=commonPolicyService.auditReuseConfigData(page, auditBatchCfg,appIpMap,hasData); } - if(hasData) { - page.setPageNo(page.getNext()); - } }else{ hasData = false; } @@ -3262,6 +3263,8 @@ public class BaseController { }else { boolean hasData = true; while(hasData){ + page.setPageNo(1); + page.setLastPage(false); List list = Lists.newArrayList(); /* 1026 app_domain_cfg @@ -3297,9 +3300,6 @@ public class BaseController { } hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,newList, hasData); } - if(hasData) { - page.setPageNo(page.getNext()); - } }else{ hasData = false; } @@ -3312,6 +3312,8 @@ public class BaseController { /********************回调类处理生效和失效一个方法【由于每个表检索条件不一样，需要自己处理，无法复用全量下发】*********/ boolean hasData = true; while(hasData){ + page.setPageNo(1); + page.setLastPage(false); hasData=handelCallbackData(classNameXml, page, hasData, auditBatchCfg , searchCfg , searchAppCfg @@ -3324,9 +3326,6 @@ public class BaseController { , searchDnsIpCfg , searchIpPortCfg , searchSignSampleCfg); - if(hasData){ - page.setPageNo(page.getNext()); - } } } } @@ -3340,7 +3339,7 @@ public class BaseController { } } long end=System.currentTimeMillis(); - logger.info("配置批量生效/失效耗时："+(end-start)); + logger.warn("配置批量生效/失效耗时："+(end-start)); } diff --git a/src/main/java/com/nis/web/controller/configuration/ConfigSynchronizationController.java b/src/main/java/com/nis/web/controller/configuration/ConfigSynchronizationController.java index 118f56fc1..533d23b5f 100644 --- a/src/main/java/com/nis/web/controller/configuration/ConfigSynchronizationController.java +++ b/src/main/java/com/nis/web/controller/configuration/ConfigSynchronizationController.java @@ -51,10 +51,11 @@ public class ConfigSynchronizationController extends BaseController { * 下发同步命令 */ @RequestMapping(value = {"configSync"}) - public String configSync(Model model,Integer cmd,HttpServletRequest request,HttpServletResponse response){ + public String configSync(Model model,Integer cmd,Integer serviceId,HttpServletRequest request,HttpServletResponse response){ Map map = new HashMap(); map.put("syncStatus", cmd); - JSONObject result = ConfigServiceUtil.configSyncCmd(BaseService.gsonToJson(map)); + //TODO 联调时打开JSONObject result = ConfigServiceUtil.configSyncCmd(BaseService.gsonToJson(map)); + JSONObject result=JSONObject.fromObject("{\"status\": 201,\"businessCode\": 2001000,\"reason\":\"数据获取操作成功\",\"msg\": \"根据配置id获取对应的编译,组,域等信息成功\",\"fromuri\": \"/galaxy-service/service/cfg/v1/getAllKVByCompileId\",\"traceCode\": \"2019031211285044813363\",\"data\": [{\"service\":\"ntc\",\"status\":0,\"opTime\":\"2016-11-22 08:31:27\"}]}"); if(result.get("status").equals(201)){//响应成功 if(cmd.equals(1)){//同步 SysDataDictionaryName sysDictName = new SysDataDictionaryName(); @@ -73,7 +74,7 @@ public class ConfigSynchronizationController extends BaseController { CacheUtils.remove(Constants.CACHE_DICT_MAP); } } - send(model,request,response); + send(serviceId,model,request,response); }else if(cmd.equals(0)){//取消 } @@ -85,10 +86,10 @@ public class ConfigSynchronizationController extends BaseController { * 下发同步配置 */ @RequestMapping(value = {"send"}) - public void send(Model model,HttpServletRequest request,HttpServletResponse response){ + public void send(Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response){ int status = -2; try { - configSynchronizationService.send(request,response,null); + configSynchronizationService.send(serviceId,request,response,null); status = 1; } catch (NoSuchFieldException e) { e.printStackTrace(); @@ -128,7 +129,8 @@ public class ConfigSynchronizationController extends BaseController { }else{ boolean isFinished = true; while(isFinished){ - JSONObject result = ConfigServiceUtil.configSyncStatus();//获取同步状态 + //TODO 联调时打开JSONObject result = ConfigServiceUtil.configSyncStatus();//获取同步状态 + JSONObject result = JSONObject.fromObject("{\"status\": 200,\"businessCode\": 2001000,\"reason\":\"数据获取操作成功\",\"msg\": \"根据配置id获取对应的编译,组,域等信息成功\",\"fromuri\": \"/galaxy-service/service/cfg/v1/getAllKVByCompileId\",\"traceCode\": \"2019031211285044813363\",\"data\": [{\"service\":\"ntc\",\"status\":3,\"opTime\":\"2016-11-22 08:31:27\"}]}"); if(result.get("status").equals(200)){ List> list = result.getJSONArray("data"); if(!StringUtil.isEmpty(list)){ @@ -180,7 +182,8 @@ public class ConfigSynchronizationController extends BaseController { String failStatus = DictUtils.getDictCode("config_sync_status", "fail","-2"); Map map = Maps.newHashMap(); if(!currentStatus.equals(successStatus) && !currentStatus.equals(failStatus) && !currentStatus.equals(serverFailStatus)){ - JSONObject result = ConfigServiceUtil.configSyncStatus();//获取同步状态 + JSONObject result = JSONObject.fromObject("{\"status\": 200,\"businessCode\": 2001000,\"reason\":\"数据获取操作成功\",\"msg\": \"根据配置id获取对应的编译,组,域等信息成功\",\"fromuri\": \"/galaxy-service/service/cfg/v1/getAllKVByCompileId\",\"traceCode\": \"2019031211285044813363\",\"data\": [{\"service\":\"ntc\",\"status\":0,\"opTime\":\"2016-11-22 08:31:27\"}]}"); + //TODO 联调时打开JSONObject result = ConfigServiceUtil.configSyncStatus();//获取同步状态 if(result.get("status").equals(200)){ List> list = result.getJSONArray("data"); if(!StringUtil.isEmpty(list)){ diff --git a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java index 2e17cf7e9..9cc13aa39 100644 --- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java +++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java @@ -97,6 +97,7 @@ public interface ConfigSynchronizationDao { public List getComplexStrListByService(BaseCfg entity); public List getAppIpPortList(@Param("tableName")String tableName,@Param("compileIds")List compileIds); public List getAppIpFeatureList(BaseCfg entity); + public List getAsnIpList(BaseCfg entity); public void updateCfgStatus(BaseCfg entity); diff --git a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml index 7c8cc7dac..b24468cfb 100644 --- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml @@ -777,7 +777,7 @@ a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable, a.area_effective_ids,a.function_id,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port ,a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.pps_threadshold, - a.antiddos_protocol,a.bps_threadshold,a.do_blacklist + a.antiddos_protocol,a.bps_threadshold a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port, @@ -813,9 +813,9 @@ a.expr_type,a.match_method,a.is_hexbin,a.compile_id - a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_id,a.audit_time, + a.cfg_id,a.cfg_desc,a.cfg_type,a.raw_len,a.digest,a.cfds_level,a.file_url,a.action,a.is_valid,a.is_audit,a.creator_id,a.audit_time, a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable, - a.area_effective_ids,a.function_id,a.do_log,a.user_region1,a.user_region2, + a.area_effective_ids,a.function_id,a.do_log,a.user_region1,a.user_region2 a.cfg_id,a.cfg_desc @@ -1062,7 +1062,7 @@ SELECT - , s.name as creator_name,u.name as auditor_name + s.name as creator_name,u.name as auditor_name FROM file_digest_cfg a left join sys_user s on a.creator_id=s.id @@ -1124,30 +1124,6 @@ - @@ -1625,6 +1601,39 @@ ORDER BY a.CFG_ID + +
diff --git a/src/main/webapp/WEB-INF/views/sys/configSyncInfo.jsp b/src/main/webapp/WEB-INF/views/sys/configSyncInfo.jsp index 332065e9e..6b3ca2d1d 100644 --- a/src/main/webapp/WEB-INF/views/sys/configSyncInfo.jsp +++ b/src/main/webapp/WEB-INF/views/sys/configSyncInfo.jsp @@ -5,6 +5,7 @@ -
+

@@ -34,6 +44,17 @@ 界面端同步失败

+
+
+ +
+