From 4102936e655f5ae727f5be095f7d0b2b869a5d33 Mon Sep 17 00:00:00 2001 From: smallchill Date: Tue, 29 Jun 2021 21:56:02 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/springblade/resource/feign/ISmsClient.java | 3 ++- .../org/springblade/resource/feign/ISmsClientFallback.java | 3 ++- .../src/main/java/org/springblade/resource/utils/SmsUtil.java | 4 ++-- .../main/java/org/springblade/resource/feign/SmsClient.java | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/ISmsClient.java b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/ISmsClient.java index fbb8da69..d2512638 100644 --- a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/ISmsClient.java +++ b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/ISmsClient.java @@ -65,9 +65,10 @@ public interface ISmsClient { * @param code 资源编号 * @param id 校验id * @param value 校验值 + * @param phone 手机号 * @return R */ @PostMapping(VALIDATE_MESSAGE) - R validateMessage(@RequestParam("code") String code, @RequestParam("id") String id, @RequestParam("value") String value); + R validateMessage(@RequestParam("code") String code, @RequestParam("id") String id, @RequestParam("value") String value, @RequestParam("phone") String phone); } diff --git a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/ISmsClientFallback.java b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/ISmsClientFallback.java index 8051953b..f139fea3 100644 --- a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/ISmsClientFallback.java +++ b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/ISmsClientFallback.java @@ -37,7 +37,8 @@ public class ISmsClientFallback implements ISmsClient { } @Override - public R validateMessage(String code, String id, String value) { + public R validateMessage(String code, String id, String value, String phone) { return R.fail("远程调用失败"); } + } diff --git a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/utils/SmsUtil.java b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/utils/SmsUtil.java index b1f65a77..b40deb4e 100644 --- a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/utils/SmsUtil.java +++ b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/utils/SmsUtil.java @@ -105,8 +105,8 @@ public class SmsUtil { * @param value 校验值 * @return 发送结果 */ - public static boolean validateMessage(String code, String id, String value) { - R result = getSmsClient().validateMessage(code, id, value); + public static boolean validateMessage(String code, String id, String value, String phone) { + R result = getSmsClient().validateMessage(code, id, value, phone); return result.isSuccess(); } diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/SmsClient.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/SmsClient.java index 691258c3..6dd681ea 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/SmsClient.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/SmsClient.java @@ -62,8 +62,8 @@ public class SmsClient implements ISmsClient { @Override @PostMapping(VALIDATE_MESSAGE) - public R validateMessage(String code, String id, String value) { - SmsCode smsCode = new SmsCode().setId(id).setValue(value); + public R validateMessage(String code, String id, String value, String phone) { + SmsCode smsCode = new SmsCode().setId(id).setValue(value).setPhone(phone); boolean validate = smsBuilder.template(code).validateMessage(smsCode); return validate ? R.success(VALIDATE_SUCCESS) : R.fail(VALIDATE_FAIL); }