diff --git a/src/main/java/run/halo/app/Application.java b/src/main/java/run/halo/app/Application.java index 8e05a50be..cac3c1b18 100755 --- a/src/main/java/run/halo/app/Application.java +++ b/src/main/java/run/halo/app/Application.java @@ -18,7 +18,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication @EnableJpaAuditing @EnableScheduling -@EnableJpaRepositories(basePackages = {"run.halo.app.repository"}, repositoryBaseClass = BaseRepositoryImpl.class) +@EnableJpaRepositories(basePackages = "run.halo.app.repository", repositoryBaseClass = BaseRepositoryImpl.class) public class Application { public static void main(String[] args) { diff --git a/src/main/java/run/halo/app/config/SwaggerConfiguration.java b/src/main/java/run/halo/app/config/SwaggerConfiguration.java index 3e6bd62c9..7529d9ea2 100644 --- a/src/main/java/run/halo/app/config/SwaggerConfiguration.java +++ b/src/main/java/run/halo/app/config/SwaggerConfiguration.java @@ -63,7 +63,7 @@ public class SwaggerConfiguration { @Bean public Docket haloDefaultApi() { log.debug("Doc disabled: [{}]", haloProperties.getDocDisabled()); - return buildApiDocket("run.halo.app.default", + return buildApiDocket("run.halo.app.portal.api", "run.halo.app.web.controller.portal.api", "/api/**") .enable(!haloProperties.getDocDisabled()); diff --git a/src/main/java/run/halo/app/model/properties/AttachmentProperties.java b/src/main/java/run/halo/app/model/properties/AttachmentProperties.java index 4ed101221..f2284ad4e 100644 --- a/src/main/java/run/halo/app/model/properties/AttachmentProperties.java +++ b/src/main/java/run/halo/app/model/properties/AttachmentProperties.java @@ -22,7 +22,6 @@ public enum AttachmentProperties implements PropertyEnum { this.type = type; } - @Override public Class getType() { return type; diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml index 52b3dea88..0fa6bb69b 100755 --- a/src/main/resources/application-dev.yaml +++ b/src/main/resources/application-dev.yaml @@ -17,16 +17,16 @@ spring: type: com.zaxxer.hikari.HikariDataSource # H2database 配置 -# driver-class-name: org.h2.Driver -# url: jdbc:h2:file:~/halo-dev/db/halo -# username: admin -# password: 123456 + driver-class-name: org.h2.Driver + url: jdbc:h2:file:~/halo-dev/db/halo + username: admin + password: 123456 #MySql配置 - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/halodb?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai - username: root - password: 123456 +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: jdbc:mysql://127.0.0.1:3306/halodb?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai +# username: root +# password: 123456 h2: console: