移动settings.py

apps/common/monitor/collectors/db_collector.py

@@ -9,7 +9,7 @@ import asyncio
 from typing import Dict, Any, List
 from globalobjects import logger as log_config
 from globalobjects.db_manager import get_db_managers
-from config.settings import MYAPS_MAIN_DB
+from core.settings import MYAPS_MAIN_DB
 from ..allert import AlertType, alert_sender
 
 

apps/common/monitor/collectors/resource_collector.py

@@ -130,7 +130,7 @@ class ResourceCollector:
             list: 告警信息列表
         """
         # 从settings.py加载阈值
-        from config.settings import MONITOR_THRESHOLDS
+        from core.settings import MONITOR_THRESHOLDS
         resource_thresholds = MONITOR_THRESHOLDS.get('resource', {})
         
         default_thresholds = {

apps/common/monitor/routers.py

@@ -213,7 +213,7 @@ async def get_environment():
     返回当前系统的环境变量配置
     """
     import os
-    from config.settings import PROJECT_DIR, PROJECT_JSON
+    from core.settings import PROJECT_DIR, PROJECT_JSON
     
     return {
         "project_dir": PROJECT_DIR,

apps/common/utils/resource_monitor.py

@@ -18,7 +18,7 @@ class ResourceMonitor:
         self._monitor_thread = None
         
         # 从settings.py加载阈值
-        from config.settings import MONITOR_THRESHOLDS, RESOURCE_CLEANUP_CONFIG
+        from core.settings import MONITOR_THRESHOLDS, RESOURCE_CLEANUP_CONFIG
         
         resource_thresholds = MONITOR_THRESHOLDS.get('resource', {})
         self._thresholds = {

apps/data_opt/components/_base.py

@@ -10,7 +10,7 @@ import requests
 import time
 
 
-from config.settings import THIS_BASE_URL, MYAPS_MAIN_DB, MYAPS_DB_SET
+from core.settings import THIS_BASE_URL, MYAPS_MAIN_DB, MYAPS_DB_SET
 from apps.data_opt.utils.common import get_session, convert_timeunit, clean_value
 from apps.data_opt.utils.data_processor import DataProcessor
 from apps.io_api.schemas import (

apps/data_opt/components/yonyou_tplus.py

@@ -8,7 +8,7 @@ import pandas as pd
 
 # from pydantic import InstanceOf
 
-from config.settings import MYAPS_MAIN_DB
+from core.settings import MYAPS_MAIN_DB
 
 
 from ._base import (

apps/data_opt/models.py

@@ -2,7 +2,7 @@ from enum import unique
 from tortoise.models import Model as TortoiseBaseModel
 from tortoise import fields
 
-from config.settings import THIS_DB_NAME
+from core.settings import THIS_DB_NAME
 from apps.io_api import protomodels as pm
 
 

apps/data_opt/routers.py

@@ -9,7 +9,7 @@ import pandas as pd
 from fastapi import APIRouter, Query, Body, Header, File, UploadFile#, HTTPException
 from fastapi.responses import HTMLResponse#, StreamingResponse
 
-from config.settings import BASE_DIR
+from core.settings import BASE_DIR
 from project_files import  project_client, hap_conn
 # from .schemas import SupplyOperationBody, SupplyAction
 # from apps.io_api.models import TSupply

apps/data_opt/utils/common.py

@@ -7,7 +7,7 @@ from typing import Optional, Dict, Union
 from concurrent.futures import ThreadPoolExecutor, as_completed
 
 
-from config.settings import LOG_LEVEL
+from core.settings import LOG_LEVEL
 from apps.common.monitor.http_client_wrapper import HTTPMonitorWrapper
 
 

apps/data_opt/utils/hap/fields.py

@@ -8,7 +8,7 @@ from typing import Dict, Any, Optional, Type, Union, List, TYPE_CHECKING
 from ..data_processor import DataProcessor
 from .utils import HapUtils
 from globalobjects import logger as log_config
-from config.settings import LOG_LEVEL
+from core.settings import LOG_LEVEL
 
 
 logger = log_config.get_logger(__name__, level=LOG_LEVEL)

apps/data_opt/utils/mysqlmonitor.py

@@ -62,7 +62,7 @@ from pymysqlreplication.row_event import (
     DeleteRowsEvent,
 )
 
-from config.settings import MYAPS_DB_HOST, MYAPS_DB_PORT, MYAPS_DB_USER, MYAPS_DB_PASSWORD, MYAPS_MAIN_DB, MYAPS_DBSET_LIST, TURNON_DBMONITOR, TURNON_BINLOG_POSITION_MANAGER, MYAPS_ROOT_PASSWORD
+from core.settings import MYAPS_DB_HOST, MYAPS_DB_PORT, MYAPS_DB_USER, MYAPS_DB_PASSWORD, MYAPS_MAIN_DB, MYAPS_DBSET_LIST, TURNON_DBMONITOR, TURNON_BINLOG_POSITION_MANAGER, MYAPS_ROOT_PASSWORD
 from globalobjects import logger as log_config
 from apps.common.utils.thread_pool_manager import global_pool_manager
 import os

apps/data_opt/utils/routechecker.py

@@ -6,7 +6,7 @@ from collections import defaultdict
 
 from fastapi.responses import StreamingResponse
 from globalobjects import logger as log_config
-from config.settings import LOG_LEVEL
+from core.settings import LOG_LEVEL
 
 
 logger = log_config.get_logger(__name__, level=LOG_LEVEL)

apps/io_api/routers.py

@@ -8,7 +8,7 @@ import inspect, functools, pandas as pd, asyncio
 from fastapi import APIRouter, Path, Query, Body, Header, status#, Request
 # from tortoise import Tortoise
 
-from config.settings import MYAPS_DB_SET, MYAPS_DBSET_LIST, MYAPS_MAIN_DB, THIS_BASE_URL
+from core.settings import MYAPS_DB_SET, MYAPS_DBSET_LIST, MYAPS_MAIN_DB, THIS_BASE_URL
 from globalobjects import globalconst as gc, logger as log_config, ProjectDefaultValues as pdv
 # from .models import TMaterial, TWorkcenter, TMatWc, TMatVer, TMatWcBom, TSupply, TDemand, TMold, TMatWcMold, TConfirm#,TortoiseBaseModel
 from .schemas import (

apps/io_api/schemas.py

@@ -5,7 +5,7 @@ from decimal import Decimal
 
 from pydantic import BaseModel, Field, model_validator, PrivateAttr#, ValidationError, field_validator
 
-from config.settings import MYAPS_VERSION
+from core.settings import MYAPS_VERSION
 from globalobjects import globalconst as gc, ProjectDefaultValues as pdv
 
 

apps/io_api/utils/common.py

@@ -7,7 +7,7 @@ from fastapi.responses import JSONResponse
 from fastapi.exceptions import RequestValidationError
 from pydantic import BaseModel as PydanticSchema
 
-# from config.settings import MYAPS_MAIN_DB
+# from core.settings import MYAPS_MAIN_DB
 # from globalobjects.globalconst import SupplyTypeEnum
 
 

apps/io_api/utils/db_operation.py

@@ -6,7 +6,7 @@ from fastapi import status
 from tortoise.models import Model as TortoiseBaseModel
 from pydantic import BaseModel as PydanticSchema
 
-from config.settings import MYAPS_DB_SET, LOG_LEVEL
+from core.settings import MYAPS_DB_SET, LOG_LEVEL
 from globalobjects.db_manager import get_db_managers, DbManager
 from globalobjects import logger as log_config
 

core/app.py

@@ -1,5 +1,5 @@
 from fastapi import FastAPI
-from config.settings import PORT
+from core.settings import PORT
 
 def create_app(lifespan=None):
     app = FastAPI(

core/database.py

@@ -6,7 +6,7 @@ from typing import Dict, Any, Optional
 from datetime import datetime, timedelta
 
 from tortoise.contrib.fastapi import register_tortoise
-from config.settings import TORTOISE_ORM_CONFIG, MYAPS_MAIN_DB, MYAPS_DBSET_LIST
+from core.settings import TORTOISE_ORM_CONFIG, MYAPS_MAIN_DB, MYAPS_DBSET_LIST
 from globalobjects import logger as log_config
 
 

core/lifespan.py

@@ -6,7 +6,7 @@ from apps.data_opt.utils.scheduler import scheduler_manager, get_scheduler_statu
 from apps.data_opt.utils.mysqlmonitor import mysql_monitor
 from apps.common.utils.resource_monitor import resource_monitor
 from globalobjects import EVENT_AGGREGATOR
-from config.settings import TURNON_DBMONITOR, TRUNON_SCHEDULER
+from core.settings import TURNON_DBMONITOR, TRUNON_SCHEDULER
 from core.database import check_db_connections, warmup_connections, start_pool_monitoring
 
 @asynccontextmanager

core/settings.py

@@ -150,6 +150,20 @@ for db in MYAPS_DBSET_LIST:
         }
     }
 
+
+
+TORTOISE_ORM_CONFIG = {
+    "connections": connections,
+    "apps": {
+        "io_api_models": {
+            "models": ["apps.io_api.models",],
+            "default_connection": MYAPS_MAIN_DB  # 使用MyAPS账套
+        },
+    },
+}
+
+
+
 if THIS_DB_NAME:
     # 创建PostgreSQL连接配置
     connections[THIS_DB_NAME] = {
@@ -164,17 +178,8 @@ if THIS_DB_NAME:
             "max_size": 10,  # 最大连接数
         }
     }
+    TORTOISE_ORM_CONFIG["apps"]["data_opt_models"] = {
+        "models": ["apps.data_opt.models", "aerich.models"],
+        "default_connection": THIS_DB_NAME,
+    }
 
-TORTOISE_ORM_CONFIG = {
-    "connections": connections,
-    "apps": {
-        "io_api_models": {
-            "models": ["apps.io_api.models",],
-            "default_connection": MYAPS_MAIN_DB  # 使用MyAPS账套
-        },
-        "data_opt_models": {
-            "models": ["apps.data_opt.models", "aerich.models"],
-            "default_connection": THIS_DB_NAME or MYAPS_MAIN_DB  # 当THIS_DB_NAME为None时，使用MYAPS_MAIN_DB作为默认连接
-        },
-    },
-}

globalobjects/db_manager.py

@@ -8,7 +8,7 @@ from tortoise.expressions import Q
 from tortoise.transactions import in_transaction
 from tortoise.exceptions import IntegrityError
 
-from config.settings import MYAPS_DBSET_LIST
+from core.settings import MYAPS_DBSET_LIST
 from apps.io_api.utils.common import dict_to_lower_keys
 from globalobjects import logger as log_config
 import os

main.py

@@ -29,7 +29,7 @@ from core.websocket import websocket_endpoint, websocket_root
 from core.routes_register import register_routes
 from core.database import register_database
 from apps.io_api.utils.common import register_exception_handlers
-from config.settings import PORT
+from core.settings import PORT
 
 # 创建应用实例
 app = create_app(lifespan=lifespan)

project_files/JYHDXS/client.py

@@ -9,7 +9,7 @@ from fastapi import status
 from dateutil.relativedelta import relativedelta
 
 
-from config.settings import MYAPS_DB_SET, MYAPS_MAIN_DB, THIS_BASE_URL, SCHEDULER_HOUR
+from core.settings import MYAPS_DB_SET, MYAPS_MAIN_DB, THIS_BASE_URL, SCHEDULER_HOUR
 from .._base import (
     get_scheduler_minute,
     ApsHelpers, CLIENT_LOGGER, standard_response, get_session,

project_files/__init__.py

@@ -12,7 +12,7 @@ env_file = os.path.join(BASE_DIR, '.env')
 load_dotenv(env_file)
 
 # 导入模块
-from config.settings import MYAPS_MAIN_DB, THIS_BASE_URL, MYAPS_DB_SET, MYAPS_DBSET_LIST
+from core.settings import MYAPS_MAIN_DB, THIS_BASE_URL, MYAPS_DB_SET, MYAPS_DBSET_LIST
 from globalobjects.globalconst import OrderStatusEnum
 from apps.io_api.utils.common import dict_to_lower_keys
 from globalobjects import logger as log_config

project_files/_base.py

@@ -16,7 +16,7 @@ from globalobjects.globalconst import OrderStatusEnum
 
 
 # ❗❗❗❗❗❗❗❗❗❗❗❗⬇️不要删掉，便于各项目文件引用 ❗❗❗❗❗❗❗❗❗❗❗❗
-from config.settings import MYAPS_MAIN_DB, THIS_BASE_URL, MYAPS_DB_SET, SCHEDULER_MINUTE
+from core.settings import MYAPS_MAIN_DB, THIS_BASE_URL, MYAPS_DB_SET, SCHEDULER_MINUTE
 from globalobjects import logger as log_config, PROJECT_JSON_FILE, ProjectDefaultValues as pdv
 from apps.io_api.utils.common import standard_response
 from apps.io_api.utils.db_operation import db_delete, db_bupsert, call_dbprocdure, db_query, db_supsert, db_update_by_index

pyproject.toml

@@ -1,4 +1,4 @@
 [tool.aerich]
-tortoise_orm = "config.settings.TORTOISE_ORM_CONFIG"
+tortoise_orm = "core.settings.TORTOISE_ORM_CONFIG"
 location = "./migrations"
 src_folder = "./."