From 73a99f02905bd5506a30db6cf001709ed3c0d50d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92Sakura=E9=85=B1?= Date: Mon, 18 Mar 2019 14:39:48 +0800 Subject: [PATCH 1/2] :wrench: Changing configuration files.remove gateway warning when upms running --- pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml index c69ce98fb..9a0279862 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml @@ -14,7 +14,7 @@ spring: enabled: true service-id: pigx-config autoconfigure: - exclude: org.springframework.cloud.gateway.config.GatewayAutoConfiguration + exclude: org.springframework.cloud.gateway.config.GatewayAutoConfiguration,org.springframework.cloud.gateway.config.GatewayClassPathWarningAutoConfiguration main: allow-bean-definition-overriding: true profiles: From 6a695baa636674a5cb44c34b4cd484ac2680abb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92Sakura=E9=85=B1?= Date: Mon, 18 Mar 2019 16:34:52 +0800 Subject: [PATCH 2/2] :bug: Fixing a bug.fix some details with new daemon project --- docker-compose.yml | 17 +++++++++++++---- pigx-visual/pigx-daemon-quartz/Dockerfile | 4 ++-- pigx-visual/pigx-daemon-quartz/pom.xml | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index cf6092b34..d4440cecd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -90,13 +90,22 @@ services: ports: - 5006:5006 - pigx-daemon: + pigx-daemon-quartz: build: context: ./ - dockerfile: ./pigx-visual/pigx-daemon/Dockerfile + dockerfile: ./pigx-visual/pigx-daemon-quartz/Dockerfile restart: always - image: pigx-daemon - container_name: pigx-daemon + image: pigx-daemon-quartz + container_name: pigx-daemon-quartz + + pigx-daemon-elastic: + build: + context: ./ + dockerfile: ./pigx-visual/pigx-daemon-elastic/Dockerfile + restart: always + image: pigx-daemon-elastic + container_name: pigx-daemon-elastic + pigx-codegen: build: diff --git a/pigx-visual/pigx-daemon-quartz/Dockerfile b/pigx-visual/pigx-daemon-quartz/Dockerfile index 2307fcb8e..966fbfae5 100644 --- a/pigx-visual/pigx-daemon-quartz/Dockerfile +++ b/pigx-visual/pigx-daemon-quartz/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /pigx-daemon-quartz WORKDIR /pigx-daemon-quartz -EXPOSE 5002 +EXPOSE 5007 -ADD ./pigx-daemon-quartz/target/pigx-daemon-quartz.jar ./ +ADD ./pigx-visual/pigx-daemon-quartz/target/pigx-daemon-quartz.jar ./ CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-daemon-quartz.jar diff --git a/pigx-visual/pigx-daemon-quartz/pom.xml b/pigx-visual/pigx-daemon-quartz/pom.xml index f34dfba14..fa40dd6dd 100644 --- a/pigx-visual/pigx-daemon-quartz/pom.xml +++ b/pigx-visual/pigx-daemon-quartz/pom.xml @@ -3,8 +3,8 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - pigx com.pig4cloud + pigx-visual 2.6.0 4.0.0