diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml deleted file mode 100755 index 3f2d6f807..000000000 --- a/src/main/resources/application-dev.yaml +++ /dev/null @@ -1,57 +0,0 @@ -server: - port: 8090 - use-forward-headers: true - undertow: - io-threads: 2 - worker-threads: 36 - buffer-size: 1024 - directBuffers: true - servlet: - session: - timeout: 86400s -spring: - datasource: - type: com.zaxxer.hikari.HikariDataSource - - # H2database 配置 - driver-class-name: org.h2.Driver - url: jdbc:h2:file:~/halo/halo-dev - 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 - - h2: - console: - settings: - web-allow-others: true - path: /h2-console - enabled: true - jpa: - hibernate: - ddl-auto: update - show-sql: true - freemarker: - allow-request-override: false - cache: false - check-template-location: true - charset: utf-8 - content-type: text/html - expose-request-attributes: false - expose-session-attributes: false - expose-spring-macro-helpers: true - suffix: .ftl - settings: - auto_import: /spring.ftl as spring - servlet: - multipart: - max-file-size: 10MB - max-request-size: 10MB - - # 多语言资源文件路径 - messages: - basename: i18n/messages \ No newline at end of file diff --git a/src/main/resources/application-prod.yaml b/src/main/resources/application-prod.yaml deleted file mode 100755 index d5f36e489..000000000 --- a/src/main/resources/application-prod.yaml +++ /dev/null @@ -1,61 +0,0 @@ -server: - port: 8090 - use-forward-headers: true - undertow: - io-threads: 2 - worker-threads: 36 - buffer-size: 1024 - directBuffers: true - servlet: - session: - timeout: 86400s -spring: - datasource: - type: com.zaxxer.hikari.HikariDataSource - - # H2database 配置 - driver-class-name: org.h2.Driver - url: jdbc:h2:file:~/halo/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 - - h2: - console: - settings: - web-allow-others: true - path: /h2-console - enabled: true - jpa: - hibernate: - ddl-auto: update - show-sql: false - freemarker: - allow-request-override: false - cache: false - check-template-location: true - charset: utf-8 - content-type: text/html - expose-request-attributes: false - expose-session-attributes: false - expose-spring-macro-helpers: true - suffix: .ftl - settings: - auto_import: /spring.ftl as spring - servlet: - multipart: - max-file-size: 10MB - max-request-size: 10MB - - # 多语言资源文件路径 - messages: - basename: i18n/messages -logging: - file: ./logs/log.log - - diff --git a/src/main/resources/application-test.yaml b/src/main/resources/application-test.yaml deleted file mode 100755 index abcb4a717..000000000 --- a/src/main/resources/application-test.yaml +++ /dev/null @@ -1,46 +0,0 @@ -server: - use-forward-headers: true - undertow: - io-threads: 2 - worker-threads: 36 - buffer-size: 1024 - directBuffers: true - servlet: - session: - timeout: 86400s -spring: - datasource: - type: com.zaxxer.hikari.HikariDataSource - # H2database 配置 - driver-class-name: org.h2.Driver - url: jdbc:h2:file:~/halo/halo-test - username: admin - password: 123456 - jpa: - hibernate: - ddl-auto: update - show-sql: true - freemarker: - allow-request-override: false - cache: false - check-template-location: true - charset: utf-8 - content-type: text/html - expose-request-attributes: false - expose-session-attributes: false - expose-spring-macro-helpers: true - suffix: .ftl - settings: - auto_import: /spring.ftl as spring - servlet: - multipart: - max-file-size: 10MB - max-request-size: 10MB - - # 多语言资源文件路径 - messages: - basename: i18n/messages -logging: - file: ./logs/log.log - - diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 90385b2bc..3af830efa 100755 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1,3 +1,59 @@ +server: + port: 8090 + use-forward-headers: true + undertow: + io-threads: 2 + worker-threads: 36 + buffer-size: 1024 + directBuffers: true + servlet: + session: + timeout: 86400s spring: - profiles: - active: prod \ No newline at end of file + datasource: + type: com.zaxxer.hikari.HikariDataSource + + # H2database 配置 + driver-class-name: org.h2.Driver + url: jdbc:h2:file:~/halo/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 + + h2: + console: + settings: + web-allow-others: true + path: /h2-console + enabled: true + jpa: + hibernate: + ddl-auto: update + show-sql: false + freemarker: + allow-request-override: false + cache: false + check-template-location: true + charset: utf-8 + content-type: text/html + expose-request-attributes: false + expose-session-attributes: false + expose-spring-macro-helpers: true + suffix: .ftl + settings: + auto_import: /spring.ftl as spring + servlet: + multipart: + max-file-size: 10MB + max-request-size: 10MB + + # 多语言资源文件路径 + messages: + basename: i18n/messages +logging: + file: ./logs/log.log