From 8c35219569635d86242b4d96996e5148b8c5acf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Sat, 11 May 2024 15:54:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config-example.txt |  4 ++--
 docker-compose.yml | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config-example.txt b/config-example.txt
index cf22e0c..8a894f8 100644
--- a/config-example.txt
+++ b/config-example.txt
@@ -13,10 +13,10 @@ VOLUME_DIR=/data/dataease
 TZ=Asia/Shanghai
 
 # MySQL
-DB_HOST=mysql-de
+DB_HOST=mysql
 DB_PORT=3306
 DB_USER=root
-DB_PASSWORD=Password123@mysql
+DB_PASSWORD=nu4x599Wq7u0Bn8EABh3J91G
 DB_NAME=dataease
 
 # Web
diff --git a/docker-compose.yml b/docker-compose.yml
index d6c1b4c..01a870c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,14 +1,14 @@
 services:
-  mysql-de:
+  mysql:
     image: mariadb:10.6
     container_name: de_mysql
     restart: always
     environment:
       TZ: ${TZ:-Asia/Shanghai}
-      MARIADB_DATABASE: $DB_NAME
-      MARIADB_ROOT_PASSWORD: $DB_PASSWORD
+      MARIADB_DATABASE: ${DB_NAME:-dataease}
+      MARIADB_ROOT_PASSWORD: ${DB_PASSWORD:-nu4x599Wq7u0Bn8EABh3J91G}
     volumes:
-      - ${VOLUME_DIR}/mariadb/data:/var/lib/mysql
+      - ${VOLUME_DIR:-./data}/mariadb/data:/var/lib/mysql
     healthcheck:
       test: "mysql -h127.0.0.1 -uroot -p$$MARIADB_ROOT_PASSWORD -e 'SHOW DATABASES;'"
       interval: 10s
@@ -18,17 +18,17 @@ services:
     networks:
       - net
 
-  core-de:
+  core:
     image: wojiushixiaobai/dataease:${VERSION:-latest}
     container_name: de_core
     restart: always
     environment:
       TZ: ${TZ:-Asia/Shanghai}
-      DB_HOST: ${DB_HOST:-mysql-de}
+      DB_HOST: ${DB_HOST:-mysql}
       DB_PORT: ${DB_PORT:-3306}
       DB_NAME: ${DB_NAME:-dataease}
       DB_USER: ${DB_USER:-root}
-      DB_PASSWORD: ${DB_PASSWORD:-Password123@mysql}
+      DB_PASSWORD: ${DB_PASSWORD:-nu4x599Wq7u0Bn8EABh3J91G}
     ports:
       - ${HTTP_PORT:-8100}:8100
     volumes:
@@ -42,7 +42,7 @@ services:
       retries: 3
       start_period: 90s
     depends_on:
-      mysql-de:
+      mysql:
         condition: service_healthy
     networks:
       - net