diff --git a/pom.xml b/pom.xml index de9ace0..504010e 100644 --- a/pom.xml +++ b/pom.xml @@ -76,6 +76,12 @@ mapstruct 1.5.5.Final + + + com.xiang + xservice-message-starter + 2.0 + \ No newline at end of file diff --git a/xs-server/src/main/java/com/xiang/AuthApplication.java b/xs-server/src/main/java/com/xiang/AuthApplication.java index 5fb62af..955849a 100644 --- a/xs-server/src/main/java/com/xiang/AuthApplication.java +++ b/xs-server/src/main/java/com/xiang/AuthApplication.java @@ -2,9 +2,13 @@ package com.xiang; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.ConfigurationPropertiesScan; import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; @SpringBootApplication +@ConfigurationPropertiesScan(basePackages = { + "com.xiang.xservice.basic.xservice.aliyun.config" +}) @EnableMethodSecurity(prePostEnabled = true) public class AuthApplication { public static void main(String[] args) { diff --git a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/ValidationCodeController.java b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/ValidationCodeController.java index 421efaf..d4106bc 100644 --- a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/ValidationCodeController.java +++ b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/ValidationCodeController.java @@ -6,6 +6,7 @@ import com.xiang.xservice.auth.service.enums.CaptchaTypeEnum; import com.xiang.xservice.auth.service.service.ValidCodeGenerateFactory; import com.xiang.xservice.basic.common.resp.Result; import com.xiang.xservice.basic.utils.RandomCodeUtils; +import com.xiang.xservice.basic.xservice.aliyun.smscode.ISmsCodeService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -23,6 +24,7 @@ import java.util.Objects; public class ValidationCodeController { private final ValidCodeGenerateFactory validCodeGenerateFactory; + private final ISmsCodeService smsCodeService; @PostMapping("/public/captchaImage") public Result getCaptchaImage(@RequestBody @NotNull(message = "请求参数不能为空") @Valid CaptchaImageRequest request) { @@ -53,11 +55,13 @@ public class ValidationCodeController { @PostMapping("/public/getSmsCode") public Result getSmsCode(@RequestBody @NotNull(message = "请求参数不能为空") @Valid CaptchaImageRequest request) { if (Objects.isNull(request.getNumber())) { - request.setNumber(4); + request.setNumber(6); } try { - validCodeGenerateFactory.get(CaptchaTypeEnum.NUMBER_CAPTCHA_CODE.getType()).getCaptchaImage(request); + CaptchaDTO captchaImage = validCodeGenerateFactory.get(CaptchaTypeEnum.NUMBER_CAPTCHA_CODE.getType()).getCaptchaImage(request); + String code = captchaImage.getCaptchaImageCode(); + smsCodeService.asyncSendPhoneValidCode4DaXiangNet(request.getUsername(), code); return Result.success(); } catch (Exception e) { log.error("获取验证码失败", e); diff --git a/xs-server/src/main/resources/application-local.yml b/xs-server/src/main/resources/application-local.yml index a55d6bb..5b7821f 100644 --- a/xs-server/src/main/resources/application-local.yml +++ b/xs-server/src/main/resources/application-local.yml @@ -39,4 +39,9 @@ user: # https://oauth.pstmn.io/v1/callback # 移动端 APP 自定义 Scheme: # myapp://callback - redirectUrl: http://localhost:8080/login/oauth2/code/oauth-client-init \ No newline at end of file + redirectUrl: http://localhost:8080/login/oauth2/code/oauth-client-init + +aliyun: + auth: + accessKeyId: LTAI5tDMjaVF8Bbqcpp4dmvP + accessKeySecret: nkmnaNjWQy5984C5kjyS0oDmdMKGQd \ No newline at end of file diff --git a/xs-service/src/main/java/com/xiang/xservice/auth/service/service/impl/captcha/NumberCaptchaCode.java b/xs-service/src/main/java/com/xiang/xservice/auth/service/service/impl/captcha/NumberCaptchaCode.java index b26feaf..337ee20 100644 --- a/xs-service/src/main/java/com/xiang/xservice/auth/service/service/impl/captcha/NumberCaptchaCode.java +++ b/xs-service/src/main/java/com/xiang/xservice/auth/service/service/impl/captcha/NumberCaptchaCode.java @@ -19,7 +19,7 @@ public class NumberCaptchaCode implements ICaptchaService { @Override public CaptchaDTO getCaptchaImage(CaptchaImageRequest request) { - String randomCode = RandomCodeUtils.getMixtureRandomCode(request.getNumber()); + String randomCode = RandomCodeUtils.getNumberRandomCode(request.getNumber()); redisService.set(RedisConstant.XS_SMS_CODE_KEY + request.getUsername(), randomCode, 5, TimeUnit.MINUTES); CaptchaDTO captchaDTO = new CaptchaDTO(); captchaDTO.setCaptchaImageCode(randomCode);