From 6c1e146bc17c51ed744aa289b20febe339703196 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期一, 11 七月 2022 13:10:41 +0800 Subject: [PATCH] update 优化 docker 部署方式 使用 host 模式简化部署流程 降低使用成本 --- ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml | 68 +++++++++++----------------------- 1 files changed, 22 insertions(+), 46 deletions(-) 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 e431911..d4fda93 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,34 +4,21 @@ servlet: context-path: /xxl-job-admin spring: - mvc: - servlet: - load-on-startup: 0 - static-path-pattern: /static/** - web: - resources: - static-locations: classpath:/static/ + application: + name: ruoyi-xxl-job-admin + profiles: + active: @profiles.active@ + mvc: + servlet: + load-on-startup: 0 + static-path-pattern: /static/** + web: + resources: + static-locations: classpath:/static/ ---- # 鏁版嵁搴撻厤缃� +--- # mybatis 閰嶇疆 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 - connection-timeout: 10000 - idle-timeout: 30000 - max-lifetime: 900000 - maximum-pool-size: 30 - minimum-idle: 10 - pool-name: HikariCP - validation-timeout: 1000 --- # 椤甸潰閰嶇疆 spring: @@ -43,31 +30,20 @@ suffix: .ftl templateLoaderPath: classpath:/templates/ ---- # 閭欢閰嶇疆 -spring: - mail: - from: xxx@qq.com - host: smtp.qq.com - username: xxx@qq.com - password: xxx - port: 25 - properties: - mail: - smtp: - auth: true - socketFactory: - class: javax.net.ssl.SSLSocketFactory - starttls: - enable: true - required: true - ---- # 鐩戞帶閰嶇疆 +--- # Actuator 鐩戞帶绔偣鐨勯厤缃」 management: health: mail: enabled: false - server: - base-path: /actuator + endpoints: + web: + exposure: + include: '*' + endpoint: + health: + show-details: ALWAYS + logfile: + external-file: ./logs/ruoyi-xxl-job-admin.log --- # xxljob绯荤粺閰嶇疆 xxl: -- Gitblit v1.9.3