From 2c5c39d23b4056d199b5e7658aedfabb9ba02d3b Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Wed, 20 Jul 2022 10:16:34 +0800
Subject: [PATCH] JeecgBoot 3.3.0 版本发布,企业级低代码平台

---
 jeecg-boot/jeecg-boot-module-system/pom.xml | 44 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/jeecg-boot/jeecg-boot-module-system/pom.xml b/jeecg-boot/jeecg-boot-module-system/pom.xml
index f9ecaca..6e55c8d 100644
--- a/jeecg-boot/jeecg-boot-module-system/pom.xml
+++ b/jeecg-boot/jeecg-boot-module-system/pom.xml
@@ -34,11 +34,6 @@
 			<groupId>org.jeecgframework.boot</groupId>
 			<artifactId>jeecg-system-local-api</artifactId>
 		</dependency>
-		<!-- 企业微信/钉钉 api -->
-		<dependency>
-			<groupId>org.jeecgframework</groupId>
-			<artifactId>jeewx-api</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
@@ -47,11 +42,16 @@
 			<groupId>org.jeecgframework.boot</groupId>
 			<artifactId>hibernate-re</artifactId>
 		</dependency>
+
+		<!-- 企业微信/钉钉 api -->
+		<dependency>
+			<groupId>org.jeecgframework</groupId>
+			<artifactId>jeewx-api</artifactId>
+		</dependency>
 		<!-- 积木报表 -->
 		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>
 			<artifactId>jimureport-spring-boot-starter</artifactId>
-			<version>${jimureport-spring-boot-starter.version}</version>
 		</dependency>
 		<!-- DEMO 示例模块 -->
 		<dependency>
@@ -68,10 +68,38 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
-					<!--微服务模式下修改为true,跳过SpringBoot启动打包插件,否则微服务模块无法引用-->
+					<!--SpringCloud运行环境 ,值改为true跳过SpringBoot启动打包插件 -->
 					<skip>${skip.springboot.maven}</skip>
 				</configuration>
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+
+	<profiles>
+		<!-- SpringCloud运行环境 -->
+		<profile>
+			<id>SpringCloud</id>
+			<build>
+				<resources>
+					<resource>
+						<directory>src/main/resources</directory>
+						<filtering>true</filtering>
+						<!-- SpringCloud运行环境的配置,排除system模块jar里的yaml -->
+						<excludes>
+							<exclude>application.yml</exclude>
+							<exclude>application-*.yml</exclude>
+						</excludes>
+					</resource>
+					<resource>
+						<directory>src/main/java</directory>
+						<includes>
+							<include>**/*.xml</include>
+							<include>**/*.json</include>
+							<include>**/*.ftl</include>
+						</includes>
+					</resource>
+				</resources>
+			</build>
+		</profile>
+	</profiles>
+</project>
--
libgit2 0.22.2