Merge branch 'master-jdk21' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk21

This commit is contained in:
YunaiV 2024-04-29 20:52:32 +08:00
commit ba7d9c046f
2 changed files with 5 additions and 5 deletions

View File

@ -5100,7 +5100,7 @@ CREATE TABLE `system_sms_channel` (
`id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
`signature` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '短信签名',
`code` varchar(63) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '渠道编码',
`status` tinyint NOT NULL COMMENT '开启状态',
`status` tinyint NOT NULL COMMENT '开启状态. 0: 启用, 1: 禁用',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注',
`api_key` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '短信 API 的账号',
`api_secret` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '短信 API 的秘钥',
@ -5199,8 +5199,8 @@ COMMIT;
DROP TABLE IF EXISTS `system_sms_template`;
CREATE TABLE `system_sms_template` (
`id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
`type` tinyint NOT NULL COMMENT '短信签名',
`status` tinyint NOT NULL COMMENT '开启状态',
`type` tinyint NOT NULL COMMENT '模板类型. 1: 验证码, 2: 通知, 3: 营销',
`status` tinyint NOT NULL COMMENT '开启状态. 0: 启用, 1: 禁用',
`code` varchar(63) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模板编码',
`name` varchar(63) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模板名称',
`content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模板内容',

View File

@ -26,7 +26,7 @@ public class SmsCallbackController {
@PostMapping("/aliyun")
@PermitAll
@Operation(summary = "阿里云短信的回调", description = "参见 https://help.aliyun.com/document_detail/120998.html 文档")
@Operation(summary = "阿里云短信的回调", description = "参见 https://help.aliyun.com/zh/sms/developer-reference/configure-delivery-receipts-1 文档")
public CommonResult<Boolean> receiveAliyunSmsStatus(HttpServletRequest request) throws Throwable {
String text = ServletUtils.getBody(request);
smsSendService.receiveSmsStatus(SmsChannelEnum.ALIYUN.getCode(), text);
@ -35,7 +35,7 @@ public class SmsCallbackController {
@PostMapping("/tencent")
@PermitAll
@Operation(summary = "腾讯云短信的回调", description = "参见 https://cloud.tencent.com/document/product/382/52077 文档")
@Operation(summary = "腾讯云短信的回调", description = "参见 https://cloud.tencent.com/document/product/382/59178 文档")
public CommonResult<Boolean> receiveTencentSmsStatus(HttpServletRequest request) throws Throwable {
String text = ServletUtils.getBody(request);
smsSendService.receiveSmsStatus(SmsChannelEnum.TENCENT.getCode(), text);