diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApi.java index 951cfbc6f4ac89f5e11860c30ff25e2b98b1a6a2..53de7d0d01a5ed1a16bffa3e15544c95bbf0d5c0 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApi.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApi.java @@ -1,30 +1,39 @@ package cn.iocoder.yudao.module.system.api.sensitiveword; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.system.enums.ApiConstants; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + import java.util.List; -/** - * æ•æ„Ÿè¯ API æŽ¥å£ - * - * @author æ°¸ä¸è¨€è´¥ - */ +@FeignClient(name = ApiConstants.NAME) // TODO 芋艿:fallbackFacx`tory = +@Api(tags = "RPC æœåŠ¡ - æ•æ„Ÿè¯") public interface SensitiveWordApi { - /** - * 获得文本所包å«çš„ä¸åˆæ³•çš„æ•æ„Ÿè¯æ•°ç»„ - * - * @param text 文本 - * @param tags æ ‡ç¾æ•°ç»„ - * @return ä¸åˆæ³•çš„æ•æ„Ÿè¯æ•°ç»„ - */ - List<String> validateText(String text, List<String> tags); + String PREFIX = ApiConstants.PREFIX + "/oauth2/sensitive-word"; + + @GetMapping(PREFIX + "/validate-text") + @ApiOperation("获得文本所包å«çš„ä¸åˆæ³•çš„æ•æ„Ÿè¯æ•°ç»„") + @ApiImplicitParams({ + @ApiImplicitParam(name = "text", value = "文本", required = true, dataTypeClass = String.class), + @ApiImplicitParam(name = "tags", value = "æ ‡ç¾æ•°ç»„", required = true, allowMultiple = true) + }) + CommonResult<List<String>> validateText(@RequestParam("text") String text, + @RequestParam("tags") List<String> tags); - /** - * åˆ¤æ–æ–‡æœ¬æ˜¯å¦åŒ…嫿•æ„Ÿè¯ - * - * @param text 文本 - * @param tags 表述数组 - * @return 是å¦åŒ…å« - */ - boolean isTextValid(String text, List<String> tags); + @GetMapping(PREFIX + "/is-text-valid") + @ApiOperation("åˆ¤æ–æ–‡æœ¬æ˜¯å¦åŒ…嫿•感è¯") + @ApiImplicitParams({ + @ApiImplicitParam(name = "text", value = "文本", required = true, dataTypeClass = String.class), + @ApiImplicitParam(name = "tags", value = "æ ‡ç¾æ•°ç»„", required = true, allowMultiple = true) + }) + CommonResult<Boolean> isTextValid(@RequestParam("text") String text, + @RequestParam("tags") List<String> tags); } diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsCodeApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsCodeApi.java index ffcf46dc08cda56fc6e95c9f47b0241298a1fada..381450e66f441493f1f898b70c90f1e51213c17f 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsCodeApi.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsCodeApi.java @@ -1,40 +1,36 @@ package cn.iocoder.yudao.module.system.api.sms; -import cn.iocoder.yudao.framework.common.exception.ServiceException; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeCheckReqDTO; import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeSendReqDTO; import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO; +import cn.iocoder.yudao.module.system.enums.ApiConstants; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; import javax.validation.Valid; -/** - * çŸä¿¡éªŒè¯ç API æŽ¥å£ - * - * @author èŠ‹é“æºç - */ +@FeignClient(name = ApiConstants.NAME) // TODO 芋艿:fallbackFactory = +@Api(tags = "RPC æœåŠ¡ - çŸä¿¡éªŒè¯ç ") public interface SmsCodeApi { - /** - * 创建çŸä¿¡éªŒè¯ç ,并进行å‘é€ - * - * @param reqDTO å‘é€è¯·æ±‚ - */ - void sendSmsCode(@Valid SmsCodeSendReqDTO reqDTO); - - /** - * 验è¯çŸä¿¡éªŒè¯ç ,并进行使用 - * 如果æ£ç¡®ï¼Œåˆ™å°†éªŒè¯ç æ ‡è®°æˆå·²ä½¿ç”¨ - * 如果错误,则抛出 {@link ServiceException} 异常 - * - * @param reqDTO 使用请求 - */ - void useSmsCode(@Valid SmsCodeUseReqDTO reqDTO); - - /** - * 检查验è¯ç æ˜¯å¦æœ‰æ•ˆ - * - * @param reqDTO æ ¡éªŒè¯·æ±‚ - */ - void checkSmsCode(@Valid SmsCodeCheckReqDTO reqDTO); + String PREFIX = ApiConstants.PREFIX + "/oauth2/sms/code"; + + @PostMapping(PREFIX + "/send") + @ApiOperation("创建çŸä¿¡éªŒè¯ç ,并进行å‘é€") + CommonResult<Boolean> sendSmsCode(@Valid @RequestBody SmsCodeSendReqDTO reqDTO); + + @PutMapping(PREFIX + "/use") + @ApiOperation("验è¯çŸä¿¡éªŒè¯ç ,并进行使用") + CommonResult<Boolean> useSmsCode(@Valid @RequestBody SmsCodeUseReqDTO reqDTO); + + @GetMapping(PREFIX + "/check") + @ApiOperation("检查验è¯ç æ˜¯å¦æœ‰æ•ˆ") + CommonResult<Boolean> checkSmsCode(@Valid @RequestBody SmsCodeCheckReqDTO reqDTO); } diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsSendApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsSendApi.java index c86bbf503fb5f445b8aca88b627ca3cef805a7cb..5514bc01d8958c066c703ea2a059bf3e90c223af 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsSendApi.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsSendApi.java @@ -1,34 +1,28 @@ package cn.iocoder.yudao.module.system.api.sms; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.system.api.sms.dto.send.SmsSendSingleToUserReqDTO; +import cn.iocoder.yudao.module.system.enums.ApiConstants; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import javax.validation.Valid; -/** - * çŸä¿¡å‘é€ API æŽ¥å£ - * - * @author èŠ‹é“æºç - */ +@FeignClient(name = ApiConstants.NAME) // TODO 芋艿:fallbackFactory = +@Api(tags = "RPC æœåŠ¡ - çŸä¿¡å‘é€") public interface SmsSendApi { - /** - * å‘é€å•æ¡çŸä¿¡ç»™ Admin 用户 - * - * 在 mobile 为空时,使用 userId åŠ è½½å¯¹åº” Admin çš„æ‰‹æœºå· - * - * @param reqDTO å‘é€è¯·æ±‚ - * @return å‘逿—¥å¿—ç¼–å· - */ - Long sendSingleSmsToAdmin(@Valid SmsSendSingleToUserReqDTO reqDTO); + String PREFIX = ApiConstants.PREFIX + "/oauth2/sms/send"; - /** - * å‘é€å•æ¡çŸä¿¡ç»™ Member 用户 - * - * 在 mobile 为空时,使用 userId åŠ è½½å¯¹åº” Member çš„æ‰‹æœºå· - * - * @param reqDTO å‘é€è¯·æ±‚ - * @return å‘逿—¥å¿—ç¼–å· - */ - Long sendSingleSmsToMember(@Valid SmsSendSingleToUserReqDTO reqDTO); + @PostMapping(PREFIX + "/send-single-admin") + @ApiOperation(value = "å‘é€å•æ¡çŸä¿¡ç»™ Admin 用户", notes = "在 mobile 为空时,使用 userId åŠ è½½å¯¹åº” Admin 的手机å·") + CommonResult<Long> sendSingleSmsToAdmin(@Valid @RequestBody SmsSendSingleToUserReqDTO reqDTO); + + @PostMapping(PREFIX + "/send-single-member") + @ApiOperation(value = "å‘é€å•æ¡çŸä¿¡ç»™ Member 用户", notes = "在 mobile 为空时,使用 userId åŠ è½½å¯¹åº” Member 的手机å·") + CommonResult<Long> sendSingleSmsToMember(@Valid @RequestBody SmsSendSingleToUserReqDTO reqDTO); } diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeCheckReqDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeCheckReqDTO.java index 92895bb4d2f4726a9ec0282cf12f5618ee8c6e9c..99107492e42a373dc88e0171f11cd05b72fc984f 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeCheckReqDTO.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeCheckReqDTO.java @@ -3,34 +3,26 @@ package cn.iocoder.yudao.module.system.api.sms.dto.code; import cn.iocoder.yudao.framework.common.validation.InEnum; import cn.iocoder.yudao.framework.common.validation.Mobile; import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -/** - * çŸä¿¡éªŒè¯ç çš„æ ¡éªŒ Request DTO - * - * @author èŠ‹é“æºç - */ +@ApiModel("RPC æœåŠ¡ - çŸä¿¡éªŒè¯ç çš„æ ¡éªŒ Request DTO") @Data public class SmsCodeCheckReqDTO { - /** - * æ‰‹æœºå· - */ + @ApiModelProperty(value = "手机å·", required = true, example = "15601691300") @Mobile @NotEmpty(message = "手机å·ä¸èƒ½ä¸ºç©º") private String mobile; - /** - * å‘é€åœºæ™¯ - */ + @ApiModelProperty(value = "å‘é€åœºæ™¯", required = true, example = "1") @NotNull(message = "å‘é€åœºæ™¯ä¸èƒ½ä¸ºç©º") @InEnum(SmsSceneEnum.class) private Integer scene; - /** - * 验è¯ç - */ + @ApiModelProperty(value = "验è¯ç ", required = true, example = "1024") @NotEmpty(message = "验è¯ç ") private String code; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java index 5d6579bd78a3d70bea75bbcfc17c8ce4ce44320c..9c23f7f512db0fafa33ccf15ced71943e097262e 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java @@ -3,34 +3,26 @@ package cn.iocoder.yudao.module.system.api.sms.dto.code; import cn.iocoder.yudao.framework.common.validation.InEnum; import cn.iocoder.yudao.framework.common.validation.Mobile; import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -/** - * çŸä¿¡éªŒè¯ç çš„å‘é€ Request DTO - * - * @author èŠ‹é“æºç - */ +@ApiModel("RPC æœåŠ¡ - çŸä¿¡éªŒè¯ç çš„å‘é€ Request DTO") @Data public class SmsCodeSendReqDTO { - /** - * æ‰‹æœºå· - */ + @ApiModelProperty(value = "手机å·", required = true, example = "15601691300") @Mobile @NotEmpty(message = "手机å·ä¸èƒ½ä¸ºç©º") private String mobile; - /** - * å‘é€åœºæ™¯ - */ + @ApiModelProperty(value = "å‘é€åœºæ™¯", required = true, example = "1") @NotNull(message = "å‘é€åœºæ™¯ä¸èƒ½ä¸ºç©º") @InEnum(SmsSceneEnum.class) private Integer scene; - /** - * å‘é€ IP - */ + @ApiModelProperty(value = "å‘é€ IP", required = true, example = "10.20.30.40") @NotEmpty(message = "å‘é€ IP ä¸èƒ½ä¸ºç©º") private String createIp; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeUseReqDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeUseReqDTO.java index 3043adfb00ef9dbf1c2536862c20eb3630b1d2d2..40b682b796a2e5cf5a314d27f91315e894285e59 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeUseReqDTO.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeUseReqDTO.java @@ -3,39 +3,29 @@ package cn.iocoder.yudao.module.system.api.sms.dto.code; import cn.iocoder.yudao.framework.common.validation.InEnum; import cn.iocoder.yudao.framework.common.validation.Mobile; import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -/** - * çŸä¿¡éªŒè¯ç 的使用 Request DTO - * - * @author èŠ‹é“æºç - */ +@ApiModel("RPC æœåŠ¡ - çŸä¿¡éªŒè¯ç 的使用 Request DTO") @Data public class SmsCodeUseReqDTO { - /** - * æ‰‹æœºå· - */ + @ApiModelProperty(value = "手机å·", required = true, example = "15601691300") @Mobile @NotEmpty(message = "手机å·ä¸èƒ½ä¸ºç©º") private String mobile; - /** - * å‘é€åœºæ™¯ - */ + @ApiModelProperty(value = "å‘é€åœºæ™¯", required = true, example = "1") @NotNull(message = "å‘é€åœºæ™¯ä¸èƒ½ä¸ºç©º") @InEnum(SmsSceneEnum.class) private Integer scene; - /** - * 验è¯ç - */ + @ApiModelProperty(value = "验è¯ç ", required = true, example = "1024") @NotEmpty(message = "验è¯ç ") private String code; - /** - * 使用 IP - */ + @ApiModelProperty(value = "å‘é€ IP", required = true, example = "10.20.30.40") @NotEmpty(message = "使用 IP ä¸èƒ½ä¸ºç©º") private String usedIp; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java index 67a5d93d21fc3466c99a869e8999947e082112d3..31d6f5b907e9f4b8c2f763ad9d76b9011ea53f3e 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java @@ -1,37 +1,27 @@ package cn.iocoder.yudao.module.system.api.sms.dto.send; import cn.iocoder.yudao.framework.common.validation.Mobile; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.util.Map; -/** - * çŸä¿¡å‘é€ç»™ Admin 或者 Member 用户 - * - * @author èŠ‹é“æºç - */ +@ApiModel("RPC æœåŠ¡ - çŸä¿¡å‘é€ç»™ Admin 或者 Member 用户 Request DTO") @Data public class SmsSendSingleToUserReqDTO { - /** - * ç”¨æˆ·ç¼–å· - */ + @ApiModelProperty(value = "用户编å·", example = "1024") private Long userId; - /** - * æ‰‹æœºå· - */ + @ApiModelProperty(value = "手机å·", required = true, example = "15601691300") @Mobile private String mobile; - /** - * çŸä¿¡æ¨¡æ¿ç¼–å· - */ + @ApiModelProperty(value = "用户编å·", required = true, example = "USER_SEND") @NotEmpty(message = "çŸä¿¡æ¨¡æ¿ç¼–å·ä¸èƒ½ä¸ºç©º") private String templateCode; - /** - * çŸä¿¡æ¨¡æ¿å‚æ•° - */ + @ApiModelProperty(value = "çŸä¿¡æ¨¡æ¿å‚æ•°") private Map<String, Object> templateParams; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApiImpl.java index a6d5b52fdd90c446085eacce968adf44ca5addbe..7965957025615e292c1506a270aeb7589af9748a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApiImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApiImpl.java @@ -1,29 +1,34 @@ package cn.iocoder.yudao.module.system.api.sensitiveword; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.system.service.sensitiveword.SensitiveWordService; +import org.apache.dubbo.config.annotation.DubboService; import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; -/** - * æ•æ„Ÿè¯ API 实现类 - * - * @author æ°¸ä¸è¨€è´¥ - */ -@Service +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; + +@RestController // æä¾› RESTful API 接å£ï¼Œç»™ Feign 调用 +@DubboService(version = VERSION) // æä¾› Dubbo RPC 接å£ï¼Œç»™ Dubbo Consumer 调用 +@Validated public class SensitiveWordApiImpl implements SensitiveWordApi { @Resource private SensitiveWordService sensitiveWordService; @Override - public List<String> validateText(String text, List<String> tags) { - return sensitiveWordService.validateText(text, tags); + public CommonResult<List<String>> validateText(String text, List<String> tags) { + return success(sensitiveWordService.validateText(text, tags)); } @Override - public boolean isTextValid(String text, List<String> tags) { - return sensitiveWordService.isTextValid(text, tags); + public CommonResult<Boolean> isTextValid(String text, List<String> tags) { + return success(sensitiveWordService.isTextValid(text, tags)); } + } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsCodeApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsCodeApiImpl.java index 81957e08288650a7cd6ea4c776c413637e5723ab..15e59a264e170e9bd2dbea24cea27859f0aa35af 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsCodeApiImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsCodeApiImpl.java @@ -1,20 +1,21 @@ package cn.iocoder.yudao.module.system.api.sms; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeCheckReqDTO; import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeSendReqDTO; import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO; import cn.iocoder.yudao.module.system.service.sms.SmsCodeService; -import org.springframework.stereotype.Service; +import org.apache.dubbo.config.annotation.DubboService; import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -/** - * çŸä¿¡éªŒè¯ç API 实现类 - * - * @author èŠ‹é“æºç - */ -@Service +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; + +@RestController // æä¾› RESTful API 接å£ï¼Œç»™ Feign 调用 +@DubboService(version = VERSION) // æä¾› Dubbo RPC 接å£ï¼Œç»™ Dubbo Consumer 调用 @Validated public class SmsCodeApiImpl implements SmsCodeApi { @@ -22,18 +23,21 @@ public class SmsCodeApiImpl implements SmsCodeApi { private SmsCodeService smsCodeService; @Override - public void sendSmsCode(SmsCodeSendReqDTO reqDTO) { + public CommonResult<Boolean> sendSmsCode(SmsCodeSendReqDTO reqDTO) { smsCodeService.sendSmsCode(reqDTO); + return success(true); } @Override - public void useSmsCode(SmsCodeUseReqDTO reqDTO) { + public CommonResult<Boolean> useSmsCode(SmsCodeUseReqDTO reqDTO) { smsCodeService.useSmsCode(reqDTO); + return success(true); } @Override - public void checkSmsCode(SmsCodeCheckReqDTO reqDTO) { + public CommonResult<Boolean> checkSmsCode(SmsCodeCheckReqDTO reqDTO) { smsCodeService.checkSmsCode(reqDTO); + return success(true); } } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsSendApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsSendApiImpl.java index ee5812d3c3d02fbbbdd431eb3afefd1789910898..edfa9101f4e241318e93e658b79f7c892fe55cfe 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsSendApiImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsSendApiImpl.java @@ -1,18 +1,20 @@ package cn.iocoder.yudao.module.system.api.sms; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.system.api.sms.dto.send.SmsSendSingleToUserReqDTO; import cn.iocoder.yudao.module.system.service.sms.SmsSendService; +import org.apache.dubbo.config.annotation.DubboService; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -/** - * çŸä¿¡å‘é€ API æŽ¥å£ - * - * @author èŠ‹é“æºç - */ -@Service +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; + +@RestController // æä¾› RESTful API 接å£ï¼Œç»™ Feign 调用 +@DubboService(version = VERSION) // æä¾› Dubbo RPC 接å£ï¼Œç»™ Dubbo Consumer 调用 @Validated public class SmsSendApiImpl implements SmsSendApi { @@ -20,15 +22,15 @@ public class SmsSendApiImpl implements SmsSendApi { private SmsSendService smsSendService; @Override - public Long sendSingleSmsToAdmin(SmsSendSingleToUserReqDTO reqDTO) { - return smsSendService.sendSingleSmsToAdmin(reqDTO.getMobile(), reqDTO.getUserId(), - reqDTO.getTemplateCode(), reqDTO.getTemplateParams()); + public CommonResult<Long> sendSingleSmsToAdmin(SmsSendSingleToUserReqDTO reqDTO) { + return success(smsSendService.sendSingleSmsToAdmin(reqDTO.getMobile(), reqDTO.getUserId(), + reqDTO.getTemplateCode(), reqDTO.getTemplateParams())); } @Override - public Long sendSingleSmsToMember(SmsSendSingleToUserReqDTO reqDTO) { - return smsSendService.sendSingleSmsToMember(reqDTO.getMobile(), reqDTO.getUserId(), - reqDTO.getTemplateCode(), reqDTO.getTemplateParams()); + public CommonResult<Long> sendSingleSmsToMember(SmsSendSingleToUserReqDTO reqDTO) { + return success(smsSendService.sendSingleSmsToMember(reqDTO.getMobile(), reqDTO.getUserId(), + reqDTO.getTemplateCode(), reqDTO.getTemplateParams())); } }