From b2936abe1a52dc3c25ea97c49dbd27f13e6fba13 Mon Sep 17 00:00:00 2001
From: wanglihui <949764788@qq.com>
Date: Fri, 20 Aug 2021 18:54:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E4=BD=8D=E5=BA=93?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zdjizhi/common/CommonConfig.java | 13 -------
 src/main/java/com/zdjizhi/utils/IpUtils.java  |  6 ++--
 src/main/resources/common.properties          | 34 +------------------
 3 files changed, 4 insertions(+), 49 deletions(-)

diff --git a/src/main/java/com/zdjizhi/common/CommonConfig.java b/src/main/java/com/zdjizhi/common/CommonConfig.java
index b0b1f97..2ff146d 100644
--- a/src/main/java/com/zdjizhi/common/CommonConfig.java
+++ b/src/main/java/com/zdjizhi/common/CommonConfig.java
@@ -45,17 +45,4 @@ public class CommonConfig {
     public static final double BASELINE_SESSIONS_SEVERE_THRESHOLD = CommonConfigurations.getDoubleProperty("baseline.sessions.severe.threshold");
     public static final double BASELINE_SESSIONS_CRITICAL_THRESHOLD = CommonConfigurations.getDoubleProperty("baseline.sessions.critical.threshold");
 
-    public static final String BIFANG_SERVER_URI = CommonConfigurations.getStringProperty("bifang.server.uri");
-    public static final String BIFANG_SERVER_USER = CommonConfigurations.getStringProperty("bifang.server.user");
-    public static final String BIFANG_SERVER_PASSWORD = CommonConfigurations.getStringProperty("bifang.server.password");
-    public static final String BIFANG_SERVER_ENCRYPTPWD_PATH = CommonConfigurations.getStringProperty("bifang.server.encryptpwd.path");
-    public static final String BIFANG_SERVER_LOGIN_PATH = CommonConfigurations.getStringProperty("bifang.server.login.path");
-    public static final String BIFANG_SERVER_POLICY_THRESHOLD_PATH = CommonConfigurations.getStringProperty("bifang.server.policy.threshold.path");
-
-    public static final int HTTP_POOL_MAX_CONNECTION = CommonConfigurations.getIntProperty("http.pool.max.connection");
-    public static final int HTTP_POOL_MAX_PER_ROUTE = CommonConfigurations.getIntProperty("http.pool.max.per.route");
-    public static final int HTTP_POOL_REQUEST_TIMEOUT = CommonConfigurations.getIntProperty("http.pool.request.timeout");
-    public static final int HTTP_POOL_CONNECT_TIMEOUT = CommonConfigurations.getIntProperty("http.pool.connect.timeout");
-    public static final int HTTP_POOL_RESPONSE_TIMEOUT = CommonConfigurations.getIntProperty("http.pool.response.timeout");
-
 }
diff --git a/src/main/java/com/zdjizhi/utils/IpUtils.java b/src/main/java/com/zdjizhi/utils/IpUtils.java
index d8576c8..4f7e5d7 100644
--- a/src/main/java/com/zdjizhi/utils/IpUtils.java
+++ b/src/main/java/com/zdjizhi/utils/IpUtils.java
@@ -9,9 +9,9 @@ public class IpUtils {
      */
     public static IpLookup ipLookup = new IpLookup.Builder(false)
             .loadDataFileV4(CommonConfig.IP_MMDB_PATH + "ip_v4.mmdb")
-//            .loadDataFileV6(CommonConfig.IP_MMDB_PATH + "ip_v6.mmdb")
-//            .loadDataFilePrivateV4(CommonConfig.IP_MMDB_PATH + "ip_private_v4.mmdb")
-//            .loadDataFilePrivateV6(CommonConfig.IP_MMDB_PATH + "ip_private_v6.mmdb")
+            .loadDataFileV6(CommonConfig.IP_MMDB_PATH + "ip_v6.mmdb")
+            .loadDataFilePrivateV4(CommonConfig.IP_MMDB_PATH + "ip_private_v4.mmdb")
+            .loadDataFilePrivateV6(CommonConfig.IP_MMDB_PATH + "ip_private_v6.mmdb")
             .build();
 
     public static void main(String[] args) {
diff --git a/src/main/resources/common.properties b/src/main/resources/common.properties
index cde96d8..3700f90 100644
--- a/src/main/resources/common.properties
+++ b/src/main/resources/common.properties
@@ -80,36 +80,4 @@ baseline.sessions.minor.threshold=0.1
 baseline.sessions.warning.threshold=0.5
 baseline.sessions.major.threshold=1
 baseline.sessions.severe.threshold=3
-baseline.sessions.critical.threshold=8
-
-#bifang服务访问地址
-bifang.server.uri=http://192.168.44.3:80
-
-#访问bifang服务用户名密码
-bifang.server.user=admin
-bifang.server.password=admin
-
-#加密密码路径信息
-bifang.server.encryptpwd.path=/v1/user/encryptpwd
-
-#登录bifang服务路径信息
-bifang.server.login.path=/v1/user/login
-
-#获取静态阈值路径信息
-bifang.server.policy.threshold.path=/v1/policy/profile/DoS/detection/threshold
-
-#http请求相关参数
-#最大连接数
-http.pool.max.connection=400
-
-#单路由最大连接数
-http.pool.max.per.route=80
-
-#向服务端请求超时时间设置(单位:毫秒)
-http.pool.request.timeout=60000
-
-#向服务端连接超时时间设置(单位:毫秒)
-http.pool.connect.timeout=60000
-
-#服务端响应超时时间设置(单位:毫秒)
-http.pool.response.timeout=60000
\ No newline at end of file
+baseline.sessions.critical.threshold=8
\ No newline at end of file