springboot4升级

haha-admin/src/main/java/com/haha/admin/config/RedisConfig.java

@@ -1,60 +0,0 @@
-package com.haha.admin.config;
-
-import io.lettuce.core.ClientOptions;
-import io.lettuce.core.SocketOptions;
-import io.lettuce.core.protocol.ProtocolVersion;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
-import org.springframework.data.redis.connection.lettuce.LettucePoolingClientConfiguration;
-
-import java.time.Duration;
-
-/**
- * Redis 配置类
- * 增强连接稳定性，防止断连问题
- */
-@Configuration
-@Slf4j
-public class RedisConfig {
-
-    @Bean
-    public RedisConnectionFactory redisConnectionFactory(RedisProperties redisProperties) {
-        // 配置 Socket 选项 - 连接超时和保持连接
-        SocketOptions socketOptions = SocketOptions.builder()
-                .connectTimeout(Duration.ofMillis(redisProperties.getTimeout().toMillis()))
-                .keepAlive(true)
-                .build();
-
-        // 配置客户端选项 - 自动重连，使用RESP2协议避免HELLO认证问题
-        ClientOptions clientOptions = ClientOptions.builder()
-                .socketOptions(socketOptions)
-                .autoReconnect(true)
-                .protocolVersion(ProtocolVersion.RESP2)
-                .disconnectedBehavior(ClientOptions.DisconnectedBehavior.REJECT_COMMANDS)
-                .build();
-
-        // 配置连接池
-        LettucePoolingClientConfiguration poolConfig = LettucePoolingClientConfiguration.builder()
-                .commandTimeout(redisProperties.getTimeout())
-                .clientOptions(clientOptions)
-                .build();
-
-        // 创建Redis单机配置，设置host、port、password和database
-        RedisStandaloneConfiguration redisConfig = new RedisStandaloneConfiguration();
-        redisConfig.setHostName(redisProperties.getHost());
-        redisConfig.setPort(redisProperties.getPort());
-        redisConfig.setPassword(redisProperties.getPassword());
-        redisConfig.setDatabase(redisProperties.getDatabase());
-
-        log.info("Redis 增强配置已加载: host={}, port={}, database={}, 连接超时={}ms, 协议版本=RESP2", 
-                redisProperties.getHost(), redisProperties.getPort(), 
-                redisProperties.getDatabase(), redisProperties.getTimeout().toMillis());
-
-        return new LettuceConnectionFactory(redisConfig, poolConfig);
-    }
-}

haha-common/pom.xml

@@ -16,26 +16,7 @@
     <description>公共模块 - 通用工具类和响应结果类</description>
 
     <dependencies>
-        <!-- FastJson -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-
-        <!-- Hutool 工具包 -->
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-        </dependency>
-
-        <!-- MyBatis Plus (用于分页等) - provided scope -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Spring Web (用于HTTP相关工具) - provided scope -->
+        <!-- Spring Web (用于 HTTP 相关工具) - provided scope -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>

haha-entity/pom.xml

@@ -22,18 +22,6 @@
             <artifactId>haha-common</artifactId>
         </dependency>
 
-        <!-- MyBatis Plus -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
-        </dependency>
-
-        <!-- FastJson -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-
         <!-- Jakarta Validation API -->
         <dependency>
             <groupId>jakarta.validation</groupId>

haha-mapper/pom.xml

@@ -22,10 +22,10 @@
             <artifactId>haha-entity</artifactId>
         </dependency>
 
-        <!-- MyBatis Plus -->
+        <!-- Spring Boot JDBC (提供数据源自动配置) -->
         <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>
     </dependencies>
 

haha-miniapp/src/main/java/com/haha/miniapp/config/RedisConfig.java

