refactor(email): 优化邮件模板的数据处理和展示逻辑
- 在 EmailTemplateUtil 中增加了对 email 和 newPassword 的非空校验 - 更新了 notification.html、password-reset.html 和 register-success.html 模板中的条件判断逻辑 - 优化了模板的 HTML 结构和样式,提高了邮件的可读性和美观性
This commit is contained in:
@@ -37,7 +37,9 @@ public class EmailTemplateUtil {
|
||||
data.put("username", username);
|
||||
data.put("phone", phone);
|
||||
data.put("password", password);
|
||||
data.put("email", email);
|
||||
if (email != null && !email.trim().isEmpty()) {
|
||||
data.put("email", email);
|
||||
}
|
||||
|
||||
emailRecordService.sendHtmlEmail(title, "register-success.html", data, new String[]{email});
|
||||
} catch (Exception e) {
|
||||
@@ -62,8 +64,10 @@ public class EmailTemplateUtil {
|
||||
Map<String, Object> data = new HashMap<>();
|
||||
data.put("username", username);
|
||||
data.put("phone", phone);
|
||||
data.put("newPassword", newPassword);
|
||||
data.put("resetTime", DateUtil.now());
|
||||
if (newPassword != null && !newPassword.trim().isEmpty()) {
|
||||
data.put("newPassword", newPassword);
|
||||
}
|
||||
|
||||
emailRecordService.sendHtmlEmail(title, "password-reset.html", data, new String[]{email});
|
||||
} catch (Exception e) {
|
||||
@@ -93,16 +97,16 @@ public class EmailTemplateUtil {
|
||||
data.put("content", content);
|
||||
data.put("sendTime", DateUtil.now());
|
||||
|
||||
if (greeting != null) {
|
||||
if (greeting != null && !greeting.trim().isEmpty()) {
|
||||
data.put("greeting", greeting);
|
||||
}
|
||||
if (infoMessage != null) {
|
||||
if (infoMessage != null && !infoMessage.trim().isEmpty()) {
|
||||
data.put("infoMessage", infoMessage);
|
||||
}
|
||||
if (actionUrl != null) {
|
||||
if (actionUrl != null && !actionUrl.trim().isEmpty()) {
|
||||
data.put("actionUrl", actionUrl);
|
||||
}
|
||||
if (actionText != null) {
|
||||
if (actionText != null && !actionText.trim().isEmpty()) {
|
||||
data.put("actionText", actionText);
|
||||
}
|
||||
|
||||
|
||||
@@ -218,14 +218,14 @@
|
||||
</div>
|
||||
|
||||
<!-- Info Box -->
|
||||
<% if(infoMessage!) { %>
|
||||
<% if(has(infoMessage)) { %>
|
||||
<div class="info-box">
|
||||
<strong>ℹ️ 温馨提示:</strong> ${infoMessage!}
|
||||
</div>
|
||||
<% } %>
|
||||
|
||||
<!-- CTA Button -->
|
||||
<% if(actionUrl!) { %>
|
||||
<% if(has(actionUrl)) { %>
|
||||
<div class="cta-section">
|
||||
<a href="${actionUrl!}" class="cta-button">${actionText!'查看详情'}</a>
|
||||
</div>
|
||||
|
||||
@@ -269,7 +269,7 @@
|
||||
<span class="info-label">重置时间:</span>
|
||||
<span class="info-value">${resetTime!}</span>
|
||||
</div>
|
||||
<% if(newPassword!) { %>
|
||||
<% if(has(newPassword)) { %>
|
||||
<div class="info-item">
|
||||
<span class="info-label">新密码:</span>
|
||||
<span class="info-value">${newPassword!}</span>
|
||||
@@ -284,7 +284,7 @@
|
||||
|
||||
<!-- CTA Button -->
|
||||
<div class="cta-section">
|
||||
<a href="https://www.gxwebsoft.com/login" class="cta-button">立即登录</a>
|
||||
<a href="https://websoft.top/login" class="cta-button">立即登录</a>
|
||||
</div>
|
||||
|
||||
<!-- Security Tips -->
|
||||
@@ -303,19 +303,18 @@
|
||||
<!-- Footer -->
|
||||
<div class="footer">
|
||||
<div class="footer-content">
|
||||
<strong>南宁网宿信息科技有限公司</strong><br>
|
||||
<strong>网宿软件</strong><br>
|
||||
专业的企业数字化转型服务商
|
||||
</div>
|
||||
|
||||
<div class="footer-links">
|
||||
<a href="https://www.gxwebsoft.com">官方网站</a>
|
||||
<a href="https://www.gxwebsoft.com/help">帮助中心</a>
|
||||
<a href="https://www.gxwebsoft.com/contact">联系我们</a>
|
||||
<a href="https://websoft.top">官方网站</a>
|
||||
<a href="https://websoft.top/help">帮助中心</a>
|
||||
<a href="https://websoft.top/contact">联系我们</a>
|
||||
</div>
|
||||
|
||||
<div class="copyright">
|
||||
© 2024 南宁网宿信息科技有限公司 版权所有<br>
|
||||
如有疑问,请联系客服:170083662@qq.com
|
||||
© 2025 WebSoft Inc.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -282,7 +282,7 @@
|
||||
<span class="info-label">登录密码:</span>
|
||||
<span class="info-value">${password!}</span>
|
||||
</div>
|
||||
<% if(email!) { %>
|
||||
<% if(has(email)) { %>
|
||||
<div class="info-item">
|
||||
<span class="info-label">邮箱:</span>
|
||||
<span class="info-value">${email!}</span>
|
||||
|
||||
Reference in New Issue
Block a user