diff --git a/nladmin-system/doc/grafana使用截图.png b/nladmin-system/doc/grafana使用截图.png new file mode 100644 index 0000000..c804416 Binary files /dev/null and b/nladmin-system/doc/grafana使用截图.png differ diff --git a/nladmin-system/nlsso-server/pom.xml b/nladmin-system/nlsso-server/pom.xml index 92dfc2c..10a07cc 100644 --- a/nladmin-system/nlsso-server/pom.xml +++ b/nladmin-system/nlsso-server/pom.xml @@ -32,6 +32,12 @@ + + + com.internetitem + logback-elasticsearch-appender + 1.6 + com.dameng DmJdbcDriver18 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java b/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java index feef8d3..73696fd 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java @@ -1,6 +1,7 @@ package org.nl; import cn.dev33.satoken.annotation.SaIgnore; +import lombok.extern.slf4j.Slf4j; import org.dromara.dynamictp.core.spring.EnableDynamicTp; import org.mybatis.spring.annotation.MapperScan; import org.nl.config.SpringContextHolder; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController; * @author ldjun * @date 2021/2/22 9:20:19 */ +@Slf4j @EnableAsync @RestController @SpringBootApplication(exclude = { @@ -54,6 +56,7 @@ public class AppRun implements ApplicationRunner { @Override public void run(ApplicationArguments args) throws Exception { + log.info("noblelift - 项目启动成功!"); System.out.println("项目启动成功!"); } } diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml index 5e418f1..90884dc 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml @@ -9,6 +9,8 @@ nl: username: root password: 12356 database: nl-platform + es: + address: http://127.0.0.1:9200 redis: ip: 127.0.0.1 port: 6379 diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/nladmin-system/nlsso-server/src/main/resources/config/application.yml index 38d4fa7..e9df79b 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -6,6 +6,9 @@ lucene: index: path: D:\lucene2\index spring: + elasticsearch: + rest: + uris: ${nl.config.es.address} profiles: active: dev autoconfigure: @@ -89,6 +92,12 @@ spring: redis: repositories: enabled: false + elasticsearch: + repositories: + enabled: true + client: + reactive: + endpoints: ${nl.config.es.address} redis: # 数据库索引 host: ${REDIS_HOST:${nl.config.redis.ip}} @@ -279,3 +288,7 @@ sa-token: password: # 连接超时时间 timeout: 10s +management: + health: + elasticsearch: + enabled: false diff --git a/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index 4e9f4a9..90dbf9b 100644 --- a/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -13,7 +13,9 @@ https://juejin.cn/post/6844903775631572999 + + @@ -80,10 +82,58 @@ https://juejin.cn/post/6844903775631572999 500 + + http://127.0.0.1:9200/_bulk + nl_lms + sever + es-logger + es-error-logger + 30000 + false + false + false + 30000 + 3 + 30000 + 250 + false + true + -1 + + + + host + 127.0.0.1 + true + + + severity + %level + + + thread + %thread + + + stacktrace + %ex + + + logger + %logger + + + +
+ Content-Type + application/json +
+
+
- - + +