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

# Conflicts:
#	jeecg-boot/jflow-core/src/main/java/bp/wf/httphandler/WF_GPM.java

jeecg-boot/jeecg-server-cloud/docker-compose.yml

@@ -50,6 +50,19 @@ services:
     hostname: jeecg-boot-gateway
     networks:
       - jeecg-boot
+
+  jflow-cloud-start:
+    depends_on:
+      - jeecg-boot-nacos
+    build:
+      context: ./jflow-cloud-start
+    container_name: jflow-cloud-start
+    hostname: jeecg-boot-jflow
+    restart: on-failure
+    environment:
+      - TZ=Asia/Shanghai
+    networks:
+      - jeecg-boot
 #  jeecg-boot-sentinel:
 #    restart: on-failure
 #    build:

jeecg-boot/jeecg-server-cloud/jflow-cloud-start/Dockerfile

@@ -10,6 +10,6 @@ WORKDIR /jflow-cloud-start
 
 EXPOSE 7100
 
-ADD ./target/jflow-cloud-start-1.0.0.jar ./
+ADD ./target/jflow-cloud-start-3.7.0.jar ./
 
-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jflow-cloud-start-1.0.0.jar
+CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jflow-cloud-start-3.7.0.jar

jeecg-boot/jeecg-server-cloud/jflow-cloud-start/docker-compose.yml

@@ -1,8 +1,8 @@
 version: '2'
 services:
   jflow-cloud-start:
-    depends_on:
-      - jeecg-boot-nacos
+#    depends_on:
+#      - jeecg-boot-nacos
     build:
       context: .
     container_name: jflow-cloud-start
@@ -11,7 +11,7 @@ services:
     environment:
       - TZ=Asia/Shanghai
     networks:
-      - jeecg-boot
+      - jeecg_boot
 
 #  jeecg-boot-sentinel:
 #    restart: on-failure
@@ -38,7 +38,7 @@ services:
 #    networks:
 #      - jeecg-boot
 networks:
-  jeecg-boot:
-    name: jeecg_boot
+  jeecg_boot:
+    external: true
 
 

jeecg-boot/jeecg-server-cloud/jflow-cloud-start/pom.xml

@@ -11,7 +11,6 @@
 
     <artifactId>jflow-cloud-start</artifactId>
     <description>jflow微服务启动</description>
-    <version>1.0.0</version>
 
     <dependencies>
         <!--引入微服务启动依赖 starter-->
@@ -41,8 +40,6 @@
         <dependency>
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>jflow-core</artifactId>
-            <version>1.1.0</version>
-            <scope>compile</scope>
         </dependency>
     </dependencies>
 

jeecg-boot/jeecg-server-cloud/jflow-cloud-start/src/main/resources/application.yml

@@ -1,3 +1,4 @@
+
 spring:
   debug: true
   application:
@@ -18,4 +19,6 @@ spring:
         password: @config.password@
   config:
     import:
-      - optional:nacos:jflow-@profile.name@.yaml
+      - optional:nacos:jflow-@profile.name@.yaml
+server:
+  port: 7100

jeecg-boot/pom.xml

@@ -34,6 +34,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- 微服务 -->
+        <jflow-core.version>1.1.0</jflow-core.version>
         <lttc-moudule-system.version>1.0.0</lttc-moudule-system.version>
         <spring-cloud.version>2021.0.3</spring-cloud.version>
         <spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>
@@ -87,6 +88,7 @@
         <module>jeecg-module-demo</module>
         <module>jeecg-module-system</module>
         <module>lttc-module-system</module>
+        <module>jflow-core</module>
         <!--		<module>jeecg-module-appmanage</module>-->
     </modules>
 
@@ -152,6 +154,13 @@
 
     <dependencyManagement>
         <dependencies>
+            <!--引入jflow-core-->
+            <dependency>
+                <groupId>org.jeecgframework.boot</groupId>
+                <artifactId>jflow-core</artifactId>
+                <version>${jflow-core.version}</version>
+                <scope>compile</scope>
+            </dependency>
             <!--引入lttc-system-->
             <dependency>
                 <groupId>cn.lttc</groupId>