diff --git a/config/broker.conf b/config/broker.conf
index d6c9767..0d2110a 100644
--- a/config/broker.conf
+++ b/config/broker.conf
@@ -6,4 +6,3 @@ fileReservedTime=48
 brokerRole=ASYNC_MASTER
 flushDiskType=ASYNC_FLUSH
 brokerIP1=192.168.0.116
-namesrvAddr=localhost:9876
diff --git a/docker-compose.yml b/docker-compose.yml
index 3b09780..85c2cda 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,8 @@
 version: '3'
 services: 
   mysql:
-    restart: always
     image: mysql
+    restart: always
     container_name: mysql
     volumes:
       - ../volumes/data/mysqldata:/var/lib/mysql
@@ -38,8 +38,9 @@ services:
     command: redis-server --port 6379 --requirepass lilishop --appendonly yes
 
   elasticsearch:
-    container_name: elasticsearch
     image: elasticsearch:7.3.0
+    restart: always
+    container_name: elasticsearch
     volumes:
       - ../volumes/data/es7/logs:/usr/share/es7/logs:rw
       - ../volumes/data/es7/data:/usr/share/es7/data:rw
@@ -65,6 +66,7 @@ services:
 
   kibana:
     image: docker.elastic.co/kibana/kibana:7.3.0
+    restart: always
     container_name: kibana
     ports:
       - 5601:5601
@@ -77,6 +79,7 @@ services:
 
   logstash:
     image: logstash:7.3.0
+    restart: always
     container_name: logstash
     volumes:
       - ./config/logstash-springboot.conf:/usr/share/logstash/pipeline/logstash.conf #挂载logstash的配置文件
@@ -89,51 +92,56 @@ services:
  # rocket mq name server
   rmqnamesrv:
     image: foxiswho/rocketmq:server
+    restart: always
     container_name: rocket-server
-    network_mode: host
     environment:
       JAVA_OPT_EXT: "-server -Xms64m -Xmx64m -Xmn64m"
-    ports:
-      - 9876:9876
     volumes:
       - ../volumes/data/rocket/server/logs:/opt/logs
       - ../volumes/data/rocket/server/store:/opt/rmqstore
-
+    networks:
+      - rocketmq
+    ports:
+      - 9876:9876
   # rocket mq broker
   rmqbroker:
     image: foxiswho/rocketmq:broker
+    restart: always
     container_name: rocket-broker
-    network_mode: host
-    ports:
-      - 10909:10909
-      - 10911:10911
     volumes:
       - ../volumes/data/rocket/broker/logs:/opt/logs
       - ../volumes/data/rocket/broker/store:/opt/rmqstore
       - ./config/broker.conf:/etc/rocketmq/broker.conf
     environment:
-      - NAMESRV_ADDR=localhost:9876
+      - NAMESRV_ADDR=rmqnamesrv:9876
       - JAVA_OPTS:=-Duser.home=/opt
       - JAVA_OPT_EXT=-server -Xms64m -Xmx64m -Xmn64m
     command: mqbroker -c /etc/rocketmq/broker.conf
     depends_on:
       - rmqnamesrv
+    networks:
+      - rocketmq
+    ports:
+      - 10909:10909
+      - 10911:10911
   # rocket console 这个可以不需要
   rmqconsole:
     image: styletang/rocketmq-console-ng
+    restart: always
     container_name: rocket-console
-    network_mode: host
-    ports:
-      - 8180:8180
     environment:
-      - JAVA_OPTS=-Drocketmq.config.namesrvAddr=localhost:9876 -Dserver.port=8180 -Drocketmq.config.isVIPChannel=false
+      - JAVA_OPTS=-Drocketmq.config.namesrvAddr=rmqnamesrv:9876 -Dserver.port=8180 -Drocketmq.config.isVIPChannel=false
       - JAVA_OPT_EXT=-Xms128m -Xmx128m -Xmn128m
     depends_on:
       - rmqnamesrv
-
+    networks:
+      - rocketmq
+    ports:
+      - 8180:8180
   # xxl-job 分布式调度中心
-  rmqconsole:
+  xxl-job:
     image: xuxueli/xxl-job-admin:2.3.0
+    restart: always
     container_name: xxl-job
     network_mode: host
     environment:
@@ -143,5 +151,8 @@ services:
     volumes:
       - ../volumes/data/xxl-job:/data/applogs
 networks: 
+  rocketmq:
+    driver: bridge
   stack:
     driver: bridge
