From a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
pom.xml | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index b96426c..adafdea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,9 +20,13 @@
</parent>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>25.0.2</java.version>
+ <maven.compiler.source>25</maven.compiler.source>
+ <maven.compiler.target>25</maven.compiler.target>
+ <maven.compiler.release>25</maven.compiler.release>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <java.version>25</java.version>
+ <lombok.version>1.18.44</lombok.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<pagehelper.spring.boot.starter.version>2.1.1</pagehelper.spring.boot.starter.version>
<fastjson.version>2.0.53</fastjson.version>
@@ -46,6 +50,7 @@
<mybatis-plus.version>3.5.16</mybatis-plus.version>
<getui-sdk.version>1.0.7.0</getui-sdk.version>
<jsqlparser.version>4.9</jsqlparser.version>
+ <thumbnailator.version>0.4.20</thumbnailator.version>
</properties>
<dependencies>
@@ -298,10 +303,11 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </dependency>
<!-- minio -->
@@ -360,16 +366,38 @@
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
+ <dependency>
+ <groupId>net.coobird</groupId>
+ <artifactId>thumbnailator</artifactId>
+ <version>${thumbnailator.version}</version>
+ </dependency>
+
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.14.1</version>
+ <configuration>
+ <release>${maven.compiler.release}</release>
+ <proc>full</proc>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
</build>
<repositories>
--
Gitblit v1.9.3