gitee
/
snowy
mirror of https://gitee.com/xiaonuobase/snowy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
parent 3a5ecac001 e26fa7ead3
commit 1bba4d061d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
snowy-plugin-api/snowy-plugin-dev-api/src/main/java/vip/xiaonuo/dev/api/DevSseApi.java
View File

@ -36,7 +36,7 @@ public interface DevSseApi {
* @author diantu * @author diantu
* @date 2023/7/5 * @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 * @author diantu
* @date 2023/7/5 * @date 2023/7/5
**/ **/
public void closeSseConnect(String clientId); void closeSseConnect(String clientId);
/** /**
* 推送消息到所有客户端 * 推送消息到所有客户端
@ -54,7 +54,7 @@ public interface DevSseApi {
* @author diantu * @author diantu
* @date 2023/7/5 * @date 2023/7/5
**/ **/
public void sendMessageToAllClient(String msg); void sendMessageToAllClient(String msg);
/** /**
* 根据clientId发送消息给某一客户端 * 根据clientId发送消息给某一客户端
@ -64,6 +64,6 @@ public interface DevSseApi {
* @author diantu * @author diantu
* @date 2023/7/5 * @date 2023/7/5
**/ **/
public void sendMessageToOneClient(String clientId, String msg); void sendMessageToOneClient(String clientId, String msg);
} }

24
snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/service/impl/ClientUserServiceImpl.java
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);