diff --git a/src/main/java/run/halo/app/controller/content/ContentJournalController.java b/src/main/java/run/halo/app/controller/content/ContentJournalController.java index f48c8fa7c..513cb5999 100644 --- a/src/main/java/run/halo/app/controller/content/ContentJournalController.java +++ b/src/main/java/run/halo/app/controller/content/ContentJournalController.java @@ -70,8 +70,8 @@ public class ContentJournalController { */ @GetMapping(value = "page/{page}") public String journals(Model model, - @PathVariable(value = "page") Integer page, - @SortDefault(sort = "createTime", direction = DESC) Sort sort) { + @PathVariable(value = "page") Integer page, + @SortDefault(sort = "createTime", direction = DESC) Sort sort) { log.debug("Requested journal page, sort info: [{}]", sort); int pageSize = optionService.getPostPageSize(); diff --git a/src/main/resources/application-user.yaml b/src/main/resources/application-user.yaml new file mode 100755 index 000000000..65c256ea0 --- /dev/null +++ b/src/main/resources/application-user.yaml @@ -0,0 +1,25 @@ +server: + port: 8090 +spring: + datasource: + type: com.zaxxer.hikari.HikariDataSource + + # H2Database 配置,如果你需要使用 MySQL,请注释掉该配置并取消注释 MySQL 的配置。 + driver-class-name: org.h2.Driver + url: jdbc:h2:file:~/.halo/db/halo + username: admin + password: 123456 + + # MySql 配置,如果你需要使用 H2Database,请注释掉该配置并取消注释上方 H2Database 的配置。 +# 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 + + # H2Database 的控制台相关配置,如果你使用的是 MySQL ,请注释掉下方内容。 + h2: + console: + settings: + web-allow-others: false + path: /h2-console + enabled: false