From 6b0d9214a927e6df3cf7e53ae2248b30db78e413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Tue, 28 Jun 2022 13:15:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update=20=E6=9B=B4=E6=94=B9=20readme=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b7f5d60b0..d2e514751 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE) [![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
-[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-4.2.0_beta1-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus) +[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-4.2.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus) [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.6-blue.svg)]() [![JDK-8+](https://img.shields.io/badge/JDK-8-green.svg)]() [![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]() From 5e6d0b79e3809931e10404645ac73583a2798574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=89=91=E9=94=8B?= <1822213252@qq.com> Date: Tue, 28 Jun 2022 10:56:05 +0000 Subject: [PATCH 2/3] =?UTF-8?q?update=20=E6=96=B0=E5=A2=9E=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0=E7=B1=BB@Override?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/sms/core/AliyunSmsTemplate.java | 1 + .../src/main/java/com/ruoyi/sms/core/TencentSmsTemplate.java | 1 + 2 files changed, 2 insertions(+) diff --git a/ruoyi-sms/src/main/java/com/ruoyi/sms/core/AliyunSmsTemplate.java b/ruoyi-sms/src/main/java/com/ruoyi/sms/core/AliyunSmsTemplate.java index 87c3f3bdb..eede376e5 100644 --- a/ruoyi-sms/src/main/java/com/ruoyi/sms/core/AliyunSmsTemplate.java +++ b/ruoyi-sms/src/main/java/com/ruoyi/sms/core/AliyunSmsTemplate.java @@ -38,6 +38,7 @@ public class AliyunSmsTemplate implements SmsTemplate { this.client = new Client(config); } + @Override public SmsResult send(String phones, String templateId, Map param) { if (StringUtils.isBlank(phones)) { throw new SmsException("手机号不能为空"); diff --git a/ruoyi-sms/src/main/java/com/ruoyi/sms/core/TencentSmsTemplate.java b/ruoyi-sms/src/main/java/com/ruoyi/sms/core/TencentSmsTemplate.java index ce82c3c69..1de8eae14 100644 --- a/ruoyi-sms/src/main/java/com/ruoyi/sms/core/TencentSmsTemplate.java +++ b/ruoyi-sms/src/main/java/com/ruoyi/sms/core/TencentSmsTemplate.java @@ -43,6 +43,7 @@ public class TencentSmsTemplate implements SmsTemplate { this.client = new SmsClient(credential, "", clientProfile); } + @Override public SmsResult send(String phones, String templateId, Map param) { if (StringUtils.isBlank(phones)) { throw new SmsException("手机号不能为空"); From 181eaefea86ccef7ca60dd8e186ec8ece353ddf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Tue, 28 Jun 2022 21:09:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20mysql=20sys=5Fno?= =?UTF-8?q?tice=20=E4=B8=8E=20sys=5Fconfig=20=E8=A1=A8=E4=B8=BB=E9=94=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=95=BF=E5=BA=A6=E4=B8=8D=E5=A4=9F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/sql/ry_vue_4.X.sql | 4 ++-- script/sql/update/update-4.1-4.2.sql | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/script/sql/ry_vue_4.X.sql b/script/sql/ry_vue_4.X.sql index 07fe33e88..560f3fc53 100644 --- a/script/sql/ry_vue_4.X.sql +++ b/script/sql/ry_vue_4.X.sql @@ -515,7 +515,7 @@ insert into sys_dict_data values(28, 2, '失败', '1', 'sys_common_st -- ---------------------------- drop table if exists sys_config; create table sys_config ( - config_id int(5) not null comment '参数主键', + config_id bigint(20) not null comment '参数主键', config_name varchar(100) default '' comment '参数名称', config_key varchar(100) default '' comment '参数键名', config_value varchar(500) default '' comment '参数键值', @@ -559,7 +559,7 @@ create table sys_logininfor ( -- ---------------------------- drop table if exists sys_notice; create table sys_notice ( - notice_id int(4) not null comment '公告ID', + notice_id bigint(20) not null comment '公告ID', notice_title varchar(50) not null comment '公告标题', notice_type char(1) not null comment '公告类型（1通知 2公告）', notice_content longblob default null comment '公告内容', diff --git a/script/sql/update/update-4.1-4.2.sql b/script/sql/update/update-4.1-4.2.sql index 2d4767785..1d9cf508f 100644 --- a/script/sql/update/update-4.1-4.2.sql +++ b/script/sql/update/update-4.1-4.2.sql @@ -8,3 +8,7 @@ update sys_oss_config set endpoint = 'cos.ap-beijing.myqcloud.com' where oss_con insert into sys_oss_config values (5, 'image', 'ruoyi', 'ruoyi123', 'ruoyi', 'image', '127.0.0.1:9000', 'N', '', '1', '', 'admin', sysdate(), 'admin', sysdate(), NULL, ''); alter table gen_table_column modify column table_id bigint(0) null default null COMMENT '归属表编号'; + +alter table sys_notice modify column notice_id bigint(0) not null COMMENT '公告ID'; + +alter table sys_config modify column config_id bigint(0) not null COMMENT '参数主键';