From 6196f0a4636f2d140841ba285ecdad36e7f0a50d Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Wed, 30 Mar 2022 13:45:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=EF=BC=9A=E7=AE=80=E5=8C=96?=
 =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1=E5=88=87=E6=8D=A2=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0profile=E6=A8=A1=E5=BC=8F=20SpringCloud?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  2 +-
 jeecg-boot/jeecg-boot-module-demo/pom.xml     | 23 ++++++++++-------
 jeecg-boot/jeecg-boot-module-system/pom.xml   |  6 ++---
 .../jeecg-cloud-system-start/pom.xml          |  7 ++++++
 jeecg-boot/pom.xml                            | 25 +++++++++++++------
 5 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 69f4c793..eeee4cdb 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ Jeecg-Boot低代码开发平台，可以应用在任何J2EE项目的开发中，
 
 - 新手指南： [快速入门](http://www.jeecg.com/doc/quickstart)  |   [常见问题 ](http://www.jeecg.com/doc/qa)  |   [技术支持](http://jeecg.com/doc/help) |  [1分钟体验低代码](https://my.oschina.net/jeecg/blog/3083313)
 
-- 微服务开发：  [单体切换为微服务](http://doc.jeecg.com/2043906)
+- 微服务开发：  [单体切换为微服务](http://doc.jeecg.com/2704725)
 
 - QQ交流群 ： ⑤860162132、683903138(VUE3版)、~~④774126647(满)、③816531124(满)、②769925425(满)、①284271917(满)~~
 
diff --git a/jeecg-boot/jeecg-boot-module-demo/pom.xml b/jeecg-boot/jeecg-boot-module-demo/pom.xml
index 37affdaa..68135f8a 100644
--- a/jeecg-boot/jeecg-boot-module-demo/pom.xml
+++ b/jeecg-boot/jeecg-boot-module-demo/pom.xml
@@ -16,14 +16,19 @@
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>jeecg-boot-base-core</artifactId>
         </dependency>
-        <!--引入微服务启动依赖 starter
-      <dependency>
-          <groupId>org.jeecgframework.boot</groupId>
-          <artifactId>jeecg-boot-starter-cloud</artifactId>
-      </dependency>
-        <dependency>
-            <groupId>org.jeecgframework.boot</groupId>
-            <artifactId>jeecg-boot-starter-job</artifactId>
-        </dependency>-->
     </dependencies>
+
+    <profiles>
+        <profile>
+            <id>SpringCloud</id>
+            <!-- 引入微服务启动 Starter依赖 -->
+            <dependencies>
+                <dependency>
+                    <groupId>org.jeecgframework.boot</groupId>
+                    <artifactId>jeecg-boot-starter-cloud</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
 </project>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/pom.xml b/jeecg-boot/jeecg-boot-module-system/pom.xml
index 5f8af3ff..5b43eeff 100644
--- a/jeecg-boot/jeecg-boot-module-system/pom.xml
+++ b/jeecg-boot/jeecg-boot-module-system/pom.xml
@@ -54,7 +54,7 @@
 		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>
 			<artifactId>jimureport-spring-boot-starter</artifactId>
-			<version>1.4.32</version>
+			<version>1.4.4-beta</version>
 		</dependency>
 
 
@@ -73,8 +73,8 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
-					<!--微服务模式下修改为true,跳过此打包插件，否则微服务模块无法引用-->
-					<skip>false</skip>
+					<!--微服务模式下修改为true,跳过SpringBoot启动打包插件，否则微服务模块无法引用-->
+					<skip>${skip.springboot.maven}</skip>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/pom.xml
index f23cd827..482c3061 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/pom.xml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/pom.xml
@@ -28,6 +28,13 @@
         <dependency>
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>jeecg-boot-module-system</artifactId>
+            <!-- 排除demo模块，demo模块采用微服务方式独立启动 -->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jeecgframework.boot</groupId>
+                    <artifactId>jeecg-boot-module-demo</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- 测试模块依赖 -->
diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml
index fd22020e..c8c7d325 100644
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@@ -4,6 +4,7 @@
   <artifactId>jeecg-boot-parent</artifactId>
   <version>3.1.0</version>
   <packaging>pom</packaging>
+  <name>JEECG BOOT ${project.version}</name>
   
   	<parent>
 	    <groupId>org.springframework.boot</groupId>
@@ -14,6 +15,8 @@
 
 	<properties>
 		<jeecgboot.version>3.1.0</jeecgboot.version>
+		<!-- 微服务专用属性 -->
+		<skip.springboot.maven>false</skip.springboot.maven>
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
@@ -56,9 +59,6 @@
         <module>jeecg-boot-base</module>
         <module>jeecg-boot-module-demo</module>
         <module>jeecg-boot-module-system</module>
-        <!--需要微服务，请打开
-        <module>jeecg-boot-starter</module>
-        <module>jeecg-cloud-module</module>-->
 	</modules>
 
 	<distributionManagement>
@@ -296,11 +296,7 @@
 
 	<build>
 		<plugins>
-			<!--<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-			 指定JDK编译版本 -->
+			<!-- 指定JDK编译版本 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -420,5 +416,18 @@
                 <discovery.server-addr>jeecg-boot-nacos:8848</discovery.server-addr>
             </properties>
         </profile>
+		<!-- SpringCloud运行环境 -->
+		<profile>
+			<id>SpringCloud</id>
+			<properties>
+				<!--微服务模式下修改为true, system模块跳过打包插件，否则微服务无法引用-->
+				<skip.springboot.maven>true</skip.springboot.maven>
+			</properties>
+			<modules>
+				<!-- 微服务模块 -->
+				<module>jeecg-boot-starter</module>
+				<module>jeecg-cloud-module</module>
+			</modules>
+		</profile>
     </profiles>
 </project>
\ No newline at end of file