feat(shop): 添加邮件发送功能并优化产品关联逻辑

- 新增邮件发送相关配置和代码，实现邮件发送功能 - 优化产品关联逻辑，解决空指针异常问题 - 更新数据库连接配置

feat(shop): 添加邮件发送功能并优化产品关联逻辑
- 新增邮件发送相关配置和代码，实现邮件发送功能 - 优化产品关联逻辑，解决空指针异常问题 - 更新数据库连接配置
曾国涛
1 parent 97a1d2ed
Showing 11 changed files with 253 additions and 23 deletions
admin/src/main/resources/application-test.yml
admin/src/main/resources/application.yml
shop/pom.xml
shop/src/main/java/com/canrd/shop/controller/EmailController.java
shop/src/main/java/com/canrd/shop/module/dto/SendTextEmailDto.java
shop/src/main/java/com/canrd/shop/service/IEmailService.java
shop/src/main/java/com/canrd/shop/service/impl/EmailServiceImpl.java
shop/src/main/java/com/canrd/shop/service/impl/ProductServiceImpl.java
shop/src/main/resources/application-test.yml
shop/src/main/resources/application.yml
shop/src/test/java/com/canrd/shop/TranslateTest.java
@@ -57,9 +57,9 @@ spring:
     testWhileIdle: true
     testOnBorrow: true
     testOnReturn: true
-    password: 123456
+    password: canrd@2024
     time-between-eviction-runs-millis: 1000
-    url: jdbc:mysql://159.75.211.11:3306/canrd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
+    url: jdbc:mysql://39.108.227.113:3307/canrd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
     username: root
   redis:
     database: 3
@@ -3,4 +3,4 @@ server:
 spring:
   profiles:
-    active: local
 \ No newline at end of file
+    active: test
 \ No newline at end of file
@@ -43,6 +43,10 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-freemarker</artifactId>
             <version>3.3.5</version>
         </dependency>
