|
@@ -15,6 +15,7 @@ import cn.kdan.pdf.tech.core.service.*;
|
|
|
import cn.kdan.pdf.tech.core.utils.EmailUtils;
|
|
|
import cn.kdan.pdf.tech.core.utils.ExcelUtils;
|
|
|
import cn.kdan.pdf.tech.core.utils.FileUtil;
|
|
|
+import cn.kdan.pdf.tech.core.utils.ThreadPoolSingleUtil;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
import constant.CommonConstant;
|
|
@@ -139,14 +140,16 @@ public class VppRTeamMemberRoleServiceImpl implements VppRTeamMemberRoleService
|
|
|
}
|
|
|
|
|
|
// 发送邮件
|
|
|
- CaptchaActionEnum actionEnum = CaptchaActionEnum.JOIN_TEAM_FOR_MEMBER;
|
|
|
- String code = CommonUtils.generateVerifyCode();
|
|
|
- String url = readerproUrl + confirmAddUrl + "?teamId=" + dto.getTeamId() + "&code=" + code + "&memberEmail=" + dto.getMemberEmail() + "&memberName=" + dto.getMemberName() + "&action=" + actionEnum.value();
|
|
|
- String text = String.format(actionEnum.text(), dto.getMemberEmail(), vppTeam.getName(), url) + CommonConstant.signHtml;
|
|
|
- String subject = String.format(actionEnum.subject(), user.getFullName());
|
|
|
- if(emailUtils.sendMail(subject, text, Collections.singletonList(dto.getMemberEmail()))) {
|
|
|
- redisUtils.hset(AuthConstant.VERIFY_CODE_KEY + actionEnum.value(), dto.getMemberEmail(), code, AuthConstant.INVITE_VERIFY_CODE_KEY_EXPIRE_TIME);
|
|
|
- }
|
|
|
+ ThreadPoolSingleUtil.getInstance().excute(() -> {
|
|
|
+ CaptchaActionEnum actionEnum = CaptchaActionEnum.JOIN_TEAM_FOR_MEMBER;
|
|
|
+ String code = CommonUtils.generateVerifyCode();
|
|
|
+ String url = readerproUrl + confirmAddUrl + "?teamId=" + dto.getTeamId() + "&code=" + code + "&memberEmail=" + dto.getMemberEmail() + "&memberName=" + dto.getMemberName() + "&action=" + actionEnum.value();
|
|
|
+ String text = String.format(actionEnum.text(), dto.getMemberEmail(), vppTeam.getName(), url) + CommonConstant.signHtml;
|
|
|
+ String subject = String.format(actionEnum.subject(), user.getFullName());
|
|
|
+ if(emailUtils.sendMail(subject, text, Collections.singletonList(dto.getMemberEmail()))) {
|
|
|
+ redisUtils.hset(AuthConstant.VERIFY_CODE_KEY + actionEnum.value(), dto.getMemberEmail(), code, AuthConstant.INVITE_VERIFY_CODE_KEY_EXPIRE_TIME);
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -227,17 +230,18 @@ public class VppRTeamMemberRoleServiceImpl implements VppRTeamMemberRoleService
|
|
|
// throw new BackendRuntimeException(VppMemberConstant.MEMBEU_HAS_ADMIN);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- // 发送邮件
|
|
|
- CaptchaActionEnum actionEnum = CaptchaActionEnum.JOIN_TEAM_FOR_MEMBER;
|
|
|
- String code = CommonUtils.generateVerifyCode();
|
|
|
- String url = readerproUrl + confirmAddUrl + "?teamId=" + vppTeam.getId() + "&code=" + code + "&memberEmail=" + memberEmail + "&memberName=" + memberName + "&action=" + actionEnum.value();
|
|
|
- String text = String.format(actionEnum.text(), memberEmail, vppTeam.getName(), url) + CommonConstant.signHtml;
|
|
|
- String subject = String.format(actionEnum.subject(), user.getFullName());
|
|
|
- if(emailUtils.sendMail(subject, text, Collections.singletonList(memberEmail))){
|
|
|
- redisUtils.hset(AuthConstant.VERIFY_CODE_KEY + actionEnum.value(), memberEmail, code, AuthConstant.INVITE_VERIFY_CODE_KEY_EXPIRE_TIME);
|
|
|
- }
|
|
|
count++;
|
|
|
+ // 发送邮件
|
|
|
+ ThreadPoolSingleUtil.getInstance().excute(() -> {
|
|
|
+ CaptchaActionEnum actionEnum = CaptchaActionEnum.JOIN_TEAM_FOR_MEMBER;
|
|
|
+ String code = CommonUtils.generateVerifyCode();
|
|
|
+ String url = readerproUrl + confirmAddUrl + "?teamId=" + vppTeam.getId() + "&code=" + code + "&memberEmail=" + memberEmail + "&memberName=" + memberName + "&action=" + actionEnum.value();
|
|
|
+ String text = String.format(actionEnum.text(), memberEmail, vppTeam.getName(), url) + CommonConstant.signHtml;
|
|
|
+ String subject = String.format(actionEnum.subject(), user.getFullName());
|
|
|
+ if(emailUtils.sendMail(subject, text, Collections.singletonList(memberEmail))){
|
|
|
+ redisUtils.hset(AuthConstant.VERIFY_CODE_KEY + actionEnum.value(), memberEmail, code, AuthConstant.INVITE_VERIFY_CODE_KEY_EXPIRE_TIME);
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
} catch (IOException e) {
|
|
|
log.error("批量导入团队成员读取数据失败,{}", e.getMessage());
|