From 030af2dc0eed880fe4c75708b92a4b0d7c1cb135 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 22 七月 2024 16:50:22 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/pom.xml | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/pom.xml b/pipIrr-platform/pipIrr-global/pom.xml
index 960b924..67e9c0e 100644
--- a/pipIrr-platform/pipIrr-global/pom.xml
+++ b/pipIrr-platform/pipIrr-global/pom.xml
@@ -21,6 +21,12 @@
<groupId>com.dy</groupId>
<artifactId>pipIrr-common</artifactId>
<version>1.0.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -118,23 +124,39 @@
<version>1.5.5.Final</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </dependency>
+ <!--EasyExcel鐩稿叧渚濊禆-->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>easyexcel</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+ <!--OkHttp-->
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>4.9.2</version>
+ </dependency>
</dependencies>
<build>
<plugins>
- <plugin>
- <!-- spring boot鎻愪緵鐨刴aven鎵撳寘鎻掍欢 -->
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </exclude>
- </excludes>
- </configuration>
- </plugin>
+<!-- <plugin>-->
+<!-- <!– spring boot鎻愪緵鐨刴aven鎵撳寘鎻掍欢 –>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
+<!-- <configuration>-->
+<!-- <excludes>-->
+<!-- <exclude>-->
+<!-- <groupId>org.projectlombok</groupId>-->
+<!-- <artifactId>lombok</artifactId>-->
+<!-- </exclude>-->
+<!-- </excludes>-->
+<!-- </configuration>-->
+<!-- </plugin>-->
<plugin>
<!-- maven閲屾墽琛屾祴璇曠敤渚嬬殑鎻掍欢 -->
<groupId>org.apache.maven.plugins</groupId>
--
Gitblit v1.8.0