From 11c2235472ed9dc4ac2b72fd95fa3bd158b819b3 Mon Sep 17 00:00:00 2001 From: keliang Date: Thu, 7 Dec 2023 12:20:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8E=AF=E5=A2=83=E5=8F=98?= =?UTF-8?q?=E9=87=8F=20MYSQLDB=5FNAME=20=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-docker/dbswitch/dbswitch-release/conf/application.yml | 4 ++-- build-docker/install/docker-compose.yml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build-docker/dbswitch/dbswitch-release/conf/application.yml b/build-docker/dbswitch/dbswitch-release/conf/application.yml index bd0e402e..62b3ee7a 100644 --- a/build-docker/dbswitch/dbswitch-release/conf/application.yml +++ b/build-docker/dbswitch/dbswitch-release/conf/application.yml @@ -12,7 +12,7 @@ spring: static-path-pattern: /statics/** datasource: driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://${MYSQLDB_HOST:dbswitch_mysqldb}:${MYSQLDB_PORT:3306}/dbswitch?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=UTF8&autoReconnect=true&useSSL=false&allowMultiQueries=true&failOverReadOnly=false&connectTimeout=30000 + url: jdbc:mysql://${MYSQLDB_HOST:dbswitch_mysqldb}:${MYSQLDB_PORT:3306}/${MYSQLDB_NAME:dbswitch}?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=UTF8&autoReconnect=true&useSSL=false&allowMultiQueries=true&failOverReadOnly=false&connectTimeout=30000 username: ${MYSQLDB_USERNAME:tangyibo} password: ${MYSQLDB_PASSWORD:123456} validation-query: SELECT 1 @@ -32,4 +32,4 @@ mybatis: dbswitch: configuration: - drivers-base-path: ${APP_DRIVERS_PATH} \ No newline at end of file + drivers-base-path: ${APP_DRIVERS_PATH} diff --git a/build-docker/install/docker-compose.yml b/build-docker/install/docker-compose.yml index af4870f8..3934d291 100644 --- a/build-docker/install/docker-compose.yml +++ b/build-docker/install/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3.3' services: mysqldb: container_name: dbswitch_mysqldb @@ -25,6 +24,7 @@ services: MYSQLDB_PORT: 3306 MYSQLDB_USERNAME: tangyibo MYSQLDB_PASSWORD: 123456 + MYSQLDB_NAME: dbswitch volumes: - /tmp:/tmp ports: @@ -32,4 +32,3 @@ services: depends_on: mysqldb: condition: service_healthy -