add:es

lms/nladmin-system/src/main/resources/config/application-dev.yml

@@ -2,16 +2,30 @@ server:
   port: 8010
 #配置数据源
 spring:
+  data:
+    elasticsearch:
+      repositories:
+        enabled: true
+      client:
+        reactive:
+          #endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网
+          endpoints: 47.96.133.178:8200 #外网
+  elasticsearch:
+    rest:
+      #uris: 172.31.185.110:9200,172.31.154.9:9200 #内网
+      uris: 47.96.133.178:8200 #外网
+#      username: elastic
+#      password: 123456
   datasource:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:lms_test2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_tb_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       #      username: ${DB_USER:root}
       username: ${DB_USER:root}
 #      password: ${DB_PWD:123456}
-      password: ${DB_PWD:root}
+      password: ${DB_PWD:942464Yy}
       # 初始连接数
       initial-size: 5
       # 最小连接数
@@ -93,7 +107,7 @@ login:
     # 字体大小
     font-size: 25
 
-#jwt
+#jwt/api/esLog
 jwt:
   header: Authorization
   # 令牌前缀

lms/nladmin-system/src/main/resources/config/application.yml

@@ -83,6 +83,7 @@ security:
     # 参数
     - /api/param/getValueByCode
     - /plumelog/**
+    - /api/esLog/**
 # Sa-Token配置
 sa-token:
   # token 名称 (同时也是cookie名称)

lms/nladmin-system/src/main/resources/logback-spring.xml

@@ -12,7 +12,7 @@ https://juejin.cn/post/6844903775631572999
     <contextName>nlAdmin</contextName>
     <property name="log.charset" value="utf-8"/>
     <property name="log.pattern"
-              value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
+              value="%black(%contextName-) %X{traceId} %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <springProperty scope="context" name="lokiUrl" source="loki.url"/>
     <springProperty scope="context" name="systemName" source="loki.systemName"/>
@@ -49,9 +49,9 @@ https://juejin.cn/post/6844903775631572999
 
 
     <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
-        <url>http://10.1.3.90:9200/_bulk</url>
-        <index>lms_root</index>
-        <type>lms_root</type>
+        <url>http://47.96.133.178:8200/_bulk</url>
+        <index>lms_log</index>
+        <type>lms_log</type>
         <loggerName>es-logger</loggerName> <!-- optional -->
         <errorLoggerName>es-error-logger</errorLoggerName> <!-- optional -->
         <connectTimeout>30000</connectTimeout> <!-- optional (in ms, default 30000) -->
@@ -68,30 +68,33 @@ https://juejin.cn/post/6844903775631572999
         <!--        <authentication class="com.internetitem.logback.elasticsearch.config.BasicAuthentication" /> &lt;!&ndash; optional &ndash;&gt;-->
         <properties>
             <property>
-                <name>host</name>
-                <value>${HOSTNAME}</value>
-                <allowEmpty>false</allowEmpty>
+                <name>trackId</name>
+                <value>%X{trackId}</value>
             </property>
             <property>
-                <name>severity</name>
+                <name>logLevel</name>
                 <value>%level</value>
             </property>
+            <property>
+                <name>requestMethod</name>
+                <value>%X{requestMethod}</value>
+            </property>
+            <property>
+                <name>requestTime</name>
+                <value>%X{requestTime}</value>
+            </property>
+            <property>
+                <name>requestIp</name>
+                <value>%X{requestIp}</value>
+            </property>
             <property>
                 <name>thread</name>
                 <value>%thread</value>
             </property>
-            <property>
-                <name>stacktrace</name>
-                <value>%ex</value>
-            </property>
             <property>
                 <name>logger</name>
                 <value>%logger</value>
             </property>
-            <property>
-                <name>traceId</name>
-                <value>%X{traceId}</value>
-            </property>
         </properties>
         <headers>
             <header>
@@ -133,7 +136,6 @@ https://juejin.cn/post/6844903775631572999
         <root level="debug">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="asyncFileAppender"/>
-            <appender-ref ref="ERROR" />
             <appender-ref ref="esLogAppender" />
         </root>
         <logger name="org.springframework" level="ERROR" additivity="false">