Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

lms/nladmin-system/pom.xml

@@ -63,7 +63,15 @@
             <artifactId>ik-analyzer</artifactId>
             <version>8.2.0</version>
         </dependency>
-
+<!---->
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
         <!--支持中文分词  -->
         <dependency>
             <groupId>org.apache.lucene</groupId>

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

@@ -44,7 +44,8 @@ spring:
         reset-enable: false
       filters:
         DruidFilter,stat
-#        stat:
+#      query-timeout: 1
+  #        stat:
 #          enabled: true
 #          # 记录慢SQL
 #          log-slow-sql: true
@@ -173,3 +174,20 @@ es:
 lucene:
   index:
     path: D:\lms\lucene\index
+management:
+  endpoints:
+    web:
+      exposure:
+        include: prometheus
+      base-path: /metrics
+  metrics:
+    prometheus:
+      enabled: true
+    enable:
+      process: false
+      integration: false
+      uptime: false
+      jdbc: false
+      system: false
+      jvm: false
+      logback: false