From a6b682e820164a40b1edb9d6ba1dab937cbcab00 Mon Sep 17 00:00:00 2001 From: maxiuxiang Date: Sat, 12 Oct 2024 11:32:13 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=80=9A=E7=94=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/RocketMqAutoConfiguration.java | 4 --- .../resources/application-local.properties | 33 ++++++++++++++---- .../resources/application-online.properties | 33 +++++++++++++++--- .../resources/application-remote.properties | 34 ++++++++++++++++--- 4 files changed, 84 insertions(+), 20 deletions(-) diff --git a/template/common/src/main/java/{{.packagePath}}/common/config/RocketMqAutoConfiguration.java b/template/common/src/main/java/{{.packagePath}}/common/config/RocketMqAutoConfiguration.java index 67ba7b0..f97713e 100644 --- a/template/common/src/main/java/{{.packagePath}}/common/config/RocketMqAutoConfiguration.java +++ b/template/common/src/main/java/{{.packagePath}}/common/config/RocketMqAutoConfiguration.java @@ -1,9 +1,5 @@ package {{ .package }}.common.config; -import io.micrometer.core.instrument.Clock; -import io.micrometer.core.instrument.MeterRegistry; -import io.micrometer.core.instrument.MockClock; -import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import javax.annotation.Resource; diff --git a/template/entrance/web/src/main/resources/application-local.properties b/template/entrance/web/src/main/resources/application-local.properties index 39bcb77..f23ffd1 100644 --- a/template/entrance/web/src/main/resources/application-local.properties +++ b/template/entrance/web/src/main/resources/application-local.properties @@ -7,15 +7,36 @@ cross.domain.headers= base.package={{.groupId}} mock.enabled=true -# datasource -spring.datasource.url=jdbc:mysql://${DB_HOST:10.0.2.201:3306}/${DB_DATABASE:hande_test}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai -spring.datasource.username=${DB_USER:hande_test_user} -spring.datasource.password=${DB_PASSWORD:Yu0FvhjUQDGdnmm5} -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +# ????? +#datasource +{{- if eq .dbType "oracle" }} +spring.datasource.url=jdbc:oracle:thin:@//{{ .dbHost }}:{{ .dbPort }}/ORCLCDB +{{- else if eq .dbType "postgresql" }} +spring.datasource.url=jdbc:postgresql://{{ .dbHost }}:{{ .dbPort }}/{{ .dbDatabase }}?useUnicode=true&characterEncoding=utf8&autoReconnect=true&stringtype=unspecified +{{- else if eq .dbType "oracle" }} +spring.datasource.url=jdbc:{{ .dbType }}://{{ .dbHost }}:{{ .dbPort }}/{{ .dbDatabase }}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai +{{- end }} +spring.datasource.username={{ .dbUsername }} +spring.datasource.password={{ .dbPassword }} spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource + +# Druid Data Source Config +{{- if eq .dbType "mysql" }} +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +{{- else if eq .dbType "postgresql" }} +spring.datasource.driver-class-name=org.postgresql.Driver +vs.sqlmapper.dialect=postgresql +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +{{- else if eq .dbType "oracle" }} +spring.datasource.driver-class-name=oracle.jdbc.OracleDriver +hibernate.dialect=org.hibernate.dialect.Oracle10gDialect +hibernate.show_sql=true +vs.sqlmapper.dialect=oracle +vs.sqlmapper.showSql=true +{{- end }} spring.datasource.tomcat.max-age=3600000 spring.jpa.open-in-view=false -management.metrics.export.simple.enabled=false spring.redis.host=${REDIS_HOST:redis.byteawake.com} diff --git a/template/entrance/web/src/main/resources/application-online.properties b/template/entrance/web/src/main/resources/application-online.properties index 6795314..32900e7 100644 --- a/template/entrance/web/src/main/resources/application-online.properties +++ b/template/entrance/web/src/main/resources/application-online.properties @@ -6,14 +6,37 @@ cross.domain.headers= #spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration base.package={{.groupId}} -# datasource -spring.datasource.url=jdbc:mysql://${DB_HOST:10.0.2.201:3306}/${DB_DATABASE:hande_test}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai -spring.datasource.username=${DB_USER:hande_test_user} -spring.datasource.password=${DB_PASSWORD:Yu0FvhjUQDGdnmm5} -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +# ????? +#datasource +{{- if eq .dbType "oracle" }} +spring.datasource.url=jdbc:oracle:thin:@//{{ .dbHost }}:{{ .dbPort }}/ORCLCDB +{{- else if eq .dbType "postgresql" }} +spring.datasource.url=jdbc:postgresql://{{ .dbHost }}:{{ .dbPort }}/{{ .dbDatabase }}?useUnicode=true&characterEncoding=utf8&autoReconnect=true&stringtype=unspecified +{{- else if eq .dbType "oracle" }} +spring.datasource.url=jdbc:{{ .dbType }}://{{ .dbHost }}:{{ .dbPort }}/{{ .dbDatabase }}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai +{{- end }} +spring.datasource.username={{ .dbUsername }} +spring.datasource.password={{ .dbPassword }} spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource + +# Druid Data Source Config +{{- if eq .dbType "mysql" }} +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +{{- else if eq .dbType "postgresql" }} +spring.datasource.driver-class-name=org.postgresql.Driver +vs.sqlmapper.dialect=postgresql +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +{{- else if eq .dbType "oracle" }} +spring.datasource.driver-class-name=oracle.jdbc.OracleDriver +hibernate.dialect=org.hibernate.dialect.Oracle10gDialect +hibernate.show_sql=true +vs.sqlmapper.dialect=oracle +vs.sqlmapper.showSql=true +{{- end }} spring.datasource.tomcat.max-age=3600000 spring.jpa.open-in-view=false +spring.redis.host=${REDIS_HOST:redis.byteawake.com} # flyway spring.flyway.enabled=false diff --git a/template/entrance/web/src/main/resources/application-remote.properties b/template/entrance/web/src/main/resources/application-remote.properties index f8e11bb..938f2be 100644 --- a/template/entrance/web/src/main/resources/application-remote.properties +++ b/template/entrance/web/src/main/resources/application-remote.properties @@ -6,14 +6,38 @@ cross.domain.headers= #spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration base.package={{.groupId}} -# datasource -spring.datasource.url=jdbc:mysql://${DB_HOST:10.0.2.201:3306}/${DB_DATABASE:hande_test}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai -spring.datasource.username=${DB_USER:hande_test_user} -spring.datasource.password=${DB_PASSWORD:Yu0FvhjUQDGdnmm5} -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +# ????? +#datasource +{{- if eq .dbType "oracle" }} +spring.datasource.url=jdbc:oracle:thin:@//{{ .dbHost }}:{{ .dbPort }}/ORCLCDB +{{- else if eq .dbType "postgresql" }} +spring.datasource.url=jdbc:postgresql://{{ .dbHost }}:{{ .dbPort }}/{{ .dbDatabase }}?useUnicode=true&characterEncoding=utf8&autoReconnect=true&stringtype=unspecified +{{- else if eq .dbType "oracle" }} +spring.datasource.url=jdbc:{{ .dbType }}://{{ .dbHost }}:{{ .dbPort }}/{{ .dbDatabase }}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai +{{- end }} +spring.datasource.username={{ .dbUsername }} +spring.datasource.password={{ .dbPassword }} spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource + +# Druid Data Source Config +{{- if eq .dbType "mysql" }} +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +{{- else if eq .dbType "postgresql" }} +spring.datasource.driver-class-name=org.postgresql.Driver +vs.sqlmapper.dialect=postgresql +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +{{- else if eq .dbType "oracle" }} +spring.datasource.driver-class-name=oracle.jdbc.OracleDriver +hibernate.dialect=org.hibernate.dialect.Oracle10gDialect +hibernate.show_sql=true +vs.sqlmapper.dialect=oracle +vs.sqlmapper.showSql=true +{{- end }} + spring.datasource.tomcat.max-age=3600000 spring.jpa.open-in-view=false +spring.redis.host=${REDIS_HOST:redis.byteawake.com} # flyway spring.flyway.enabled=false