Browse Source

恢复日志,准备使用Skywalking和ELK追踪收集日志

Huanyi 2 tháng trước cách đây
mục cha
commit
e7dbe4a6da
23 tập tin đã thay đổi với 6 bổ sung528 xóa
  1. 0 2
      pom.xml
  2. 0 25
      ruoyi-auth/src/main/resources/logback-plus-without-file.xml
  3. 0 25
      ruoyi-gateway/src/main/resources/logback-plus-with-file.xml
  4. 0 25
      ruoyi-gateway/src/main/resources/logback-plus-without-file.xml
  5. 0 25
      ruoyi-modules/ruoyi-gen/src/main/resources/logback-plus-with-file.xml
  6. 0 25
      ruoyi-modules/ruoyi-gen/src/main/resources/logback-plus-without-file.xml
  7. 4 1
      ruoyi-modules/ruoyi-gen/src/main/resources/logback-plus.xml
  8. 0 25
      ruoyi-modules/ruoyi-job/src/main/resources/logback-plus-with-file.xml
  9. 0 25
      ruoyi-modules/ruoyi-job/src/main/resources/logback-plus-without-file.xml
  10. 0 25
      ruoyi-modules/ruoyi-resource/src/main/resources/logback-plus-with-file.xml
  11. 0 25
      ruoyi-modules/ruoyi-resource/src/main/resources/logback-plus-without-file.xml
  12. 0 25
      ruoyi-modules/ruoyi-system/src/main/resources/logback-plus-with-file.xml
  13. 0 25
      ruoyi-modules/ruoyi-system/src/main/resources/logback-plus-without-file.xml
  14. 0 25
      ruoyi-modules/ruoyi-workflow/src/main/resources/logback-plus-with-file.xml
  15. 0 25
      ruoyi-modules/ruoyi-workflow/src/main/resources/logback-plus-without-file.xml
  16. 0 25
      ruoyi-visual/ruoyi-monitor/src/main/resources/logback-plus-with-file.xml
  17. 0 25
      ruoyi-visual/ruoyi-monitor/src/main/resources/logback-plus-without-file.xml
  18. 1 1
      ruoyi-visual/ruoyi-seata-server/src/main/resources/application.yml
  19. 0 49
      ruoyi-visual/ruoyi-seata-server/src/main/resources/logback-spring-with-file.xml
  20. 0 49
      ruoyi-visual/ruoyi-seata-server/src/main/resources/logback-spring-without-file.xml
  21. 1 1
      ruoyi-visual/ruoyi-snailjob-server/src/main/resources/application.yml
  22. 0 25
      ruoyi-visual/ruoyi-snailjob-server/src/main/resources/logback-plus-with-file.xml
  23. 0 25
      ruoyi-visual/ruoyi-snailjob-server/src/main/resources/logback-plus-without-file.xml

+ 0 - 2
pom.xml

@@ -75,8 +75,6 @@
                 <nacos.password>nacos</nacos.password>
                 <nacos.discovery.address>192.168.1.118</nacos.discovery.address>
                 <logstash.address>127.0.0.1:4560</logstash.address>
-                <seata.log>logback-spring-without-file.xml</seata.log>
-                <snailjob.log>logback-plus-without-file.xml</snailjob.log>
             </properties>
             <activation>
                 <!-- 默认环境 -->

+ 0 - 25
ruoyi-auth/src/main/resources/logback-plus-without-file.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-<!--    <property name="log.path" value="logs/${project.artifactId}"/>-->
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-<!--    <include resource="logback-common.xml" />-->
-
-    <include resource="logback-logstash.xml" />
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>

+ 0 - 25
ruoyi-gateway/src/main/resources/logback-plus-with-file.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/${project.artifactId}"/>
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-    <include resource="logback-common.xml" />
-
-    <include resource="logback-logstash.xml" />
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>

+ 0 - 25
ruoyi-gateway/src/main/resources/logback-plus-without-file.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-<!--    <property name="log.path" value="logs/${project.artifactId}"/>-->
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-<!--    <include resource="logback-common.xml" />-->
-
-    <include resource="logback-logstash.xml" />
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>

+ 0 - 25
ruoyi-modules/ruoyi-gen/src/main/resources/logback-plus-with-file.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/${project.artifactId}"/>
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-    <include resource="logback-common.xml" />
-
-    <include resource="logback-logstash.xml" />
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>

+ 0 - 25
ruoyi-modules/ruoyi-gen/src/main/resources/logback-plus-without-file.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-<!--    <property name="log.path" value="logs/${project.artifactId}"/>-->
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-<!--    <include resource="logback-common.xml" />-->
-
-    <include resource="logback-logstash.xml" />
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>

+ 4 - 1
ruoyi-auth/src/main/resources/logback-plus-with-file.xml → ruoyi-modules/ruoyi-gen/src/main/resources/logback-plus.xml

@@ -14,10 +14,13 @@
         </encoder>
     </appender>
 
-    <include resource="logback-common.xml" />
+<!--    <include resource="logback-common.xml" />-->
 
     <include resource="logback-logstash.xml" />
 
+    <!-- 开启 skywalking 日志收集 -->
+    <include resource="logback-skylog.xml" />
+
     <!--系统操作日志-->
     <root level="info">
         <appender-ref ref="console"/>

+ 0 - 25
ruoyi-modules/ruoyi-job/src/main/resources/logback-plus-with-file.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/${project.artifactId}"/>
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-    <include resource="logback-common.xml" />
-
-    <include resource="logback-logstash.xml" />
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>

+ 0 - 25
ruoyi-modules/ruoyi-job/src/main/resources/logback-plus-without-file.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-<!--    <property name="log.path" value="logs/${project.artifactId}"/>-->
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-<!--    <include resource="logback-common.xml" />-->
-
-    <include resource="logback-logstash.xml" />
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>

