From 9404b08eb4bbe237082c9935f7ebad3cef701ba4 Mon Sep 17 00:00:00 2001
From: qidaijie <qidaijie@geedgenetworks.com>
Date: Wed, 21 Sep 2022 18:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=81=97=E6=BC=8F=E7=9A=84?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 properties/default_config.properties                      | 2 +-
 src/main/java/com/zdjizhi/tools/hbase/GtpCRelation.java   | 2 --
 src/main/java/com/zdjizhi/tools/hbase/HBaseUtils.java     | 2 --
 src/main/java/com/zdjizhi/tools/hbase/RadiusRelation.java | 2 --
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/properties/default_config.properties b/properties/default_config.properties
index 9af6157..781d319 100644
--- a/properties/default_config.properties
+++ b/properties/default_config.properties
@@ -70,4 +70,4 @@ hbase.radius.scan.max.rows=0
 
 #Whether vsys_id is used as the relationship key between gtpc and radius.
 #vsys or global
-data.relationship.model=vsys
\ No newline at end of file
+data.relationship.model=global
\ No newline at end of file
diff --git a/src/main/java/com/zdjizhi/tools/hbase/GtpCRelation.java b/src/main/java/com/zdjizhi/tools/hbase/GtpCRelation.java
index ad7b128..4ab4d6b 100644
--- a/src/main/java/com/zdjizhi/tools/hbase/GtpCRelation.java
+++ b/src/main/java/com/zdjizhi/tools/hbase/GtpCRelation.java
@@ -56,8 +56,6 @@ class GtpCRelation {
                     }
                 }
             }
-
-            System.out.println(gtpcMap.toString());
             logger.warn("The obtain the number of GTP-C relationships : " + gtpcMap.size());
             logger.warn("The time spent to obtain GTP-C relationships : " + (System.currentTimeMillis() - begin) + "ms");
         } catch (IOException | RuntimeException e) {
diff --git a/src/main/java/com/zdjizhi/tools/hbase/HBaseUtils.java b/src/main/java/com/zdjizhi/tools/hbase/HBaseUtils.java
index dc66b21..58420b0 100644
--- a/src/main/java/com/zdjizhi/tools/hbase/HBaseUtils.java
+++ b/src/main/java/com/zdjizhi/tools/hbase/HBaseUtils.java
@@ -159,8 +159,6 @@ public class HBaseUtils {
         long nowTime = System.currentTimeMillis();
         RadiusRelation.upgradeRadiusRelation(connection, radiusMap, time - 1000, nowTime + 500);
         GtpCRelation.upgradeGtpCRelation(connection, gtpcMap, time - 1000, nowTime + 500);
-        System.out.println(gtpcMap);
-        System.out.println(radiusMap);
         time = nowTime;
     }
 
diff --git a/src/main/java/com/zdjizhi/tools/hbase/RadiusRelation.java b/src/main/java/com/zdjizhi/tools/hbase/RadiusRelation.java
index 7c5372f..6866c7d 100644
--- a/src/main/java/com/zdjizhi/tools/hbase/RadiusRelation.java
+++ b/src/main/java/com/zdjizhi/tools/hbase/RadiusRelation.java
@@ -45,8 +45,6 @@ class RadiusRelation {
                     }
                 }
             }
-            System.out.println(radiusMap.toString());
-
             logger.warn("The obtain the number of RADIUS relationships : " + radiusMap.size());
             logger.warn("The time spent to obtain radius relationships : " + (System.currentTimeMillis() - begin) + "ms");
         } catch (IOException | RuntimeException e) {