hi

.gitignore

@@ -21,3 +21,4 @@ wishing-platform/platform-entity/.idea/
 wishing-platform/platform-gateway/.idea/
 wishing-platform/platform-service/.idea/
 wishing-platform/platform-base/.idea/
+wishing-platform/platform-entity/platform-entity-wishing/target/

wishing-platform/platform-core/platform-core-base/pom.xml

@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
+            <artifactId>spring-boot-starter-aspectj</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

wishing-platform/platform-core/platform-core-base/src/main/java/cn/qinys/platform/base/config/BaseBeanConfig.java

@@ -1,12 +1,9 @@
 package cn.qinys.platform.base.config;
 
-import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.client.RestTemplate;
 
-import java.time.Duration;
-
 /**
  * Description:
  *
@@ -18,10 +15,8 @@ public class BaseBeanConfig {
 
     @Bean
     RestTemplate restTemplate() {
-        RestTemplateBuilder builder = new RestTemplateBuilder();
-        builder.connectTimeout(Duration.ofSeconds(30));
-        builder.readTimeout(Duration.ofSeconds(120));
-        return builder.build();
+        RestTemplate restTemplate = new RestTemplate();
+        return restTemplate;
     }
 
 }

wishing-platform/platform-core/platform-core-base/src/main/java/cn/qinys/platform/base/redis/RedisConfig.java

@@ -1,8 +1,7 @@
 package cn.qinys.platform.base.redis;
 
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.ObjectMapper;
+
+import jakarta.annotation.Resource;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -12,12 +11,9 @@ import org.springframework.data.redis.cache.RedisCacheWriter;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
 
-import java.net.UnknownHostException;
 import java.time.Duration;
 
 /**
@@ -29,61 +25,43 @@ import java.time.Duration;
 @EnableCaching
 @Configuration
 public class RedisConfig {
+
+    @Resource
+    private RedisConnectionFactory factory;
     /**
      * 缓存管理器
-     *
-     * @param factory
-     * @return
      */
     @Bean
-    @SuppressWarnings("all")
-    public RedisCacheManager cacheManager(RedisConnectionFactory factory) {
-        ObjectMapper om = new ObjectMapper();
-        RedisSerializer<String> redisSerializer = new StringRedisSerializer();
-        Jackson2JsonRedisSerializer<Object> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<>(Object.class);
-        // 解决查询缓存转换异常的问题
-        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-        om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
-        jackson2JsonRedisSerializer.setObjectMapper(om);
-        // 配置序列化（解决乱码的问题）
+    public RedisCacheManager cacheManager() {
         RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig()
                 .entryTtl(Duration.ofMillis(-1))
-                .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(redisSerializer))
-                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(jackson2JsonRedisSerializer))
+                .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(RedisSerializer.string()))
+                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(RedisSerializer.json()))
                 .disableCachingNullValues();
-        RedisCacheWriter cacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(factory);
 
+        RedisCacheWriter cacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(factory);
         return new RedisConfigCacheManager(cacheWriter, config);
     }
 
-    //重写template配置累
+    /**
+     * RedisTemplate 配置
+     */
     @Bean
