From 208c8758682955a86419555b2eb020af1a77cccf Mon Sep 17 00:00:00 2001
From: Tim <nagisa12164@163.com>
Date: Mon, 29 Sep 2025 10:42:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4compose=E4=B8=AD?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=A3=B0=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example               |  6 +++---
 docker/docker-compose.yaml | 17 +----------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/.env.example b/.env.example
index 197b29a0e..038182d43 100644
--- a/.env.example
+++ b/.env.example
@@ -28,9 +28,9 @@ REDIS_HOST=redis
 REDIS_DATABASE=0
 
 # === RabbitMQ Configuration ===
-RABBITMQ_HOST=rabbitmq
-RABBITMQ_USERNAME=openisle
-RABBITMQ_PASSWORD=openisle_password
+RABBITMQ_HOST=localhost
+RABBITMQ_USERNAME=guest
+RABBITMQ_PASSWORD=guest
 
 # === Backend Application Secrets ===
 JWT_SECRET=change-me-jwt-secret
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 58c0e1150..29c8b432a 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -6,11 +6,6 @@ services:
     restart: always
     env_file:
       - ../.env
-    environment:
-      MYSQL_DATABASE: ${MYSQL_DATABASE}
-      MYSQL_USER: ${MYSQL_USER}
-      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
     ports:
       - "${MYSQL_PORT:-3306}:3306"
     volumes:
@@ -62,9 +57,6 @@ services:
     restart: unless-stopped
     env_file:
       - ../.env
-    environment:
-      RABBITMQ_DEFAULT_USER: ${RABBITMQ_USERNAME}
-      RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD}
     ports:
       - "${RABBITMQ_PORT:-5672}:5672"
       - "${RABBITMQ_MANAGEMENT_PORT:-15672}:15672"
@@ -102,6 +94,7 @@ services:
       - mysql
       - redis
       - rabbitmq
+      - websocket-service
     command: mvn clean spring-boot:run -Dmaven.test.skip=true
     networks:
       - openisle-network
@@ -112,14 +105,6 @@ services:
     working_dir: /app
     env_file:
       - ../.env
-    environment:
-      SERVER_PORT: ${WEBSOCKET_PORT}
-      RABBITMQ_HOST: ${RABBITMQ_HOST}
-      RABBITMQ_PORT: ${RABBITMQ_PORT}
-      RABBITMQ_USERNAME: ${RABBITMQ_USERNAME}
-      RABBITMQ_PASSWORD: ${RABBITMQ_PASSWORD}
-      JWT_SECRET: ${JWT_SECRET}
-      WEBSITE_URL: ${WEBSITE_URL}
     ports:
       - "${WEBSOCKET_PORT:-8082}:${WEBSOCKET_PORT:-8082}"
     volumes: