Pre Merge pull request !268 from zp-wmhx/dev

pull/268/MERGE
zp-wmhx 2025-06-10 05:48:33 +00:00 committed by Gitee
commit 1bba4d061d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 16 additions and 16 deletions

View File

@ -36,7 +36,7 @@ public interface DevSseApi {
* @author diantu
* @date 2023/7/5
**/
public SseEmitter createSseConnect(String clientId, Boolean setHeartBeat, Boolean defaultHeartbeat, Consumer<CommonSseParam> consumer);
SseEmitter createSseConnect(String clientId, Boolean setHeartBeat, Boolean defaultHeartbeat, Consumer<CommonSseParam> consumer);
/**
*
@ -45,7 +45,7 @@ public interface DevSseApi {
* @author diantu
* @date 2023/7/5
**/
public void closeSseConnect(String clientId);
void closeSseConnect(String clientId);
/**
*
@ -54,7 +54,7 @@ public interface DevSseApi {
* @author diantu
* @date 2023/7/5
**/
public void sendMessageToAllClient(String msg);
void sendMessageToAllClient(String msg);
/**
* clientId
@ -64,6 +64,6 @@ public interface DevSseApi {
* @author diantu
* @date 2023/7/5
**/
public void sendMessageToOneClient(String clientId, String msg);
void sendMessageToOneClient(String clientId, String msg);
}

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);
// 获取格式化后的主题
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);
// 将请求号作为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);
// 获取格式化后的主题
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);
}
@ -667,9 +667,9 @@ public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientU
// 定义变量参数
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 {
// 发送邮件
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)
.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);
// 将请求号作为key验证码的值作为value放到redis用于校验
@ -870,9 +870,9 @@ public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientU
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);
// 将请求号作为key验证码的值作为value放到redis用于校验
@ -1098,9 +1098,9 @@ public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientU
// 定义变量参数
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 {
// 发送邮件
devEmailApi.sendDynamicHtmlEmail(email, subject, content);