Merge remote-tracking branch 'origin/master'

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

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
+CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jero-cloud-gateway-2.4.2.jar

jero-web/package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "vue-antd-jeecg",
+  "name": "jero-web",
   "version": "2.4.2",
   "lockfileVersion": 1,
   "requires": true,