Merge remote-tracking branch 'origin/dev' into 4.X

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<String, String> param) {
         if (StringUtils.isBlank(phones)) {
             throw new SmsException("手机号不能为空");

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<String, String> param) {
         if (StringUtils.isBlank(phones)) {
             throw new SmsException("手机号不能为空");

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 '公告内容',

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 '参数主键';