Merge remote-tracking branch 'origin/master'

This commit is contained in:
zer0Black
2021-03-12 09:11:02 +08:00
3 changed files with 9 additions and 9 deletions
@@ -73,13 +73,13 @@ services:
environment: environment:
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
# jero-boot-xxljob: jero-boot-xxljob:
# build: build:
# context: ./jero-cloud-xxljob context: ./jero-cloud-xxljob
# ports: ports:
# - 9080:9080 - 9080:9080
# container_name: jero-boot-xxljob container_name: jero-boot-xxljob
# hostname: jero-boot-xxljob hostname: jero-boot-xxljob
# jero-boot-rabbitmq: # jero-boot-rabbitmq:
# # image: rabbitmq:3-management # # image: rabbitmq:3-management
@@ -12,4 +12,4 @@ EXPOSE 9999
ADD ./target/jero-cloud-gateway-2.4.2.jar ./ 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
+1 -1
View File
@@ -1,5 +1,5 @@
{ {
"name": "vue-antd-jeecg", "name": "jero-web",
"version": "2.4.2", "version": "2.4.2",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,