fix

app/plugins/__init__.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from typing import Any
 
 from app.chain import ChainBase
-from app.core import settings
+from app.core.config import settings
 from app.db import SessionLocal
 from app.db.models import Base
 from app.db.models.plugin import PluginData

app/plugins/autosignin/__init__.py

@@ -7,8 +7,9 @@ from urllib.parse import urljoin
 from apscheduler.schedulers.background import BackgroundScheduler
 from ruamel.yaml import CommentedMap
 
-from app.core import EventManager, settings, eventmanager
-from app.helper import ModuleHelper
+from app.core.event_manager import EventManager, eventmanager
+from app.core.config import settings
+from app.helper.module import ModuleHelper
 from app.helper.cloudflare import under_challenge
 from app.helper.sites import SitesHelper
 from app.log import logger

app/plugins/autosignin/sites/52pt.py

@@ -4,7 +4,7 @@ from typing import Tuple
 
 from lxml import etree
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/btschool.py

@@ -2,7 +2,7 @@ from typing import Tuple
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/chdbits.py

@@ -5,7 +5,7 @@ from typing import Tuple
 from lxml import etree
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/haidan.py

@@ -2,7 +2,7 @@ from typing import Tuple
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/hares.py

@@ -3,7 +3,7 @@ from typing import Tuple
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/hdarea.py

@@ -2,7 +2,7 @@ from typing import Tuple
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/hdchina.py

@@ -4,7 +4,7 @@ from typing import Tuple
 from lxml import etree
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/hdcity.py

@@ -2,7 +2,7 @@ from typing import Tuple
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/hdsky.py

@@ -4,7 +4,7 @@ from typing import Tuple
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.helper.ocr import OcrHelper
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler

app/plugins/autosignin/sites/hdupt.py

@@ -3,7 +3,7 @@ from typing import Tuple
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/opencd.py

@@ -5,7 +5,7 @@ from typing import Tuple
 from lxml import etree
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.helper.ocr import OcrHelper
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler

app/plugins/autosignin/sites/pterclub.py

@@ -3,7 +3,7 @@ from typing import Tuple
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/tjupt.py

@@ -8,7 +8,7 @@ from PIL import Image
 from lxml import etree
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/ttg.py

@@ -3,7 +3,7 @@ from typing import Tuple
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/u2.py

@@ -6,7 +6,7 @@ from typing import Tuple
 from lxml import etree
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/zhuque.py

@@ -4,7 +4,7 @@ from typing import Tuple
 from lxml import etree
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/sitestatistic/__init__.py

@@ -7,9 +7,10 @@ import requests
 from apscheduler.schedulers.background import BackgroundScheduler
 from ruamel.yaml import CommentedMap
 
-from app.core import settings, eventmanager
+from app.core.config import settings
+from app.core.event_manager import eventmanager
 from app.core.event_manager import Event
-from app.helper import ModuleHelper
+from app.helper.module import ModuleHelper
 from app.helper.sites import SitesHelper
 from app.log import logger
 from app.plugins import _PluginBase

app/plugins/sitestatistic/siteuserinfo/__init__.py

@@ -10,7 +10,7 @@ import requests
 from lxml import etree
 from requests import Session
 
-from app.core import settings
+from app.core.config import settings
 from app.helper.cloudflare import under_challenge
 from app.log import logger
 from app.utils.http import RequestUtils