diff --git a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java b/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java index 5845d0b..9e5a7e6 100644 --- a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java +++ b/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java @@ -28,6 +28,7 @@ import com.nis.domain.restful.MaatConfig; import com.nis.restful.RestBusinessCode; import com.nis.restful.RestServiceException; import com.nis.util.Constants; +import com.nis.util.FileUtils; import com.nis.util.OracleErrorCodeUtil; import com.nis.util.ServiceAndRDBIndexReal; import com.nis.util.StringUtil; @@ -148,9 +149,6 @@ public class ConfigSourcesController extends BaseRestController { idMap.put(redisDB, map); boolean delMaatConfig = configRedisService.delMaatConfig(idMap); - if (delMaatConfig) { - configRedisService.delMaatRelation(idMap); - } return "ok"; } catch (Exception e) { e.printStackTrace(); @@ -165,15 +163,16 @@ public class ConfigSourcesController extends BaseRestController { try { Map> configMap = new HashMap>(); List redisDBByService = ServiceAndRDBIndexReal.getRedisDBByService(service); - MaatConfig maatConfig = getMaatConfig(service); + long seq_groupid = configRedisService.getIncrId("SEQ_GROUPID"); + List listMap = new ArrayList(); + long seq_regionid2 = configRedisService.getIncrId("SEQ_REGIONID"); + listMap.add(getMaatConfig1(service, seq_groupid,seq_regionid2)); + //listMap.add(getMaatConfig2(service, seq_groupid,seq_regionid2)); + for (Integer db : redisDBByService) { - List listMap = new ArrayList(); - listMap.add(maatConfig); configMap.put(db, listMap); } - if (configRedisService.saveMaatConfig(configMap)) { - configRedisService.addMaatRelation(configMap); - } + configRedisService.saveMaatConfig(configMap); // configRedisService.saveMaatConfig(listMap, service); // new ConfigRedisServiceimpl().GETMaatConfig(listMap); return "ok"; @@ -183,13 +182,93 @@ public class ConfigSourcesController extends BaseRestController { return "false"; } - public MaatConfig getMaatConfig(Integer service) { + public MaatConfig getMaatConfig1(Integer service, long seq_groupid,long seq_regionid2) { + String time = new Date().getTime() + ""; + Map configMap1 = new HashMap(); + long seq_compileid = configRedisService.getIncrId("SEQ_COMPILEID"); + long seq_regionid1 = configRedisService.getIncrId("SEQ_REGIONID"); + // int id=2; + configMap1.put("compile_id", seq_compileid + ""); + configMap1.put("service", service + ""); + configMap1.put("action", "0"); + configMap1.put("do_blacklist", "1"); + configMap1.put("do_log", "1"); + configMap1.put("effective_range", "0"); + configMap1.put("user_region", "0"); + configMap1.put("is_valid", "1"); + configMap1.put("group_num", "1"); + configMap1.put("father_cfg_id", "0"); + configMap1.put("op_time", time); + + List> groupMapList = new ArrayList>(); + Map groupMap1 = new HashMap(); + groupMap1.put("group_id", seq_groupid + ""); + groupMap1.put("compile_id", seq_compileid + ""); + groupMap1.put("is_valid", "1"); + groupMap1.put("op_time", time); + groupMap1.put("service", service + ""); + groupMapList.add(groupMap1); + Long incrId = configRedisService.getIncrId("SEQ_GROUPID"); + Map groupMap2 = new HashMap(); + groupMap2.put("group_id", incrId + ""); + groupMap2.put("compile_id", seq_compileid + ""); + groupMap2.put("is_valid", "1"); + groupMap2.put("op_time", time); + groupMap2.put("service", service + ""); + groupMapList.add(groupMap2); + List> ipRegionMapList = new ArrayList>(); + Map strMap = new HashMap(); + strMap.put("group_id", incrId + ""); + strMap.put("region_id", seq_regionid1 + ""); + strMap.put("addr_type", "4"); + strMap.put("src_ip", "0.0.0.0"); + strMap.put("mask_src_ip", "255.255.255.255"); + strMap.put("src_port", "0"); + strMap.put("mask_src_port", "0"); + strMap.put("dst_ip", "0.0.0.0"); + strMap.put("mask_dst_ip", "255.255.255.255"); + strMap.put("dst_port", "0"); + strMap.put("mask_dst_port", "0"); + strMap.put("protocol", "0"); + strMap.put("direction", "0"); + strMap.put("is_valid", "1"); + strMap.put("op_time", time); + strMap.put("service", service + ""); + + ipRegionMapList.add(strMap); + + strMap = new HashMap(); + strMap.put("group_id", seq_groupid + ""); + strMap.put("region_id", seq_regionid2 + ""); + strMap.put("addr_type", "4"); + strMap.put("src_ip", "0.0.0.0"); + strMap.put("mask_src_ip", "255.255.255.255"); + strMap.put("src_port", "0"); + strMap.put("mask_src_port", "0"); + strMap.put("dst_ip", "0.0.0.0"); + strMap.put("mask_dst_ip", "255.255.255.255"); + strMap.put("dst_port", "0"); + strMap.put("mask_dst_port", "0"); + strMap.put("protocol", "0"); + strMap.put("direction", "0"); + strMap.put("is_valid", "1"); + strMap.put("op_time", time); + strMap.put("service", service + ""); + ipRegionMapList.add(strMap); + + MaatConfig maatConfig = new MaatConfig(); + maatConfig.setCompileMap(configMap1); + maatConfig.setGroupMapList(groupMapList); + maatConfig.setService(service); + maatConfig.setIpRegionMapList(ipRegionMapList); + return maatConfig; + } + + public MaatConfig getMaatConfig2(Integer service, long seq_groupid,long seq_regionid2) { String time = new Date().getTime() + ""; Map configMap = new HashMap(); long seq_compileid = configRedisService.getIncrId("SEQ_COMPILEID"); - long seq_groupid = configRedisService.getIncrId("SEQ_GROUPID"); - long seq_regionid1 = configRedisService.getIncrId("SEQ_REGIONID"); - long seq_regionid2 = configRedisService.getIncrId("SEQ_REGIONID"); + // int id=2; configMap.put("compile_id", seq_compileid + ""); configMap.put("service", service + ""); @@ -210,31 +289,10 @@ public class ConfigSourcesController extends BaseRestController { groupMap.put("is_valid", "1"); groupMap.put("op_time", time); groupMap.put("service", service + ""); - groupMapList.add(groupMap); List> ipRegionMapList = new ArrayList>(); - Map strMap = new HashMap(); - strMap.put("group_id", seq_groupid + ""); - strMap.put("region_id", seq_regionid1 + ""); - strMap.put("addr_type", "4"); - strMap.put("src_ip", "0.0.0.0"); - strMap.put("mask_src_ip", "255.255.255.255"); - strMap.put("src_port", "0"); - strMap.put("mask_src_port", "0"); - strMap.put("dst_ip", "0.0.0.0"); - strMap.put("mask_dst_ip", "255.255.255.255"); - strMap.put("dst_port", "0"); - strMap.put("mask_dst_port", "0"); - strMap.put("protocol", "0"); - strMap.put("direction", "0"); - strMap.put("is_valid", "1"); - strMap.put("op_time", time); - strMap.put("service", service + ""); - - ipRegionMapList.add(strMap); - strMap = new HashMap(); strMap.put("group_id", seq_groupid + ""); strMap.put("region_id", seq_regionid2 + ""); @@ -508,13 +566,14 @@ public class ConfigSourcesController extends BaseRestController { HttpServletResponse response) { ConfigSourcesService.setMsgList(new ArrayList());// 清除上次记录的日志信息 long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_PUT, request,jsonString); + SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_PUT, request, + jsonString); StringBuffer sb = new StringBuffer(); - - configSourcesService.updateCommonSources(thread, start,jsonString, new Date(),sb); - return compileServiceResponse(thread, System.currentTimeMillis() - start, request, response, - "配置状态修改成功" , Constants.IS_DEBUG ? jsonString : null); + configSourcesService.updateCommonSources(thread, start, jsonString, new Date(), sb); + + return compileServiceResponse(thread, System.currentTimeMillis() - start, request, response, "配置状态修改成功", + Constants.IS_DEBUG ? jsonString : null); } @RequestMapping(value = "/cfg/v1/fileUploadSources", method = RequestMethod.POST) @@ -539,7 +598,7 @@ public class ConfigSourcesController extends BaseRestController { if (!StringUtil.isEmpty(fileDesc.getChecksum())) { // 验证Md5 String md5 = DigestUtils.md5Hex(file.getInputStream()); - //String md5 = DigestUtils.md5Hex(file.getBytes()); + // String md5 = DigestUtils.md5Hex(file.getBytes()); System.out.println("----------------------------MD5:'" + md5 + "'==='" + fileDesc.getChecksum() + "'"); if (!md5.equals(fileDesc.getChecksum())) { thread.setExceptionInfo("checksum与文件MD5值不一致"); @@ -563,7 +622,7 @@ public class ConfigSourcesController extends BaseRestController { e.printStackTrace(); } JSONObject jsonObj = new JSONObject(); -// jsonObj.put("accessUrl", filePath.substring(filePath.indexOf("group"))); + // jsonObj.put("accessUrl", filePath.substring(filePath.indexOf("group"))); jsonObj.put("accessUrl", "filePath"); return compileServiceResponse(thread, System.currentTimeMillis() - start, request, response, "文件上传成功", jsonObj); } @@ -571,7 +630,8 @@ public class ConfigSourcesController extends BaseRestController { @RequestMapping(value = "/cfg/v1/fileDigestSources", method = RequestMethod.POST) @ApiOperation(value = "文件摘要获取", httpMethod = "POST", response = Map.class, notes = "文件摘要获取") @ApiParam(value = "摘要文件", name = "MultipartFile", required = true) - public Map fileDigestSources(MultipartFile file, HttpServletRequest request, HttpServletResponse response) { + public Map fileDigestSources(@RequestBody MultipartFile file, HttpServletRequest request, + HttpServletResponse response) { long start = System.currentTimeMillis(); SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_POST, request, file, null); @@ -587,6 +647,7 @@ public class ConfigSourcesController extends BaseRestController { try { if (!StringUtil.isEmpty(fileDesc.getChecksum())) { // 验证Md5 + String md5 = DigestUtils.md5Hex(file.getInputStream()); System.out.println("----------------------------MD5:'" + md5 + "'==='" + fileDesc.getChecksum() + "'"); if (!md5.equals(fileDesc.getChecksum())) { @@ -605,17 +666,18 @@ public class ConfigSourcesController extends BaseRestController { // meta_list[4] = new NameValuePair("fileMd5", md5); logger.info("-----------------调用接口上传文件---------------"); String filePath = FileManager.upload(fdsfile, null); -// resultObject.put("path", filePath.substring(filePath.indexOf("group"))); + // resultObject.put("path", filePath.substring(filePath.indexOf("group"))); resultObject.put("path", filePath); } - CommonsMultipartFile filetemp = (CommonsMultipartFile) file; - String tempFilePath = filetemp.getStorageDescription().toString(); - tempFilePath = tempFilePath.substring(tempFilePath.indexOf("[") + 1, tempFilePath.indexOf("]")); - + String tempFilePath = request.getRealPath(File.separator) + "upload" + File.separator + + (new Date()).getTime() + file.getOriginalFilename(); + file.transferTo(new File(tempFilePath)); + System.out.println("------------" + tempFilePath); String digestStr = configSourcesService.getDigestGen(request.getRealPath(File.separator), tempFilePath); resultObject.put("digest", digestStr); resultObject.put("rawLen", file.getSize()); + FileUtils.deleteFile(tempFilePath); } catch (IOException e) { // TODO Auto-generated catch block logger.error("文件上传过程中出现异常"); diff --git a/src/main/java/com/nis/web/service/restful/ConfigRedisService.java b/src/main/java/com/nis/web/service/restful/ConfigRedisService.java index 4961b48..d7e1858 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigRedisService.java +++ b/src/main/java/com/nis/web/service/restful/ConfigRedisService.java @@ -32,7 +32,7 @@ public interface ConfigRedisService { * 下发配置成功后,需要更新编译,组,域等配置id的对应关系 * @param configMap */ - public void addMaatRelation(Map> configMap); + //public void addMaatRelation(Map> configMap); /** * 获取指定key的自增长值 @@ -59,6 +59,6 @@ public interface ConfigRedisService { * 删除maat类配置成功后,需要更新编译,组,域等配置id的对应关系 * @param idMap */ - public void delMaatRelation(Map>> idMap); + //public void delMaatRelation(Map>> idMap); } diff --git a/src/main/java/com/nis/web/service/restful/ConfigRedisServiceimpl.java b/src/main/java/com/nis/web/service/restful/ConfigRedisServiceimpl.java index a6069b5..d5f7187 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigRedisServiceimpl.java +++ b/src/main/java/com/nis/web/service/restful/ConfigRedisServiceimpl.java @@ -2,6 +2,7 @@ package com.nis.web.service.restful; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -173,7 +174,178 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { /** * 下发配置成功后,需要更新编译,组,域等配置id的对应关系 */ - public void addMaatRelation(Map> configMap) { + private void addMaatRelation(Map> configMap) { + if (configMap != null && configMap.size() > 0) { + for (Integer redisDBIndex : configMap.keySet()) { + if (redisDBIndex >= 0 && redisDBIndex < Configurations.getIntProperty("maxRedisDBIndex", 6)) { + int idRelaRedisDBIndex = Configurations.getIntProperty("idRelaRedisDBIndex", 15); + RedisTemplate redisTemplate = SpringContextHolder + .getBean("redisTemplate" + idRelaRedisDBIndex); + List maatConfigList = configMap.get(redisDBIndex); + if (maatConfigList != null && maatConfigList.size() > 0) { + Map> compileAndGroupMap = new HashMap>(); + Map> groupAndCompileMap = new HashMap>(); + for (MaatConfig maatConfig : maatConfigList) { + String compileId = maatConfig.getCompileMap().get("compile_id"); + List> groupMapList = maatConfig.getGroupMapList(); + if (groupMapList != null && groupMapList.size() > 0) { + for (Map map : groupMapList) { + String cfgIdStr = redisDBIndex + ":COMPILEGROUP:" + map.get("compile_id"); + String groupIdStr = redisDBIndex + ":GROUPCOMPILE:" + map.get("group_id"); + // + map.get("compile_id"); + if (cfgIdStr != null && groupIdStr != null && !cfgIdStr.equals("") + && !groupIdStr.equals("")) { + if (compileAndGroupMap.containsKey(cfgIdStr.toUpperCase())) { + compileAndGroupMap.get(cfgIdStr.toUpperCase()) + .add(groupIdStr.toUpperCase()); + } else { + List list = new ArrayList(); + list.add(groupIdStr.toUpperCase()); + compileAndGroupMap.put(cfgIdStr.toUpperCase(), list); + } + if (groupAndCompileMap.containsKey(groupIdStr.toUpperCase())) { + groupAndCompileMap.get(groupIdStr.toUpperCase()) + .add(cfgIdStr.toUpperCase()); + } else { + List list = new ArrayList(); + list.add(cfgIdStr.toUpperCase()); + groupAndCompileMap.put(groupIdStr.toUpperCase(), list); + } + } + } + } + + Map> map = new HashMap>(); + int service = maatConfig.getService(); + MaatXmlConfig maatXmlConfig = ReadMaatXmlUtil.getMaatConfigByService(service); + addGroupAndRegionRelations(maatXmlConfig, service, 12, maatConfig.getIpRegionMapList(), + redisTemplate, map, redisDBIndex, compileId); + addGroupAndRegionRelations(maatXmlConfig, service, 13, maatConfig.getNumRegionMapList(), + redisTemplate, map, redisDBIndex, compileId); + addGroupAndRegionRelations(maatXmlConfig, service, 14, maatConfig.getStrRegionMapList(), + redisTemplate, map, redisDBIndex, compileId); + addGroupAndRegionRelations(maatXmlConfig, service, 15, maatConfig.getStrStrRegionMapList(), + redisTemplate, map, redisDBIndex, compileId); + addGroupAndRegionRelations(maatXmlConfig, service, 16, + maatConfig.getFileDigestRegionMapList(), redisTemplate, map, redisDBIndex, + compileId); + addGroupAndRegionRelations(maatXmlConfig, service, 17, + maatConfig.getFileLikeRegionMapList(), redisTemplate, map, redisDBIndex, compileId); + addGroupAndRegionRelations(maatXmlConfig, service, 18, maatConfig.getIpClientRangeMapList(), + redisTemplate, map, redisDBIndex, compileId); + + for (String groupIdStr : map.keySet()) { + List list = map.get(groupIdStr); + StringBuffer sb = new StringBuffer(); + if (list != null && list.size() > 0) { + for (String regionIdStr : list) { + sb.append(regionIdStr); + sb.append(";"); + } + } + redisTemplate.opsForValue().set(groupIdStr, sb.substring(0, sb.length() - 1));// 保存分组id和域id的关系(每个域配置,只会属于一个组) + } + + } + + for (String compile : compileAndGroupMap.keySet()) { + List list = compileAndGroupMap.get(compile); + StringBuffer sb = new StringBuffer(); + if (list != null && list.size() > 0) { + for (String groupIdStr : list) { + sb.append(groupIdStr); + sb.append(";"); + } + } + redisTemplate.opsForValue().set(compile, sb.substring(0, sb.length() - 1));// 保存分组id和域id的关系(每个域配置,只会属于一个组) + } + for (String group : groupAndCompileMap.keySet()) { + List list = groupAndCompileMap.get(group); + StringBuffer sb = new StringBuffer(); + if (list != null && list.size() > 0) { + for (String compile : list) { + sb.append(compile); + sb.append(";"); + } + } + redisTemplate.opsForValue().append(group, sb.substring(0, sb.length() - 1));// 保存分组id和域id的关系(每个域配置,只会属于一个组) + // redisTemplate.opsForValue().set(group, sb.substring(0, sb.length() - 1));// + // 保存分组id和域id的关系(每个域配置,只会属于一个组) + } + + } + } else { + throw new RuntimeException("redis数据库编号:" + redisDBIndex + "不正确,请检查数据库编号"); + } + } + } else { + throw new RuntimeException("参数不能为空"); + } + + } + + /** + * 封装组id与域id对应关系并添加到对象中 + * @param regionMapList + * @param compileAndGroupRelations + */ + private Map> addGroupAndRegionRelations(MaatXmlConfig maatXmlConfig, int service, int type, + List> regionMapList, RedisTemplate redisTemplate, + Map> groupAndRegionMap, int redisDBIndex, String compileId) { + if (regionMapList != null && regionMapList.size() > 0) { + for (Map map : regionMapList) { + List expressionList = maatXmlConfig.getExpressionList(); + String maatKey = null; + for (MaatXmlExpr maatXmlExpr : expressionList) { + if (type == maatXmlExpr.getType().intValue()) { + StringBuffer keyBF = new StringBuffer(); + String[] keySplit = maatXmlExpr.getKeyExpression().split(";"); + for (String keyStr : keySplit) { + if (!StringUtils.isEmpty(keyStr) && keyStr.trim().startsWith("[")) { + keyStr = keyStr.trim().replace("[", "").replace("]", ""); + keyBF.append(map.get(keyStr)); + } else if (!StringUtils.isEmpty(keyStr) && keyStr.trim().startsWith("{")) { + keyStr = keyStr.trim().replace("{", "").replace("}", ""); + if (keyStr.toLowerCase().contains("table_name")) { + String argTableName = map.get("tableName"); + String maatTableName = ServiceAndRDBIndexReal.getMaatTableName(service, type, + argTableName == null ? null : argTableName); + if (maatTableName == null) { + throw new RuntimeException( + "未从业务类型和表对应关系中,找到业务类型:" + service + ",配置类型:" + type + ",对应的真实表名"); + } else { + keyBF.append(maatTableName); + } + } + + } else { + keyBF.append(keyStr.trim()); + } + } + maatKey = keyBF.toString(); + break; + } + } + // String groupIdStr = redisDBIndex + ":GROUPREGION:" + map.get("group_id") + + // compileId; + String groupIdStr = redisDBIndex + ":GROUPREGION:" + map.get("group_id"); + if (groupAndRegionMap.containsKey(groupIdStr.toUpperCase())) { + groupAndRegionMap.get(groupIdStr.toUpperCase()).add(redisDBIndex + ":" + maatKey.toUpperCase()); + } else { + List list = new ArrayList(); + list.add(redisDBIndex + ":" + maatKey.toUpperCase()); + groupAndRegionMap.put(groupIdStr.toUpperCase(), list); + } + } + } + return groupAndRegionMap; + + } + + /** + * 下发配置成功后,需要更新编译,组,域等配置id的对应关系 + */ + public void addMaatRelationOld(Map> configMap) { if (configMap != null && configMap.size() > 0) { for (Integer redisDBIndex : configMap.keySet()) { if (redisDBIndex >= 0 && redisDBIndex < Configurations.getIntProperty("maxRedisDBIndex", 6)) { @@ -188,20 +360,20 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { int service = maatConfig.getService(); MaatXmlConfig maatXmlConfig = ReadMaatXmlUtil.getMaatConfigByService(service); - addGroupAndRegionRelations(maatXmlConfig, service, 12, maatConfig.getIpRegionMapList(), + addGroupAndRegionRelationsOld(maatXmlConfig, service, 12, maatConfig.getIpRegionMapList(), compileAndGroupRelations); - addGroupAndRegionRelations(maatXmlConfig, service, 13, maatConfig.getNumRegionMapList(), + addGroupAndRegionRelationsOld(maatXmlConfig, service, 13, maatConfig.getNumRegionMapList(), compileAndGroupRelations); - addGroupAndRegionRelations(maatXmlConfig, service, 14, maatConfig.getStrRegionMapList(), + addGroupAndRegionRelationsOld(maatXmlConfig, service, 14, maatConfig.getStrRegionMapList(), compileAndGroupRelations); - addGroupAndRegionRelations(maatXmlConfig, service, 15, maatConfig.getStrStrRegionMapList(), - compileAndGroupRelations); - addGroupAndRegionRelations(maatXmlConfig, service, 16, + addGroupAndRegionRelationsOld(maatXmlConfig, service, 15, + maatConfig.getStrStrRegionMapList(), compileAndGroupRelations); + addGroupAndRegionRelationsOld(maatXmlConfig, service, 16, maatConfig.getFileDigestRegionMapList(), compileAndGroupRelations); - addGroupAndRegionRelations(maatXmlConfig, service, 17, + addGroupAndRegionRelationsOld(maatXmlConfig, service, 17, maatConfig.getFileLikeRegionMapList(), compileAndGroupRelations); - addGroupAndRegionRelations(maatXmlConfig, service, 18, maatConfig.getIpClientRangeMapList(), - compileAndGroupRelations); + addGroupAndRegionRelationsOld(maatXmlConfig, service, 18, + maatConfig.getIpClientRangeMapList(), compileAndGroupRelations); CompileGroupRegionRela.addIdRelation(redisDBIndex, compileAndGroupRelations); } @@ -221,7 +393,7 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { * @param regionMapList * @param compileAndGroupRelations */ - private void addGroupAndRegionRelations(MaatXmlConfig maatXmlConfig, int service, int type, + private void addGroupAndRegionRelationsOld(MaatXmlConfig maatXmlConfig, int service, int type, List> regionMapList, CompileAndGroupRelations compileAndGroupRelations) { if (regionMapList != null && regionMapList.size() > 0 && compileAndGroupRelations != null) { for (Map map : regionMapList) { @@ -304,6 +476,7 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { } } if (count == configMap.size()) { + addMaatRelation(configMap); return true; } } else { @@ -325,9 +498,10 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { public void setConfig(MaatConfig maatConfig, MaatXmlConfig maatXmlConfig, Long maatVersion, int service, RedisTemplate redisTemplate, Integer redisDBIndex) { Map compileMap = maatConfig.getCompileMap(); + String compileId = compileMap.get("compile_id"); if (compileMap != null && compileMap.size() > 0) { setCommonConfig(maatXmlConfig, compileMap, 10, maatVersion.doubleValue(), service, redisTemplate, - redisDBIndex);// 10代表是编译配置 + redisDBIndex, null);// 10代表是编译配置 } else { throw new RuntimeException("无法从参数中获取" + redisDBIndex + "号redis库,业务类型为:" + service + "的编译配置信息,请检查配置参数是否正确"); } @@ -335,8 +509,8 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { List> groupMapList = maatConfig.getGroupMapList(); if (groupMapList != null && groupMapList.size() > 0) { for (Map map : groupMapList) { - setCommonConfig(maatXmlConfig, map, 11, maatVersion.doubleValue(), service, redisTemplate, - redisDBIndex);// 11代表是分组配置 + setCommonConfig(maatXmlConfig, map, 11, maatVersion.doubleValue(), service, redisTemplate, redisDBIndex, + compileId);// 11代表是分组配置 } } else { throw new RuntimeException("无法从参数中获取" + redisDBIndex + "号redis库,业务类型为:" + service + "的分组配置信息,请检查配置参数是否正确"); @@ -345,51 +519,51 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { List> ipRegionMapList = maatConfig.getIpRegionMapList(); if (ipRegionMapList != null && ipRegionMapList.size() > 0) { for (Map map : ipRegionMapList) { - setCommonConfig(maatXmlConfig, map, 12, maatVersion.doubleValue(), service, redisTemplate, - redisDBIndex);// 12代表是ip类域配置 + setCommonConfig(maatXmlConfig, map, 12, maatVersion.doubleValue(), service, redisTemplate, redisDBIndex, + null);// 12代表是ip类域配置 } } List> numRegionMapList = maatConfig.getNumRegionMapList(); if (numRegionMapList != null && numRegionMapList.size() > 0) { for (Map map : numRegionMapList) { - setCommonConfig(maatXmlConfig, map, 13, maatVersion.doubleValue(), service, redisTemplate, - redisDBIndex);// 13代表是数值类配置 + setCommonConfig(maatXmlConfig, map, 13, maatVersion.doubleValue(), service, redisTemplate, redisDBIndex, + null);// 13代表是数值类配置 } } List> strRegionMapList = maatConfig.getStrRegionMapList(); if (strRegionMapList != null && strRegionMapList.size() > 0) { for (Map map : strRegionMapList) { - setCommonConfig(maatXmlConfig, map, 14, maatVersion.doubleValue(), service, redisTemplate, - redisDBIndex);// 14代表是字符串类域配置 + setCommonConfig(maatXmlConfig, map, 14, maatVersion.doubleValue(), service, redisTemplate, redisDBIndex, + null);// 14代表是字符串类域配置 } } List> strStrRegionMapList = maatConfig.getStrStrRegionMapList(); if (strStrRegionMapList != null && strStrRegionMapList.size() > 0) { for (Map map : strStrRegionMapList) { - setCommonConfig(maatXmlConfig, map, 15, maatVersion.doubleValue(), service, redisTemplate, - redisDBIndex);// 15代表是增强字符串类域配置 + setCommonConfig(maatXmlConfig, map, 15, maatVersion.doubleValue(), service, redisTemplate, redisDBIndex, + null);// 15代表是增强字符串类域配置 } } List> fileDigestRegionMapList = maatConfig.getFileDigestRegionMapList(); if (fileDigestRegionMapList != null && fileDigestRegionMapList.size() > 0) { for (Map map : fileDigestRegionMapList) { - setCommonConfig(maatXmlConfig, map, 16, maatVersion.doubleValue(), service, redisTemplate, - redisDBIndex);// 16代表是文件摘要类域配置 + setCommonConfig(maatXmlConfig, map, 16, maatVersion.doubleValue(), service, redisTemplate, redisDBIndex, + null);// 16代表是文件摘要类域配置 } } List> fileLikeRegionMapList = maatConfig.getFileLikeRegionMapList(); if (fileLikeRegionMapList != null && fileLikeRegionMapList.size() > 0) { for (Map map : fileLikeRegionMapList) { - setCommonConfig(maatXmlConfig, map, 17, maatVersion.doubleValue(), service, redisTemplate, - redisDBIndex);// 17代表是文本相似性域配置 + setCommonConfig(maatXmlConfig, map, 17, maatVersion.doubleValue(), service, redisTemplate, redisDBIndex, + null);// 17代表是文本相似性域配置 } } List> ipclientList = maatConfig.getIpClientRangeMapList(); if (ipclientList != null && ipclientList.size() > 0) { for (Map map : ipclientList) { - setCommonConfig(maatXmlConfig, map, 18, maatVersion.doubleValue(), service, redisTemplate, - redisDBIndex);// 18代表是区域ip域配置 + setCommonConfig(maatXmlConfig, map, 18, maatVersion.doubleValue(), service, redisTemplate, redisDBIndex, + null);// 18代表是区域ip域配置 } } @@ -407,7 +581,7 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { * @param redisDBIndex */ public void setCommonConfig(MaatXmlConfig maatXmlConfig, Map map, int type, Double maatVersion, - int service, RedisTemplate redisTemplate, Integer redisDBIndex) { + int service, RedisTemplate redisTemplate, Integer redisDBIndex, String compileId) { if (maatXmlConfig != null && map != null && map.size() > 0) { List expressionList = maatXmlConfig.getExpressionList(); String maatKey = null; @@ -419,6 +593,10 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { if (!StringUtils.isEmpty(keyStr) && keyStr.trim().startsWith("[")) { keyStr = keyStr.trim().replace("[", "").replace("]", ""); keyBF.append(map.get(keyStr)); + if (type == 11 && keyStr.toLowerCase().equals("group_id")) { + keyBF.append(compileId); + } + } else if (!StringUtils.isEmpty(keyStr) && keyStr.trim().startsWith("{")) { keyStr = keyStr.trim().replace("{", "").replace("}", ""); if (keyStr.toLowerCase().contains("table_name")) { @@ -662,6 +840,11 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { if (idMap != null && idMap.size() > 0) { int count = 0; for (Integer redisDBIndex : idMap.keySet()) { + + int idRelaRedisDBIndex = Configurations.getIntProperty("idRelaRedisDBIndex", 15); + RedisTemplate idRredisTemplate = SpringContextHolder + .getBean("redisTemplate" + idRelaRedisDBIndex); + RedisTemplate redisTemplate = SpringContextHolder .getBean("redisTemplate" + redisDBIndex); Map> serviceConfigMap = idMap.get(redisDBIndex); @@ -670,27 +853,29 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { if (maatVersionStr == null) { maatVersionStr = "0"; } - MaatRelation maatRelation = CompileGroupRegionRela.getIdRelationMap().get(redisDBIndex); + // MaatRelation maatRelation = + // CompileGroupRegionRela.getIdRelationMap().get(redisDBIndex); if (maatVersionStr != null) { Long maatVersion = Long.valueOf(maatVersionStr) + 1; - if (maatRelation != null && redisTemplate != null) { - for (Integer service : serviceConfigMap.keySet()) { - MaatXmlConfig maatXmlConfig = ReadMaatXmlUtil.getMaatConfigByService(service); - removeConfig(serviceConfigMap.get(service), maatXmlConfig, maatVersion, service, - redisTemplate, maatRelation, redisDBIndex); + // if (maatRelation != null && redisTemplate != null) { + for (Integer service : serviceConfigMap.keySet()) { + MaatXmlConfig maatXmlConfig = ReadMaatXmlUtil.getMaatConfigByService(service); + removeConfig(serviceConfigMap.get(service), maatXmlConfig, maatVersion, service, + redisTemplate, redisDBIndex, idRredisTemplate); - } - redisTemplate.boundValueOps("MAAT_VERSION").increment(1l); - logger.info("向{}号redis数据库更新了MAAT_VERSION,更新后版本是{}", redisDBIndex, - Integer.valueOf(maatVersionStr) + 1); - count++; } + redisTemplate.boundValueOps("MAAT_VERSION").increment(1l); + logger.info("向{}号redis数据库更新了MAAT_VERSION,更新后版本是{}", redisDBIndex, + Integer.valueOf(maatVersionStr) + 1); + count++; + // } } } else { throw new RuntimeException("向" + redisDBIndex + "号redis库中添加配置时,未发现对应的配置信息,请检查配置参数是否正确"); } } if (count == idMap.size()) { + delMaatRelation(idMap); return true; } } else { @@ -709,40 +894,35 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { * @param maatRelation id对应关系对象 */ private void removeConfig(List idList, MaatXmlConfig maatXmlConfig, Long maatVersion, int service, - RedisTemplate redisTemplate, MaatRelation maatRelation, int redisDBIndex) { - if (maatRelation != null && idList != null && idList.size() > 0 && maatXmlConfig != null) { + RedisTemplate redisTemplate, int redisDBIndex, + RedisTemplate idRredisTemplate) { + if (idList != null && idList.size() > 0 && maatXmlConfig != null) { for (Long id : idList) { - removeCompileAndGroupConfig(maatXmlConfig, id, 10, maatVersion.doubleValue(), service, redisTemplate, - redisDBIndex);// 10代表是编译配置 - Set groupSet = maatRelation.getCompileAndGroupMap().get(id); - if (groupSet != null && groupSet.size() > 0) { - for (Long groupId : groupSet) { - Set set = maatRelation.getGroupAndCompileMap().get(groupId);// 获取组对应的编译id - if (set != null && set.size() != 0) {// 如果只有一个编译id且与上面的编译id相同则说明未被分组复用,可以将其下的所有域置失效,否则不处理域配置,只把编译,分组关系置为无效 - for (Long compileId : set) { - if (compileId.longValue() == id.longValue()) {// - Set regionIdSet = maatRelation.getGroupAndRegionMap().get(groupId); - if (regionIdSet != null && regionIdSet.size() > 0) { - removeRegionConfig(maatXmlConfig, regionIdSet, maatVersion.doubleValue(), - service, redisTemplate, redisDBIndex);// 12代表是ip类域配置 - // removeRegionConfig(maatXmlConfig, regionIdSet, 13, maatVersion.doubleValue(), - // service, redisTemplate, redisDBIndex);// 13代表是数值类配置 - // removeRegionConfig(maatXmlConfig, regionIdSet, 14, maatVersion.doubleValue(), - // service, redisTemplate, redisDBIndex);// 14代表是字符串类域配置 - // removeRegionConfig(maatXmlConfig, regionIdSet, 15, maatVersion.doubleValue(), - // service, redisTemplate, redisDBIndex);// 15代表是增强字符串类域配置 - // removeRegionConfig(maatXmlConfig, regionIdSet, 16, maatVersion.doubleValue(), - // service, redisTemplate, redisDBIndex);// 16代表是文件摘要类域配置 - // removeRegionConfig(maatXmlConfig, regionIdSet, 17, maatVersion.doubleValue(), - // service, redisTemplate, redisDBIndex);// 17代表是文本相似性域配置 - // removeRegionConfig(maatXmlConfig, regionIdSet, 18, maatVersion.doubleValue(), - // service, redisTemplate, redisDBIndex);// 18代表是区域ip域配置 + removeCompileAndGroupConfig(maatXmlConfig, id + "", 10, maatVersion.doubleValue(), service, + redisTemplate, redisDBIndex, null);// 10代表是编译配置 + String compileStr = redisDBIndex + ":COMPILEGROUP:" + id; + // 获取当前编译下所有的分组id + String groupCompileStrs = idRredisTemplate.opsForValue().get(compileStr); + if (groupCompileStrs != null && !groupCompileStrs.equals("")) { + String[] split = groupCompileStrs.split(";"); + for (String groupId : split) { + String compileGroupStr = idRredisTemplate.opsForValue().get(groupId); + String[] compileGroupArr = compileGroupStr.split(";");// 获取组对应的编译id + if (compileGroupArr != null && compileGroupArr.length == 1) {// 如果只有一个编译id且与上面的编译id相同则说明未被分组复用,可以将其下的所有域置失效,否则不处理域配置,只把编译,分组关系置为无效 + for (String compileId : compileGroupArr) { + if (compileId.equals(compileStr)) {// + String groupRegionKey = groupId.replace("GROUPCOMPILE", "GROUPREGION"); + String regionStr = idRredisTemplate.opsForValue().get(groupRegionKey); + String[] regionKeyArr = regionStr.split(";"); + if (regionKeyArr != null && regionKeyArr.length > 0) { + removeRegionConfig(maatXmlConfig, regionKeyArr, maatVersion.doubleValue(), + service, redisTemplate, redisDBIndex); } } } } - removeCompileAndGroupConfig(maatXmlConfig, groupId, 11, maatVersion.doubleValue(), service, - redisTemplate, redisDBIndex);// 11代表是分组配置 + removeCompileAndGroupConfig(maatXmlConfig, groupId.replace(redisDBIndex + ":GROUPCOMPILE:", ""), + 11, maatVersion.doubleValue(), service, redisTemplate, redisDBIndex, id + "");// 11代表是分组配置 } } } @@ -760,8 +940,8 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { * @param service * @param redisTemplate */ - private void removeCompileAndGroupConfig(MaatXmlConfig maatXmlConfig, long id, int type, Double maatVersion, - int service, RedisTemplate redisTemplate, int redisDBIndex) { + private void removeCompileAndGroupConfig(MaatXmlConfig maatXmlConfig, String id, int type, Double maatVersion, + int service, RedisTemplate redisTemplate, int redisDBIndex, String compileId) { if (maatXmlConfig != null) { List expressionList = maatXmlConfig.getExpressionList(); String maatKey = null; @@ -790,6 +970,9 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { } } String oldKey = keyBF.toString().toUpperCase(); + if (compileId != null) { + oldKey += compileId; + } maatKey = oldKey.replace("EFFECTIVE_RULE", "OBSOLETE_RULE"); if (redisTemplate.hasKey(oldKey)) { redisTemplate.rename(oldKey, maatKey.toUpperCase()); @@ -834,12 +1017,13 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { } } - private void removeRegionConfig(MaatXmlConfig maatXmlConfig, Set idList, Double maatVersion, int service, + private void removeRegionConfig(MaatXmlConfig maatXmlConfig, String[] regionArr, Double maatVersion, int service, RedisTemplate redisTemplate, int redisDBIndex) { - if (maatXmlConfig != null && idList != null && idList.size() > 0) { + if (maatXmlConfig != null && regionArr != null && regionArr.length > 0) { List expressionList = maatXmlConfig.getExpressionList(); String maatKey = null; - for (String oldKey : idList) { + for (String oldKey : regionArr) { + oldKey = oldKey.replace(redisDBIndex + ":", ""); maatKey = oldKey.replace("EFFECTIVE_RULE", "OBSOLETE_RULE"); if (redisTemplate.hasKey(oldKey)) { redisTemplate.rename(oldKey, maatKey.toUpperCase()); @@ -886,7 +1070,80 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { * 删除配置成功后,需要更新编译,组,域等配置id的对应关系 * @param idMap */ - public void delMaatRelation(Map>> idMap) { + private void delMaatRelation(Map>> idMap) { + if (idMap != null && idMap.size() > 0) { + int idRelaRedisDBIndex = Configurations.getIntProperty("idRelaRedisDBIndex", 15); + RedisTemplate redisTemplate = SpringContextHolder + .getBean("redisTemplate" + idRelaRedisDBIndex); + for (Integer redisDBIndex : idMap.keySet()) { + if (redisDBIndex >= 0 && redisDBIndex < Configurations.getIntProperty("maxRedisDBIndex", 6)) { + Map> map = idMap.get(redisDBIndex); + if (map != null && map.size() > 0) { + for (Integer service : map.keySet()) { + List idList = map.get(service); + if (idList != null && idList.size() > 0) { + for (Long compileId : idList) { + String compileStr = redisDBIndex + ":COMPILEGROUP:" + compileId; + String groupCompileStr = redisTemplate.opsForValue().get(compileStr);// 根据编译id获取该编译下的分组关系 + if (groupCompileStr != null && !groupCompileStr.equals("")) { + String[] groupCompileStrSplit = groupCompileStr.split(";");// 得到分组关系 + for (String groupCompile : groupCompileStrSplit) {// 遍历所有分组关系 + String compileGroupStr = redisTemplate.opsForValue() + .get(groupCompile.toUpperCase());// 获取当前分组关系对应的编译信息 + if (compileGroupStr != null && !compileGroupStr.equals("")) { + String[] compileGroupStrSplit = compileGroupStr.split(";"); + if (compileGroupStrSplit != null && compileGroupStrSplit.length == 1 + && compileGroupStr.equals(compileStr.toUpperCase())) {// 当前的分组关系只属于当前的compileid,说明没有被分组复用,需要将编译配置,分组关系,域配置,置无效 + if (compileGroupStrSplit[0].toUpperCase() + .equals(compileStr.toUpperCase())) { + String groupRegion = groupCompile.replaceAll("GROUPCOMPILE", + "GROUPREGION"); + if (redisTemplate.hasKey(groupRegion)) { + redisTemplate.delete(groupRegion);// 删除组对应的域 + } + + if (redisTemplate.hasKey(groupCompile.toUpperCase())) { + redisTemplate.delete(groupCompile.toUpperCase());// 删除当前组所对应的编译 + } + + } + } else {// 当前的分组被复用了,属于多个编译,需要将当前的分组关系置为无效 + Set groupCompileSet = new HashSet(); + for (String compileGroup : compileGroupStrSplit) { + if (!compileGroup.equals(compileStr.toUpperCase())) { + groupCompileSet.add(compileGroup); + } + } + StringBuffer sb = new StringBuffer(); + // 更新组对应的编译 + for (String str : groupCompileSet) { + sb.append(str); + sb.append(";"); + } + redisTemplate.opsForValue().set(groupCompile, + sb.substring(0, sb.length() - 1)); + } + } + } + if (redisTemplate.hasKey(compileStr.toUpperCase())) { + redisTemplate.delete(compileStr.toUpperCase());// 删除编译下面所有的组 + } + + } + } + } + } + } + } else { + throw new RuntimeException("redis数据库编号:" + redisDBIndex + "不正确,请检查数据库编号"); + } + } + } else { + throw new RuntimeException("参数不能为空"); + } + } + + public void delMaatRelationOld(Map>> idMap) { if (idMap != null && idMap.size() > 0) { for (Integer redisDBIndex : idMap.keySet()) { if (redisDBIndex >= 0 && redisDBIndex < Configurations.getIntProperty("maxRedisDBIndex", 6)) { @@ -911,5 +1168,4 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { throw new RuntimeException("参数不能为空"); } } - } diff --git a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java index c39c132..2e22180 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java +++ b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java @@ -1299,11 +1299,8 @@ public class ConfigSourcesService extends BaseService { } } - if (configRedisService.saveMaatConfig(configMap)) { - configRedisService.addMaatRelation(configMap); - } + configRedisService.saveMaatConfig(configMap); logger1.info("---------------调用maat配置新增接口---------------------"); - return "ok"; } private Map convertObjectToMap(Object obj,Class clazz){ @@ -1385,9 +1382,7 @@ public class ConfigSourcesService extends BaseService { } } try { - if(configRedisService.delMaatConfig(restMap)){ - configRedisService.delMaatRelation(restMap); - }else{ + if(!configRedisService.delMaatConfig(restMap)){ RuntimeException e = new RuntimeException("不存在映射关系"); msgList.add(e); return "error"; @@ -2461,6 +2456,29 @@ public class ConfigSourcesService extends BaseService { throw new RestServiceException(thread, System.currentTimeMillis() - start,"请检查service配置是否正确", RestBusinessCode.wrong_range.getValue()); } + //获取IP类型 + Integer ipType = null; + String ipTypeName =""; + for (CommonSourceFieldCfg commonSourceFieldCfg : commonSourceFieldCfgList) { + if(commonSourceFieldCfg.getDstName().equals("ip_type")){ + String dstVal = srcMap.get(commonSourceFieldCfg.getSrcName()).toString(); + ipTypeName = commonSourceFieldCfg.getSrcName(); + //regexp 特殊格式正则验证 + Boolean valFlag = true; + if(!StringUtil.isEmpty(commonSourceFieldCfg.getRegexp())){ + Pattern pattern = Pattern.compile(commonSourceFieldCfg.getRegexp()); + Matcher matcher = pattern.matcher(dstVal); + valFlag = valFlag&matcher.matches(); + } + if (!valFlag) { + logger1.error(commonSourceFieldCfg.getSrcName()+"参数格式与正则不匹配"); + thread.setExceptionInfo(commonSourceFieldCfg.getSrcName()+"参数格式与正则不匹配"); + throw new RestServiceException(thread, System.currentTimeMillis() - start, commonSourceFieldCfg.getSrcName()+"参数格式不正确或数据不在有效范围", + RestBusinessCode.param_formate_error.getValue()); + } + ipType = Integer.parseInt(dstVal); + } + } for (CommonSourceFieldCfg commonSourceFieldCfg : commonSourceFieldCfgList) { //是否必填 if(commonSourceFieldCfg.getIsRequired()&&!srcMap.containsKey(commonSourceFieldCfg.getSrcName())){ @@ -2498,10 +2516,10 @@ public class ConfigSourcesService extends BaseService { } break; case "Ip": - if (!isIp(dstStr)) { - logger1.error(commonSourceFieldCfg.getSrcName()+"参数格式不正确，不是合法的IP地址"); - thread.setExceptionInfo(commonSourceFieldCfg.getSrcName()+"参数格式不正确，不是合法的IP地址"); - throw new RestServiceException(thread, System.currentTimeMillis() - start,commonSourceFieldCfg.getSrcName()+"参数不能格式不正确，不是合法的IP地址", + if (!BasicProvingUtil.isIpOrIpMask(dstStr,ipType)) { + logger1.error(commonSourceFieldCfg.getSrcName()+"参数格式不正确或与"+ipTypeName+"不一致"); + thread.setExceptionInfo(commonSourceFieldCfg.getSrcName()+"参数格式不正确或与"+ipTypeName+"不一致"); + throw new RestServiceException(thread, System.currentTimeMillis() - start,commonSourceFieldCfg.getSrcName()+"参数格式不正确或与"+ipTypeName+"不一致", RestBusinessCode.missing_args.getValue()); } break; diff --git a/src/main/resources/applicationContext-redis.xml b/src/main/resources/applicationContext-redis.xml index 4591b3e..d608549 100644 --- a/src/main/resources/applicationContext-redis.xml +++ b/src/main/resources/applicationContext-redis.xml @@ -61,6 +61,10 @@ p:host-name="${redis.host}" p:port="${redis.port}" p:pool-config-ref="poolConfig" p:database="6" /> + @@ -148,5 +152,14 @@ - + + + + + + + + + + diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 8c7ff97..866ab73 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -246,4 +246,6 @@ digest.gen.tool.path=maat-redis/digest_gen ##redis中有多少个数据库 -maxRedisDBIndex=6 \ No newline at end of file +maxRedisDBIndex=6 +##存放编译,分组,域配置id关系的redis数据库编号 +idRelaRedisDBIndex=15 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 2f1139f..b7704ba 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -164,11 +164,11 @@ - - - com.nis.listener.CompileGroupRegionRela - - + + + + +