diff --git a/app/services/qgis/qgis_env.py b/app/services/qgis/qgis_env.py index 615e9f1..ff2c560 100644 --- a/app/services/qgis/qgis_env.py +++ b/app/services/qgis/qgis_env.py @@ -111,7 +111,23 @@ def get_runner_script() -> str: def _generate_bat_wrapper(qgis_root: str, python_path: str, runner_script: str) -> str: """生成 .bat 包装脚本,设置 QGIS 环境变量并启动 runner""" - qgis_app_dir = os.path.join(qgis_root, "apps", "qgis-ltr").replace("/", "\\") + # 自动检测 QGIS 应用目录(qgis-ltr 或 qgis) + qgis_app_dir = os.path.join(qgis_root, "apps", "qgis-ltr") + if not os.path.isdir(qgis_app_dir): + qgis_app_dir = os.path.join(qgis_root, "apps", "qgis") + qgis_app_dir = qgis_app_dir.replace("/", "\\") + + # 自动检测 PROJ 目录 + proj_data = "" + for pd in [ + os.path.join(qgis_app_dir, "share", "proj"), + os.path.join(qgis_root, "share", "proj"), + os.path.join(qgis_root, "apps", "gdal", "share", "proj"), + ]: + if os.path.isfile(os.path.join(pd, "proj.db")): + proj_data = pd.replace("/", "\\") + break + python_dir = os.path.join(qgis_root, "apps", "Python312").replace("/", "\\") qt5_plugins = os.path.join(qgis_root, "apps", "Qt5", "plugins").replace("/", "\\") qtplugins = os.path.join(qgis_app_dir, "qtplugins").replace("/", "\\") @@ -121,12 +137,16 @@ def _generate_bat_wrapper(qgis_root: str, python_path: str, runner_script: str) qt5_bin = os.path.join(qgis_root, "apps", "Qt5", "bin").replace("/", "\\") gdal_lib = os.path.join(qgis_root, "apps", "gdal", "lib").replace("/", "\\") + proj_line = f'set "PROJ_DATA={proj_data}"' if proj_data else "REM PROJ_DATA not found" + bat_content = f"""@echo off +chcp 65001 >nul set "PYTHONHOME={python_dir}" set "PYTHONPATH={qgis_python_dir}" set "QGIS_PREFIX_PATH={qgis_app_dir}" set "QT_PLUGIN_PATH={qtplugins};{qt5_plugins}" set "GDAL_DATA={gdal_data}" +{proj_line} set "PYTHONUTF8=1" set "GDAL_FILENAME_IS_UTF8=YES" set "VSI_CACHE=TRUE" diff --git a/app/utils/logger.py b/app/utils/logger.py index e835efd..8a6190b 100644 --- a/app/utils/logger.py +++ b/app/utils/logger.py @@ -1,33 +1,43 @@ """ 日志工具类 -使用 loguru 提供增强的日志功能,支持按天分割、自动清理过期日志 +主进程使用 loguru,QGIS 子进程(无 loguru)回退到标准 logging。 """ import sys from pathlib import Path -from loguru import logger + +try: + from loguru import logger + _HAS_LOGURU = True +except ImportError: + _HAS_LOGURU = False + import logging class LoggerManager: - """日志管理器 - 基于 loguru""" + """日志管理器""" _configured = False @classmethod def get_logger(cls, name: str = "algorithm", log_dir: str = "logs"): - """ - 获取日志记录器(loguru 不需要传统意义上的 logger 实例) - - Args: - name: 日志名称(用于文件命名) - log_dir: 日志目录 - - Returns: - loguru.logger 实例 - """ + if not _HAS_LOGURU: + return cls._get_stdlib_logger(name) if not cls._configured: cls._configure_loguru(name, log_dir) return logger + @classmethod + def _get_stdlib_logger(cls, name: str): + lg = logging.getLogger(name) + if not lg.handlers: + lg.setLevel(logging.INFO) + h = logging.StreamHandler(sys.stderr) + h.setFormatter(logging.Formatter( + "%(asctime)s [%(threadName)s] %(levelname)-5s %(name)s - %(message)s" + )) + lg.addHandler(h) + return lg + @classmethod def _configure_loguru(cls, name: str, log_dir: str): """