From 77a849992e777369672e8d712c6c63f3f47a6510 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 17 六月 2023 00:52:19 +0800
Subject: [PATCH] update 优化 powerjob-server 对接 monitor-admin 监控
---
ruoyi-extend/ruoyi-powerjob-server/pom.xml | 7 +
ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-dev.properties | 11 ++
/dev/null | 132 --------------------------
ruoyi-extend/ruoyi-powerjob-server/src/main/resources/logback-plus.xml | 116 +---------------------
ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-prod.properties | 11 ++
ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application.properties | 7 +
6 files changed, 43 insertions(+), 241 deletions(-)
diff --git a/ruoyi-extend/ruoyi-powerjob-server/pom.xml b/ruoyi-extend/ruoyi-powerjob-server/pom.xml
index f771ae9..0a9ce70 100644
--- a/ruoyi-extend/ruoyi-powerjob-server/pom.xml
+++ b/ruoyi-extend/ruoyi-powerjob-server/pom.xml
@@ -11,6 +11,7 @@
<properties>
<spring-boot.version>2.7.12</spring-boot.version>
+ <spring-boot-admin.version>2.7.10</spring-boot-admin.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -34,6 +35,12 @@
</dependency>
<dependency>
+ <groupId>de.codecentric</groupId>
+ <artifactId>spring-boot-admin-starter-client</artifactId>
+ <version>${spring-boot-admin.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
diff --git a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-dev.properties b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-dev.properties
index b3e342e..36dbdfc 100644
--- a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-dev.properties
+++ b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-dev.properties
@@ -8,9 +8,18 @@
spring.datasource.core.maximum-pool-size=20
spring.datasource.core.minimum-idle=5
+# 鐩戞帶閰嶇疆
+# 瀹㈡埛绔紑鍏�
+spring.boot.admin.client.enabled=true
+# 璁剧疆 Spring Boot Admin Server 鍦板潃
+spring.boot.admin.client.url: http://localhost:9090/admin
+spring.boot.admin.client.instance.service-host-type=IP
+spring.boot.admin.client.username=ruoyi
+spring.boot.admin.client.password=123456
+
####### MongoDB properties(Non-core configuration properties) #######
####### delete mongodb config to disable mongodb #######
-#oms.mongodb.enable=true
+oms.mongodb.enable=false
#spring.data.mongodb.uri=mongodb+srv://zqq:No1Bug2Please3!@cluster0.wie54.gcp.mongodb.net/powerjob_daily?retryWrites=true&w=majority
####### Email properties(Non-core configuration properties) #######
diff --git a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-prod.properties b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-prod.properties
index 6316e30..e6a6052 100644
--- a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-prod.properties
+++ b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application-prod.properties
@@ -8,9 +8,18 @@
spring.datasource.core.maximum-pool-size=20
spring.datasource.core.minimum-idle=5
+# 鐩戞帶閰嶇疆
+# 瀹㈡埛绔紑鍏�
+spring.boot.admin.client.enabled=true
+# 璁剧疆 Spring Boot Admin Server 鍦板潃
+spring.boot.admin.client.url: http://localhost:9090/admin
+spring.boot.admin.client.instance.service-host-type=IP
+spring.boot.admin.client.username=ruoyi
+spring.boot.admin.client.password=123456
+
####### MongoDB properties(Non-core configuration properties) #######
####### delete mongodb config to disable mongodb #######
-#oms.mongodb.enable=true
+oms.mongodb.enable=false
#spring.data.mongodb.uri=mongodb+srv://zqq:No1Bug2Please3!@cluster0.wie54.gcp.mongodb.net/powerjob_daily?retryWrites=true&w=majority
####### Email properties(Non-core configuration properties) #######
diff --git a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application.properties b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application.properties
index 7028499..5477c1f 100644
--- a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application.properties
+++ b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/application.properties
@@ -21,3 +21,10 @@
oms.http.port=10010
# Prefix for all tables. Default empty string. Config if you have needs, i.e. pj_
oms.table-prefix=pj_
+
+# Actuator 鐩戞帶绔偣鐨勯厤缃」
+spring.application.name: ruoyi-powerjob-server
+management.endpoints.web.exposure.include=*
+management.endpoint.health.show-details=ALWAYS
+management.endpoint.logfile.external-file=./logs/ruoyi-powerjob-server.log
+management.health.mongo.enabled=${oms.mongodb.enable}
diff --git a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/logback-config/powerjob_monitor.xml b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/logback-config/powerjob_monitor.xml
deleted file mode 100644
index d357a83..0000000
--- a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/logback-config/powerjob_monitor.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0"?>
-<included>
-
- <property name="MONITOR_LOG_PATH" value="${LOG_PATH}/monitors"/>
- <property name="ROTATE_PATTERN" value="%d{yyyy-MM-dd}.%i"/>
-
- <property name="MONITOR_LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS}|%thread|%X{serverId}|%msg%n"/>
-
- <!-- database -->
- <appender name="MONITOR_LOGGER_DB_OPERATION_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${MONITOR_LOG_PATH}/database.log</file>
- <encoder>
- <pattern>${MONITOR_LOG_PATTERN}</pattern>
- <charset>UTF-8</charset>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${MONITOR_LOG_PATH}/database.log.${ROTATE_PATTERN}</fileNamePattern>
- <maxHistory>3</maxHistory>
- <maxFileSize>200MB</maxFileSize>
- <totalSizeCap>1000MB</totalSizeCap>
- </rollingPolicy>
- </appender>
- <appender name="ASYNC_MONITOR_LOGGER_DB_OPERATION_APPENDER" class="ch.qos.logback.classic.AsyncAppender">
- <queueSize>512</queueSize>
- <discardingThreshold>0</discardingThreshold>
- <neverBlock>true</neverBlock>
- <appender-ref ref="MONITOR_LOGGER_DB_OPERATION_APPENDER"/>
- </appender>
- <logger name="MONITOR_LOGGER_DB_OPERATION" level="INFO" additivity="false">
- <appender-ref ref="ASYNC_MONITOR_LOGGER_DB_OPERATION_APPENDER"/>
- </logger>
-
-
- <!-- TtReportInstanceStatusEvent -->
- <appender name="MONITOR_LOGGER_TT_REPORT_STATUS_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${MONITOR_LOG_PATH}/tt_status_report.log</file>
- <encoder>
- <pattern>${MONITOR_LOG_PATTERN}</pattern>
- <charset>UTF-8</charset>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${MONITOR_LOG_PATH}/tt_status_report.log.${ROTATE_PATTERN}</fileNamePattern>
- <maxHistory>3</maxHistory>
- <maxFileSize>200MB</maxFileSize>
- <totalSizeCap>1000MB</totalSizeCap>
- </rollingPolicy>
- </appender>
- <appender name="ASYNC_MONITOR_LOGGER_TT_REPORT_STATUS_APPENDER" class="ch.qos.logback.classic.AsyncAppender">
- <queueSize>512</queueSize>
- <discardingThreshold>0</discardingThreshold>
- <neverBlock>true</neverBlock>
- <appender-ref ref="MONITOR_LOGGER_TT_REPORT_STATUS_APPENDER"/>
- </appender>
- <logger name="MONITOR_LOGGER_TT_REPORT_STATUS" level="INFO" additivity="false">
- <appender-ref ref="ASYNC_MONITOR_LOGGER_TT_REPORT_STATUS_APPENDER"/>
- </logger>
-
- <!-- WorkerHeartbeatEvent -->
- <appender name="MONITOR_LOGGER_WORKER_HEART_BEAT_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${MONITOR_LOG_PATH}/worker_heartbeat.log</file>
- <encoder>
- <pattern>${MONITOR_LOG_PATTERN}</pattern>
- <charset>UTF-8</charset>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${MONITOR_LOG_PATH}/worker_heartbeat.log.${ROTATE_PATTERN}</fileNamePattern>
- <maxHistory>3</maxHistory>
- <maxFileSize>200MB</maxFileSize>
- <totalSizeCap>1000MB</totalSizeCap>
- </rollingPolicy>
- </appender>
- <appender name="ASYNC_MONITOR_LOGGER_WORKER_HEART_BEAT_APPENDER" class="ch.qos.logback.classic.AsyncAppender">
- <queueSize>512</queueSize>
- <discardingThreshold>0</discardingThreshold>
- <neverBlock>true</neverBlock>
- <appender-ref ref="MONITOR_LOGGER_WORKER_HEART_BEAT_APPENDER"/>
- </appender>
- <logger name="MONITOR_LOGGER_WORKER_HEART_BEAT" level="INFO" additivity="false">
- <appender-ref ref="ASYNC_MONITOR_LOGGER_WORKER_HEART_BEAT_APPENDER"/>
- </logger>
-
-
- <!-- WorkerLogReportEvent -->
- <appender name="MONITOR_LOGGER_WORKER_LOG_REPORT_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${MONITOR_LOG_PATH}/worker_log_report.log</file>
- <encoder>
- <pattern>${MONITOR_LOG_PATTERN}</pattern>
- <charset>UTF-8</charset>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${MONITOR_LOG_PATH}/worker_log_report.log.${ROTATE_PATTERN}</fileNamePattern>
- <maxHistory>3</maxHistory>
- <maxFileSize>200MB</maxFileSize>
- <totalSizeCap>1000MB</totalSizeCap>
- </rollingPolicy>
- </appender>
- <appender name="ASYNC_MONITOR_LOGGER_WORKER_LOG_REPORT_APPENDER" class="ch.qos.logback.classic.AsyncAppender">
- <queueSize>512</queueSize>
- <discardingThreshold>0</discardingThreshold>
- <neverBlock>true</neverBlock>
- <appender-ref ref="MONITOR_LOGGER_WORKER_LOG_REPORT_APPENDER"/>
- </appender>
- <logger name="MONITOR_LOGGER_WORKER_LOG_REPORT" level="INFO" additivity="false">
- <appender-ref ref="ASYNC_MONITOR_LOGGER_WORKER_LOG_REPORT_APPENDER"/>
- </logger>
-
-
- <!-- SlowLockEvent -->
- <appender name="MONITOR_LOGGER_SLOW_LOCK_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${MONITOR_LOG_PATH}/lock.log</file>
- <encoder>
- <pattern>${MONITOR_LOG_PATTERN}</pattern>
- <charset>UTF-8</charset>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${MONITOR_LOG_PATH}/lock.log.${ROTATE_PATTERN}</fileNamePattern>
- <maxHistory>3</maxHistory>
- <maxFileSize>200MB</maxFileSize>
- <totalSizeCap>1000MB</totalSizeCap>
- </rollingPolicy>
- </appender>
- <appender name="ASYNC_MONITOR_LOGGER_SLOW_LOCK_APPENDER" class="ch.qos.logback.classic.AsyncAppender">
- <queueSize>512</queueSize>
- <discardingThreshold>0</discardingThreshold>
- <neverBlock>true</neverBlock>
- <appender-ref ref="MONITOR_LOGGER_SLOW_LOCK_APPENDER"/>
- </appender>
- <logger name="MONITOR_LOGGER_SLOW_LOCK" level="INFO" additivity="false">
- <appender-ref ref="ASYNC_MONITOR_LOGGER_SLOW_LOCK_APPENDER"/>
- </logger>
-
-</included>
\ No newline at end of file
diff --git a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/logback-plus.xml b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/logback-plus.xml
index 658aeb0..ad3bfa9 100644
--- a/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/logback-plus.xml
+++ b/ruoyi-extend/ruoyi-powerjob-server/src/main/resources/logback-plus.xml
@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
- <property name="log.path" value="./logs"/>
+<configuration debug="false" scan="true" scanPeriod="1 seconds">
+
+ <contextName>logback</contextName>
+ <property name="log.path" value="./logs/ruoyi-powerjob-server"/>
<property name="console.log.pattern"
value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
<property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>
- <!-- include other logback configs -->
- <include resource="logback-config/powerjob_monitor.xml"/>
-
- <!-- 鎺у埗鍙拌緭鍑� -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${console.log.pattern}</pattern>
@@ -16,117 +14,21 @@
</encoder>
</appender>
- <!-- 鎺у埗鍙拌緭鍑� -->
- <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/sys-console.log</file>
+ <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
- <fileNamePattern>${log.path}/sys-console.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 鏃ュ織鏈�澶� 1澶� -->
- <maxHistory>1</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
- <charset>utf-8</charset>
- </encoder>
- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
- <!-- 杩囨护鐨勭骇鍒� -->
- <level>INFO</level>
- </filter>
- </appender>
-
- <!-- 绯荤粺鏃ュ織杈撳嚭 -->
- <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/sys-info.log</file>
- <!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
- <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <fileNamePattern>${log.path}.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <!-- 杩囨护鐨勭骇鍒� -->
- <level>INFO</level>
- <!-- 鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛� -->
- <onMatch>ACCEPT</onMatch>
- <!-- 涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛� -->
- <onMismatch>DENY</onMismatch>
- </filter>
</appender>
- <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/sys-error.log</file>
- <!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
- <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <!-- 杩囨护鐨勭骇鍒� -->
- <level>ERROR</level>
- <!-- 鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛� -->
- <onMatch>ACCEPT</onMatch>
- <!-- 涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛� -->
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
-
- <!-- info寮傛杈撳嚭 -->
- <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender">
- <!-- 涓嶄涪澶辨棩蹇�.榛樿鐨�,濡傛灉闃熷垪鐨�80%宸叉弧,鍒欎細涓㈠純TRACT銆丏EBUG銆両NFO绾у埆鐨勬棩蹇� -->
- <discardingThreshold>0</discardingThreshold>
- <!-- 鏇存敼榛樿鐨勯槦鍒楃殑娣卞害,璇ュ�间細褰卞搷鎬ц兘.榛樿鍊间负256 -->
- <queueSize>512</queueSize>
- <!-- 娣诲姞闄勫姞鐨刟ppender,鏈�澶氬彧鑳芥坊鍔犱竴涓� -->
- <appender-ref ref="file_info"/>
- </appender>
-
- <!-- error寮傛杈撳嚭 -->
- <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender">
- <!-- 涓嶄涪澶辨棩蹇�.榛樿鐨�,濡傛灉闃熷垪鐨�80%宸叉弧,鍒欎細涓㈠純TRACT銆丏EBUG銆両NFO绾у埆鐨勬棩蹇� -->
- <discardingThreshold>0</discardingThreshold>
- <!-- 鏇存敼榛樿鐨勯槦鍒楃殑娣卞害,璇ュ�间細褰卞搷鎬ц兘.榛樿鍊间负256 -->
- <queueSize>512</queueSize>
- <!-- 娣诲姞闄勫姞鐨刟ppender,鏈�澶氬彧鑳芥坊鍔犱竴涓� -->
- <appender-ref ref="file_error"/>
- </appender>
-
- <!-- 鏁村悎 skywalking 鎺у埗鍙拌緭鍑� tid -->
-<!-- <appender name="console" class="ch.qos.logback.core.ConsoleAppender">-->
-<!-- <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">-->
-<!-- <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">-->
-<!-- <pattern>[%tid] ${console.log.pattern}</pattern>-->
-<!-- </layout>-->
-<!-- <charset>utf-8</charset>-->
-<!-- </encoder>-->
-<!-- </appender>-->
-
- <!-- 鏁村悎 skywalking 鎺ㄩ�侀噰闆嗘棩蹇� -->
-<!-- <appender name="sky_log" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">-->
-<!-- <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">-->
-<!-- <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">-->
-<!-- <pattern>[%tid] ${console.log.pattern}</pattern>-->
-<!-- </layout>-->
-<!-- <charset>utf-8</charset>-->
-<!-- </encoder>-->
-<!-- </appender>-->
-
- <!--绯荤粺鎿嶄綔鏃ュ織-->
<root level="info">
- <appender-ref ref="console" />
- <appender-ref ref="async_info" />
- <appender-ref ref="async_error" />
- <appender-ref ref="file_console" />
-<!-- <appender-ref ref="sky_log"/>-->
+ <appender-ref ref="console"/>
+ <appender-ref ref="file"/>
</root>
</configuration>
--
Gitblit v1.9.3