From 63aab08cd422e940bf27a6908acd0e93a4df3a5c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 17 六月 2025 08:53:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/shop/src/main/java/com/doumee/api/common/PublicController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/server/shop/src/main/java/com/doumee/api/common/PublicController.java b/server/shop/src/main/java/com/doumee/api/common/PublicController.java
index d8754cb..3a5b382 100644
--- a/server/shop/src/main/java/com/doumee/api/common/PublicController.java
+++ b/server/shop/src/main/java/com/doumee/api/common/PublicController.java
@@ -5,9 +5,12 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.excel.ExcelToPdfTool;
import com.doumee.core.annotation.trace.Trace;
+import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.aliyun.ALiYunUtil;
+import com.doumee.dao.business.model.SmsEmail;
+import com.doumee.service.business.third.EmailService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -15,10 +18,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
@@ -47,12 +47,20 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private EmailService emailService;
@ApiOperation("娴嬭瘯")
@PostMapping("/testPdf")
public String testPdf(@RequestParam Map<String,String> req, HttpServletResponse response) {
ExcelToPdfTool.excelToPdf(req.get("f1"),req.get("f2"));
return JSONObject.toJSONString(req);
}
+ @ApiOperation("娴嬭瘯閭")
+ @PostMapping("/testEmail")
+ public ApiResponse<Boolean> testEmail(@RequestBody SmsEmail smsEmail, HttpServletResponse response) {
+ boolean result= emailService.sendEmail(smsEmail.getEmail(),smsEmail.getTitle(),smsEmail.getContent(),smsEmail.getFileList());
+ return ApiResponse.success(result);
+ }
@ApiOperation(value = "涓婁紶", notes = "涓婁紶", httpMethod = "POST", position = 6)
@ApiImplicitParams({
--
Gitblit v1.9.3