fix: 对齐 PR1187 与 PR1204 修复

- 修复 WebProperties 嵌套属性级联校验 - 修复邮件模板代码块包含特殊字符时的替换异常 - 补充相关回归测试

fix: 对齐 PR1187 与 PR1204 修复
- 修复 WebProperties 嵌套属性级联校验 - 修复邮件模板代码块包含特殊字符时的替换异常 - 补充相关回归测试
YunaiV
1 parent 895c650c
Showing 3 changed files with 20 additions and 4 deletions
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/WebProperties.java
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImplTest.java
@@ -17,17 +17,19 @@ import jakarta.validation.constraints.NotNull;
 public class WebProperties {
  
     @NotNull(message = "APP API 不能为空")
+    @Valid
     private Api appApi = new Api("/app-api", "**.controller.app.**");
     @NotNull(message = "Admin API 不能为空")
+    @Valid
     private Api adminApi = new Api("/admin-api", "**.controller.admin.**");
  
     @NotNull(message = "Admin UI 不能为空")
+    @Valid
     private Ui adminUi;
  
     @Data
     @AllArgsConstructor
     @NoArgsConstructor
-    @Valid
     public static class Api {
  
         /**
@@ -53,7 +55,6 @@ public class WebProperties {
     }
  
     @Data
-    @Valid
     public static class Ui {
  
         /**
@@ -166,7 +166,7 @@ public class MailTemplateServiceImpl implements MailTemplateService {
             // 提取 <pre> 标签内的内容
             String innerContent = matcher.group(1);
             // 返回 div 标签包裹的内容
-            matcher.appendReplacement(sb, "<div>" + innerContent + "</div>");
+            matcher.appendReplacement(sb, Matcher.quoteReplacement("<div>" + innerContent + "</div>"));
         }
         matcher.appendTail(sb);
         return sb.toString();
@@ -207,7 +207,8 @@ public class MailTemplateServiceImpl implements MailTemplateService {
             String codeBlock = matcher.group(1);
             // 为代码块添加样式
             String replacement = "<pre style=\"background-color: #f5f5f5; padding: 10px; border-radius: 5px; overflow-x: auto;\"><code>" + codeBlock + "</code></pre>";
-            matcher.appendReplacement(sb, replacement);
+            // 代码块内容可能包含 $ 或 \\，需要 quoteReplacement，否则会抛 IllegalArgumentException: Illegal group reference
+            matcher.appendReplacement(sb, Matcher.quoteReplacement(replacement));
         }
         matcher.appendTail(sb);
         return sb.toString();
@@ -398,4 +398,18 @@ public class MailTemplateServiceImplTest extends BaseDbUnitTest {
         assertFalse(formattedContent.contains("{activationLink}"));
     }
  
+    @Test
+    public void testFormatMailTemplateContent_dollarInCodeBlock() {
+        // 准备参数
+        Map<String, Object> params = new HashMap<>();
+
+        // 测试代码块中包含 $ 与 \\（历史上 appendReplacement 会抛 IllegalArgumentException: Illegal group reference）
+        String content = "<pre><code>echo $HOME && ls \\root</code></pre>";
+
+        // 调用，并断言内容原样保留
+        String result = mailTemplateService.formatMailTemplateContent(content, params);
+        assertTrue(result.contains("echo $HOME && ls \\root"));
+        assertTrue(result.contains("<div><code>"));
+    }
+
 }