包含 LoginError

从而避免无法获取默认课表以保存到数据库的问题

njupt_api/zhengfang/__init__.py

@@ -1,4 +1,5 @@
 from .createcourse import create_course_schedule
+from .exc import LoginError
 from .lib import jwxt
 from .sso import SSO
 from .types import Course, course_dict_serializer, course_list_serializer
@@ -12,4 +13,5 @@ __all__ = [
     course_list_serializer,
     ZhengFang,
     jwxt,
+    LoginError,
 ]

router/admin_router.py

@@ -7,7 +7,7 @@ from pydantic import BaseModel
 from sqlmodel import Session, delete, select
 
 from njupt_api.baselib import config, logger
-from njupt_api.zhengfang import ZhengFang, course_list_serializer
+from njupt_api.zhengfang import LoginError, course_list_serializer, jwxt
 from router.enhance.auth import verify_token
 from router.enhance.lib import AliasDto, ReturnDto, TestDto, get_session
 from router.enhance.model import Alias, Course
@@ -37,8 +37,8 @@ async def validate_token(vtd: ValidateTokenDto) -> ReturnDto:
 
 @admin_router.post("/schedule/test", dependencies=[Depends(verify_token)])
 async def post_schedule_test(test: TestDto, session: Annotated[Session, Depends(get_session)]) -> ReturnDto:
-    async with ZhengFang() as zf:
+    try:
-        if await zf.login(test.username, test.password):
+        async with jwxt(test.username, test.password) as zf:
             if test.scheduleType == "class":
                 final_course_list = course_list_serializer(
                     await zf.get_class_schedule(),
@@ -67,13 +67,8 @@ async def post_schedule_test(test: TestDto, session: Annotated[Session, Depends(
                 success=False,
                 message="参数错误，请检查 scheduleType 参数。",
             )
-        logger.error(
+    except LoginError as e:
-            f"{test.username} | 获取课程表失败，请检查账号密码是否正确后再试。",
+        return ReturnDto(success=False, message=str(e))
-        )
-        return ReturnDto(
-            success=False,
-            message="获取课程表失败，请检查账号密码是否正确后再试。",
-        )
 
 
 @admin_router.get("/schedule/test", dependencies=[Depends(verify_token)])

webui/src/pages/Log.vue

@@ -14,7 +14,7 @@ ansiUp.use_classes = true
 let ws: WebSocket | null = null
 
 const initWebSocket = () => {
-  ws = new WebSocket('ws://127.0.0.1:8000/ws/logs')
+  ws = new WebSocket(`ws://${window.location.hostname}:8000/ws/logs`)
 
   ws.onmessage = (event) => {
     // 1. 解析 ANSI 颜色编码

webui/vite.config.ts

@@ -53,6 +53,10 @@ export default defineConfig({
         target: 'http://localhost:8000',
         changeOrigin: true,
       },
+      '/ws': {
+        target: 'http://localhost:8000',
+        changeOrigin: true,
+      },
       '/version': {
         target: 'http://localhost:8000',
         changeOrigin: true,