diff --git a/backend/apps/system/middleware/auth.py b/backend/apps/system/middleware/auth.py index 8c3a1f59..4f4d8706 100644 --- a/backend/apps/system/middleware/auth.py +++ b/backend/apps/system/middleware/auth.py @@ -36,7 +36,7 @@ class TokenMiddleware(BaseHTTPMiddleware): request.state.current_user = validator[1] request.state.assistant = validator[2] return await call_next(request) - return JSONResponse({"msg": f"Unauthorized:[{validator[1]}]"}, status_code=401, headers={"Access-Control-Allow-Origin": "*"}) + return JSONResponse(f"Unauthorized:[{validator[1]}]", status_code=401, headers={"Access-Control-Allow-Origin": "*"}) #validate pass tokenkey = settings.TOKEN_KEY token = request.headers.get(tokenkey) @@ -44,7 +44,7 @@ class TokenMiddleware(BaseHTTPMiddleware): if validate_pass: request.state.current_user = data return await call_next(request) - return JSONResponse({"msg": f"Unauthorized:[{data}]"}, status_code=401, headers={"Access-Control-Allow-Origin": "*"}) + return JSONResponse(f"Unauthorized:[{data}]", status_code=401, headers={"Access-Control-Allow-Origin": "*"}) def is_options(self, request: Request): return request.method == "OPTIONS" diff --git a/backend/common/core/response_middleware.py b/backend/common/core/response_middleware.py index e1dbab9b..6842893e 100644 --- a/backend/common/core/response_middleware.py +++ b/backend/common/core/response_middleware.py @@ -14,7 +14,8 @@ class ResponseMiddleware(BaseHTTPMiddleware): if isinstance(response, JSONResponse) or request.url.path == f"{settings.API_V1_STR}/openapi.json": return response - + if response.status_code != 200: + return response if response.headers.get("content-type") == "application/json": try: body = b"" @@ -51,11 +52,7 @@ class ResponseMiddleware(BaseHTTPMiddleware): SQLBotLogUtil.error(f"Response processing error: {str(e)}", exc_info=True) return JSONResponse( status_code=500, - content={ - "code": 500, - "data": None, - "msg": str(e) - }, + content=str(e), headers={ k: v for k, v in response.headers.items() if k.lower() not in ("content-length", "content-type") @@ -71,11 +68,7 @@ class exception_handler(): SQLBotLogUtil.error(f"HTTP Exception: {exc.detail}", exc_info=True) return JSONResponse( status_code=exc.status_code, - content={ - "code": exc.status_code, - "msg": exc.detail, - "data": None - }, + content=exc.detail, headers={"Access-Control-Allow-Origin": "*"} ) @@ -85,11 +78,7 @@ class exception_handler(): SQLBotLogUtil.error(f"Unhandled Exception: {str(exc)}", exc_info=True) return JSONResponse( status_code=500, - content={ - "code": 500, - "msg": str(exc), - "data": None - }, + content=str(exc), headers={"Access-Control-Allow-Origin": "*"} ) diff --git a/frontend/src/utils/request.ts b/frontend/src/utils/request.ts index 588b9d09..03a7e998 100644 --- a/frontend/src/utils/request.ts +++ b/frontend/src/utils/request.ts @@ -171,9 +171,9 @@ class HttpService { errorMessage = 'Invalid request parameters' break case 401: - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore - errorMessage = error.response?.data?.data?.msg || 'Unauthorized, please login again' + errorMessage = error.response?.data + ? error.response.data.toString() + : 'Unauthorized, please login again' // Redirect to login page if needed ElMessage({ message: errorMessage, @@ -199,10 +199,7 @@ class HttpService { errorMessage = `Server responded with error: ${error.response.status}` } if (error?.response?.data) { - const msgData: any = error.response.data - if (msgData?.msg) { - errorMessage = msgData.msg - } + errorMessage = error.response.data.toString() } } else if (error.request) { errorMessage = 'No response from server'