From 797cced43a3457355ce4c7d670eb7e0c717cd55b Mon Sep 17 00:00:00 2001 From: MactavishCui Date: Thu, 19 Dec 2024 23:46:36 +0800 Subject: [PATCH] roll back --- dinky-admin/src/main/resources/application-mysql.yml | 6 +++--- dinky-admin/src/main/resources/application.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dinky-admin/src/main/resources/application-mysql.yml b/dinky-admin/src/main/resources/application-mysql.yml index 99be71caa7..6c71564216 100644 --- a/dinky-admin/src/main/resources/application-mysql.yml +++ b/dinky-admin/src/main/resources/application-mysql.yml @@ -17,7 +17,7 @@ spring: datasource: - url: jdbc:mysql://${MYSQL_ADDR:8.130.112.240:3306}/${MYSQL_DATABASE:dinky}?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true - username: ${MYSQL_USERNAME:root} - password: ${MYSQL_PASSWORD:@TryMyBest121217} + url: jdbc:mysql://${MYSQL_ADDR:127.0.0.1:3306}/${MYSQL_DATABASE:dinky}?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + username: ${MYSQL_USERNAME:dinky} + password: ${MYSQL_PASSWORD:dinky} driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/dinky-admin/src/main/resources/application.yml b/dinky-admin/src/main/resources/application.yml index 6ce7f505ac..a65c87a70c 100644 --- a/dinky-admin/src/main/resources/application.yml +++ b/dinky-admin/src/main/resources/application.yml @@ -16,7 +16,7 @@ spring: # If you use pgsql database, please configure pgsql database connection information in application-postgresql.yml # If you use the h2 database, please configure the h2 database connection information in application-h2.yml, # note: the h2 database is only for experience use, and the related data that has been created cannot be migrated, please use it with caution - active: ${DB_ACTIVE:mysql} #[h2,mysql,pgsql] + active: ${DB_ACTIVE:h2} #[h2,mysql,pgsql] include: - jmx - flyway