增加jsonpath解析判断（TSG-8341）

2 files changed, 6 insertions, 8 deletions

diff --git a/pom.xml b/pom.xml
index bad0fba..6a833fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.zdjizhi</groupId>
     <artifactId>log-completion-schema</artifactId>
-    <version>210908-security</version>
+    <version>211105-flattenSpec</version>
 
     <name>log-completion-schema</name>
     <url>http://www.example.com</url>
diff --git a/src/main/java/com/zdjizhi/utils/general/TransFunction.java b/src/main/java/com/zdjizhi/utils/general/TransFunction.java
index 7dc806e..f02abc0 100644
--- a/src/main/java/com/zdjizhi/utils/general/TransFunction.java
+++ b/src/main/java/com/zdjizhi/utils/general/TransFunction.java
@@ -91,11 +91,7 @@ class TransFunction {
      * @return account
      */
     static String radiusMatch(String ip) {
-        String account = HBaseUtils.getAccount(ip.trim());
-//        if (StringUtil.isBlank(account)) {
-//            logger.warn("HashMap get account is null, Ip is :" + ip);
-//        }
-        return account;
+        return HBaseUtils.getAccount(ip.trim());
     }
 
     /**
@@ -164,9 +160,11 @@ class TransFunction {
         try {
             if (StringUtil.isNotBlank(expr)) {
                 ArrayList<String> read = JsonPath.parse(message).read(expr);
-                flattenResult = read.get(0);
+                if (read.size() >= 1) {
+                    flattenResult = read.get(0);
+                }
             }
-        } catch (ClassCastException | InvalidPathException e) {
+        } catch (ClassCastException | InvalidPathException | ArrayIndexOutOfBoundsException e) {
             logger.error("设备标签解析异常，[ " + expr + " ]解析表达式错误" + e);
         }
         return flattenResult;