From 2b0452207ed14352e66f046475ec9e9b83770722 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:06:42 +0800
Subject: [PATCH] update admin监控增加日志文件输出
---
ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml | 63 ++++++++++++++++++++-----------
ruoyi-extend/ruoyi-monitor-admin/Dockerfile | 1
ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/banner.txt | 8 ++++
ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback.xml | 34 +++++++++++++++++
4 files changed, 83 insertions(+), 23 deletions(-)
diff --git a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile b/ruoyi-extend/ruoyi-monitor-admin/Dockerfile
index ef551fe..b506a2d 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile
+++ b/ruoyi-extend/ruoyi-monitor-admin/Dockerfile
@@ -3,6 +3,7 @@
MAINTAINER Lion Li
RUN mkdir -p /ruoyi/monitor
+RUN mkdir -p /ruoyi/monitor/logs
WORKDIR /ruoyi/monitor
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback.xml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback.xml
new file mode 100644
index 0000000..16bb937
--- /dev/null
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false" scan="true" scanPeriod="1 seconds">
+
+ <contextName>logback</contextName>
+ <property name="log.path" value="./logs/ruoyi-monitor-admin"/>
+ <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"/>
+
+ <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>${console.log.pattern}</pattern>
+ <charset>utf-8</charset>
+ </encoder>
+ </appender>
+
+ <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}.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
+ <maxHistory>60</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ </appender>
+
+ <root level="info">
+ <appender-ref ref="console"/>
+ <appender-ref ref="file"/>
+ </root>
+
+</configuration>
\ No newline at end of file
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 bf07eed..e431911 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
@@ -1,19 +1,27 @@
-management:
- health:
- mail:
- enabled: false
- server:
- servlet:
- context-path: /actuator
-mybatis:
- mapper-locations: classpath:/mybatis-mapper/*Mapper.xml
+--- # server 閰嶇疆
server:
port: 9100
servlet:
context-path: /xxl-job-admin
spring:
+ mvc:
+ servlet:
+ load-on-startup: 0
+ static-path-pattern: /static/**
+ web:
+ resources:
+ static-locations: classpath:/static/
+
+--- # 鏁版嵁搴撻厤缃�
+mybatis:
+ mapper-locations: classpath:/mybatis-mapper/*Mapper.xml
+spring:
datasource:
+ type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
+ username: root
+ password: root
hikari:
auto-commit: true
connection-test-query: SELECT 1
@@ -24,10 +32,9 @@
minimum-idle: 10
pool-name: HikariCP
validation-timeout: 1000
- type: com.zaxxer.hikari.HikariDataSource
- url: jdbc:mysql://localhost:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
- username: root
- password: root
+
+--- # 椤甸潰閰嶇疆
+spring:
freemarker:
charset: UTF-8
request-context-attribute: request
@@ -35,10 +42,14 @@
number_format: 0.##########
suffix: .ftl
templateLoaderPath: classpath:/templates/
+
+--- # 閭欢閰嶇疆
+spring:
mail:
- from: xx@qq.com
+ from: xxx@qq.com
host: smtp.qq.com
- password: XXXXXXXX
+ username: xxx@qq.com
+ password: xxx
port: 25
properties:
mail:
@@ -49,17 +60,23 @@
starttls:
enable: true
required: true
- username: XXXXXX@qq.com
- mvc:
- servlet:
- load-on-startup: 0
- static-path-pattern: /static/**
- resources:
- static-locations: classpath:/static/
+
+--- # 鐩戞帶閰嶇疆
+management:
+ health:
+ mail:
+ enabled: false
+ server:
+ base-path: /actuator
+
+--- # xxljob绯荤粺閰嶇疆
xxl:
job:
- accessToken: ''
+ # 閴存潈token
+ accessToken: xxl-job
+ # 鍥介檯鍖�
i18n: zh_CN
+ # 鏃ュ織娓呯悊
logretentiondays: 30
triggerpool:
fast:
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/banner.txt b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/banner.txt
new file mode 100644
index 0000000..a9179c6
--- /dev/null
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/banner.txt
@@ -0,0 +1,8 @@
+Application Version: ${ruoyi-vue-plus.version}
+Spring Boot Version: ${spring-boot.version}
+__ __ _ _ _ _ _
+\ \ / / | | | | | | /\ | | (_)
+ \ V / __ _| |______ | | ___ | |__ ______ / \ __| |_ __ ___ _ _ __
+ > < \ \/ / |______| | |/ _ \| '_ \______/ /\ \ / _` | '_ ` _ \| | '_ \
+ / . \ > <| | | |__| | (_) | |_) | / ____ \ (_| | | | | | | | | | |
+/_/ \_\/_/\_\_| \____/ \___/|_.__/ /_/ \_\__,_|_| |_| |_|_|_| |_|
--
Gitblit v1.9.3