Skip to content

Commit 51da2a2

Browse files
committed
(〃'▽'〃) v2025.12 发布:极大极大完善 vben5 的 antd、vben 版本的功能,新增 admin uniapp vue3 版本
1 parent fead40e commit 51da2a2

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
3535

3636
<properties>
37-
<revision>2025.11-jdk8-SNAPSHOT</revision>
37+
<revision>2025.12-jdk8-SNAPSHOT</revision>
3838
<!-- Maven 相关 -->
3939
<java.version>1.8</java.version>
4040
<maven.compiler.source>${java.version}</maven.compiler.source>

yudao-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
1515

1616
<properties>
17-
<revision>2025.11-jdk8-SNAPSHOT</revision>
17+
<revision>2025.12-jdk8-SNAPSHOT</revision>
1818
<flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
1919
<!-- 统一依赖管理 -->
2020
<spring.framework.version>5.3.39</spring.framework.version>

yudao-module-infra/yudao-module-infra-server/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
6565

6666
@MockBean
6767
private DatabaseTableService databaseTableService;
68-
@MockitoBean
68+
@MockBean
6969
private DataSourceConfigService dataSourceConfigService;
7070

7171
@MockBean

yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import cn.iocoder.yudao.module.promotion.dal.dataobject.coupon.CouponTemplateDO;
88
import cn.iocoder.yudao.module.promotion.enums.coupon.CouponTakeTypeEnum;
99

10-
import jakarta.validation.Valid;
10+
import javax.validation.Valid;
1111
import java.util.Collection;
1212
import java.util.List;
1313

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
1212
import cn.iocoder.yudao.module.system.dal.redis.RedisKeyConstants;
1313
import com.google.common.annotations.VisibleForTesting;
14-
import jakarta.annotation.Resource;
15-
import jakarta.validation.Valid;
1614
import lombok.extern.slf4j.Slf4j;
1715
import org.springframework.cache.annotation.CacheEvict;
1816
import org.springframework.cache.annotation.Cacheable;
1917
import org.springframework.stereotype.Service;
2018
import org.springframework.validation.annotation.Validated;
2119

20+
import javax.annotation.Resource;
21+
import javax.validation.Valid;
2222
import java.util.ArrayList;
2323
import java.util.List;
2424
import java.util.Map;
@@ -152,7 +152,7 @@ private String replaceOuterPreWithDiv(String content) {
152152
String regex = "(?s)<pre[^>]*>(.*?)</pre>";
153153
Pattern pattern = Pattern.compile(regex);
154154
Matcher matcher = pattern.matcher(content);
155-
StringBuilder sb = new StringBuilder();
155+
StringBuffer sb = new StringBuffer();
156156
while (matcher.find()) {
157157
// 提取 <pre> 标签内的内容
158158
String innerContent = matcher.group(1);
@@ -192,7 +192,7 @@ private String formatHtmlCodeBlocks(String content) {
192192
// 匹配 <pre><code> 标签的代码块
193193
Pattern codeBlockPattern = Pattern.compile("<pre\\s*.*?><code\\s*.*?>(.*?)</code></pre>", Pattern.DOTALL);
194194
Matcher matcher = codeBlockPattern.matcher(content);
195-
StringBuilder sb = new StringBuilder();
195+
StringBuffer sb = new StringBuffer();
196196
while (matcher.find()) {
197197
// 获取代码块内容
198198
String codeBlock = matcher.group(1);

0 commit comments

Comments
 (0)