small fix
This commit is contained in:
parent
cf174de2b5
commit
ff98203cc0
|
|
@ -7,16 +7,12 @@ dict_search = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
@dict_search.get("/search")
|
@dict_search.get("/search")
|
||||||
async def search(request: Request, lang_pref: str, query_word: str, user: Depends(get_current_user)):
|
async def search(
|
||||||
|
request: Request, lang_pref: str, query_word: str, user=Depends(get_current_user)
|
||||||
|
):
|
||||||
word_content = await DefinitionFr.filter(
|
word_content = await DefinitionFr.filter(
|
||||||
word__icontains=query_word,
|
word__icontains=query_word, lang_pref=lang_pref
|
||||||
lang_pref=lang_pref
|
).values("word", "part_of_speech", "meaning", "example")
|
||||||
).values(
|
|
||||||
"word",
|
|
||||||
"part_of_speech",
|
|
||||||
"meaning",
|
|
||||||
"example"
|
|
||||||
)
|
|
||||||
if not word_content:
|
if not word_content:
|
||||||
raise HTTPException(status_code=404, detail="Word not found")
|
raise HTTPException(status_code=404, detail="Word not found")
|
||||||
return word_content
|
return word_content
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
from . import signals
|
from . import signals
|
||||||
from .fr import WordlistFr, DefinitionFr, AttachmentFr
|
from .fr import WordlistFr, DefinitionFr, AttachmentFr
|
||||||
from .jp import WordlistJp, DefinitionJp, AttachmentJp
|
from .jp import WordlistJp, DefinitionJp, AttachmentJp
|
||||||
from base import User
|
from .base import User
|
||||||
|
|
|
||||||
21
main.py
21
main.py
|
|
@ -1,12 +1,14 @@
|
||||||
from contextlib import asynccontextmanager
|
from contextlib import asynccontextmanager
|
||||||
|
|
||||||
from fastapi import FastAPI
|
from fastapi import FastAPI
|
||||||
|
from fastapi.middleware.cors import CORSMiddleware
|
||||||
import uvicorn
|
import uvicorn
|
||||||
from tortoise.contrib.fastapi import register_tortoise
|
from tortoise.contrib.fastapi import register_tortoise
|
||||||
|
|
||||||
from settings import TORTOISE_ORM
|
from settings import TORTOISE_ORM
|
||||||
from app.api.users import users_router
|
from app.api.users import users_router
|
||||||
from app.api.admin.router import admin_router
|
from app.api.admin.router import admin_router
|
||||||
|
from app.api.search import dict_search
|
||||||
from app.core.redis import init_redis_pool
|
from app.core.redis import init_redis_pool
|
||||||
import app.models.signals
|
import app.models.signals
|
||||||
|
|
||||||
|
|
@ -20,6 +22,20 @@ async def lifespan(app: FastAPI):
|
||||||
|
|
||||||
app = FastAPI(lifespan=lifespan)
|
app = FastAPI(lifespan=lifespan)
|
||||||
|
|
||||||
|
# 添加CORS中间件
|
||||||
|
app.add_middleware(
|
||||||
|
CORSMiddleware,
|
||||||
|
allow_origins=[
|
||||||
|
"http://localhost:5173",
|
||||||
|
"http://localhost:5174",
|
||||||
|
"http://127.0.0.1:5173",
|
||||||
|
"http://127.0.0.1:5174",
|
||||||
|
],
|
||||||
|
allow_credentials=True,
|
||||||
|
allow_methods=["*"],
|
||||||
|
allow_headers=["*"],
|
||||||
|
)
|
||||||
|
|
||||||
register_tortoise(
|
register_tortoise(
|
||||||
app=app,
|
app=app,
|
||||||
config=TORTOISE_ORM,
|
config=TORTOISE_ORM,
|
||||||
|
|
@ -27,6 +43,7 @@ register_tortoise(
|
||||||
|
|
||||||
app.include_router(users_router, tags=["User API"], prefix="/users")
|
app.include_router(users_router, tags=["User API"], prefix="/users")
|
||||||
app.include_router(admin_router, tags=["Administrator API"], prefix="/admin")
|
app.include_router(admin_router, tags=["Administrator API"], prefix="/admin")
|
||||||
|
app.include_router(dict_search, tags=["Dictionary Search API"])
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == "__main__":
|
||||||
uvicorn.run("main:app", host='127.0.0.1', port=8000, reload=True)
|
uvicorn.run("main:app", host="127.0.0.1", port=8000, reload=True)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue