From 4b90e9aff25d2bbcf9eab5021a652586d04f86b0 Mon Sep 17 00:00:00 2001 From: RenKaiGe-Office Date: Thu, 28 Jun 2018 18:47:35 +0800 Subject: [PATCH] =?UTF-8?q?1:=E5=9C=A8=E6=B7=BB=E5=8A=A0maat=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=97=B6=E5=88=A4=E6=96=AD=E5=9F=9F=E9=87=8C=E9=9D=A2?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8service,user=5Fregion,actio?= =?UTF-8?q?n,=E5=A6=82=E6=9E=9C=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=88=99?= =?UTF-8?q?=E4=B8=8D=E6=B7=BB=E5=8A=A0=202:=E4=B8=BA=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=85=8D=E7=BD=AE,=E5=88=86=E7=BB=84=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=AD=89=E5=9C=A8maat.xml=E9=85=8D=E7=BD=AE=E4=BA=86=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E4=BD=86=E6=98=AF=E6=B2=A1=E6=9C=89=E4=BC=A0=E5=80=BC?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E7=BB=99=E5=87=BA=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../restful/ConfigRedisServiceimpl.java | 33 ++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) 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 0bc56b3..d987335 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigRedisServiceimpl.java +++ b/src/main/java/com/nis/web/service/restful/ConfigRedisServiceimpl.java @@ -494,7 +494,12 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { for (String keyStr : keySplit) { if (!StringUtils.isEmpty(keyStr) && keyStr.trim().startsWith("[")) { keyStr = keyStr.trim().replace("[", "").replace("]", ""); - keyBF.append(map.get(keyStr)); + String keyVal = map.get(keyStr); + if (keyVal != null && !keyVal.equals("")) { + keyBF.append(keyVal); + } else { + throw new RuntimeException("未从map中获取到" + keyStr + "的值,无法拼接redisKey,请检查数据是否正确"); + } if (type == 11 && keyStr.toLowerCase().equals("group_id")) { keyBF.append(compileId); } @@ -522,7 +527,25 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { for (String valStr : valSplit) { if (!StringUtils.isEmpty(valStr) && valStr.trim().startsWith("[")) { valStr = valStr.trim().replace("[", "").replace("]", ""); - valBF.append(map.get(valStr)); + String val = map.get(valStr); + if (val != null) { + valBF.append(val); + } else { + if (type != 10 && type != 11) {// 域配置 + if (valStr.toLowerCase().equals("service") || valStr.toLowerCase().equals("action") + || valStr.toLowerCase().equals("user_region")) {// 域配置中只有这三个可以为空 + // 删除前面的\t + } else {// 其他不可以为空 + throw new RuntimeException( + "未从map中获取到" + valStr + "的值,无法拼接redisValue,请检查数据是否正确"); + } + } else {// 编译配置或分组配置 所有在maat.xml中配置的属性都不可以为空 + // if (!valStr.toLowerCase().equals("service")&&! + // valStr.toLowerCase().equals("action") + // &&!valStr.toLowerCase().equals("user_region") &&type==10) { + throw new RuntimeException("未从map中获取到" + valStr + "的值,无法拼接redisValue,请检查数据是否正确"); + } + } } else if (valStr.equals(" ")) { valBF.append(" "); } else if (valStr.equals("\\t")) {// xml中是字符串的\t这里判断的时候需要转义为\\t,但是添加的时候需要添加\t不是\\t @@ -1026,7 +1049,8 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { redisTemplate.delete(groupRegion);// 删除组对应的域 } else { throw new RuntimeException("从" + idRelaRedisDBIndex - + "号redis库中判断"+groupRegion+"组和域关系时不存在,请联系开发人员检查删除逻辑是否正确或redis数据是否出现了异常"); + + "号redis库中判断" + groupRegion + + "组和域关系时不存在,请联系开发人员检查删除逻辑是否正确或redis数据是否出现了异常"); } @@ -1035,7 +1059,8 @@ public class ConfigRedisServiceimpl implements ConfigRedisService { redisTemplate.delete(groupCompile.toUpperCase());// 删除当前组所对应的编译 } else { throw new RuntimeException("从" + idRelaRedisDBIndex - + "号redis库中判断"+groupCompile.toUpperCase()+"组和域关系时不存在,请联系开发人员检查删除逻辑是否正确或redis数据是否出现了异常"); + + "号redis库中判断" + groupCompile.toUpperCase() + + "组和域关系时不存在,请联系开发人员检查删除逻辑是否正确或redis数据是否出现了异常"); }