Skip to content

Commit 8e01bf6

Browse files
perf: Exception msg
1 parent e6b6c98 commit 8e01bf6

File tree

3 files changed

+11
-25
lines changed

3 files changed

+11
-25
lines changed

backend/apps/system/middleware/auth.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ async def dispatch(self, request, call_next):
3636
request.state.current_user = validator[1]
3737
request.state.assistant = validator[2]
3838
return await call_next(request)
39-
return JSONResponse({"msg": f"Unauthorized:[{validator[1]}]"}, status_code=401, headers={"Access-Control-Allow-Origin": "*"})
39+
return JSONResponse(f"Unauthorized:[{validator[1]}]", status_code=401, headers={"Access-Control-Allow-Origin": "*"})
4040
#validate pass
4141
tokenkey = settings.TOKEN_KEY
4242
token = request.headers.get(tokenkey)
4343
validate_pass, data = await self.validateToken(token)
4444
if validate_pass:
4545
request.state.current_user = data
4646
return await call_next(request)
47-
return JSONResponse({"msg": f"Unauthorized:[{data}]"}, status_code=401, headers={"Access-Control-Allow-Origin": "*"})
47+
return JSONResponse(f"Unauthorized:[{data}]", status_code=401, headers={"Access-Control-Allow-Origin": "*"})
4848

4949
def is_options(self, request: Request):
5050
return request.method == "OPTIONS"

backend/common/core/response_middleware.py

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ async def dispatch(self, request, call_next):
1414

1515
if isinstance(response, JSONResponse) or request.url.path == f"{settings.API_V1_STR}/openapi.json":
1616
return response
17-
17+
if response.status_code != 200:
18+
return response
1819
if response.headers.get("content-type") == "application/json":
1920
try:
2021
body = b""
@@ -51,11 +52,7 @@ async def dispatch(self, request, call_next):
5152
SQLBotLogUtil.error(f"Response processing error: {str(e)}", exc_info=True)
5253
return JSONResponse(
5354
status_code=500,
54-
content={
55-
"code": 500,
56-
"data": None,
57-
"msg": str(e)
58-
},
55+
content=str(e),
5956
headers={
6057
k: v for k, v in response.headers.items()
6158
if k.lower() not in ("content-length", "content-type")
@@ -71,11 +68,7 @@ async def http_exception_handler(request: Request, exc: HTTPException):
7168
SQLBotLogUtil.error(f"HTTP Exception: {exc.detail}", exc_info=True)
7269
return JSONResponse(
7370
status_code=exc.status_code,
74-
content={
75-
"code": exc.status_code,
76-
"msg": exc.detail,
77-
"data": None
78-
},
71+
content=exc.detail,
7972
headers={"Access-Control-Allow-Origin": "*"}
8073
)
8174

@@ -85,11 +78,7 @@ async def global_exception_handler(request: Request, exc: Exception):
8578
SQLBotLogUtil.error(f"Unhandled Exception: {str(exc)}", exc_info=True)
8679
return JSONResponse(
8780
status_code=500,
88-
content={
89-
"code": 500,
90-
"msg": str(exc),
91-
"data": None
92-
},
81+
content=str(exc),
9382
headers={"Access-Control-Allow-Origin": "*"}
9483
)
9584

frontend/src/utils/request.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ class HttpService {
171171
errorMessage = 'Invalid request parameters'
172172
break
173173
case 401:
174-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
175-
// @ts-ignore
176-
errorMessage = error.response?.data?.data?.msg || 'Unauthorized, please login again'
174+
errorMessage = error.response?.data
175+
? error.response.data.toString()
176+
: 'Unauthorized, please login again'
177177
// Redirect to login page if needed
178178
ElMessage({
179179
message: errorMessage,
@@ -199,10 +199,7 @@ class HttpService {
199199
errorMessage = `Server responded with error: ${error.response.status}`
200200
}
201201
if (error?.response?.data) {
202-
const msgData: any = error.response.data
203-
if (msgData?.msg) {
204-
errorMessage = msgData.msg
205-
}
202+
errorMessage = error.response.data.toString()
206203
}
207204
} else if (error.request) {
208205
errorMessage = 'No response from server'

0 commit comments

Comments
 (0)