From 31de5b7ea1172080bf691f7158fa787e239d1f02 Mon Sep 17 00:00:00 2001 From: lan Date: Wed, 16 Aug 2023 13:03:56 +0800 Subject: [PATCH 1/2] test:1 --- core/database.py | 44 ++++++++------------------------------------ 1 file changed, 8 insertions(+), 36 deletions(-) diff --git a/core/database.py b/core/database.py index c30471e2c..9d9cde527 100644 --- a/core/database.py +++ b/core/database.py @@ -36,42 +36,14 @@ class Codes(Base): async def init_models(s): async with engine.begin() as conn: await conn.run_sync(Base.metadata.create_all) - if await conn.scalar(select(Options).filter(Options.key == 'INSTALL')) is None: - # 如果没有存在install，则清空表，并插入默认数据 - await conn.execute(delete(table=Options)) - await conn.execute(insert(table=Options, values=[ - {'key': 'INSTALL', 'value': settings.VERSION}, - {'key': 'DEBUG', 'value': settings.DEBUG}, - {'key': 'DATABASE_FILE', 'value': settings.DATABASE_FILE}, - {'key': 'PORT', 'value': settings.PORT}, - {'key': 'DATA_ROOT', 'value': settings.DATA_ROOT}, - {'key': 'LOCAL_ROOT', 'value': settings.LOCAL_ROOT}, - {'key': 'STATIC_URL', 'value': settings.STATIC_URL}, - {'key': 'BANNERS', 'value': settings.BANNERS}, - {'key': 'ENABLE_UPLOAD', 'value': settings.ENABLE_UPLOAD}, - {'key': 'MAX_DAYS', 'value': settings.MAX_DAYS}, - {'key': 'ERROR_COUNT', 'value': settings.ERROR_COUNT}, - {'key': 'ERROR_MINUTE', 'value': settings.ERROR_COUNT}, - {'key': 'UPLOAD_COUNT', 'value': settings.UPLOAD_COUNT}, - {'key': 'UPLOAD_MINUTE', 'value': settings.UPLOAD_MINUTE}, - {'key': 'DELETE_EXPIRE_FILES_INTERVAL', 'value': settings.DELETE_EXPIRE_FILES_INTERVAL}, - {'key': 'ADMIN_ADDRESS', 'value': settings.ADMIN_ADDRESS}, - {'key': 'ADMIN_PASSWORD', 'value': settings.ADMIN_PASSWORD}, - {'key': 'FILE_SIZE_LIMIT', 'value': settings.FILE_SIZE_LIMIT}, - {'key': 'TITLE', 'value': settings.TITLE}, - {'key': 'DESCRIPTION', 'value': settings.DESCRIPTION}, - {'key': 'KEYWORDS', 'value': settings.KEYWORDS}, - {'key': 'STORAGE_ENGINE', 'value': settings.STORAGE_ENGINE}, - {'key': 'STORAGE_CONFIG', 'value': {}}, - ])) - print( - f'初始化数据库成功！\n' - f'如您未配置.env文件，将为您随机生成信息\n' - f'您的后台地址为：/{settings.ADMIN_ADDRESS}\n' - f'您的管理员密码为：{settings.ADMIN_PASSWORD}\n' - f'请尽快修改后台信息！\n' - f'FileCodeBox https://github.com/vastsa/FileCodeBox' - ) + print( + f'初始化数据库成功！\n' + f'如您未配置.env文件，将为您随机生成信息\n' + f'您的后台地址为：/{settings.ADMIN_ADDRESS}\n' + f'您的管理员密码为：{settings.ADMIN_PASSWORD}\n' + f'请尽快修改后台信息！\n' + f'FileCodeBox https://github.com/vastsa/FileCodeBox' + ) await settings.updates(await conn.execute(select(Options).filter())) From 222c048e384b2c97998f7fa5f23978272cd89647 Mon Sep 17 00:00:00 2001 From: lan Date: Thu, 18 Jan 2024 18:46:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=9F=BA=E7=A1=80=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index 2125aee49..c31aa7ea5 100644 --- a/main.py +++ b/main.py @@ -27,12 +27,13 @@ async def startup(s: AsyncSession = Depends(get_session)): asyncio.create_task(delete_expire_files()) +BASE_DIR = Path(__file__).resolve().parent.parent # 数据存储文件夹 -DATA_ROOT = Path(settings.DATA_ROOT) +DATA_ROOT = BASE_DIR / settings.DATA_ROOT if not DATA_ROOT.exists(): DATA_ROOT.mkdir(parents=True) # 本地文件文件夹 -LOCAL_ROOT = Path(settings.LOCAL_ROOT) +LOCAL_ROOT = BASE_DIR / settings.LOCAL_ROOT if not LOCAL_ROOT.exists(): LOCAL_ROOT.mkdir(parents=True)