+package com.canrd.shop.controller;
+
+import com.canrd.shop.common.constant.ServerResult;
+import com.canrd.shop.module.dto.SendTextEmailDto;
+import com.canrd.shop.service.IEmailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author zgt
+ * @project canrd-services
+ * @description
+ * @date 2024/12/27
+ */
+@RestController
+@RequestMapping("/email")
+public class EmailController {
+    @Autowired
+    private IEmailService emailService;
+
+    /**
+     * 发送邮件到配置账号
+     * @param dto
+     * @return
+     */
+    @PostMapping("/send")
+    public ServerResult send(@Validated @RequestBody SendTextEmailDto dto){
+        String content ="姓名："+ dto.getFirstName()+" " + dto.getLastName()+"\n" +"邮箱："+ dto.getEmail()+"\n"+"消息："+dto.getMessage();
+        emailService.sendTo(content);
+        return ServerResult.success();
+    }
+}
+package com.canrd.shop.module.dto;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author zgt
+ * @project canrd-services
+ * @description
+ * @date 2024/12/27
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class SendTextEmailDto {
+
+        private String firstName;
+
+        private String lastName;
+
+        @Email
+        private String email;
+        @NotNull
+        private String message;
+
+        private String subject;
+
+}
+package com.canrd.shop.service;
+
+import java.io.File;
+import java.util.List;
+
+public interface IEmailService {
+
+
+
+    /**
+     * 邮件发送
+     *
+     * @param name    发送人名称
+     * @param to      发送对象
+     * @param subject 主题
+     * @param content 内容
+     * @param isHtml  是否为html
+     * @param cc      抄送，多人用逗号隔开
+     * @param bcc     密送，多人用逗号隔开
+     * @param files   文件
+     */
+    void send(String name, String to, String subject, String content, Boolean isHtml, String cc, String bcc, List<File> files);
+
+
+    void sendText(String name, String to, String subject, String content);
+
+    void sendHtml(String name, String to, String subject, String content);
+
+    void sendTo(String content);
+}
+package com.canrd.shop.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.canrd.shop.common.exception.BusinessException;
+import com.canrd.shop.service.IEmailService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.stereotype.Service;
+
+import javax.mail.internet.InternetAddress;
+import java.io.File;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zgt
+ * @project canrd-services
+ * @description
+ * @date 2024/12/27
+ */
+@Slf4j
+@Service
+public class EmailServiceImpl implements IEmailService {
+
+    @Value("${mail.to}")
+    private String to;
+
+    @Autowired
+    private JavaMailSender javaMailSender;//注入邮件工具类
+
+    @Value("${spring.mail.username}")
+    private String from;
+    @Override
+    public void send(String name,  String to, String subject, String content, Boolean isHtml, String cc, String bcc, List<File> files) {
+
+        if (StringUtils.isAnyBlank(from, to, subject, content)) {
+            throw new BusinessException("发送人,接收人,主题,内容均不可为空");
+        }
+        try {
+            //true表示支持复杂类型
+            MimeMessageHelper messageHelper = new MimeMessageHelper(javaMailSender.createMimeMessage(), true);
+            //邮件发信人
+            messageHelper.setFrom(new InternetAddress(name + "<" + from + ">"));
+            //邮件收信人
+            messageHelper.setTo(to.split(","));
+            //邮件主题
+            messageHelper.setSubject(subject);
+            //邮件内容
+            messageHelper.setText(content, isHtml);
+            //抄送
+            if (!StringUtils.isEmpty(cc)) {
+                messageHelper.setCc(cc.split(","));
+            }
+            //密送
+            if (!StringUtils.isEmpty(bcc)) {
+                messageHelper.setCc(bcc.split(","));
+            }
+            //添加邮件附件
+            if (CollectionUtil.isNotEmpty(files)) {
+                for (File file : files) {
+                    messageHelper.addAttachment(file.getName(), file);
+                }
+            }
+            // 邮件发送时间
+            messageHelper.setSentDate(new Date());
+            //正式发送邮件
+            javaMailSender.send(messageHelper.getMimeMessage());
+        } catch (Exception e) {
+            throw new BusinessException("邮件发送失败", e);
+        }
+    }
+
+
+    @Override
+    public void sendText(String name, String to, String subject, String content) {
+        this.send(name, to, subject, content, false, null, null, null);
+    }
+
+    @Override
+    public void sendHtml(String name, String to, String subject, String content) {
+        this.send(name, to, subject, content, true, null, null, null);
+    }
+
+    @Override
+    public void sendTo(String content) {
+        this.send(from, to, "客户咨询", content, false, null, null, null);
+    }
+
+}
+
+
@@ -234,13 +234,31 @@ public class ProductServiceImpl extends ServiceImpl&lt;ProductMapper, ProductDO&gt; im
                     .collect(Collectors.toList());
             List<String> collect = productCategoryRelationService.lambdaQuery()
                     .select(Productcategoryrelation::getProductId)
-                    .in(Productcategoryrelation::getCategoryId, cateIds)
-                    .notIn(Productcategoryrelation::getProductId,productVO.getRelatedProductIds())
+                    .func(wrapper -> {
+                        if (CollUtil.isEmpty(cateIds)){
+                            wrapper.apply("1!=1");
+                        }else {
+                            wrapper.in(Productcategoryrelation::getCategoryId, cateIds);
+                        }
+                    })
+                    .func(wrapper -> {
+                        if (CollUtil.isEmpty(productVO.getRelatedProductIds())){
+                            wrapper.apply("1!=1");
+                        }else {
+                            wrapper.notIn(Productcategoryrelation::getProductId,productVO.getRelatedProductIds());
+                        }
+                    })
                     .list().stream()
                     .map(Productcategoryrelation::getProductId)
                     .collect(Collectors.toList());
             List<String> records = this.lambdaQuery()