+
diff --git a/docker-compose1.yml b/docker-compose1.yml
deleted file mode 100644
index 6a52737..0000000
--- a/docker-compose1.yml
+++ /dev/null
@@ -1,150 +0,0 @@
-version: '3'
-services: 
-  mysql:
-    restart: always
-    image: mysql
-    container_name: mysql
-    volumes:
-      - ../volumes/data/mysqldata:/var/lib/mysql
-      - ./config/my.cnf:/etc/my.cnf
-      #      数据库还原目录 可将需要还原的sql文件放在这里
-      - ./init/mysql:/docker-entrypoint-initdb.d
-    environment:
-      - "MYSQL_ROOT_PASSWORD=lilishop"
-      - "MYSQL_DATABASE=lilishop"
-      - "TZ=Asia/Shanghai"
-    ports:
-      - 3306:3306
-      
-  mongo:
-    image: mongo
-    restart: always
-    container_name: 'mongo'
-    environment:
-      MONGO_INITDB_ROOT_USERNAME: root
-      MONGO_INITDB_ROOT_PASSWORD: lilishop
-    ports:
-      - 27017:27017
-    volumes: 
-      - ../volumes/data/mongodata:/data/db
-
-  redis:
-    image: redis
-    restart: always
-    ports:
-      - 6379:6379
-    volumes: 
-      - ../volumes/data/redsidata:/data
-    networks:
-      - "redisnet"
-    command: redis-server --port 6379 --requirepass lilishop --appendonly yes
-
-  elasticsearch:
-    container_name: elasticsearch
-    image: elasticsearch:7.3.0
-    volumes:
-      - ../volumes/data/es7/logs:/usr/share/es7/logs:rw
-      - ../volumes/data/es7/data:/usr/share/es7/data:rw
-      - ./config/ik:/usr/share/elasticsearch/plugins/ik
-        #      - "./elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml"
-    restart: on-failure
-    ports: 
-      - "9200:9200"
-      - "9300:9300"
-    environment:
-      cluster.name: elasticsearch
-      discovery.type: single-node
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "50m"
-    networks: 
-      - stack
-    ulimits:
-      nofile:
-          soft: 65535
-          hard: 65535
-
-  kibana:
-    image: docker.elastic.co/kibana/kibana:7.3.0
-    container_name: kibana
-    ports: ['5601:5601']
-    # volumes:
-            #    - "./config/kibana.yml:/usr/share/kibana/config/kibana.yml"
-    networks: 
-      - stack
-    depends_on: ['elasticsearch']  
-
-
-  logstash:
-    image: logstash:7.3.0
-    container_name: logstash
-    volumes:
-      - ./config/logstash-springboot.conf:/usr/share/logstash/pipeline/logstash.conf #挂载logstash的配置文件
-    networks: 
-      - stack
-    depends_on: ['elasticsearch']
-    ports: ['4560:4560']
-    
- # rocket mq name server
-  rmqnamesrv:
-    image: foxiswho/rocketmq:server
-    container_name: rocket-server
-    network_mode: host
-    environment:
-      JAVA_OPT_EXT: "-server -Xms64m -Xmx64m -Xmn64m"
-    ports:
-      - 9876:9876
-    volumes:
-      - ../volumes/data/rocket/server/logs:/opt/logs
-      - ../volumes/data/rocket/server/store:/opt/rmqstore
-
-  # rocket mq broker
-  rmqbroker:
-    image: foxiswho/rocketmq:broker
-    container_name: rocket-broker
-    network_mode: host
-    ports:
-      - 10909:10909
-      - 10911:10911
-    volumes:
-      - ../volumes/data/rocket/broker/logs:/opt/logs
-      - ../volumes/data/rocket/broker/store:/opt/rmqstore
-      - ./config/broker.conf:/etc/rocketmq/broker.conf
-    environment:
-      - NAMESRV_ADDR=localhost:9876
-      - JAVA_OPTS:=-Duser.home=/opt
-      - JAVA_OPT_EXT=-server -Xms64m -Xmx64m -Xmn64m
-    command: mqbroker -c /etc/rocketmq/broker.conf
-    depends_on:
-      - rmqnamesrv
-  # rocket console 这个可以不需要
-  rmqconsole:
-    image: styletang/rocketmq-console-ng
-    container_name: rocket-console
-    network_mode: host
-    ports:
-      - 8180:8180
-    environment:
-      - JAVA_OPTS=-Drocketmq.config.namesrvAddr=localhost:9876 -Dserver.port=8180 -Drocketmq.config.isVIPChannel=false
-      - JAVA_OPT_EXT=-Xms128m -Xmx128m -Xmn128m
-    depends_on:
-      - rmqnamesrv
-
-  # xxl-job 分布式调度中心
-  rmqconsole:
-    image: xuxueli/xxl-job-admin:2.3.0
-    container_name: xxl-job
-    network_mode: host
-    ports:
-      - 9001:9001
-    environment:
-      - PARAMS=--spring.datasource.url=jdbc:mysql://127.0.0.1:3306/lilishop?Unicode=true&characterEncoding=UTF-8  --spring.datasource.username=root --spring.datasource.password=lilishop --server.port=9001
-    depends_on:
-      - mysql
-    volumes:
-      - ../volumes/data/xxl-job:/data/applogs
-networks: 
-  stack:
-  redisnet: 
-    driver: bridge