Merge remote-tracking branch 'origin/master' into xin

xin

2025-06-03 95dc030ad8e77303207a1a42a3afd9a7a6612d75

 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,7 +37,7 @@
    @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("发送邮件")
@@ -43,6 +45,6 @@
    @ApiOperation("发送邮件")
    public ResponseEntity<Object> sendEmail(@Validated @RequestBody EmailDto emailDto){
        emailService.send(emailDto,emailService.find());
        return new ResponseEntity<>(HttpStatus.OK);
        return new ResponseEntity<>(R.success(), HttpStatus.OK);
    }
}