+ 0 - 25
ruoyi-modules/ruoyi-resource/src/main/resources/logback-plus-with-file.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/${project.artifactId}"/>
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-    <include resource="logback-common.xml" />
-
-    <include resource="logback-logstash.xml" />
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>

+ 0 - 25
ruoyi-modules/ruoyi-resource/src/main/resources/logback-plus-without-file.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-<!--    <property name="log.path" value="logs/${project.artifactId}"/>-->
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-<!--    <include resource="logback-common.xml" />-->
-
-    <include resource="logback-logstash.xml" />
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>

+ 0 - 25
ruoyi-modules/ruoyi-system/src/main/resources/logback-plus-with-file.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/${project.artifactId}"/>
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-    <include resource="logback-common.xml" />
-
-    <include resource="logback-logstash.xml" />
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>

+ 0 - 25
ruoyi-modules/ruoyi-system/src/main/resources/logback-plus-without-file.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-<!--    <property name="log.path" value="logs/${project.artifactId}"/>-->
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-<!--    <include resource="logback-common.xml" />-->
-
-    <include resource="logback-logstash.xml" />
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>

+ 0 - 25
ruoyi-modules/ruoyi-workflow/src/main/resources/logback-plus-with-file.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/${project.artifactId}"/>
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-    <include resource="logback-common.xml" />
-
-    <include resource="logback-logstash.xml" />
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>

+ 0 - 25
ruoyi-modules/ruoyi-workflow/src/main/resources/logback-plus-without-file.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-<!--    <property name="log.path" value="logs/${project.artifactId}"/>-->
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-<!--    <include resource="logback-common.xml" />-->
-
-    <include resource="logback-logstash.xml" />
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>

+ 0 - 25
ruoyi-visual/ruoyi-monitor/src/main/resources/logback-plus-with-file.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/${project.artifactId}"/>
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-    <include resource="logback-common.xml" />
-
-    <include resource="logback-logstash.xml" />
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>

+ 0 - 25
ruoyi-visual/ruoyi-monitor/src/main/resources/logback-plus-without-file.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-<!--    <property name="log.path" value="logs/${project.artifactId}"/>-->
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-<!--    <include resource="logback-common.xml" />-->
-
-    <include resource="logback-logstash.xml" />
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>

+ 1 - 1
ruoyi-visual/ruoyi-seata-server/src/main/resources/application.yml

@@ -11,7 +11,7 @@ spring:
     active: @profiles.active@
 
 logging:
-  config: classpath:@seata.log@
+  config: classpath:logback-spring.xml
   file:
     path: ./logs/seata
 #  extend:

+ 0 - 49
ruoyi-visual/ruoyi-seata-server/src/main/resources/logback-spring-with-file.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~  Copyright 1999-2019 Seata.io Group.
-  ~
-  ~  Licensed under the Apache License, Version 2.0 (the "License");
-  ~  you may not use this file except in compliance with the License.
-  ~  You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  -->
-
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- Context listeners -->
-    <contextListener class="org.apache.seata.server.logging.listener.SystemPropertyLoggerContextListener"/>
-    <!-- common properties -->
-    <springProperty name="PORT" source="server.port" defaultValue="7091"/>
-    <springProperty name="APPLICATION_NAME" source="spring.application.name" defaultValue="seata-server"/>
-
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/${project.artifactId}"/>
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-    <include resource="logback-common.xml" />
-
-    <include resource="logback-logstash.xml" />
-
-    <!-- 开启 skywalking 日志收集 -->
-    <include resource="logback-skylog.xml" />
-
-    <root level="INFO">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>

+ 0 - 49
ruoyi-visual/ruoyi-seata-server/src/main/resources/logback-spring-without-file.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~  Copyright 1999-2019 Seata.io Group.
-  ~
-  ~  Licensed under the Apache License, Version 2.0 (the "License");
-  ~  you may not use this file except in compliance with the License.
-  ~  You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  -->
-
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- Context listeners -->
-    <contextListener class="org.apache.seata.server.logging.listener.SystemPropertyLoggerContextListener"/>
-    <!-- common properties -->
-    <springProperty name="PORT" source="server.port" defaultValue="7091"/>
-    <springProperty name="APPLICATION_NAME" source="spring.application.name" defaultValue="seata-server"/>
-
-    <!-- 日志存放路径 -->
-<!--    <property name="log.path" value="logs/${project.artifactId}"/>-->
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-<!--    <include resource="logback-common.xml" />-->
-
-    <include resource="logback-logstash.xml" />
-
-    <!-- 开启 skywalking 日志收集 -->
-    <include resource="logback-skylog.xml" />
-
-    <root level="INFO">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>

+ 1 - 1
ruoyi-visual/ruoyi-snailjob-server/src/main/resources/application.yml

@@ -25,7 +25,7 @@ mybatis-plus:
     cache-enabled: true
 
 logging:
-  config: classpath:@snailjob.log@
+  config: classpath:logback-plus.xml
 
 management:
   endpoints:

+ 0 - 25
ruoyi-visual/ruoyi-snailjob-server/src/main/resources/logback-plus-with-file.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/${project.artifactId}"/>
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-    <include resource="logback-common.xml" />
-
-    <include resource="logback-logstash.xml" />
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>

+ 0 - 25
ruoyi-visual/ruoyi-snailjob-server/src/main/resources/logback-plus-without-file.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-<!--    <property name="log.path" value="logs/${project.artifactId}"/>-->
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-<!--    <include resource="logback-common.xml" />-->
-
-    <include resource="logback-logstash.xml" />
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>