-                    .in(ProductDO::getId, collect)
+                    .func(wrapper -> {
+                        if (CollUtil.isEmpty(collect)){
+                            wrapper.apply("1!=1");
+                        }else {
+                            wrapper.in(ProductDO::getId, collect);
+                        }
+                    })
                     .eq(ProductDO::getIsmarketable, true)
                     .select(ProductDO::getId)
                     .page(new Page<>(1, 10 - productVO.getRelatedProductIds().size())).getRecords().stream()
@@ -248,13 +266,6 @@ public class ProductServiceImpl extends ServiceImpl&lt;ProductMapper, ProductDO&gt; im
             productVO.getRelatedProductIds().addAll(records);
         }
-//        List<JournalCategoryRelation> journalCategoryRelations = journalCategoryService.lambdaQuery()
-//                .in(JournalCategoryRelation::getCategoryId, categoryIds)
-//                .list();
-//        List<Long> journalIds = journalCategoryRelations.stream().map(JournalCategoryRelation::getJournalId).collect(Collectors.toList());
-//        List<Journal> journals = journalService.lambdaQuery()
-//                .in(Journal::getId, journalIds)
-//                .list();
         List<JournalCategoryRelation> journalCategoryRelations = null;
         if (categoryIds != null && !categoryIds.isEmpty()) {
             // 查询 journalCategoryRelations，仅在 categoryIds 不为空时执行
@@ -57,14 +57,14 @@ spring:
     testWhileIdle: true
     testOnBorrow: true
     testOnReturn: true
-    password: canrd@2024
+    password: 123456
     time-between-eviction-runs-millis: 1000
-    url: jdbc:mysql://39.108.227.113:3307/canrd_overseas?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
+    url: jdbc:mysql://192.168.31.242:13306/canrd_overseas?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
     username: root
-logging:
-  config: classpath:log4j2-dev.xml
+#logging:
+#  config: classpath:log4j2-dev.xml
 static-html:
@@ -8,3 +8,22 @@ spring:
     throw-exception-if-no-handler-found: true
   resources:
     add-mappings: false
+  mail:
+    host: smtp.mxhichina.com
+    port: 465
+    username: overseas@canrd.com
+    password: Canrd@overseas
+    protocol: smtps
+    properties:
+      mail:
+        smtp:
+          auth: true
+          starttls:
+            enable: true
+            required: true
+          socketFactory:
+            port: 465
+            class: javax.net.ssl.SSLSocketFactory
+
+mail:
+  to: contact@canrd.com
@@ -16,12 +16,7 @@ import com.canrd.shop.module.dto.ProductCategoryDO;
 import com.canrd.shop.module.dto.ProductDO;
 import com.canrd.shop.module.dto.ProductFunctionDO;
 import com.canrd.shop.module.dto.TicketTypeDO;
-import com.canrd.shop.service.ProductAttributeMapStoreService;
-import com.canrd.shop.service.ProductAttributeService;
-import com.canrd.shop.service.ProductCategoryService;
-import com.canrd.shop.service.ProductFunctionService;
-import com.canrd.shop.service.ProductService;
-import com.canrd.shop.service.TicketTypeService;
+import com.canrd.shop.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.junit.Test;
@@ -75,6 +70,14 @@ public class TranslateTest {
     @Autowired
     private ChatGptUtil chatGptUtil;
+    @Autowired
+    private IEmailService emailService;
+
+    @Test
+    public void translateProductAttributeMapStoreTest(){
+        emailService.sendText("zgt","2100047874@qq.com","test","测试一下");
+        return;
+    }
     @Test
     public void translateTicketTypeTest(){
         List<TicketTypeDO> ticketTypeDOS = ticketTypeService.list();
@@ -130,6 +133,7 @@ public class TranslateTest {
         });
     }
+
     @Test
     public void translateFunctionTest(){
         List<ProductFunctionDO> productFunctionDOS = productFunctionService.list();