diff --git a/jeecg-boot/jeecg-boot-module-demo/pom.xml b/jeecg-boot/jeecg-boot-module-demo/pom.xml index 37affda..68135f8 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 5f8af3f..5b43eef 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 f23cd82..482c306 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 fd22020..c8c7d32 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