From cd1fdec5fc60198780ed239779052bf6954427ea Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 08 九月 2025 21:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ycawdasrs-2' into ycawdasrs-2
---
pom.xml | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index f2b6bc0..d62daf4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,22 +15,14 @@
<properties>
<java.version>1.8</java.version>
- <cool.version>3.2.0</cool.version>
- <mysql-driver.version>5.1.47</mysql-driver.version>
+ <cool.version>3.4.0</cool.version>
+ <mysql-driver.version>8.0.28</mysql-driver.version>
<mybatis-plus.version>2.3.2</mybatis-plus.version>
<fastjson.version>1.2.58</fastjson.version>
<springfox.version>2.7.0</springfox.version>
</properties>
-
-
<dependencies>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.7</version>
- </dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
@@ -38,11 +30,15 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>cn.cool</groupId>
@@ -54,6 +50,7 @@
<artifactId>mysql-connector-java</artifactId>
<version>${mysql-driver.version}</version>
</dependency>
+
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
@@ -64,6 +61,13 @@
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
+ <!-- jdk 8+ 寮曞叆鍙�夋ā鍧� -->
+ <!-- <dependency>-->
+ <!-- <groupId>com.baomidou</groupId>-->
+ <!-- <artifactId>mybatis-plus-jsqlparser-4.9</artifactId>-->
+ <!-- <version>3.5.9</version>-->
+ <!-- </dependency>-->
+
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
--
Gitblit v1.9.1