diff --git a/.gitignore b/.gitignore index e7e483a..d015956 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ media/ logs/ .idea -/static/upload +/data __pycache__/ *.py[cod] *$py.class @@ -111,7 +111,7 @@ celerybeat.pid *.sage.py # Environments -.env +data/.env .venv env/ venv/ @@ -150,6 +150,6 @@ for_test.py .html /evaluate/temp.py /evaluation/back.json -.env* +data/.env .backup/ /cloc-1.64.exe diff --git a/database.py b/database.py index fb06c42..c12f489 100644 --- a/database.py +++ b/database.py @@ -1,11 +1,10 @@ import datetime - from sqlalchemy import Boolean, Column, Integer, String, DateTime from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.ext.asyncio import create_async_engine from sqlalchemy.ext.asyncio.session import AsyncSession - -engine = create_async_engine("sqlite+aiosqlite:///database.db") +import settings +engine = create_async_engine(settings.DATABASE_URL) Base = declarative_base() diff --git a/main.py b/main.py index 32effe6..d1c2320 100644 --- a/main.py +++ b/main.py @@ -22,8 +22,9 @@ app = FastAPI(debug=settings.DEBUG) DATA_ROOT = Path(settings.DATA_ROOT) if not DATA_ROOT.exists(): DATA_ROOT.mkdir(parents=True) -# 静态文件夹 -app.mount(settings.STATIC_URL, StaticFiles(directory=DATA_ROOT), name="static") + +# 静态文件夹,这个固定就行了,静态资源都放在这里 +app.mount(settings.STATIC_URL, StaticFiles(directory='./static'), name="static") @app.on_event('startup') diff --git a/settings.py b/settings.py index e7b7a0a..9e4cd6a 100644 --- a/settings.py +++ b/settings.py @@ -1,15 +1,16 @@ from starlette.config import Config # 配置文件.env -config = Config(".env") +# 请将.env移动至data目录,方便docker部署 +config = Config("data/.env") # 是否开启DEBUG模式 DEBUG = config('DEBUG', cast=bool, default=False) # 端口 PORT = config('PORT', cast=int, default=12345) # Sqlite数据库文件 -DATABASE_URL = config('DATABASE_URL', cast=str, default="sqlite+aiosqlite:///database.db") -# 静态文件夹 -DATA_ROOT = config('DATA_ROOT', cast=str, default="./static") +DATABASE_URL = config('DATABASE_URL', cast=str, default="sqlite+aiosqlite:///data/database.db") +# 数据存储文件夹,文件就不暴露在静态资源里面了 +DATA_ROOT = './data/' + config('DATA_ROOT', cast=str, default=f"static") # 静态文件夹URL STATIC_URL = config('STATIC_URL', cast=str, default="/static") # 错误次数 diff --git a/templates/index.html b/templates/index.html index 7748803..28d10c1 100644 --- a/templates/index.html +++ b/templates/index.html @@ -306,8 +306,9 @@ } }, successUpload(response, file, fileList) { + console.log(response) this.$message({ - message: response.msg, + message: response.detail, type: 'success' }); this.files.unshift(response.data);