diff --git a/pom.xml b/pom.xml index 5ab8d219c..158e4f95c 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 1.80 1.16.7 - 3.3.2 + 3.3.4 2.28.22 @@ -383,8 +383,7 @@ maven-compiler-plugin ${maven-compiler-plugin.version} - ${java.version} - ${java.version} + ${java.version} ${project.build.sourceEncoding} diff --git a/ruoyi-admin/src/main/resources/ip2region_v4.xdb b/ruoyi-admin/src/main/resources/ip2region_v4.xdb index 6f86c7d9b..707ea3d45 100644 Binary files a/ruoyi-admin/src/main/resources/ip2region_v4.xdb and b/ruoyi-admin/src/main/resources/ip2region_v4.xdb differ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java index 5c74a8351..2012cd4ee 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java +++ b/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)) { - region = UNKNOWN_ADDRESS; + return UNKNOWN_ADDRESS; } - return region; + return StringUtils.replace(region, "0", UNKNOWN_ADDRESS); } 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)) { - region = UNKNOWN_ADDRESS; + return UNKNOWN_ADDRESS; } - return region; + return StringUtils.replace(region, "0", UNKNOWN_ADDRESS); } catch (Exception e) { log.error("IP地址离线获取城市异常 {}", Util.ipToString(ipBytes)); return UNKNOWN_ADDRESS; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java index ee4900709..eca329c68 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java +++ b/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.bo.TestDemoImportVo; +import org.dromara.demo.domain.vo.TestDemoImportVo; import org.dromara.demo.domain.vo.TestDemoVo; import org.dromara.demo.service.ITestDemoService; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoImportVo.java similarity index 85% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java rename to ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoImportVo.java index dc8b35f49..c799b6f12 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoImportVo.java @@ -1,10 +1,12 @@ -package org.dromara.demo.domain.bo; +package org.dromara.demo.domain.vo; 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 @@ -13,6 +15,7 @@ import jakarta.validation.constraints.NotNull; * @date 2021-07-26 */ @Data +@AutoMapper(target = TestDemo.class) public class TestDemoImportVo { /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java index 8d4708b8e..6f9ea3028 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java @@ -98,7 +98,14 @@ public class FlwCommonServiceImpl implements IFlwCommonService { } case EMAIL_MESSAGE -> MailUtils.sendText(emails, subject, message); case SMS_MESSAGE -> { - // TODO: 补充短信发送逻辑 +// LinkedHashMap 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); log.info("【短信发送 - TODO】用户数量={} 内容={}", userList.size(), message); } default -> log.warn("【消息发送】未处理的消息类型:{}", messageTypeEnum);