Merge pull request #49 from carrypann/develop

 refactor: 修改日志格式 #46

Author: carrypann

devops-boot-project/devops-boot-starters/devops-boot-starter-logging/src/main/resources/logback-spring.xml

@@ -3,13 +3,15 @@
     <include resource="logback/base.xml"/>
     <include resource="logback/appender.xml"/>
 
-    <springProfile name="default, local">
+    <springProfile name="default, local, dev">
         <root level="INFO">
             <appender-ref ref="console"/>
+            <appender-ref ref="app-log"/>
+            <appender-ref ref="error-log"/>
         </root>
     </springProfile>
 
-    <springProfile name="dev, test, prod">
+    <springProfile name="test, prod">
         <root level="INFO">
             <appender-ref ref="app-log"/>
             <appender-ref ref="error-log"/>

devops-boot-project/devops-boot-starters/devops-boot-starter-logging/src/main/resources/logback/appender.xml

@@ -46,4 +46,4 @@
         <discardingThreshold>0</discardingThreshold>
         <neverBlock>false</neverBlock>
     </appender>
-</included>
+</included>

devops-boot-project/devops-boot-starters/devops-boot-starter-web/src/main/resources/common-web.properties

@@ -1,3 +1,4 @@
+spring.output.ansi.enabled=ALWAYS
 management.endpoints.web.exposure.include=*
 management.endpoints.jmx.exposure.exclude=*
 management.endpoint.health.show-details=always

devops-boot-sample/boot-kotlin-sample/src/main/kotlin/com/tencent/devops/sample/KotlinApplication.kt

@@ -1,13 +1,29 @@
 package com.tencent.devops.sample
 
+import org.slf4j.LoggerFactory
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
+import org.springframework.scheduling.annotation.EnableScheduling
+import org.springframework.scheduling.annotation.Scheduled
 
 /**
  * 使用DevOpsBoot框架的Sample应用
  */
+@EnableScheduling
 @SpringBootApplication
-class KotlinApplication
+class KotlinApplication {
+
+    @Scheduled(fixedDelay = 60 * 1000)
+    fun schedule() {
+        logger.debug("debug log")
+        logger.info("info log")
+        logger.error("error log")
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(KotlinApplication::class.java)
+    }
+}
 
 fun main(args: Array<String>) {
     runApplication<KotlinApplication>(*args)

devops-boot-sample/boot-kotlin-sample/src/main/resources/application.yml

@@ -1,3 +1,8 @@
 spring:
   application:
     name: kotlin-sample
+
+logging:
+  level:
+    com.tencent: debug
+