From 30819dab8469a119e265b5b2756f517e25eff8e9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 10 四月 2023 18:35:15 +0800
Subject: [PATCH] update 优化 更改系统所有服务日志配置文件命名为 logback-plus.xml 避免与其他框架默认配置冲突

---
 ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml |   90 +++++++++++++++++++++-----------------------
 1 files changed, 43 insertions(+), 47 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 bf07eed..6d08292 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,33 +1,30 @@
-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:
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    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
-    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
+  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/
+
+logging:
+  config: classpath:logback-plus.xml
+
+--- # mybatis 閰嶇疆
+mybatis:
+  mapper-locations: classpath:/mybatis-mapper/*Mapper.xml
+
+--- # 椤甸潰閰嶇疆
+spring:
   freemarker:
     charset: UTF-8
     request-context-attribute: request
@@ -35,31 +32,30 @@
       number_format: 0.##########
     suffix: .ftl
     templateLoaderPath: classpath:/templates/
-  mail:
-    from: xx@qq.com
-    host: smtp.qq.com
-    password: XXXXXXXX
-    port: 25
-    properties:
-      mail:
-        smtp:
-          auth: true
-          socketFactory:
-            class: javax.net.ssl.SSLSocketFactory
-          starttls:
-            enable: true
-            required: true
-    username: XXXXXX@qq.com
-  mvc:
-    servlet:
-      load-on-startup: 0
-    static-path-pattern: /static/**
-  resources:
-    static-locations: classpath:/static/
+
+--- # Actuator 鐩戞帶绔偣鐨勯厤缃」
+management:
+  health:
+    mail:
+      enabled: false
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: ALWAYS
+    logfile:
+      external-file: ./logs/ruoyi-xxl-job-admin.log
+
+--- # xxljob绯荤粺閰嶇疆
 xxl:
   job:
-    accessToken: ''
+    # 閴存潈token
+    accessToken: xxl-job
+    # 鍥介檯鍖�
     i18n: zh_CN
+    # 鏃ュ織娓呯悊
     logretentiondays: 30
     triggerpool:
       fast:

--
Gitblit v1.9.3