diff --git a/lms/nladmin-system/nlsso-server/pom.xml b/lms/nladmin-system/nlsso-server/pom.xml index 51d819d..0a8ba4f 100644 --- a/lms/nladmin-system/nlsso-server/pom.xml +++ b/lms/nladmin-system/nlsso-server/pom.xml @@ -463,12 +463,12 @@ lucene-queryparser ${lucene.version} - - com.yomahub - tlog-core - 1.5.0 - compile - + + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LogAspect.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LogAspect.java index 31e0288..4a82b6a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LogAspect.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LogAspect.java @@ -51,8 +51,6 @@ import java.util.Map; @Slf4j public class LogAspect { - - /** * 配置环绕通知,使用在方法logPointcut()上注册的切入点 * diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java index fa297ed..b57f63e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java @@ -26,9 +26,6 @@ public class AsyncLuceneAppender extends AspectLogbackAsyncAppender { } MDC.clear(); } - } - public void appendSync(ILoggingEvent event){ super.append(event); } - } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneAppender.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneAppender.java index 1c17b2d..efa3052 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneAppender.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneAppender.java @@ -68,7 +68,7 @@ public class LuceneAppender extends AppenderBase { if (!map.isEmpty() && StringUtils.isNotEmpty(map.get("traceId"))){ doc.add(new StringField("traceId",map.get("traceId"), Field.Store.YES)); }else { - doc.add(new StringField("traceId", IdUtil.getStringId(), Field.Store.YES)); + doc.add(new StringField("traceId", " ", Field.Store.YES)); } doc.add(new TextField(LogMessageConstant.FIELD_MESSAGE, event.getFormattedMessage(), Field.Store.YES)); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java index 6b57662..924635d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java @@ -1,17 +1,24 @@ package org.nl.config.mybatis; +import com.alibaba.druid.pool.DruidDataSource; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; +import javax.annotation.PostConstruct; +import javax.sql.DataSource; + @EnableTransactionManagement @Configuration public class MybatisPlusConfig { + @Autowired + private DataSource dataSource; /** * 新的分页插件,一缓和二缓遵循mybatis的规则,需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题(该属性会在旧插件移除后一同移除) 添加自增插件 @@ -28,4 +35,10 @@ public class MybatisPlusConfig { return interceptor; } + @PostConstruct + public void datainnit() { + String url = ((DruidDataSource) dataSource).getUrl(); + System.out.println("项目数据库地址:" + url); + } + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java index a535ee9..ab6ce0a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; import java.util.List; -@Component +//@Component @RequiredArgsConstructor @Order(100) public class JobRunner implements ApplicationRunner { diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml index e25cb3a..3341d3e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml @@ -20,7 +20,7 @@ spring: # 超时时间(以秒数为单位) remove-abandoned-timeout: 180 # 获取连接超时时间 - max-wait: 3000 + max-wait: 9000 # 连接有效性检测时间 time-between-eviction-runs-millis: 60000 # 连接在池中最小生存的时间 @@ -156,5 +156,5 @@ sa-token: timeout: 10s lucene: index: - path: D:\lms\lucene\index + path: E:\lms\lucene\index diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml index ab20109..71b8661 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -112,6 +112,6 @@ mybatis-plus: id-type: INPUT lucene: index: - path: D:\lms\lucene\index + path: E:\lms\lucene\index tlog: enable-invoke-time-print: true diff --git a/lms/nladmin-ui/src/utils/request.js b/lms/nladmin-ui/src/utils/request.js index 4136273..9a581a8 100644 --- a/lms/nladmin-ui/src/utils/request.js +++ b/lms/nladmin-ui/src/utils/request.js @@ -35,6 +35,7 @@ service.interceptors.response.use( return response.data }, error => { + console.log(error) // 兼容blob下载出错json提示 if (error.response.data instanceof Blob && error.response.data.type.toLowerCase().indexOf('json') !== -1) { const reader = new FileReader() diff --git a/lms/nladmin-ui/src/views/monitor/log/errorLog.vue b/lms/nladmin-ui/src/views/monitor/log/errorLog.vue deleted file mode 100644 index fbee23f..0000000 --- a/lms/nladmin-ui/src/views/monitor/log/errorLog.vue +++ /dev/null @@ -1,139 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/monitor/log/index.vue b/lms/nladmin-ui/src/views/monitor/log/index.vue deleted file mode 100644 index f37d57a..0000000 --- a/lms/nladmin-ui/src/views/monitor/log/index.vue +++ /dev/null @@ -1,118 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/monitor/log/search.vue b/lms/nladmin-ui/src/views/monitor/log/search.vue deleted file mode 100644 index cc9f175..0000000 --- a/lms/nladmin-ui/src/views/monitor/log/search.vue +++ /dev/null @@ -1,24 +0,0 @@ - - - diff --git a/lms/nladmin-ui/src/views/system/monitor/eslog/view/index.vue b/lms/nladmin-ui/src/views/system/monitor/eslog/view/index.vue index 40e984a..fb5da9a 100644 --- a/lms/nladmin-ui/src/views/system/monitor/eslog/view/index.vue +++ b/lms/nladmin-ui/src/views/system/monitor/eslog/view/index.vue @@ -33,6 +33,14 @@ /> + + + {