Jelajahi Sumber

排除minidao的子依赖jsqlparser和druid,总与mybatisplus冲突

JEECG 1 tahun lalu
induk
melakukan
7b06715bff
2 mengubah file dengan 26 tambahan dan 12 penghapusan
  1. 2 12
      jeecg-module-system/jeecg-system-biz/pom.xml
  2. 24 0
      pom.xml

+ 2 - 12
jeecg-module-system/jeecg-system-biz/pom.xml

@@ -29,25 +29,15 @@
 			<groupId>org.jeecgframework</groupId>
 			<artifactId>jeewx-api</artifactId>
 		</dependency>
-		<!-- 积木报表 -->
+		<!-- 积木报表设计 -->
 		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>
 			<artifactId>jimureport-spring-boot-starter</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>druid</artifactId>
-					<groupId>com.alibaba</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>jsqlparser</artifactId>
-					<groupId>com.github.jsqlparser</groupId>
-				</exclusion>
-			</exclusions>
 		</dependency>
+		<!-- 积木仪表盘 -->
 		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>
 			<artifactId>jimureport-drag</artifactId>
-			<version>2.0.1</version>
 		</dependency>
 		<!-- 积木报表 mongo redis 支持包 
 		<dependency>

+ 24 - 0
pom.xml

@@ -384,6 +384,16 @@
 				<groupId>org.jeecgframework</groupId>
 				<artifactId>minidao-spring-boot-starter</artifactId>
 				<version>${minidao.version}</version>
+				<exclusions>
+					<exclusion>
+						<artifactId>druid</artifactId>
+						<groupId>com.alibaba</groupId>
+					</exclusion>
+					<exclusion>
+						<artifactId>jsqlparser</artifactId>
+						<groupId>com.github.jsqlparser</groupId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<!-- 积木报表-->
 			<dependency>
@@ -395,6 +405,14 @@
 						<artifactId>autopoi-web</artifactId>
 						<groupId>org.jeecgframework</groupId>
 					</exclusion>
+					<exclusion>
+						<artifactId>druid</artifactId>
+						<groupId>com.alibaba</groupId>
+					</exclusion>
+					<exclusion>
+						<artifactId>jsqlparser</artifactId>
+						<groupId>com.github.jsqlparser</groupId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>
@@ -402,6 +420,12 @@
 				<artifactId>jimureport-nosql-starter</artifactId>
 				<version>1.6.0</version>
 			</dependency>
+			<!-- 积木仪表盘-->
+			<dependency>
+				<groupId>org.jeecgframework.jimureport</groupId>
+				<artifactId>jimureport-drag</artifactId>
+				<version>2.0.1</version>
+			</dependency>
 			<!-- chatgpt -->
 			<dependency>
 				<groupId>org.jeecgframework.boot</groupId>