增加VSYS维度(TSG-11736)

3 files changed, 11 insertions, 2 deletions

diff --git a/pom.xml b/pom.xml
index bb5606c..457b7bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.zdjizhi</groupId>
     <artifactId>radius-account-knowledge</artifactId>
-    <version>220815-JSON</version>
+    <version>220816-VSYS</version>
 
     <name>radius-account-knowledge</name>
     <url>http://www.example.com</url>
diff --git a/src/main/java/com/zdjizhi/utils/functions/MapCompletedFunction.java b/src/main/java/com/zdjizhi/utils/functions/MapCompletedFunction.java
index 735f868..ce3cc42 100644
--- a/src/main/java/com/zdjizhi/utils/functions/MapCompletedFunction.java
+++ b/src/main/java/com/zdjizhi/utils/functions/MapCompletedFunction.java
@@ -31,7 +31,7 @@ public class MapCompletedFunction implements MapFunction<String, String> {
                 }
             }
         } catch (RuntimeException e) {
-            logger.error("Radius log parsing exception,Message is :" + e);
+            logger.error("Radius log parsing exception,Detailed info:" + e);
         }
         return result;
     }
@@ -44,6 +44,7 @@ public class MapCompletedFunction implements MapFunction<String, String> {
      */
     private static String GetKnowledgeLogs(JSONObject jsonMap) {
         JSONObject knowledge = new JSONObject();
+
         String framedIp = jsonMap.getStr("radius_framed_ip");
         String account = jsonMap.getStr("radius_account");
 
@@ -52,6 +53,9 @@ public class MapCompletedFunction implements MapFunction<String, String> {
 
             knowledge.set("account", account);
 
+            //所属vsys,若不填写默认为1
+            knowledge.set("vsys_id", jsonMap.getInt("common_vsys_id", 1));
+
             //计费请求报文类型
             knowledge.set("acct_status_type", jsonMap.getStr("radius_acct_status_type"));
 
diff --git a/src/main/java/com/zdjizhi/utils/system/RadiusKnowledgeConfigurations.java b/src/main/java/com/zdjizhi/utils/system/RadiusKnowledgeConfigurations.java
index aa5f234..58923fe 100644
--- a/src/main/java/com/zdjizhi/utils/system/RadiusKnowledgeConfigurations.java
+++ b/src/main/java/com/zdjizhi/utils/system/RadiusKnowledgeConfigurations.java
@@ -1,5 +1,7 @@
 package com.zdjizhi.utils.system;
 
+import cn.hutool.log.Log;
+import cn.hutool.log.LogFactory;
 import com.zdjizhi.utils.StringUtil;
 
 import java.io.IOException;
@@ -12,6 +14,8 @@ import java.util.Properties;
  */
 
 public final class RadiusKnowledgeConfigurations {
+    private static final Log logger = LogFactory.get();
+
 
     private static Properties propDefault = new Properties();
     private static Properties propService = new Properties();
@@ -65,6 +69,7 @@ public final class RadiusKnowledgeConfigurations {
         } catch (IOException | RuntimeException e) {
             propDefault = null;
             propService = null;
+            logger.error("Failed to obtain configuration file information,Detailed info:" + e);
         }
     }
 }