diff --git a/core/core-frontend/src/views/login/index.vue b/core/core-frontend/src/views/login/index.vue index e59b6267cf..84443e3cdd 100644 --- a/core/core-frontend/src/views/login/index.vue +++ b/core/core-frontend/src/views/login/index.vue @@ -145,15 +145,15 @@ const showLoginErrorMsg = () => { if (!loginErrorMsg.value) { return } - if (loginErrorMsg.value.startsWith('token is empty')) { + if (loginErrorMsg.value.includes('token is empty')) { ElMessage.error('token为空!') return } - if (loginErrorMsg.value.startsWith('token is Expired')) { + if (loginErrorMsg.value.includes('token is Expired')) { ElMessage.error('登录信息已过期,请重新登录!') return } - if (loginErrorMsg.value.startsWith('token is destroyed')) { + if (loginErrorMsg.value.includes('token is destroyed')) { ElMessage.error('登录信息已销毁,请重新登录!') return } diff --git a/core/core-frontend/src/views/mobile/login/index.vue b/core/core-frontend/src/views/mobile/login/index.vue index abc5b345ad..d176252a1a 100644 --- a/core/core-frontend/src/views/mobile/login/index.vue +++ b/core/core-frontend/src/views/mobile/login/index.vue @@ -253,7 +253,7 @@ const loadFail = () => { entity = new ResponseEntity<>(resultMessage, headers, HttpStatus.UNAUTHORIZED); + sendResponseEntity(res, entity); + LogUtil.error(e.getMessage(), e); + } else { + throw e; + } } finally { UserUtils.removeUser(); } @@ -86,6 +103,10 @@ public class TokenFilter implements Filter { HttpStatusCode statusCode = responseEntity.getStatusCode(); httpResponse.setStatus(statusCode.value()); httpResponse.setCharacterEncoding(StandardCharsets.UTF_8.name()); + HttpHeaders headers = responseEntity.getHeaders(); + if (ObjectUtils.isNotEmpty(headers)) { + headers.forEach((key, value) -> httpResponse.addHeader(key, value.toString())); + } httpResponse.getWriter().write(Objects.requireNonNull(JsonUtil.toJSONString(responseEntity.getBody()).toString())); }