public/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-03-07 23:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into futuer/boot4

Browse Source 
# Conflicts:
#	pom.xml
This commit is contained in:
疯狂的狮子Li
2026-02-10 13:03:48 +08:00
parent ac6fe13bcf ed9de38c6f
commit 529f614dae
6 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pom.xml
View File

@@ -38,7 +38,7 @@
<bouncycastle.version>1.80</bouncycastle.version> <bouncycastle.version>1.80</bouncycastle.version>
<justauth.version>1.16.7</justauth.version> <justauth.version>1.16.7</justauth.version>
<!-- 离线IP地址定位库 --> <!-- 离线IP地址定位库 -->
<ip2region.version>3.3.2</ip2region.version> <ip2region.version>3.3.4</ip2region.version>
<!-- OSS 配置 --> <!-- OSS 配置 -->
<aws.sdk.version>2.28.22</aws.sdk.version> <aws.sdk.version>2.28.22</aws.sdk.version>
<!-- SMS 配置 --> <!-- SMS 配置 -->
@@ -383,8 +383,7 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version> <version>${maven-compiler-plugin.version}</version>
<configuration> <configuration>
<source>${java.version}</source> <release>${java.version}</release>
<target>${java.version}</target>
<encoding>${project.build.sourceEncoding}</encoding> <encoding>${project.build.sourceEncoding}</encoding>
<annotationProcessorPaths> <annotationProcessorPaths>
<path> <path>

BIN
ruoyi-admin/src/main/resources/ip2region_v4.xdb
View File

Binary file not shown.

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

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

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

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

5
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java → ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoImportVo.java
View File

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

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

@@ -98,7 +98,14 @@ public class FlwCommonServiceImpl implements IFlwCommonService {
} }
case EMAIL_MESSAGE -> MailUtils.sendText(emails, subject, message); case EMAIL_MESSAGE -> MailUtils.sendText(emails, subject, message);
case SMS_MESSAGE -> { case SMS_MESSAGE -> {
// TODO: 补充短信发送逻辑 // 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);
log.info("【短信发送 - TODO】用户数量={} 内容={}", userList.size(), message); log.info("【短信发送 - TODO】用户数量={} 内容={}", userList.size(), message);
} }
default -> log.warn("【消息发送】未处理的消息类型：{}", messageTypeEnum); default -> log.warn("【消息发送】未处理的消息类型：{}", messageTypeEnum);