From caba6fb01ec237fd071dd0d4cb01dac0dc8deb1f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 17 十一月 2021 10:45:58 +0800
Subject: [PATCH] update 调度中心 集成监控客户端 注册到监控中心

---
 ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml      |   17 ++++++++++++++---
 ruoyi-extend/ruoyi-xxl-job-admin/pom.xml                                 |    5 +++++
 ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml |   15 +++++++++++++++
 ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml  |   15 +++++++++++++++
 4 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
index a2b198f..26892d4 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
@@ -71,6 +71,11 @@
 			<version>${mysql-connector-java.version}</version>
 		</dependency>
 
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+        </dependency>
+
 		<!-- xxl-job-core -->
 		<dependency>
 			<groupId>com.xuxueli</groupId>
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml
index 065b342..540a323 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml
@@ -1,3 +1,18 @@
+--- # 鐩戞帶閰嶇疆
+spring:
+  boot:
+    admin:
+      # Spring Boot Admin Client 瀹㈡埛绔殑鐩稿叧閰嶇疆
+      client:
+        # 澧炲姞瀹㈡埛绔紑鍏�
+        enabled: true
+        # 璁剧疆 Spring Boot Admin Server 鍦板潃
+        url: http://localhost:9090/admin
+        instance:
+          prefer-ip: true # 娉ㄥ唽瀹炰緥鏃讹紝浼樺厛浣跨敤 IP
+        username: ruoyi
+        password: 123456
+
 --- # 鏁版嵁搴撻厤缃�
 spring:
   datasource:
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
index 2994909..bcec9d8 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
@@ -1,3 +1,18 @@
+--- # 鐩戞帶閰嶇疆
+spring:
+  boot:
+    admin:
+      # Spring Boot Admin Client 瀹㈡埛绔殑鐩稿叧閰嶇疆
+      client:
+        # 澧炲姞瀹㈡埛绔紑鍏�
+        enabled: true
+        # 璁剧疆 Spring Boot Admin Server 鍦板潃
+        url: http://172.30.0.90:9090/admin
+        instance:
+          prefer-ip: true # 娉ㄥ唽瀹炰緥鏃讹紝浼樺厛浣跨敤 IP
+        username: ruoyi
+        password: 123456
+
 --- # 鏁版嵁搴撻厤缃�
 spring:
   datasource:
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml
index edafdb0..2022720 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml
@@ -4,6 +4,8 @@
   servlet:
     context-path: /xxl-job-admin
 spring:
+  application:
+    name: ruoyi-xxl-job-admin
   profiles:
     active: @profiles.active@
   mvc:
@@ -28,13 +30,22 @@
     suffix: .ftl
     templateLoaderPath: classpath:/templates/
 
---- # 鐩戞帶閰嶇疆
+--- # Actuator 鐩戞帶绔偣鐨勯厤缃」
 management:
   health:
     mail:
       enabled: false
-  server:
-    base-path: /actuator
+  endpoints:
+    web:
+      # Actuator 鎻愪緵鐨� API 鎺ュ彛鐨勬牴鐩綍銆傞粯璁や负 /actuator
+      base-path: /actuator
+      exposure:
+        # 闇�瑕佸紑鏀剧殑绔偣銆傞粯璁ゅ�煎彧鎵撳紑 health 鍜� info 涓や釜绔偣銆傞�氳繃璁剧疆 * 锛屽彲浠ュ紑鏀炬墍鏈夌鐐广��
+        # 鐢熶骇鐜涓嶅缓璁斁寮�鎵�鏈� 鏍规嵁椤圭洰闇�姹傛斁寮�鍗冲彲
+        include: @endpoints.include@
+  endpoint:
+    logfile:
+      external-file: ./logs/ruoyi-xxl-job-admin.log
 
 --- # xxljob绯荤粺閰嶇疆
 xxl:

--
Gitblit v1.9.3