diff --git a/backend/api/dp.py b/backend/api/dp.py index 455dde29..2c510003 100644 --- a/backend/api/dp.py +++ b/backend/api/dp.py @@ -16,7 +16,7 @@ SessionDep = Annotated[Session, Depends(get_db)] RedisDep = Annotated[Redis, Depends(get_redis)] -def alterToken(redis:RedisDep,alter_token: str | None = Header(None)): +def alterToken(redis: RedisDep, alter_token: str | None = Header(None)): if alter_token is not None: try: decoded_bytes = base64.b64decode(alter_token) @@ -25,8 +25,8 @@ def alterToken(redis:RedisDep,alter_token: str | None = Header(None)): # 6小时过期 if (int(time.time() * 1000) - alter['time']) / (60 * 60 * 1000) > 6: raise ResponseException('登录过期或无效Token,请刷新后重试') - alterData = get_redis_info(redis, f'dcalc:adventure:{alter['alter']}', lambda : get_adv_info(alter['alter'])) - return AlterState(alterData["class"], alter_token, {}, alter['equVersion'], alter['time']) + alterData = get_redis_info(redis, f'dcalc:adventure:{alter["alter"]}', lambda: get_adv_info(alter['alter'])) + return AlterState(alterData['class'], alter_token, {}, alter.get('equVersion', '0'), alter['time']) except (base64.binascii.Error, json.JSONDecodeError): raise ResponseException('登录过期或无效Token,请刷新后重试') else: diff --git a/frontendNew/README.md b/frontendNew/README.md index f54076a8..cac12aea 100644 --- a/frontendNew/README.md +++ b/frontendNew/README.md @@ -2,6 +2,28 @@ This template should help get you started developing with Vue 3 in Vite. +## Migration Status (frontend -> frontendNew) + +- UI library baseline: shadcn-vue + Tailwind v4 +- Routing migrated: + - `/home` + - `/dcalc/dnfhelper` + - `/character/:alter/(equipment|skill|forge)` +- Migrated pages: + - `src/pages/Home/Index.vue` + - `src/pages/Dcalc/DnfHelper/*` + - `src/pages/Character/Index.vue` + - `src/pages/Character/EquipmentDictionary/Index.vue` + - `src/pages/Character/Skill/index.vue` + - `src/pages/Character/Forge/index.vue` + +## Next Migration Steps + +- Migrate `frontend/src/pages/Character/Equipment/components/*` into shadcn-vue filter + picker panels. +- Migrate `frontend/src/pages/Character/Result/*` with Card/Item-based result layout and baseline compare blocks. +- Migrate `frontend/src/pages/Character/Config/import*.vue` into dialog/sheet flows in `frontendNew`. +- Replace placeholder summary blocks in Forge with interactive editors for avatar, emblem, jade, oath. + ## Recommended IDE Setup [VS Code](https://code.visualstudio.com/) + [Vue (Official)](https://marketplace.visualstudio.com/items?itemName=Vue.volar) (and disable Vetur). diff --git a/frontendNew/index.html b/frontendNew/index.html index 9e5fc8f0..5f8c16d7 100644 --- a/frontendNew/index.html +++ b/frontendNew/index.html @@ -1,10 +1,10 @@ - +
- - - -共 {{ list.length }} 个角色
+共 {{ sortedList.length }} 个角色