Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md

Author: netbuffer

README.md

@@ -14,6 +14,7 @@
 * [ResponseEntityExceptionHandler](https://docs.spring.io/spring-framework/docs/5.3.6/javadoc-api/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.html)
 * [requestmapping](https://docs.spring.io/spring-framework/docs/5.3.6/reference/html/web.html#mvc-ann-requestmapping-registration)
 * [hibernate_validator_reference](https://docs.jboss.org/hibernate/validator/6.2/reference/en-US/pdf/hibernate_validator_reference.pdf#validator-gettingstarted)
+* https://docs.docker.com/compose/compose-file/compose-file-v3/#build
 * https://hub.docker.com/_/openjdk
 
 ### server.servlet.session.timeout
@@ -46,10 +47,11 @@ d for days
 
 #### 构建
 1. 先通过maven打包到target目录下
-2. 执行构建指令：docker build -t netbuffer/spring-boot-demo:1.0 .
+2. 执行构建指令：`cd target;docker build -f ../Dockerfile -t netbuffer/spring-boot-demo:1.0 ../` (`docker build -t netbuffer/spring-boot-demo:1.0 .`) 
 
 #### 运行
 * docker run --rm -it -p 9100:9100 netbuffer/spring-boot-demo:1.0
+* docker-compose up (使用docker-compose启动服务)
 
 #### 发布到DockerHub
 > 需要注册DockerHub身份，再docker login登录对应的Registry

docker-compose.yml

@@ -0,0 +1,16 @@
+version: "3.9"
+# 定义服务
+services:
+  spring-boot-demo:
+    build:
+      context: .
+      dockerfile: Dockerfile
+      labels:
+        cn.netbuffer.springboot.demo.description: "spring-boot-demo webapp"
+        cn.netbuffer.springboot.demo.author: "netbuffer"
+        cn.netbuffer.springboot.demo.label-with-empty-value: ""
+    image: netbuffer/spring-boot-demo:1.0
+    ports:
+      - "9100:9100"
+    container_name: spring-boot-demo-container
+    restart: "no"

src/main/java/cn/netbuffer/springboot/demo/SpringBootDemoApplication.java

@@ -6,10 +6,12 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.retry.annotation.EnableRetry;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @Slf4j
 @EnableRetry
 @EnableAsync
+@EnableScheduling
 @SpringBootApplication
 public class SpringBootDemoApplication implements CommandLineRunner {
 

src/main/java/cn/netbuffer/springboot/demo/config/ScheduleTask.java

@@ -0,0 +1,16 @@
+package cn.netbuffer.springboot.demo.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+
+@Slf4j
+@Configuration
+public class ScheduleTask {
+
+    @Scheduled(cron = "0 0 */1 * * ?")
+    public void print(){
+        log.info("print task exec");
+    }
+
+}