From 1f7c06b777a337448da41a8c86ca580674712461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Sun, 4 Dec 2022 00:33:56 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BB=BB=E5=8A=A1=EF=BC=88=E6=89=BE=E5=9B=9E=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E8=BF=94=E5=9B=9EvalidCodeReqNo=E4=B8=8D=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=EF=BC=89=20https://gitee.com/xiaonuobase/snowy/issues?=
 =?UTF-8?q?/I644Q8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/auth/findPwd/emailFindForm.vue          | 11 ++++++-----
 .../src/views/auth/findPwd/phoneFindForm.vue          |  5 +++--
 .../user/controller/SysUserCenterController.java      |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue b/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue
index 94aa1517..d7178fd8 100644
--- a/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue
+++ b/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue
@@ -102,7 +102,7 @@
 	let formRules = ref({})
 	const emailValidCodeReqNo = ref('')
 
-	// 点击获取短信验证码
+	// 点击获取邮箱验证码
 	const getEmailValidCode = () => {
 		formRules.value.email = [required(), rules.email]
 		delete formRules.value.emailValidCode
@@ -144,7 +144,6 @@
 	const emailLoginFormModalRef = ref()
 	const emailFormModalData = ref({})
 	const validCodeBase64 = ref('')
-	const validCodeReqNo = ref('')
 	const formModalRules = {
 		validCode: [required(), rules.lettersNum]
 	}
@@ -158,10 +157,10 @@
 		visible.value = false
 	}
 	const handleOk = () => {
-		// 获取到里面的验证码，并发送短信
+		// 获取到里面的验证码，并发送邮箱
 		emailLoginFormModalRef.value.validate().then(() => {
 			visible.value = false
-			// 发送短信，首先拿到刚刚输入的手机号
+			// 发送邮箱，首先拿到刚刚输入的邮箱
 			emailFormModalData.value.email = emailFormData.value.email
 			// 禁用发送按钮，并设置为倒计时
 			state.value.smsSendBtn = true
@@ -180,13 +179,15 @@
 					emailValidCodeReqNo.value = data
 					visible.value = false
 					setTimeout(hide, 500)
-					emailFormModalData.value.validCode = ''
 				})
 				.catch(() => {
 					setTimeout(hide, 100)
 					clearInterval(interval)
 					state.value.smsSendBtn = false
 				})
+				.finally(() => {
+					emailFormModalData.value.validCode = ''
+				})
 		})
 	}
 </script>
diff --git a/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue b/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue
index 194fd253..406f98f6 100644
--- a/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue
+++ b/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue
@@ -145,7 +145,6 @@
 	const phoneLoginFormModalRef = ref()
 	const phoneFormModalData = ref({})
 	const validCodeBase64 = ref('')
-	const validCodeReqNo = ref('')
 	const formModalRules = {
 		validCode: [required(), rules.lettersNum]
 	}
@@ -181,13 +180,15 @@
 					phoneValidCodeReqNo.value = data
 					visible.value = false
 					setTimeout(hide, 500)
-					phoneFormModalData.value.validCode = ''
 				})
 				.catch(() => {
 					setTimeout(hide, 100)
 					clearInterval(interval)
 					state.value.smsSendBtn = false
 				})
+				.finally(() => {
+					phoneFormModalData.value.validCode = ''
+				})
 		})
 	}
 </script>
diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java
index 86f2fe9b..e0057bdf 100644
--- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java
+++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java
@@ -74,7 +74,7 @@ public class SysUserCenterController {
     @ApiOperation("找回密码获取手机验证码")
     @GetMapping("/sys/userCenter/findPasswordGetPhoneValidCode")
     public CommonResult<String> findPasswordGetPhoneValidCode(@Valid SysUserGetPhoneValidCodeParam sysUserGetPhoneValidCodeParam) {
-        return CommonResult.ok(sysUserService.findPasswordGetPhoneValidCode(sysUserGetPhoneValidCodeParam));
+        return CommonResult.data(sysUserService.findPasswordGetPhoneValidCode(sysUserGetPhoneValidCodeParam));
     }
 
     /**
@@ -87,7 +87,7 @@ public class SysUserCenterController {
     @ApiOperation("找回密码获取邮箱验证码")
     @GetMapping("/sys/userCenter/findPasswordGetEmailValidCode")
     public CommonResult<String> findPasswordGetEmailValidCode(@Valid SysUserGetEmailValidCodeParam sysUserGetEmailValidCodeParam) {
-        return CommonResult.ok(sysUserService.findPasswordGetEmailValidCode(sysUserGetEmailValidCodeParam));
+        return CommonResult.data(sysUserService.findPasswordGetEmailValidCode(sysUserGetEmailValidCodeParam));
     }
 
     /**