diff --git a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile b/ruoyi-extend/ruoyi-monitor-admin/Dockerfile index ef551fec..b506a2dd 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile +++ b/ruoyi-extend/ruoyi-monitor-admin/Dockerfile @@ -3,6 +3,7 @@ FROM anapsix/alpine-java:8_server-jre_unlimited 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 00000000..16bb9376 --- /dev/null +++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback.xml @@ -0,0 +1,34 @@ + + + + logback + + + + + + + ${console.log.pattern} + utf-8 + + + + + ${log.path}.log + + ${log.path}.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + + + + + + \ 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 bf07eedb..e4319110 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 @@ spring: 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 @@ spring: 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 @@ spring: 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 00000000..a9179c6a --- /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 / __ _| |______ | | ___ | |__ ______ / \ __| |_ __ ___ _ _ __ + > < \ \/ / |______| | |/ _ \| '_ \______/ /\ \ / _` | '_ ` _ \| | '_ \ + / . \ > <| | | |__| | (_) | |_) | / ____ \ (_| | | | | | | | | | | +/_/ \_\/_/\_\_| \____/ \___/|_.__/ /_/ \_\__,_|_| |_| |_|_|_| |_|