From a27460b582edb2572a99e4c893532143c4f542e9 Mon Sep 17 00:00:00 2001 From: xxssyyyyssxx <xxssyyyyssxx@126.com> Date: Tue, 9 Nov 2021 19:56:22 +0800 Subject: [PATCH] =?UTF-8?q?activiti=E8=87=AA=E5=8A=A8=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=A1=A8=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 2 +- src/main/resources/application-local.properties | 2 +- src/main/resources/application-pretest.properties | 2 +- src/main/resources/application-prod.properties | 2 +- src/main/resources/application-sit.properties | 2 +- src/main/resources/application.properties | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 53fa026..6c366a6 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,5 +1,5 @@ spring.datasource.url=jdbc:mysql://117.174.24.18:3306/fourcal?\ -characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&rewriteBatchedStatements=true +characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true spring.datasource.username=root spring.datasource.password=zytx123!@# diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 4d654fa..5aeb99b 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -1,5 +1,5 @@ spring.datasource.url=jdbc:mysql://localhost:3306/fourcal?\ -characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&rewriteBatchedStatements=true +characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true spring.datasource.username=root spring.datasource.password=123456 diff --git a/src/main/resources/application-pretest.properties b/src/main/resources/application-pretest.properties index abc9107..04d3b21 100644 --- a/src/main/resources/application-pretest.properties +++ b/src/main/resources/application-pretest.properties @@ -1,5 +1,5 @@ spring.datasource.url=jdbc:mysql://120.27.128.207:3306/fourcal?\ - characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&rewriteBatchedStatements=true + characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true spring.datasource.username=root spring.datasource.password=zytx123!@# diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index b691e91..f9306b6 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -1,5 +1,5 @@ spring.datasource.url=jdbc:mysql://172.34.31.145:3306/fourcal?\ - characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&rewriteBatchedStatements=true + characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true spring.datasource.username=fourcal spring.datasource.password=Qwer123!@#$ diff --git a/src/main/resources/application-sit.properties b/src/main/resources/application-sit.properties index 392f369..43c9c8b 100644 --- a/src/main/resources/application-sit.properties +++ b/src/main/resources/application-sit.properties @@ -1,5 +1,5 @@ spring.datasource.url=jdbc:mysql://127.0.0.1:3306/fourcal?\ - characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&rewriteBatchedStatements=true + characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true spring.datasource.username=root spring.datasource.password=zytx123!@# diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7b938b9..b89f14a 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,7 +2,7 @@ spring.application.name=fourcal server.port=8282 server.context-path=/fourcal app.version=0.0.1 -spring.profiles.active=dev +spring.profiles.active=local spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver