diff --git a/pom.xml b/pom.xml index 615c6564c..8359fd1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ https://github.com/YunaiV/ruoyi-vue-pro - 2025.11-jdk8-SNAPSHOT + 2025.12-jdk8-SNAPSHOT 1.8 ${java.version} diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index ccb311fe0..4554a7c39 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -14,7 +14,7 @@ https://github.com/YunaiV/ruoyi-vue-pro - 2025.11-jdk8-SNAPSHOT + 2025.12-jdk8-SNAPSHOT 1.6.0 5.3.39 diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java b/yudao-module-infra/yudao-module-infra-server/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java index 7b9e25bdb..a3193976f 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java +++ b/yudao-module-infra/yudao-module-infra-server/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java @@ -65,7 +65,7 @@ public class CodegenServiceImplTest extends BaseDbUnitTest { @MockBean private DatabaseTableService databaseTableService; - @MockitoBean + @MockBean private DataSourceConfigService dataSourceConfigService; @MockBean diff --git a/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateService.java b/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateService.java index cce2cf59e..0533b2372 100755 --- a/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateService.java +++ b/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateService.java @@ -7,7 +7,7 @@ import cn.iocoder.yudao.module.promotion.controller.admin.coupon.vo.template.Cou import cn.iocoder.yudao.module.promotion.dal.dataobject.coupon.CouponTemplateDO; import cn.iocoder.yudao.module.promotion.enums.coupon.CouponTakeTypeEnum; -import jakarta.validation.Valid; +import javax.validation.Valid; import java.util.Collection; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java index 2ee46dbf7..116f24155 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java @@ -11,14 +11,14 @@ import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO; import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper; import cn.iocoder.yudao.module.system.dal.redis.RedisKeyConstants; import com.google.common.annotations.VisibleForTesting; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; +import javax.annotation.Resource; +import javax.validation.Valid; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -152,7 +152,7 @@ public class MailTemplateServiceImpl implements MailTemplateService { String regex = "(?s)]*>(.*?)"; Pattern pattern = Pattern.compile(regex); Matcher matcher = pattern.matcher(content); - StringBuilder sb = new StringBuilder(); + StringBuffer sb = new StringBuffer(); while (matcher.find()) { // 提取
 标签内的内容
             String innerContent = matcher.group(1);
@@ -192,7 +192,7 @@ public class MailTemplateServiceImpl implements MailTemplateService {
         // 匹配 
 标签的代码块
         Pattern codeBlockPattern = Pattern.compile("(.*?)
", Pattern.DOTALL); Matcher matcher = codeBlockPattern.matcher(content); - StringBuilder sb = new StringBuilder(); + StringBuffer sb = new StringBuffer(); while (matcher.find()) { // 获取代码块内容 String codeBlock = matcher.group(1);