01495251 1 day ago
parent
commit
d43a529d5b

+ 1 - 1
crossborder/shandong/selenium_shandong_download.py

@@ -10,7 +10,7 @@ from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
 
 from crossborder.utils.db_helper import DBHelper
-from shandong.shandong_parse_excel import parse_excel
+from crossborder.shandong.shandong_parse_excel import parse_excel
 from crossborder.utils.constants import DOWNLOAD_DIR
 from crossborder.utils.download_utils import configure_stealth_options, generate_month_sequence, download_excel
 from crossborder.utils.log import log

+ 1 - 1
crossborder/utils/constants.py

@@ -1,7 +1,7 @@
 import os
 from pathlib import Path
 
-PROJECT_ROOT = Path(os.path.abspath(os.path.dirname(__file__))).parent
+PROJECT_ROOT = Path(os.path.abspath(os.path.dirname(__file__))).parent.parent
 DOWNLOAD_DIR = PROJECT_ROOT / 'downloads'
 DOWNLOAD_DIR.mkdir(exist_ok=True, parents=True)
 

+ 2 - 1
crossborder/utils/log.py

@@ -1,5 +1,6 @@
 import logging
 import os
+from pathlib import Path
 
 import colorlog
 
@@ -7,7 +8,7 @@ import colorlog
 log = logging.getLogger(__name__)
 log.setLevel(logging.INFO)
 
-project_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+project_root = Path(os.path.abspath(os.path.dirname(__file__))).parent.parent
 log_dir = os.path.join(project_root, 'logs')
 os.makedirs(log_dir, exist_ok=True)  # 自动创建目录(如果不存在)
 

+ 1 - 1
pyproject.toml

@@ -100,7 +100,7 @@ run-jiangsu = "crossborder.jiangsu.gov_commodity_jiangsu_country:main"
 run-hebei = "crossborder.hebei.crawl_gov_hebei_full:main"
 run-zhejiang = "crossborder.zhejiang.crawl_gov_zhejiang_full:main"
 run-quanguo = "crossborder.quanguo.selenium_download:main"
-run-crossborder = "cli:main"
+run-crossborder = "crossborder.cli:main"
 
 [build-system]
 requires = ["poetry-core"]