Commit ba7d9c046fb6aaf5e32d9e5e3c169f612e0885d5

Authored by YunaiV
2 parents cd5e6319 38cf944b

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

sql/mysql/ruoyi-vue-pro.sql
@@ -5100,7 +5100,7 @@ CREATE TABLE `system_sms_channel` ( @@ -5100,7 +5100,7 @@ CREATE TABLE `system_sms_channel` (
5100 `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号', 5100 `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
5101 `signature` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '短信签名', 5101 `signature` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '短信签名',
5102 `code` varchar(63) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '渠道编码', 5102 `code` varchar(63) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '渠道编码',
5103 - `status` tinyint NOT NULL COMMENT '开启状态', 5103 + `status` tinyint NOT NULL COMMENT '开启状态. 0: 启用, 1: 禁用',
5104 `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注', 5104 `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注',
5105 `api_key` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '短信 API 的账号', 5105 `api_key` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '短信 API 的账号',
5106 `api_secret` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '短信 API 的秘钥', 5106 `api_secret` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '短信 API 的秘钥',
@@ -5199,8 +5199,8 @@ COMMIT; @@ -5199,8 +5199,8 @@ COMMIT;
5199 DROP TABLE IF EXISTS `system_sms_template`; 5199 DROP TABLE IF EXISTS `system_sms_template`;
5200 CREATE TABLE `system_sms_template` ( 5200 CREATE TABLE `system_sms_template` (
5201 `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号', 5201 `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
5202 - `type` tinyint NOT NULL COMMENT '短信签名',  
5203 - `status` tinyint NOT NULL COMMENT '开启状态', 5202 + `type` tinyint NOT NULL COMMENT '模板类型. 1: 验证码, 2: 通知, 3: 营销',
  5203 + `status` tinyint NOT NULL COMMENT '开启状态. 0: 启用, 1: 禁用',
5204 `code` varchar(63) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模板编码', 5204 `code` varchar(63) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模板编码',
5205 `name` varchar(63) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模板名称', 5205 `name` varchar(63) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模板名称',
5206 `content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模板内容', 5206 `content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模板内容',
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsCallbackController.java
@@ -26,7 +26,7 @@ public class SmsCallbackController { @@ -26,7 +26,7 @@ public class SmsCallbackController {
26 26
27 @PostMapping("/aliyun") 27 @PostMapping("/aliyun")
28 @PermitAll 28 @PermitAll
29 - @Operation(summary = "阿里云短信的回调", description = "参见 https://help.aliyun.com/document_detail/120998.html 文档") 29 + @Operation(summary = "阿里云短信的回调", description = "参见 https://help.aliyun.com/zh/sms/developer-reference/configure-delivery-receipts-1 文档")
30 public CommonResult<Boolean> receiveAliyunSmsStatus(HttpServletRequest request) throws Throwable { 30 public CommonResult<Boolean> receiveAliyunSmsStatus(HttpServletRequest request) throws Throwable {
31 String text = ServletUtils.getBody(request); 31 String text = ServletUtils.getBody(request);
32 smsSendService.receiveSmsStatus(SmsChannelEnum.ALIYUN.getCode(), text); 32 smsSendService.receiveSmsStatus(SmsChannelEnum.ALIYUN.getCode(), text);
@@ -35,7 +35,7 @@ public class SmsCallbackController { @@ -35,7 +35,7 @@ public class SmsCallbackController {
35 35
36 @PostMapping("/tencent") 36 @PostMapping("/tencent")
37 @PermitAll 37 @PermitAll
38 - @Operation(summary = "腾讯云短信的回调", description = "参见 https://cloud.tencent.com/document/product/382/52077 文档") 38 + @Operation(summary = "腾讯云短信的回调", description = "参见 https://cloud.tencent.com/document/product/382/59178 文档")
39 public CommonResult<Boolean> receiveTencentSmsStatus(HttpServletRequest request) throws Throwable { 39 public CommonResult<Boolean> receiveTencentSmsStatus(HttpServletRequest request) throws Throwable {
40 String text = ServletUtils.getBody(request); 40 String text = ServletUtils.getBody(request);
41 smsSendService.receiveSmsStatus(SmsChannelEnum.TENCENT.getCode(), text); 41 smsSendService.receiveSmsStatus(SmsChannelEnum.TENCENT.getCode(), text);