@@ -1,61 +0,0 @@
-package com.haha.miniapp.config;
-
-import io.lettuce.core.ClientOptions;
-import io.lettuce.core.SocketOptions;
-import io.lettuce.core.protocol.ProtocolVersion;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
-import org.springframework.data.redis.connection.lettuce.LettucePoolingClientConfiguration;
-
-import java.time.Duration;
-
-/**
- * Redis 配置类
- * Sa-Token 使用 Redis 作为持久化存储，通过 sa-token-redis-jackson 自动配置
- * Redis 连接信息通过 application.yml 中的 spring.redis 配置
- */
-@Configuration
-@Slf4j
-public class RedisConfig {
-    
-    @Bean
-    public RedisConnectionFactory redisConnectionFactory(RedisProperties redisProperties) {
-        // 配置 Socket 选项 - 连接超时和保持连接
-        SocketOptions socketOptions = SocketOptions.builder()
-                .connectTimeout(Duration.ofMillis(redisProperties.getTimeout().toMillis()))
-                .keepAlive(true)
-                .build();
-
-        // 配置客户端选项 - 自动重连，使用RESP2协议避免HELLO认证问题
-        ClientOptions clientOptions = ClientOptions.builder()
-                .socketOptions(socketOptions)
-                .autoReconnect(true)
-                .protocolVersion(ProtocolVersion.RESP2)
-                .disconnectedBehavior(ClientOptions.DisconnectedBehavior.REJECT_COMMANDS)
-                .build();
-
-        // 配置连接池
-        LettucePoolingClientConfiguration poolConfig = LettucePoolingClientConfiguration.builder()
-                .commandTimeout(redisProperties.getTimeout())
-                .clientOptions(clientOptions)
-                .build();
-
-        // 创建Redis单机配置，设置host、port、password和database
-        RedisStandaloneConfiguration redisConfig = new RedisStandaloneConfiguration();
-        redisConfig.setHostName(redisProperties.getHost());
-        redisConfig.setPort(redisProperties.getPort());
-        redisConfig.setPassword(redisProperties.getPassword());
-        redisConfig.setDatabase(redisProperties.getDatabase());
-
-        log.info("Redis 增强配置已加载: host={}, port={}, database={}, 连接超时={}ms, 协议版本=RESP2", 
-                redisProperties.getHost(), redisProperties.getPort(), 
-                redisProperties.getDatabase(), redisProperties.getTimeout().toMillis());
-
-        return new LettuceConnectionFactory(redisConfig, poolConfig);
-    }
-}

haha-miniapp/src/main/resources/application.yml

@@ -19,8 +19,7 @@ spring:
       keepalive-time: 30000
 
   # Redis 配置
-  data:
-    redis:
+  redis:
       host: server.kuaiyuman.cn
       port: 6379
       password: KtXA^Zx!TZmLEy(@JjB@2(TVG0kdy5)&

haha-service/pom.xml

@@ -41,10 +41,10 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- MyBatis Plus -->
+        <!-- Jackson 2 过渡模块 (Spring Boot 4 兼容) -->
         <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-jackson2</artifactId>
         </dependency>
 
         <!-- Sa-Token -->
@@ -53,31 +53,19 @@
             <artifactId>sa-token-spring-boot3-starter</artifactId>
         </dependency>
 
-        <!-- Hutool 工具包 -->
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-        </dependency>
-
         <!-- Spring Data Redis -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
-        <!-- FastJson -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-
         <!-- PageHelper -->
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper</artifactId>
         </dependency>
 
-        <!-- Spring Security Crypto (BCrypt密码加密) -->
+        <!-- Spring Security Crypto (BCrypt 密码加密) -->
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-crypto</artifactId>

pom.xml

@@ -26,10 +26,10 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-boot.version>3.4.13</spring-boot.version>
-        <mybatis-plus.version>3.5.10.1</mybatis-plus.version>
-        <hutool.version>5.8.28</hutool.version>
-        <satoken.version>1.39.0</satoken.version>
+        <spring-boot.version>4.0.3</spring-boot.version>
+        <mybatis-plus.version>3.5.16</mybatis-plus.version>
+        <hutool.version>5.8.40</hutool.version>
+        <satoken.version>1.45.0</satoken.version>
         <fastjson.version>2.0.45</fastjson.version>
         <fastjson2.version>2.0.53</fastjson2.version>
         <pagehelper.version>5.3.3</pagehelper.version>
@@ -51,7 +51,7 @@
             <!-- MyBatis Plus -->
             <dependency>
                 <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+                <artifactId>mybatis-plus-spring-boot4-starter</artifactId>
                 <version>${mybatis-plus.version}</version>
             </dependency>
 
@@ -146,6 +146,24 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <!-- MyBatis Plus - 数据访问层基础依赖 -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-spring-boot4-starter</artifactId>
+        </dependency>
+
+        <!-- Hutool 工具包 - 通用工具类 -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
+
+        <!-- FastJson - JSON 处理 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
     </dependencies>
 
     <build>