diff --git a/backend/api/routes/colg.py b/backend/api/routes/colg.py index 52a13711..7924cd58 100644 --- a/backend/api/routes/colg.py +++ b/backend/api/routes/colg.py @@ -2,7 +2,7 @@ from api.types.colg import HistoryGold, RealTimeGold from fastapi.params import Param from api.core.Gzip import register_gzip_request import json -from fastapi import APIRouter, Path, Query +from fastapi import APIRouter, Path, Query ,Depends from api.core.Response import response from api.core.Redis import get_redis_info from api.dp import RedisDep @@ -121,7 +121,7 @@ async def get_history_gold(region: Annotated[int, Query(..., description='跨区 'zero': resp['y1'][i], } ) - except Exception as e: + except Exception as _: return response(data=None) echartsData = { 'title': {'text': f'DNF{region_name}近{timeRange}天金币价格趋势分析', 'left': 'center'}, diff --git a/backend/api/routes/info.py b/backend/api/routes/info.py index 83602946..1c166274 100644 --- a/backend/api/routes/info.py +++ b/backend/api/routes/info.py @@ -2,7 +2,8 @@ import re from api.core.Auth import createToken from api.core.Gzip import register_gzip_request import json -from fastapi import APIRouter,Request +from fastapi import APIRouter,Request, Depends +from typing import Annotated from api.core.Response import Return, response from api.core.Redis import get_redis_info from api.dp import RedisDep,AltersDep @@ -91,3 +92,14 @@ async def get_skill_info( except FileNotFoundError: return response(code=404, message=f'技能信息未找到: {jobId} {jobGrowId} {skillId}', data=None) return response(data=skill_info) + + +@router.get("/dnfhelper/{uid}/") +async def get_info_by_dnfhelper(uid: str, redis: RedisDep): + try: + from openapi.dnfhelper.main import get_main_user_info_by_id + result = await get_main_user_info_by_id(uid) + return response(data=result) + except Exception as e: + print(f"Error fetching DNFHelper info: {e}") + return response(code=500, message="Failed to fetch DNFHelper info", data=None) \ No newline at end of file diff --git a/backend/api/routes/openapi.py b/backend/api/routes/openapi.py index ff450dea..4ba43c48 100644 --- a/backend/api/routes/openapi.py +++ b/backend/api/routes/openapi.py @@ -1,7 +1,7 @@ from fastapi.params import Param from api.core.Gzip import register_gzip_request import json -from fastapi import APIRouter, Path, Query +from fastapi import APIRouter, Path, Query, Depends from api.core.Response import response from api.core.Redis import get_redis_info from api.dp import RedisDep @@ -40,7 +40,7 @@ def replace_placeholders(template): @router.get("/skills/", operation_id="skillsList") async def get_skills_list( redis: RedisDep, - skillName: Annotated[str, Param(..., description="技能名称,支持模糊查询")], + skillName: Annotated[str, Param(..., description="技能名称,支持模糊查询")] = None, ) -> SearchSkillResponse: """ 根据技能名称,获取对应的技能列表信息 @@ -72,7 +72,7 @@ async def get_skills_list( @router.get("/jobInfo/", operation_id="jobsInfo") async def get_jobs_info( redis: RedisDep, - jobName: Annotated[str, Query(..., description="职业名称,支持模糊查询")], + jobName: Annotated[str, Query(..., description="职业名称,支持模糊查询")] = None, ) -> JobInfoResponse: """ 根据职业名称,获取对应的职业转职信息 diff --git a/backend/dataFiles/dcalc_0.db b/backend/dataFiles/dcalc_0.db index 39f09782..0d1ad0f8 100644 Binary files a/backend/dataFiles/dcalc_0.db and b/backend/dataFiles/dcalc_0.db differ