Pre Merge pull request !267 from zp-wmhx/master

pull/267/MERGE
zp-wmhx 2025-06-10 05:27:17 +00:00 committed by Gitee
commit bf1c6179a8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 12 additions and 12 deletions

View File

@ -499,9 +499,9 @@ public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientU
// 定义变量参数 // 定义变量参数
JSONObject paramMap = JSONUtil.createObj().set("userEmail", email).set("validCode", emailValidCode).set("validTime", validCodeExpiredDuration/60); JSONObject paramMap = JSONUtil.createObj().set("userEmail", email).set("validCode", emailValidCode).set("validTime", validCodeExpiredDuration/60);
// 获取格式化后的主题 // 获取格式化后的主题
String subject = ClientEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);; String subject = ClientEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);
// 获取格式化后的内容 // 获取格式化后的内容
String content = ClientEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap);; String content = ClientEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap);
// 发送邮件 // 发送邮件
devEmailApi.sendDynamicHtmlEmail(email, subject, content); devEmailApi.sendDynamicHtmlEmail(email, subject, content);
// 将请求号作为key验证码的值作为value放到redis用于校验 // 将请求号作为key验证码的值作为value放到redis用于校验
@ -587,9 +587,9 @@ public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientU
// 定义变量参数 // 定义变量参数
JSONObject paramMap = JSONUtil.createObj().set("userEmail", clientUserFindPwdByEmailParam.getEmail()).set("userNewPassword", newPassword); JSONObject paramMap = JSONUtil.createObj().set("userEmail", clientUserFindPwdByEmailParam.getEmail()).set("userNewPassword", newPassword);
// 获取格式化后的主题 // 获取格式化后的主题
String subject = ClientEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);; String subject = ClientEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);
// 获取格式化后的内容 // 获取格式化后的内容
String content = ClientEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap);; String content = ClientEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap);
// 发送邮件 // 发送邮件
devEmailApi.sendDynamicHtmlEmail(email, subject, content); devEmailApi.sendDynamicHtmlEmail(email, subject, content);
} }
@ -667,9 +667,9 @@ public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientU
// 定义变量参数 // 定义变量参数
JSONObject paramMap = JSONUtil.createObj().set("userEmail", email).set("userNewPassword", newPassword); JSONObject paramMap = JSONUtil.createObj().set("userEmail", email).set("userNewPassword", newPassword);
// 获取格式化后的主题 // 获取格式化后的主题
String subject = ClientEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);; String subject = ClientEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);
// 获取格式化后的内容 // 获取格式化后的内容
String content = ClientEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap);; String content = ClientEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap);
try { try {
// 发送邮件 // 发送邮件
devEmailApi.sendDynamicHtmlEmail(email, subject, content); devEmailApi.sendDynamicHtmlEmail(email, subject, content);
@ -828,9 +828,9 @@ public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientU
JSONObject paramMap = JSONUtil.createObj().set("userEmail", email).set("validCode", emailValidCode) JSONObject paramMap = JSONUtil.createObj().set("userEmail", email).set("validCode", emailValidCode)
.set("validTime", validCodeExpiredDuration/60); .set("validTime", validCodeExpiredDuration/60);
// 获取格式化后的主题 // 获取格式化后的主题
String subject = ClientEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);; String subject = ClientEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);
// 获取格式化后的内容 // 获取格式化后的内容
String content = ClientEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap);; String content = ClientEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap);
// 发送邮件 // 发送邮件
devEmailApi.sendDynamicHtmlEmail(email, subject, content); devEmailApi.sendDynamicHtmlEmail(email, subject, content);
// 将请求号作为key验证码的值作为value放到redis用于校验 // 将请求号作为key验证码的值作为value放到redis用于校验
@ -870,9 +870,9 @@ public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientU
JSONObject paramMap = JSONUtil.createObj().set("userEmail", email).set("validCode", emailValidCode) JSONObject paramMap = JSONUtil.createObj().set("userEmail", email).set("validCode", emailValidCode)
.set("validTime", validCodeExpiredDuration/60); .set("validTime", validCodeExpiredDuration/60);
// 获取格式化后的主题 // 获取格式化后的主题
String subject = ClientEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);; String subject = ClientEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);
// 获取格式化后的内容 // 获取格式化后的内容
String content = ClientEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap);; String content = ClientEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap);
// 发送邮件 // 发送邮件
devEmailApi.sendDynamicHtmlEmail(email, subject, content); devEmailApi.sendDynamicHtmlEmail(email, subject, content);
// 将请求号作为key验证码的值作为value放到redis用于校验 // 将请求号作为key验证码的值作为value放到redis用于校验
@ -1098,9 +1098,9 @@ public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientU
// 定义变量参数 // 定义变量参数
JSONObject paramMap = JSONUtil.createObj().set("userEmail", email); JSONObject paramMap = JSONUtil.createObj().set("userEmail", email);
// 获取格式化后的主题 // 获取格式化后的主题
String subject = ClientEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);; String subject = ClientEmailFormatUtl.format(contentJSONObject.getStr("subject"), paramMap);
// 获取格式化后的内容 // 获取格式化后的内容
String content = ClientEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap);; String content = ClientEmailFormatUtl.format(contentJSONObject.getStr("content"), paramMap);
try { try {
// 发送邮件 // 发送邮件
devEmailApi.sendDynamicHtmlEmail(email, subject, content); devEmailApi.sendDynamicHtmlEmail(email, subject, content);