diff --git a/api/src/main/java/com/databasir/api/config/SecurityConfig.java b/api/src/main/java/com/databasir/api/config/SecurityConfig.java index 839ccf8..6f6cdcb 100644 --- a/api/src/main/java/com/databasir/api/config/SecurityConfig.java +++ b/api/src/main/java/com/databasir/api/config/SecurityConfig.java @@ -51,7 +51,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/oauth2/apps", "/oauth2/authorization/*", "/oauth2/login/*") .permitAll() // 静态资源无需鉴权 - .antMatchers("/", "/*.html", "/js/**", "/css/**", "/img/**", "/*.ico") + .antMatchers("/", "/*.html", "/js/**", "/css/**", "/img/**", "/*.ico", "/live") .permitAll() // api 请求需要授权 .antMatchers("/api/**").authenticated() diff --git a/api/src/main/java/com/databasir/api/config/WebConfig.java b/api/src/main/java/com/databasir/api/config/WebConfig.java index 0e102c9..5e3539a 100644 --- a/api/src/main/java/com/databasir/api/config/WebConfig.java +++ b/api/src/main/java/com/databasir/api/config/WebConfig.java @@ -1,5 +1,6 @@ package com.databasir.api.config; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; @@ -41,6 +42,7 @@ public class WebConfig extends WebMvcConfigurerAdapter { public Jackson2ObjectMapperBuilderCustomizer jsonCustomizer() { final String dateTimeFormat = "yyyy-MM-dd HH:mm:ss"; return builder -> { + builder.serializationInclusion(JsonInclude.Include.NON_NULL); builder.simpleDateFormat(dateTimeFormat); builder.serializers(new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(dateTimeFormat))); builder.deserializers(new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(dateTimeFormat))); diff --git a/docs/README/deploy/docker-deploy.md b/docs/README/deploy/docker-deploy.md index 366d047..f2f5968 100644 --- a/docs/README/deploy/docker-deploy.md +++ b/docs/README/deploy/docker-deploy.md @@ -7,6 +7,13 @@ 1. Docker 2. Mysql +## 测活接口 + +```shell +GET /live +``` +返回 200 即表示启动成功 + ## 部署流程 1. 拉取最新版镜像,当然你也可以将 latest 替换成你想要得版本号,具体有哪些镜像版本可以拉取可以在[这里](https://registry.hub.docker.com/r/vrantt/databasir)查看