Commit 448aa21e33d3684d17f3bf7b3ef6f0420208ba8d
1 parent
d649b930
1. 修复用户 APP 发送短信验证码报错
Showing
4 changed files
with
6 additions
and
3 deletions
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
| ... | ... | @@ -304,7 +304,7 @@ public class MemberAuthServiceImpl implements MemberAuthService { |
| 304 | 304 | @Override |
| 305 | 305 | public void sendSmsCode(Long userId, AppAuthSendSmsReqVO reqVO) { |
| 306 | 306 | // TODO 要根据不同的场景，校验是否有用户 |
| 307 | - smsCodeApi.sendSmsCode(AuthConvert.INSTANCE.convert(reqVO)); | |
| 307 | + smsCodeApi.sendSmsCode(AuthConvert.INSTANCE.convert(reqVO).setCreateIp(getClientIP())); | |
| 308 | 308 | } |
| 309 | 309 | |
| 310 | 310 | /** | ... | ... |
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java
| ... | ... | @@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; |
| 6 | 6 | import lombok.Data; |
| 7 | 7 | |
| 8 | 8 | import javax.validation.constraints.NotEmpty; |
| 9 | +import javax.validation.constraints.NotNull; | |
| 9 | 10 | |
| 10 | 11 | /** |
| 11 | 12 | * 短信验证码的发送 Request DTO |
| ... | ... | @@ -24,7 +25,7 @@ public class SmsCodeSendReqDTO { |
| 24 | 25 | /** |
| 25 | 26 | * 发送场景 |
| 26 | 27 | */ |
| 27 | - @NotEmpty(message = "发送场景不能为空") | |
| 28 | + @NotNull(message = "发送场景不能为空") | |
| 28 | 29 | @InEnum(SmsSceneEnum.class) |
| 29 | 30 | private Integer scene; |
| 30 | 31 | /** | ... | ... |
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/sms/SmsSceneEnum.java
| ... | ... | @@ -43,7 +43,8 @@ public enum SmsSceneEnum implements IntArrayValuable { |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | public static SmsSceneEnum getCodeByScene(Integer scene) { |
| 46 | - return ArrayUtil.firstMatch(sceneEnum -> sceneEnum.getScene().equals(scene)); | |
| 46 | + return ArrayUtil.firstMatch(sceneEnum -> sceneEnum.getScene().equals(scene), | |
| 47 | + values()); | |
| 47 | 48 | } |
| 48 | 49 | |
| 49 | 50 | } | ... | ... |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsCallbackController.java
| ... | ... | @@ -19,6 +19,7 @@ import javax.servlet.http.HttpServletRequest; |
| 19 | 19 | |
| 20 | 20 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 21 | 21 | |
| 22 | +// TODO 芋艿：这块的接口命名，在纠结下 | |
| 22 | 23 | @Api(tags = "管理后台 - 短信回调") |
| 23 | 24 | @RestController |
| 24 | 25 | @RequestMapping("/system/sms/callback") | ... | ... |