From 6e58b9ac2fe12ac09f9203514182fe8e08e30b12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= Date: Wed, 25 Feb 2026 17:27:34 +0800 Subject: [PATCH] dev --- backend/api/routes/colg.py | 4 ++-- backend/api/routes/info.py | 14 +++++++++++++- backend/api/routes/openapi.py | 6 +++--- backend/dataFiles/dcalc_0.db | Bin 1007616 -> 1007616 bytes 4 files changed, 18 insertions(+), 6 deletions(-) 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 39f0978297777978aa220dc1b3723819f37e771a..0d1ad0f84710ea22eb2ac9aba881d5b290eb9a8b 100644 GIT binary patch delta 4026 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