diff --git a/pom.xml b/pom.xml index 9c14ce4b..13c123fa 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.6 + 3.2.5 com.aida @@ -15,7 +15,7 @@ ai da 21 - 3.5.5 + 3.5.7 5.8.23 4.2.7.B 2.0.43 @@ -28,6 +28,11 @@ 1.5.5 windows-x86_64 linux-x86_64 + + + 2023.0.3.4 + + 2023.0.4 @@ -38,6 +43,22 @@ pom import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + @@ -74,9 +95,14 @@ com.baomidou - mybatis-plus-boot-starter + mybatis-plus-spring-boot3-starter ${mybatis.plus.version} + + org.mybatis + mybatis-spring + 3.0.4 + org.springframework.boot @@ -432,6 +458,33 @@ org.springframework.boot spring-boot-starter-aop + + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + diff --git a/src/main/java/com/ai/da/AiDaApplication.java b/src/main/java/com/ai/da/AiDaApplication.java index 87b3c27b..85fb879b 100644 --- a/src/main/java/com/ai/da/AiDaApplication.java +++ b/src/main/java/com/ai/da/AiDaApplication.java @@ -3,6 +3,8 @@ package com.ai.da; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @@ -10,6 +12,8 @@ import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication @EnableScheduling @EnableAsync +@EnableFeignClients +@EnableDiscoveryClient public class AiDaApplication { public static void main(String[] args) { diff --git a/src/main/java/com/ai/da/common/utils/MailUtil.java b/src/main/java/com/ai/da/common/utils/MailUtil.java index 846c959a..c15326e6 100644 --- a/src/main/java/com/ai/da/common/utils/MailUtil.java +++ b/src/main/java/com/ai/da/common/utils/MailUtil.java @@ -3,7 +3,6 @@ package com.ai.da.common.utils; import com.ai.da.common.constant.CommonConstant; import com.ai.da.model.dto.BasicEmailParamDTO; import com.alibaba.fastjson.JSONObject; -import com.sun.mail.smtp.SMTPTransport; import io.netty.util.internal.StringUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.core.io.InputStreamSource; @@ -35,7 +34,8 @@ public class MailUtil { * 发送邮件 - 默认发件人 * * @param basicEmailParamDTO 发送邮件所需参数 - * @param inputStreamSource 附件（如果有） + * @param fileName 附件名（如果有） + * @param inputStreamSource 附件（如果有） */ public int sendMail(BasicEmailParamDTO basicEmailParamDTO, String fileName, InputStreamSource inputStreamSource) throws MessagingException { MimeMessage mimeMessage = createSimpleMail(basicEmailParamDTO, fileName, inputStreamSource); @@ -62,36 +62,29 @@ public class MailUtil { } private int sendMail(MimeMessage mimeMessage, String host, String username, String password) throws MessagingException { - SMTPTransport transport = null; try { - // 获取 SMTPTransport - transport = (SMTPTransport) mimeMessage.getSession().getTransport("smtp"); - // 连接到 SMTP 服务器 - transport.connect(host, username, password); - // 发送邮件 - transport.sendMessage(mimeMessage, mimeMessage.getAllRecipients()); - // 获取 SMTP 服务器的响应 - String lastServerResponse = transport.getLastServerResponse(); - int lastReturnCode = transport.getLastReturnCode(); + // 配置连接属性 + java.util.Properties props = mimeMessage.getSession().getProperties(); + props.put("mail.smtp.auth", "true"); + props.put("mail.smtp.host", host); + props.put("mail.user", username); + props.put("mail.password", password); - log.info("SMTP 状态码: {}, SMTP 服务器响应: {}", lastReturnCode, lastServerResponse); - return lastReturnCode; - } catch (MailException | MessagingException e) { - // 记录日志或执行其他补偿逻辑 + // 使用 JavaMailSender 发送邮件（Spring Boot 3.x 标准方式） + javaMailSender.send(mimeMessage); + log.info("邮件发送成功至: {}", host); + return 1; + } catch (MailException e) { log.info("邮件发送失败：{}", e.getMessage()); - } finally { - // 关闭连接 - assert transport != null; - transport.close(); + return 0; } - return 0; } /** * 创建一封邮件 * * @param basicEmailParamDTO 创建邮件需要的参数 - * @param inputStreamSource 附件（如果有） + * @param inputStreamSource 附件（如果有） * @return 一封邮件 */ private MimeMessage createSimpleMail(BasicEmailParamDTO basicEmailParamDTO, String fileName, InputStreamSource inputStreamSource) throws MessagingException { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 974fee23..57276cce 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -5,4 +5,4 @@ #spring.profiles.active=prod #����application-dev�ļ�(��������) -spring.profiles.active=dev +spring.profiles.active=local2 diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml new file mode 100644 index 00000000..07178cc5 --- /dev/null +++ b/src/main/resources/bootstrap.yml @@ -0,0 +1,10 @@ +spring: + application: + name: aida-back + config: + import: "optional:nacos:${spring.application.name}.yml" + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + namespace: dev