diff --git a/admin/src/api/user.js b/admin/src/api/user.js index 54f82e9..e0f812d 100644 --- a/admin/src/api/user.js +++ b/admin/src/api/user.js @@ -2,6 +2,7 @@ import axios from 'axios' import glob from '../assets/js/glob.js'; const api_user = { - // test: () => axios.get(glob.URL_ROOT_WEB + '/actuator/info') + //登出 + logout: () => axios.delete(glob.URL_ROOT_WEB + '/private/rbac/user/logout') }; export default api_user; diff --git a/admin/src/assets/js/glob.js b/admin/src/assets/js/glob.js index 387ad45..2f59b2e 100644 --- a/admin/src/assets/js/glob.js +++ b/admin/src/assets/js/glob.js @@ -53,11 +53,15 @@ const glob = { axios.interceptors.response.use(response => { if (response.status == 200) { return Promise.resolve(response); + } else { + if (response.status == 403) { + //TODO 认证错误,需要跳转到首页 + } else { + this.message(error); + } + return Promise.reject(response); } - this.message(error); - return Promise.reject(response); - }, - error => { + }, error => { this.message(error); return Promise.reject(error.response); } @@ -65,14 +69,12 @@ const glob = { }, // 错误面板 message(error) { - // 默认400错误给警告框,其他为错误框 - const type = error.status === 400 ? 'warning' : 'error'; //弹出消息框 Message({ dangerouslyUseHTMLString: false, // 设置HTML显示 showClose: true, // 显示关闭按钮 duration: this.ERROR_MESSAGE_DURATION * 1000, // 默认3秒后关闭 - type, + type: error.status === 400 ? 'warning' : 'error', message: this.getErrorMessage(error) }); }, diff --git a/udf-api/udf-api-common/src/main/java/org/itkk/udf/api/common/component/DbLogImpl.java b/udf-api/udf-api-common/src/main/java/org/itkk/udf/api/common/component/DbLogImpl.java index 8a4664b..87b881d 100644 --- a/udf-api/udf-api-common/src/main/java/org/itkk/udf/api/common/component/DbLogImpl.java +++ b/udf-api/udf-api-common/src/main/java/org/itkk/udf/api/common/component/DbLogImpl.java @@ -13,6 +13,7 @@ import org.itkk.udf.starter.core.trace.ITraceAlert; import org.itkk.udf.starter.core.trace.TraceDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.http.HttpMethod; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; @@ -63,8 +64,13 @@ public class DbLogImpl implements ITraceAlert, IExceptionAlert, IDataHis { @Async public void alert(TraceDto traceDto) { try { + //定义常量 final String type = "ITraceAlert"; - traceInfoService.save(traceDto.getTraceId(), type, internalObjectMapper.writeValueAsString(traceDto)); + //排除OPTIONS请求 + if (!HttpMethod.OPTIONS.toString().toUpperCase().equals(traceDto.getMethod().toUpperCase())) { + //保存 + traceInfoService.save(traceDto.getTraceId(), type, internalObjectMapper.writeValueAsString(traceDto)); + } } catch (JsonProcessingException e) { log.warn(traceDto.getTraceId() + " (ITraceAlert)记录trace日志失败,错误信息为 : " + e.getMessage()); }