-    @SuppressWarnings("all")
-    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) throws UnknownHostException {
-
-        RedisTemplate<String, Object> template = new RedisTemplate();
+    public RedisTemplate<String, Object> redisTemplate() {
+        RedisTemplate<String, Object> template = new RedisTemplate<>();
         template.setConnectionFactory(factory);
-        //json序列化
-        Jackson2JsonRedisSerializer<Object> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
-        ObjectMapper om = new ObjectMapper();
-        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-        om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
-        jackson2JsonRedisSerializer.setObjectMapper(om);
-        //String 序列化
-        StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
-        //key 采用string序列化
-        template.setKeySerializer(stringRedisSerializer);
-        template.setHashKeySerializer(stringRedisSerializer);  //hash key也采用string
-        //value 采用json
-        template.setValueSerializer(jackson2JsonRedisSerializer);
-        template.setHashValueSerializer(jackson2JsonRedisSerializer);
+
+        template.setKeySerializer(RedisSerializer.string());
+        template.setHashKeySerializer(RedisSerializer.string());
+        template.setValueSerializer(RedisSerializer.json());
+        template.setHashValueSerializer(RedisSerializer.json());
 
         template.afterPropertiesSet();
         return template;
     }
 
     @Bean
-    public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory factory) {
+    public StringRedisTemplate stringRedisTemplate() {
         return new StringRedisTemplate(factory);
     }
 

wishing-platform/platform-core/platform-core-base/src/main/java/cn/qinys/platform/base/redis/RedisConfigCacheManager.java

@@ -2,8 +2,8 @@ package cn.qinys.platform.base.redis;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.cache.*;
-import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializationContext;
+import org.springframework.data.redis.serializer.RedisSerializer;
 
 import java.time.Duration;
 
@@ -22,7 +22,7 @@ public class RedisConfigCacheManager extends RedisCacheManager {
     }
 
     private static final RedisSerializationContext.SerializationPair<Object> DEFAULT_PAIR = RedisSerializationContext.SerializationPair
-            .fromSerializer(new GenericJackson2JsonRedisSerializer());
+            .fromSerializer(RedisSerializer.json());
 
     /**
      * @param name

wishing-platform/platform-core/platform-core-base/src/main/java/cn/qinys/platform/base/utils/PasswordUtils.java

@@ -1,7 +1,7 @@
 package cn.qinys.platform.base.utils;
 
+import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.tomcat.util.codec.binary.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

wishing-platform/platform-core/pom.xml

@@ -9,16 +9,16 @@
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-cloud.version>2025.0.2</spring-cloud.version>
-        <spring-boot.version>3.5.14</spring-boot.version>
-        <spring-cloud-alibaba.version>2025.0.0.0</spring-cloud-alibaba.version>
+        <spring-cloud.version>2025.1.2</spring-cloud.version>
+        <spring-boot.version>4.1.0</spring-boot.version>
+        <spring-cloud-alibaba.version>2025.1.0.0</spring-cloud-alibaba.version>
         <fastjson-version>2.0.32</fastjson-version>
         <mybatis-plus-version>3.5.15</mybatis-plus-version>
         <kaptcha.version>2.3.2</kaptcha.version>
         <hutool-all-version>5.8.32</hutool-all-version>
         <mysql-connector-version>8.0.33</mysql-connector-version>
         <alibaba.ttl.version>2.14.2</alibaba.ttl.version>
-        <spring-ai.version>1.1.7</spring-ai.version>
+        <spring-ai.version>2.0.0</spring-ai.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -53,7 +53,7 @@
             </dependency>
             <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>
             <dependency>
@@ -100,6 +100,18 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>com.alibaba.fastjson2</groupId>
+                <artifactId>fastjson2</artifactId>
+                <version>2.0.53</version>
+            </dependency>
+            <!-- Source: https://mvnrepository.com/artifact/tools.jackson.core/jackson-databind -->
+            <dependency>
+                <groupId>tools.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>3.2.0</version>
+                <scope>compile</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

wishing-platform/platform-entity/platform-entity-upms/pom.xml

@@ -16,13 +16,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
-        </dependency>
+       
     </dependencies>
 </project>

wishing-platform/platform-entity/platform-entity-wishing/pom.xml

@@ -18,11 +18,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
+
     </dependencies>
 </project>

wishing-platform/platform-entity/pom.xml

@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot4-starter</artifactId>
         </dependency>
     </dependencies>
 

wishing-platform/platform-gateway/pom.xml

@@ -46,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot4-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

wishing-platform/platform-gateway/src/main/java/cn/qinys/platform/gateway/config/GlobalExceptionConfiguration.java

@@ -5,7 +5,7 @@ import cn.qinys.platform.gateway.response.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler;
+import org.springframework.boot.webflux.error.ErrorWebExceptionHandler;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
 import org.springframework.http.MediaType;

wishing-platform/platform-gateway/src/main/java/cn/qinys/platform/gateway/limiter/DiyRequestRateLimiterGatewayFilterFactory.java

@@ -52,7 +52,7 @@ public class DiyRequestRateLimiterGatewayFilterFactory extends RequestRateLimite
                 ServerHttpResponse httpResponse = exchange.getResponse();
                 //修改code为500
                 httpResponse.setStatusCode(HttpStatus.TOO_MANY_REQUESTS);
-                if (!httpResponse.getHeaders().containsKey("Content-Type")) {
+                if (!httpResponse.getHeaders().containsHeader("Content-Type")) {
                     httpResponse.getHeaders().add("Content-Type", "application/json");
                 }
                 //此处无法触发全局异常处理，手动返回

wishing-platform/platform-service/platform-service-admin/pom.xml

@@ -43,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot4-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>

wishing-platform/platform-service/platform-service-mobile/pom.xml

@@ -12,7 +12,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-
     <dependencies>
         <dependency>
             <groupId>cn.qinys</groupId>
@@ -40,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot4-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
@@ -73,14 +72,6 @@
             <version>2.22.22</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
-        </dependency>
     </dependencies>
     <build>
         <finalName>wishing-mobile</finalName>

wishing-platform/platform-service/platform-service-mobile/src/main/java/cn/qinys/platform/mobile/mapper/ChatMessageMapper.java

@@ -12,8 +12,6 @@ import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface ChatMessageMapper extends BaseMapper<ChatMessage> {
-
-
     @Select("SELECT * FROM chat_message ${ew.customSqlSegment}")
     Page<ChatHistoryResp> getChatHistoryPage(Page<ChatMessage> page, @Param(Constants.WRAPPER) Wrapper<ChatMessage> wrapper);
 

wishing-platform/platform-service/platform-service-mobile/src/main/java/cn/qinys/platform/mobile/service/impl/ChatServiceImpl.java

@@ -10,17 +10,13 @@ import cn.qinys.platform.mobile.resp.ChatHistoryResp;
 import cn.qinys.platform.mobile.service.ChatService;
 import cn.qinys.platform.mobile.tool.DateTimeTools;
 import cn.qinys.platform.mobile.tool.WeatherTools;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.ai.chat.client.ChatClient;
-import org.springframework.ai.chat.client.advisor.MessageChatMemoryAdvisor;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 @Slf4j
 @Service
 public class ChatServiceImpl implements ChatService {

wishing-platform/platform-service/platform-service-mobile/src/main/resources/application.yml

@@ -28,7 +28,7 @@ jwt:
     - /dgapi/mobile/wishingtree/detail
     - /dgapi/mobile/chat/history
     - /dgapi/mobile/chat
-    - dgapi/mobile/wish/tree/**
+    - /dgapi/mobile/wish/tree/**
     - /dgapi/mobile/ext/file/**
 
 captcha:

wishing-platform/platform-service/platform-service-upms/pom.xml

@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot4-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>

wishing-platform/platform-service/platform-service-upms/src/main/resources/application-dev.yml

@@ -38,10 +38,3 @@ mybatis-plus:
 system:
   base-url: https://wish.qinys.cn/dgapi/upms/ext/file/
   file-directory: /file/
-
-
-sms:
-  debug: true
-  username: xcgsqwhxgl
-  pwd: rJi51O
-  url: http://218.65.241.103:9088/services/WebServiceSoap?wsdl

wishing-platform/platform-service/platform-service-upms/src/main/resources/application-local.yml

@@ -35,13 +35,7 @@ mybatis-plus:
       logic-delete-value: 1
       logic-not-delete-value: 0
 
+
 system:
   base-url: https://wish.qinys.cn/dgapi/upms/ext/file/
   file-directory: /file/
-
-
-sms:
-  debug: true
-  username: xcgsqwhxgl
-  pwd: rJi51O
-  url: http://218.65.241.103:9088/services/WebServiceSoap?wsdl