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-system/src/main/java/com/oying/modules/system/rest/VerifyController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/system/rest/VerifyController.java b/oying-system/src/main/java/com/oying/modules/system/rest/VerifyController.java
index ca1b4e9..8eb4df8 100644
--- a/oying-system/src/main/java/com/oying/modules/system/rest/VerifyController.java
+++ b/oying-system/src/main/java/com/oying/modules/system/rest/VerifyController.java
@@ -1,5 +1,6 @@
package com.oying.modules.system.rest;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -31,7 +32,7 @@
public ResponseEntity<Object> resetEmail(@RequestParam String email){
EmailDto emailDto = verificationCodeService.sendEmail(email, CodeEnum.EMAIL_RESET_EMAIL_CODE.getKey());
emailService.send(emailDto,emailService.find());
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(),HttpStatus.OK);
}
@PostMapping(value = "/email/resetPass")
@@ -39,7 +40,7 @@
public ResponseEntity<Object> resetPass(@RequestParam String email){
EmailDto emailDto = verificationCodeService.sendEmail(email, CodeEnum.EMAIL_RESET_PWD_CODE.getKey());
emailService.send(emailDto,emailService.find());
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(),HttpStatus.OK);
}
@GetMapping(value = "/validated")
@@ -56,6 +57,6 @@
default:
break;
}
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(),HttpStatus.OK);
}
}
--
Gitblit v1.9.3