From 5b98022ed2e07e251d410795258ea6acb6145fa8 Mon Sep 17 00:00:00 2001 From: ZhangJian He Date: Thu, 2 Mar 2023 15:57:00 +0800 Subject: [PATCH] Move mysql specify config to github profile --- .../src/main/resources/application-github.properties | 1 + apollo-common/src/main/resources/application.yaml | 4 ---- .../src/main/resources/application-github.properties | 1 + .../src/main/resources/application-github.properties | 1 + 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apollo-adminservice/src/main/resources/application-github.properties b/apollo-adminservice/src/main/resources/application-github.properties index 3312cef3cb0..4f4e34d881c 100644 --- a/apollo-adminservice/src/main/resources/application-github.properties +++ b/apollo-adminservice/src/main/resources/application-github.properties @@ -14,6 +14,7 @@ # limitations under the License. # # DataSource +spring.datasource.hikari.connection-init-sql = SET NAMES utf8mb4 spring.datasource.url = ${spring_datasource_url} spring.datasource.username = ${spring_datasource_username} spring.datasource.password = ${spring_datasource_password} diff --git a/apollo-common/src/main/resources/application.yaml b/apollo-common/src/main/resources/application.yaml index 470372bbd90..73d2c04326d 100644 --- a/apollo-common/src/main/resources/application.yaml +++ b/apollo-common/src/main/resources/application.yaml @@ -31,10 +31,6 @@ spring: mvc: converters: preferred-json-mapper: gson - # DataSource - datasource: - hikari: - connectionInitSql: set names utf8mb4 # Tomcat configuration server: diff --git a/apollo-configservice/src/main/resources/application-github.properties b/apollo-configservice/src/main/resources/application-github.properties index 3312cef3cb0..4f4e34d881c 100644 --- a/apollo-configservice/src/main/resources/application-github.properties +++ b/apollo-configservice/src/main/resources/application-github.properties @@ -14,6 +14,7 @@ # limitations under the License. # # DataSource +spring.datasource.hikari.connection-init-sql = SET NAMES utf8mb4 spring.datasource.url = ${spring_datasource_url} spring.datasource.username = ${spring_datasource_username} spring.datasource.password = ${spring_datasource_password} diff --git a/apollo-portal/src/main/resources/application-github.properties b/apollo-portal/src/main/resources/application-github.properties index 3312cef3cb0..4f4e34d881c 100644 --- a/apollo-portal/src/main/resources/application-github.properties +++ b/apollo-portal/src/main/resources/application-github.properties @@ -14,6 +14,7 @@ # limitations under the License. # # DataSource +spring.datasource.hikari.connection-init-sql = SET NAMES utf8mb4 spring.datasource.url = ${spring_datasource_url} spring.datasource.username = ${spring_datasource_username} spring.datasource.password = ${spring_datasource_password}