From eac6d033fe7809ce71cdc5acba660e79355b3d17 Mon Sep 17 00:00:00 2001
From: zeroBlack <lxtalx@gmail.com>
Date: Thu, 11 Mar 2021 21:38:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84docker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/jero-cloud-module/docker-compose.yml     | 14 +++++++-------
 .../jero-cloud-gateway/Dockerfile                  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-cloud-module/docker-compose.yml b/jero-boot/jero-cloud-module/docker-compose.yml
index 21be5c32..6bbc5bd2 100644
--- a/jero-boot/jero-cloud-module/docker-compose.yml
+++ b/jero-boot/jero-cloud-module/docker-compose.yml
@@ -73,13 +73,13 @@ services:
     environment:
       - TZ=Asia/Shanghai
 
-#  jero-boot-xxljob:
-#    build:
-#      context: ./jero-cloud-xxljob
-#    ports:
-#      - 9080:9080
-#    container_name: jero-boot-xxljob
-#    hostname: jero-boot-xxljob
+  jero-boot-xxljob:
+    build:
+      context: ./jero-cloud-xxljob
+    ports:
+      - 9080:9080
+    container_name: jero-boot-xxljob
+    hostname: jero-boot-xxljob
 
 #  jero-boot-rabbitmq:
 #    #    image: rabbitmq:3-management
diff --git a/jero-boot/jero-cloud-module/jero-cloud-gateway/Dockerfile b/jero-boot/jero-cloud-module/jero-cloud-gateway/Dockerfile
index d172892d..b13e66a0 100644
--- a/jero-boot/jero-cloud-module/jero-cloud-gateway/Dockerfile
+++ b/jero-boot/jero-cloud-module/jero-cloud-gateway/Dockerfile
@@ -12,4 +12,4 @@ EXPOSE 9999
 
 ADD ./target/jero-cloud-gateway-2.4.2.jar ./
 
-CMD sleep 10;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jero-cloud-gateway-2.4.2.jar
\ No newline at end of file
+CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jero-cloud-gateway-2.4.2.jar
\ No newline at end of file

From 8b58f0ca63851d63e5859bcd6f77257c9ca7c7d6 Mon Sep 17 00:00:00 2001
From: zeroBlack <lxtalx@gmail.com>
Date: Thu, 11 Mar 2021 21:52:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?lock=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/package-lock.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/package-lock.json b/jero-web/package-lock.json
index 3e47a235..9414818e 100644
--- a/jero-web/package-lock.json
+++ b/jero-web/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "vue-antd-jeecg",
+  "name": "jero-web",
   "version": "2.4.2",
   "lockfileVersion": 1,
   "requires": true,