!826 发布 5.5.3 版本 提前祝大家新年快乐

Merge pull request !826 from 疯狂的狮子Li/dev

pom.xml

@@ -14,7 +14,7 @@
 
     <properties>
         <revision>5.5.3</revision>
-        <spring-boot.version>3.5.9</spring-boot.version>
+        <spring-boot.version>3.5.10</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
@@ -38,7 +38,7 @@
         <bouncycastle.version>1.80</bouncycastle.version>
         <justauth.version>1.16.7</justauth.version>
         <!-- 离线IP地址定位库 -->
-        <ip2region.version>3.3.4</ip2region.version>
+        <ip2region.version>3.3.2</ip2region.version>
         <!-- OSS 配置 -->
         <aws.sdk.version>2.28.22</aws.sdk.version>
         <!-- SMS 配置 -->
@@ -375,7 +375,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-                    <release>${java.version}</release>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
                     <encoding>${project.build.sourceEncoding}</encoding>
                     <annotationProcessorPaths>
                         <path>

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java

@@ -90,9 +90,9 @@ public class RegionUtils {
         try {
             String region = ip2Region.search(ipString);
             if (StringUtils.isBlank(region)) {
-                return UNKNOWN_ADDRESS;
+                region = UNKNOWN_ADDRESS;
             }
-            return StringUtils.replace(region, "0", UNKNOWN_ADDRESS);
+            return region;
         } catch (Exception e) {
             log.error("IP地址离线获取城市异常 {}", ipString);
             return UNKNOWN_ADDRESS;
@@ -109,9 +109,9 @@ public class RegionUtils {
         try {
             String region = ip2Region.search(ipBytes);
             if (StringUtils.isBlank(region)) {
-                return UNKNOWN_ADDRESS;
+                region = UNKNOWN_ADDRESS;
             }
-            return StringUtils.replace(region, "0", UNKNOWN_ADDRESS);
+            return region;
         } catch (Exception e) {
             log.error("IP地址离线获取城市异常 {}", Util.ipToString(ipBytes));
             return UNKNOWN_ADDRESS;

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java

@@ -17,7 +17,7 @@ import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.demo.domain.TestDemo;
 import org.dromara.demo.domain.bo.TestDemoBo;
-import org.dromara.demo.domain.vo.TestDemoImportVo;
+import org.dromara.demo.domain.bo.TestDemoImportVo;
 import org.dromara.demo.domain.vo.TestDemoVo;
 import org.dromara.demo.service.ITestDemoService;
 import lombok.RequiredArgsConstructor;

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java

@@ -1,12 +1,10 @@
-package org.dromara.demo.domain.vo;
+package org.dromara.demo.domain.bo;
 
 import cn.idev.excel.annotation.ExcelProperty;
-import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import org.dromara.demo.domain.TestDemo;
 
 /**
  * 测试单表业务对象 test_demo
@@ -15,7 +13,6 @@ import org.dromara.demo.domain.TestDemo;
  * @date 2021-07-26
  */
 @Data
-@AutoMapper(target = TestDemo.class)
 public class TestDemoImportVo {
 
     /**

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java

@@ -98,14 +98,7 @@ public class FlwCommonServiceImpl implements IFlwCommonService {
                     }
                     case EMAIL_MESSAGE -> MailUtils.sendText(emails, subject, message);
                     case SMS_MESSAGE -> {
-//                        LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
-//                        // 根据具体短信服务商参数用法传参
-//                        map.put("code", "1234");
-//                        // 自动获取一个短信服务商
-//                        SmsBlend smsBlend = SmsFactory.getSmsBlend();
-//                        // 指定获取一个短信服务商 configKey
-//                        SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
-//                        SmsResponse smsResponse = smsBlend.sendMessage(phones, templateId, map);
+                        // TODO: 补充短信发送逻辑
                         log.info("【短信发送 - TODO】用户数量={} 内容={}", userList.size(), message);
                     }
                     default -> log.warn("【消息发送】未处理的消息类型：{}", messageTypeEnum);