fix 修改邮箱密码为邮箱授权码

This commit is contained in:
lijiarao
2021-11-26 14:04:46 +08:00
parent fbb62b689c
commit b4b28d59a1
4 changed files with 13 additions and 13 deletions
@@ -108,7 +108,7 @@ public class SendMessageServiceImpl implements SendMessageService {
try {
String email = loginUser.getEmail();
String emailPassword = loginUser.getEmailPassword();
//如果发件人没有邮箱或邮箱码则使用admin账户的邮箱
//如果发件人没有邮箱或邮箱授权码则使用admin账户的邮箱授权
if (StringUtils.isBlank(email) || StringUtils.isBlank(emailPassword)) {
loginUser = sysBaseAPI.getUserByName(env.getProperty("message.systemEmailUser"));
email = loginUser.getEmail();
@@ -132,7 +132,7 @@ public class SendMessageServiceImpl implements SendMessageService {
log.error("发送邮件异常",e);
if (e.getMessage() !=null){
if (e.getMessage().contains("javax.mail.AuthenticationFailedException")){
throw new JeroBootException("邮件发送失败,发件人的邮箱或邮箱码错误!");
throw new JeroBootException("邮件发送失败,发件人的邮箱或邮箱授权码错误!");
}else if (e.getMessage().contains("java.net.ConnectException")){
throw new JeroBootException("邮件发送失败,邮箱服务器连接超时!");
}else {
@@ -503,7 +503,7 @@ public class SendMessageServiceImpl implements SendMessageService {
try {
String email = loginUser.getEmail();
String emailPassword = loginUser.getEmailPassword();
//如果发件人没有邮箱或邮箱码则使用admin账户的邮箱
//如果发件人没有邮箱或邮箱授权码则使用admin账户的邮箱授权
if (StringUtils.isBlank(email) || StringUtils.isBlank(emailPassword)) {
loginUser = sysBaseAPI.getUserByName(env.getProperty("message.systemEmailUser"));
email = loginUser.getEmail();
@@ -59,7 +59,7 @@ public class EmailSendMsgHandle implements ISendMsgHandle {
mailSender.setHost(staticConfig.getHost());
//当前发送人邮箱(也就是自己)
mailSender.setUsername(email);
//授权码 (不是邮箱码 是上面咱们的准备工作获取的那个码)
//授权码 (不是邮箱授权码 是上面咱们的准备工作获取的那个码)
mailSender.setPassword(emailPassword);
//设置端口(这里用465、默认的25 在阿里云服务器上未开放,推荐我们设置465)
mailSender.setPort(25);
@@ -138,11 +138,11 @@ public class SysUser implements Serializable {
private String email;
/**
* 邮箱
* 邮箱授权
*/
@NotBlank(message = "邮箱码不能为空")
@Excel(name="邮箱",width = 15,exportConvert = true)
@ApiModelProperty(value = "邮箱")
@NotBlank(message = "邮箱授权码不能为空")
@Excel(name="邮箱授权",width = 15,exportConvert = true)
@ApiModelProperty(value = "邮箱授权")
private String emailPassword;
/**
@@ -63,12 +63,12 @@ public class SysUserTemplate {
private String email;
/**
* 邮箱
* 邮箱授权
*/
@NotBlank(message = "邮箱码不能为空")
@Size(max = 50,message = "邮箱码最长为50字符")
@Excel(name="邮箱",width = 15)
@ApiModelProperty(value = "邮箱")
@NotBlank(message = "邮箱授权码不能为空")
@Size(max = 50,message = "邮箱授权码最长为50字符")
@Excel(name="邮箱授权",width = 15)
@ApiModelProperty(value = "邮箱授权")
private String emailPassword;