From 95dc030ad8e77303207a1a42a3afd9a7a6612d75 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 03 Jun 2025 18:43:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-tools/src/main/java/com/oying/rest/EmailController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/oying-tools/src/main/java/com/oying/rest/EmailController.java b/oying-tools/src/main/java/com/oying/rest/EmailController.java
index 6d45449..dca9078 100644
--- a/oying-tools/src/main/java/com/oying/rest/EmailController.java
+++ b/oying-tools/src/main/java/com/oying/rest/EmailController.java
@@ -1,6 +1,7 @@
package com.oying.rest;
import com.oying.service.EmailService;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -14,6 +15,7 @@
/**
* 发送邮件
+ *
* @author Z
* @date 2018/09/28 6:55:53
*/
@@ -26,8 +28,8 @@
private final EmailService emailService;
@GetMapping
- public ResponseEntity<EmailConfig> queryEmailConfig(){
- return new ResponseEntity<>(emailService.find(),HttpStatus.OK);
+ public ResponseEntity<Object> queryEmailConfig() {
+ return new ResponseEntity<>(R.success(emailService.find()), HttpStatus.OK);
}
@Log("配置邮件")
@@ -35,14 +37,14 @@
@ApiOperation("配置邮件")
public ResponseEntity<Object> updateEmailConfig(@Validated @RequestBody EmailConfig emailConfig) throws Exception {
emailService.config(emailConfig, emailService.find());
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
@Log("发送邮件")
@PostMapping
@ApiOperation("发送邮件")
- public ResponseEntity<Object> sendEmail(@Validated @RequestBody EmailDto emailDto){
- emailService.send(emailDto,emailService.find());
- return new ResponseEntity<>(HttpStatus.OK);
+ public ResponseEntity<Object> sendEmail(@Validated @RequestBody EmailDto emailDto) {
+ emailService.send(emailDto, emailService.find());
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
}
--
Gitblit v1.9.3