From 1dc7d31380cf98f3b1f5fa8e848263aa8957d5bb Mon Sep 17 00:00:00 2001
From: lhd <839347550@qq.com>
Date: Fri, 14 Feb 2025 18:01:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=87=B3springboot=203.4.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 24 ++++++++++---------
 .../admin/controller/IndexImgController.java  |  2 +-
 yami-shop-common/pom.xml                      |  4 ++++
 .../security/common/config/CaptchaConfig.java |  2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 613e5f6..0575471 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,23 +22,23 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.plugin.version>3.12.0</maven.compiler.plugin.version>
-        <spring-boot.version>3.2.1</spring-boot.version>
+        <spring-boot.version>3.4.2</spring-boot.version>
         <java.version>17</java.version>
-        <guava.version>33.0.0-jre</guava.version>
-        <hutool.version>5.8.27</hutool.version>
+        <guava.version>33.4.0-jre</guava.version>
+        <hutool.version>5.8.35</hutool.version>
         <jsoup.version>1.15.3</jsoup.version>
-        <poi.version>5.2.5</poi.version>
+        <poi.version>5.4.0</poi.version>
         <qiniu.version>7.12.1</qiniu.version>
         <aliyun-core.version>4.3.9</aliyun-core.version>
         <aliyun-dysmsapi.version>1.1.0</aliyun-dysmsapi.version>
-        <mybatis-plus.version>3.5.5</mybatis-plus.version>
-        <redisson.version>3.39.0</redisson.version>
-        <transmittable-thread-local.version>2.14.2</transmittable-thread-local.version>
+        <mybatis-plus.version>3.5.10.1</mybatis-plus.version>
+        <redisson.version>3.44.0</redisson.version>
+        <transmittable-thread-local.version>2.14.5</transmittable-thread-local.version>
         <log4j.version>2.19.0</log4j.version>
-        <knife4j.version>4.3.0</knife4j.version>
+        <knife4j.version>4.5.0</knife4j.version>
         <xxl-job.version>2.4.2</xxl-job.version>
-        <spring-cloud-commons.version>4.1.0</spring-cloud-commons.version>
-        <satoken.version>1.37.0</satoken.version>
+        <spring-cloud-commons.version>4.2.0</spring-cloud-commons.version>
+        <satoken.version>1.40.0</satoken.version>
         <fastjson.version>1.2.83</fastjson.version>
         <mybatis-spring.version>3.0.3</mybatis-spring.version>
     </properties>
@@ -81,8 +81,10 @@
             </dependency>
             <dependency>
                 <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <artifactId>mybatis-plus-bom</artifactId>
                 <version>${mybatis-plus.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>com.qiniu</groupId>
diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java
index 4fc3f68..cd7ee54 100644
--- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java
+++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java
@@ -93,7 +93,7 @@ public class IndexImgController {
     @PreAuthorize("@pms.hasPermission('admin:indexImg:update')")
     public ServerResponseEntity<Void> update(@RequestBody @Valid IndexImg indexImg) {
         checkProdStatus(indexImg);
-        indexImgService.saveOrUpdate(indexImg);
+        indexImgService.updateById(indexImg);
         indexImgService.removeIndexImgCache();
         return ServerResponseEntity.success();
     }
diff --git a/yami-shop-common/pom.xml b/yami-shop-common/pom.xml
index 0839da8..1907f4e 100644
--- a/yami-shop-common/pom.xml
+++ b/yami-shop-common/pom.xml
@@ -35,6 +35,10 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-jsqlparser</artifactId>
         </dependency>
 		<dependency>
 		    <groupId>com.qiniu</groupId>
diff --git a/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/config/CaptchaConfig.java b/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/config/CaptchaConfig.java
index a9aa3df..d8bc919 100644
--- a/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/config/CaptchaConfig.java
+++ b/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/config/CaptchaConfig.java
@@ -13,12 +13,12 @@ import com.anji.captcha.model.common.CaptchaTypeEnum;
 import com.anji.captcha.model.common.Const;
 import com.anji.captcha.service.CaptchaService;
 import com.anji.captcha.service.impl.CaptchaServiceFactory;
+import com.anji.captcha.util.Base64Utils;
 import com.anji.captcha.util.ImageUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.util.Base64Utils;
 import org.springframework.util.FileCopyUtils;
 
 import java.util.Collections;