diff --git a/src/main/resources/application-user.yaml b/src/main/resources/application-user.yaml deleted file mode 100755 index c07d00d64..000000000 --- a/src/main/resources/application-user.yaml +++ /dev/null @@ -1,25 +0,0 @@ -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 diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 3faf7869c..16cbddf62 100755 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -48,6 +48,9 @@ spring: multipart: max-file-size: 10240MB max-request-size: 10240MB + mvc: + favicon: + enabled: false logging: level: run.halo.app: INFO