From 6de45a86e58511fe0c3ad2c127a1791fc9c3a38f Mon Sep 17 00:00:00 2001 From: helloplhm-qwq Date: Sun, 26 Nov 2023 11:37:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/Httpx.py | 1 - common/config.py | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/common/Httpx.py b/common/Httpx.py index 493ee1f..97979e3 100644 --- a/common/Httpx.py +++ b/common/Httpx.py @@ -16,7 +16,6 @@ import traceback import zlib import ujson as json import re -import binascii import time import pickle from . import log diff --git a/common/config.py b/common/config.py index 8beca29..f11f1ba 100644 --- a/common/config.py +++ b/common/config.py @@ -14,7 +14,6 @@ import os import traceback import sys import sqlite3 -from .utils import readfile from . import variable from .log import log import threading @@ -473,6 +472,12 @@ def initConfig(): with open("./config.json", "r", encoding="utf-8") as f: try: variable.config = json.loads(f.read()) + if (not isinstance(variable.config, dict)): + logger.warning('配置文件并不是一个有效的字典,使用默认值') + variable.config = default + with open("./config.json", "w", encoding="utf-8") as f: + f.write(json.dumps(variable.config, indent=2, ensure_ascii=False)) + f.close() except: if os.path.getsize("./config.json") != 0: logger.error("配置文件加载失败,请检查是否遵循JSON语法规范")