From cc3beb191fb90c83e6d1737ec2784279d386e204 Mon Sep 17 00:00:00 2001
From: Rock Chin <1010553892@qq.com>
Date: Sun, 5 Mar 2023 09:54:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=99=BE=E5=BA=A6=E4=BA=91=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E7=9A=84=E9=85=8D=E7=BD=AE=E4=BD=8E=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/qqbot/filter.py | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/pkg/qqbot/filter.py b/pkg/qqbot/filter.py
index 31ebabd1..e5ee8794 100644
--- a/pkg/qqbot/filter.py
+++ b/pkg/qqbot/filter.py
@@ -2,33 +2,26 @@
 import re
 import requests
 import json
-import importlib
 import logging
 
-# 默认值( 兼容性考虑 )
-
-baidu_check = False
-baidu_api_key = ""
-baidu_secret_key = ""
-inappropriate_message_tips = "[百度云]请珍惜机器人，当前返回内容不合规"
-
-# 初始化
-
-config = importlib.import_module('config')
-baidu_check = config.baidu_check
-baidu_api_key = config.baidu_api_key
-baidu_secret_key = config.baidu_secret_key
-inappropriate_message_tips = config.inappropriate_message_tips
 
 class ReplyFilter:
     sensitive_words = []
 
+    # 默认值( 兼容性考虑 )
+    baidu_check = False
+    baidu_api_key = ""
+    baidu_secret_key = ""
+    inappropriate_message_tips = "[百度云]请珍惜机器人，当前返回内容不合规"
+
     def __init__(self, sensitive_words: list):
         self.sensitive_words = sensitive_words
+        import config
         if hasattr(config, 'baidu_check') and hasattr(config, 'baidu_api_key') and hasattr(config, 'baidu_secret_key'):
             self.baidu_check = config.baidu_check
             self.baidu_api_key = config.baidu_api_key
             self.baidu_secret_key = config.baidu_secret_key
+            self.inappropriate_message_tips = config.inappropriate_message_tips
 
     def process(self, message: str) -> str:
 
@@ -46,8 +39,8 @@ class ReplyFilter:
             baidu_url = "https://aip.baidubce.com/rest/2.0/solution/v1/text_censor/v2/user_defined?access_token=" + \
                 str(requests.post("https://aip.baidubce.com/oauth/2.0/token", 
                       params={"grant_type": "client_credentials", 
-                              "client_id": baidu_api_key,
-                              "client_secret": baidu_secret_key}).json().get("access_token"))
+                              "client_id": self.baidu_api_key,
+                              "client_secret": self.baidu_secret_key}).json().get("access_token"))
 
             # 百度云审核
             payload = "text=" + message
@@ -71,7 +64,7 @@ class ReplyFilter:
                     return message
                 else:
                     logging.warning(f"百度云判定结果：{conclusion}")
-                    conclusion = inappropriate_message_tips
+                    conclusion = self.inappropriate_message_tips
             # 返回百度云审核结果
             return conclusion