style: collate configuration files. (#540)

pull/550/head
Ryan Wang 2020-02-02 16:09:53 +08:00 committed by GitHub
parent e40de371d1
commit 32ed3a9a11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 14 deletions

View File

@ -3,7 +3,6 @@ server:
forward-headers-strategy: native
compression:
enabled: false
mime-types: application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain
spring:
jackson:
date-format: yyyy-MM-dd HH:mm:ss
@ -13,13 +12,13 @@ spring:
datasource:
type: com.zaxxer.hikari.HikariDataSource
# H2 Database 配置
# H2 database configuration.
driver-class-name: org.h2.Driver
url: jdbc:h2:file:~/halo-dev/db/halo
username: admin
password: 123456
# MySQL 配置
# MySQL database configuration.
# driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://127.0.0.1:3306/halo_dev?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
# username: root

View File

@ -1,25 +1,37 @@
server:
port: 8090
# Response data gzip.
compression:
enabled: false
spring:
datasource:
type: com.zaxxer.hikari.HikariDataSource
# H2 Database 配置,如果你需要使用 MySQL请注释掉该配置并取消注释 MySQL 的配置。
# H2 database configuration.
driver-class-name: org.h2.Driver
url: jdbc:h2:file:~/.halo/db/halo
username: admin
password: 123456
# MySQL 配置,如果你需要使用 H2 Database请注释掉该配置并取消注释上方 H2 Database 的配置。
# MySQL database configuration.
# driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://127.0.0.1:3306/halodb?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
# username: root
# password: 123456
# H2 Database 的控制台相关配置,如果你使用的是 MySQL ,请注释掉下方内容。
# H2 database console configuration.
h2:
console:
settings:
web-allow-others: false
path: /h2-console
enabled: false
halo:
# Your admin client path is https://your-domain/{admin-path}
admin-path: admin
# memory or level
cache: memory

View File

@ -3,7 +3,6 @@ server:
forward-headers-strategy: native
compression:
enabled: false
mime-types: application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain
spring:
jackson:
date-format: yyyy-MM-dd HH:mm:ss
@ -15,17 +14,17 @@ spring:
datasource:
type: com.zaxxer.hikari.HikariDataSource
# H2 Database 配置
# H2 database configuration.
driver-class-name: org.h2.Driver
url: jdbc:h2:file:~/.halo/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&allowPublicKeyRetrieval=true
# username: root
# password: 123456
# MySQL database configuration.
# driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://127.0.0.1:3306/halodb?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
# username: root
# password: 123456
h2:
console: