From c491a98dc72d67cee94d2c026e45377693e75b8f Mon Sep 17 00:00:00 2001
From: ageerle <32251822+ageerle@users.noreply.github.com>
Date: 星期三, 21 五月 2025 09:40:11 +0800
Subject: [PATCH] Merge pull request #95 from MuSan-Li/feature_20250520_fix_email_config
---
ruoyi-admin/src/main/java/org/ruoyi/controller/CaptchaController.java | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/ruoyi/controller/CaptchaController.java b/ruoyi-admin/src/main/java/org/ruoyi/controller/CaptchaController.java
index 89cf243..6a76d29 100644
--- a/ruoyi-admin/src/main/java/org/ruoyi/controller/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/org/ruoyi/controller/CaptchaController.java
@@ -5,10 +5,13 @@
import cn.hutool.captcha.generator.CodeGenerator;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.ruoyi.common.core.constant.Constants;
import org.ruoyi.common.core.constant.GlobalConstants;
import org.ruoyi.common.core.domain.R;
-import org.ruoyi.common.core.exception.ServiceException;
import org.ruoyi.common.core.service.ConfigService;
import org.ruoyi.common.core.utils.SpringUtils;
import org.ruoyi.common.core.utils.StringUtils;
@@ -22,10 +25,6 @@
import org.ruoyi.common.web.enums.CaptchaType;
import org.ruoyi.system.domain.request.EmailRequest;
import org.ruoyi.system.domain.vo.CaptchaVo;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
import org.springframework.expression.Expression;
import org.springframework.expression.ExpressionParser;
import org.springframework.expression.spel.standard.SpelExpressionParser;
@@ -36,7 +35,8 @@
import org.springframework.web.bind.annotation.RestController;
import java.time.Duration;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
/**
* 楠岃瘉鐮佹搷浣滃鐞�
@@ -90,18 +90,6 @@
String key = GlobalConstants.CAPTCHA_CODE_KEY + emailRequest.getUsername();
String code = RandomUtil.randomNumbers(4);
RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
- // 妫�楠岄偖绠卞悗缂�
- String suffix = configService.getConfigValue("mail", "suffix");
- String prompt = configService.getConfigValue("mail", "prompt");
- if(StringUtils.isNotEmpty(suffix)){
- // 鍔ㄦ�佺殑鍩熷悕鍒楄〃
- String[] invalidDomains = suffix.split(",");
- for (String domain : invalidDomains) {
- if (emailRequest.getUsername().endsWith(domain)) {
- throw new ServiceException(prompt);
- }
- }
- }
// 鑷畾涔夐偖绠辨ā鏉�
String model = configService.getConfigValue("mail", "mailModel");
String mailTitle = configService.getConfigValue("mail", "mailTitle");
--
Gitblit v1.9.3