diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java index 1ee68525..434060a1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java @@ -39,14 +39,14 @@ public class DruidFilter extends FilterEventAdapter { @Override protected void statementExecuteAfter(StatementProxy statement, String sql, boolean result) { - String traceId = MDC.get("traceId"); +// String traceId = MDC.get("traceId"); int size = statement.getParametersSize(); String executeSql = sql; int count = 0; try { count=statement.getUpdateCount(); }catch (Exception ex){ } - if (true) { + if (size>0 && count>0) { Collection values = statement.getParameters().values(); List params = new ArrayList<>(); for (JdbcParameter value : values) { @@ -61,8 +61,8 @@ public class DruidFilter extends FilterEventAdapter { public ResultSetProxy statement_getResultSet(FilterChain chain, StatementProxy statement) throws SQLException { ResultSetProxy rs = super.statement_getResultSet(chain, statement); String executeSql = statement.getLastExecuteSql(); - String traceId = MDC.get("traceId"); - if (StringUtils.isNotEmpty(traceId)){ +// String traceId = MDC.get("traceId"); + if (true){ int result = 0; if (rs != null) { ResultSetImpl rss = rs.getResultSetRaw().unwrap(ResultSetImpl.class); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java index 6a0573a5..cba58307 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java @@ -25,7 +25,6 @@ public class AsyncLuceneAppender extends AspectLogbackAsyncAppender { if (mdcPropertyMap.getClass().getName().contains("SynchronizedMap")){ mdcPropertyMap.put("traceId",traceId); } - MDC.clear(); } super.append(event); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/config/SecurityConfig.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/config/SecurityConfig.java index 80a6454e..6e4f22c6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/config/SecurityConfig.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/config/SecurityConfig.java @@ -119,6 +119,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/swagger-resources/**").permitAll() .antMatchers("/webjars/**").permitAll() .antMatchers("/*/api-docs").permitAll() + .antMatchers("/metrics/**").permitAll() // 文件 .antMatchers("/avatar/**").permitAll() .antMatchers("/file/**").permitAll()