diff --git a/app/global_func.py b/app/global_func.py index 26c6a1b..00a6c2a 100644 --- a/app/global_func.py +++ b/app/global_func.py @@ -2,6 +2,7 @@ Portal全局函数 — 注册到ServerEnv供.dspy和.ui调用 """ from ahserver.serverenv import ServerEnv +from appPublic.jsonConfig import getConfig def get_module_dbname(mname): """Portal应用统一使用ocai_cms数据库""" @@ -50,6 +51,7 @@ def UiMessage(title="消息", message="后台消息", timeout=5): def set_globalvariable(): g = ServerEnv() + g.getConfig = getConfig g.get_module_dbname = get_module_dbname g.UiError = UiError g.UiMessage = UiMessage diff --git a/app/portal.py b/app/portal.py index ca12179..7b0d270 100644 --- a/app/portal.py +++ b/app/portal.py @@ -44,6 +44,11 @@ def init(): set_globalvariable() env = ServerEnv() env.get_module_dbname = get_module_dbname + + # Initialize DBPools and register db on ServerEnv for dspy use + config = getConfig('.') + env.db = DBPools(config.databases) + load_pybricks() load_appbase() load_rbac() diff --git a/conf/config.json b/conf/config.json index 2bc44a9..bac1564 100644 --- a/conf/config.json +++ b/conf/config.json @@ -1,5 +1,5 @@ { - "password_key":"!@#$%^&*(*&^%$QWERTYUIqwertyui234567", + "password_key": "!@#$%^&*(*&^%$QWERTYUIqwertyui234567", "logger": { "name": "portal", "levelname": "info", @@ -29,10 +29,6 @@ [ "$[workdir]$/../cms/wwwroot", "/cms" - ], - [ - "$[workdir]$/bricks", - "/bricks" ] ], "host": "0.0.0.0", @@ -77,4 +73,4 @@ "zh-Hans-CN": "zh-cn", "en-US": "en" } -} +} \ No newline at end of file diff --git a/init_data.py b/init_data.py index 3970ef1..ad2cb03 100644 --- a/init_data.py +++ b/init_data.py @@ -23,7 +23,7 @@ except ImportError: # 简单YAML解析(fallback) yaml = None -CMS_DIR = os.path.expanduser("~/repos/cms") +CMS_DIR = os.path.expanduser("~/cms") DATA_FILE = os.path.join(CMS_DIR, "init", "data.yaml") def load_yaml_simple(path): @@ -62,7 +62,7 @@ def main(): # 初始化日志和配置 MyLogger(getConfig()) - db = DBPools() + db = DBPools(getConfig().databases) dbname = 'ocai_cms' import asyncio diff --git a/wwwroot/api/get_config.dspy b/wwwroot/api/get_config.dspy index 310dcf1..227da4c 100644 --- a/wwwroot/api/get_config.dspy +++ b/wwwroot/api/get_config.dspy @@ -1,7 +1,7 @@ config = getConfig('.') DBPools(config.databases) -dbname = get_module_dbname('entcms') +dbname = get_module_dbname('cms') async with db.sqlorContext(dbname) as sor: group = params_kw.get('group', None) diff --git a/wwwroot/api/get_content_detail.dspy b/wwwroot/api/get_content_detail.dspy index e906d9e..a568a57 100644 --- a/wwwroot/api/get_content_detail.dspy +++ b/wwwroot/api/get_content_detail.dspy @@ -1,7 +1,7 @@ config = getConfig('.') DBPools(config.databases) -dbname = get_module_dbname('entcms') +dbname = get_module_dbname('cms') async with db.sqlorContext(dbname) as sor: _id = params_kw.get('id', '') diff --git a/wwwroot/api/get_published_content.dspy b/wwwroot/api/get_published_content.dspy index 0fc70da..2955a2f 100644 --- a/wwwroot/api/get_published_content.dspy +++ b/wwwroot/api/get_published_content.dspy @@ -1,7 +1,7 @@ config = getConfig('.') DBPools(config.databases) -dbname = get_module_dbname('entcms') +dbname = get_module_dbname('cms') async with db.sqlorContext(dbname) as sor: content_type = params_kw.get('content_type', None) diff --git a/wwwroot/api/get_sections.dspy b/wwwroot/api/get_sections.dspy index 9650681..301cf0b 100644 --- a/wwwroot/api/get_sections.dspy +++ b/wwwroot/api/get_sections.dspy @@ -1,7 +1,7 @@ config = getConfig('.') DBPools(config.databases) -dbname = get_module_dbname('entcms') +dbname = get_module_dbname('cms') async with db.sqlorContext(dbname) as sor: ns = {'is_visible': '1', 'sort': 'sort_order asc'} diff --git a/wwwroot/api/submit_lead.dspy b/wwwroot/api/submit_lead.dspy index 8345433..b07dfcb 100644 --- a/wwwroot/api/submit_lead.dspy +++ b/wwwroot/api/submit_lead.dspy @@ -1,6 +1,6 @@ config = getConfig('.') DBPools(config.databases) -dbname = get_module_dbname('entcms') +dbname = get_module_dbname('cms') async with db.sqlorContext(dbname) as sor: data = {