Merge remote-tracking branch 'origin/leng_dev' into leng_dev

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:

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:

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

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">
 	<parent>
-		<artifactId>pigx</artifactId>
 		<groupId>com.pig4cloud</groupId>
+		<artifactId>pigx-visual</artifactId>
 		<version>2.6.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>