diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/AccountController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/AccountController.java index b067241..bf709ef 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/AccountController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/AccountController.java @@ -8,10 +8,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.dubbo.config.annotation.DubboReference; import org.qinan.safetyeval.client.api.AccountApi; import org.qinan.safetyeval.client.co.AccountCO; import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.domain.exception.BizException; +import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -20,6 +23,8 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; +import static org.qinan.safetyeval.domain.exception.ErrorCode.SMS_SOURCE_CODE_NOT_EXIST; + /** * 用户适配层(Controller) * @@ -37,6 +42,9 @@ public class AccountController { @DubboReference private MessageFacade messageFacade; + @Value("${sms.sign.sourceCode:}") + private String sourceCode; + @ApiOperation("新增用户") @PostMapping("/save") public SingleResponse add(@Validated @RequestBody AccountAddCmd cmd) { @@ -70,6 +78,9 @@ public class AccountController { @ApiOperation("发送短信") @PostMapping("/sendMessage") public com.alibaba.cola.dto.SingleResponse sendMessage(@Validated @RequestBody SendMessageCmd cmd) { + if (StringUtils.isBlank(sourceCode)) { + throw new BizException(SMS_SOURCE_CODE_NOT_EXIST); + } MessageSendCmd messageSendCmd = new MessageSendCmd(); messageSendCmd.setBusinessId(UUID.randomUUID().toString().replace("-", "")); @@ -77,11 +88,12 @@ public class AccountController { MessageTargetCmd messageTargetCmd = new MessageTargetCmd(); messageTargetCmd.setMobile(cmd.getMobile()); messageSendCmd.setTargetCmd(messageTargetCmd); - messageSendCmd.setNeedTokenEnum(null); + messageSendCmd.setNeedTokenEnum(false); - messageSendCmd.setSourceCode("MS000146"); + messageSendCmd.setSourceCode(sourceCode); Map codeMap = new HashMap<>(); - codeMap.put("code", "512454"); + codeMap.put("others_1", "123456"); + codeMap.put("valid_code", "123456"); messageSendCmd.setParams(codeMap); log.info("发送短信参数: messageSendCmd: {}", JSONUtil.toJsonStr(messageSendCmd)); diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/exception/ErrorCode.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/exception/ErrorCode.java index 2a329bd..77a9dc7 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/exception/ErrorCode.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/exception/ErrorCode.java @@ -89,6 +89,12 @@ public enum ErrorCode { FILE_URL_GENERATE_FAILED("03-01-007", "文件地址生成失败"), FILE_SIZE_EXCEEDED("03-01-008", "文件大小超出限制"), + + /** + * 短信码不存在 + */ + SMS_SOURCE_CODE_NOT_EXIST("04-01-001", "短信码不存在"), + /** * 未知错误 */ diff --git a/safety-eval-start/src/main/resources/sdk-prod.yml b/safety-eval-start/src/main/resources/sdk-prod.yml index 333b793..a29aa69 100644 --- a/safety-eval-start/src/main/resources/sdk-prod.yml +++ b/safety-eval-start/src/main/resources/sdk-prod.yml @@ -50,3 +50,6 @@ openapi: #多个可以逗号隔开,可以为空 tenantIds: 1838408702262321152 +sms: + sign: + sourceCode: MS000151 \ No newline at end of file diff --git a/safety-eval-start/src/main/resources/sdk.yml b/safety-eval-start/src/main/resources/sdk.yml index b13bb8f..4e6f206 100644 --- a/safety-eval-start/src/main/resources/sdk.yml +++ b/safety-eval-start/src/main/resources/sdk.yml @@ -49,3 +49,7 @@ openapi: apiCode: test:01 #多个可以逗号隔开,可以为空 tenantIds: 1838408702262321152 + +sms: + sign: + sourceCode: MS000146 \ No newline at end of file