From 2c38f66e2ae0bc5034cc44d88add99afcb227f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=BF=E6=B2=90?= Date: Wed, 17 Aug 2022 14:44:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Emessage=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/mysql/module/fast-boot-message.sql | 41 ++++++++++++++++++++++ fast-boot-module/fast-boot-message/pom.xml | 19 ++++++++++ fast-boot-module/pom.xml | 1 + .../net/maku/framework/common/utils/RedisKeys.java | 20 ----------- fast-server/pom.xml | 5 +++ fast-server/src/main/resources/application-dev.yml | 4 +-- 6 files changed, 68 insertions(+), 22 deletions(-) create mode 100644 db/mysql/module/fast-boot-message.sql create mode 100644 fast-boot-module/fast-boot-message/pom.xml diff --git a/db/mysql/module/fast-boot-message.sql b/db/mysql/module/fast-boot-message.sql new file mode 100644 index 0000000..cafbef8 --- /dev/null +++ b/db/mysql/module/fast-boot-message.sql @@ -0,0 +1,41 @@ +INSERT INTO sys_menu (pid, name, url, authority, type, open_style, icon, sort, version, deleted, creator, create_time, updater, update_time) VALUES (1, '短信服务', 'message/sms/index', NULL, 0, 0, 'icon-reloadtime', 0, 0, 0, 10000, now(), 10000, now()); + +SET @menuId = @@identity; +INSERT INTO sys_menu (pid, name, url, authority, type, open_style, icon, sort, version, deleted, creator, create_time, updater, update_time) VALUES ((SELECT @menuId), '查看', '', 'schedule:page', 1, 0, '', 0, 0, 0, 10000, now(), 10000, now()); +INSERT INTO sys_menu (pid, name, url, authority, type, open_style, icon, sort, version, deleted, creator, create_time, updater, update_time) VALUES ((SELECT @menuId), '新增', '', 'schedule:save', 1, 0, '', 1, 0, 0, 10000, now(), 10000, now()); +INSERT INTO sys_menu (pid, name, url, authority, type, open_style, icon, sort, version, deleted, creator, create_time, updater, update_time) VALUES ((SELECT @menuId), '修改', '', 'schedule:update,schedule:info', 1, 0, '', 2, 0, 0, 10000, now(), 10000, now()); +INSERT INTO sys_menu (pid, name, url, authority, type, open_style, icon, sort, version, deleted, creator, create_time, updater, update_time) VALUES ((SELECT @menuId), '删除', '', 'schedule:delete', 1, 0, '', 3, 0, 0, 10000, now(), 10000, now()); +INSERT INTO sys_menu (pid, name, url, authority, type, open_style, icon, sort, version, deleted, creator, create_time, updater, update_time) VALUES ((SELECT @menuId), '立即运行', '', 'schedule:run', 1, 0, '', 2, 0, 0, 10000, now(), 10000, now()); +INSERT INTO sys_menu (pid, name, url, authority, type, open_style, icon, sort, version, deleted, creator, create_time, updater, update_time) VALUES ((SELECT @menuId), '日志', '', 'schedule:log', 1, 0, '', 4, 0, 0, 10000, now(), 10000, now()); + + +CREATE TABLE sms_platform +( + id bigint NOT NULL AUTO_INCREMENT COMMENT 'id', + platform tinyint COMMENT '平台类型 0：阿里云 1：腾讯云', + sign_name varchar(50) NOT NULL COMMENT '短信签名', + template_id varchar(50) NOT NULL COMMENT '短信模板', + access_key varchar(100) COMMENT '密码', + secret_key varchar(100) COMMENT '密码', + status tinyint COMMENT '状态 0：禁用 1：启用', + version int COMMENT '版本号', + deleted tinyint COMMENT '删除标识 0：正常 1：已删除', + creator bigint COMMENT '创建者', + create_time datetime COMMENT '创建时间', + updater bigint COMMENT '更新者', + update_time datetime COMMENT '更新时间', + primary key (id) +) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT ='短信平台'; + + +CREATE TABLE sms_log +( + id bigint NOT NULL AUTO_INCREMENT COMMENT 'id', + platform_id bigint COMMENT '平台ID', + platform tinyint COMMENT '平台类型', + mobile varchar(20) NOT NULL COMMENT '手机号', + status tinyint COMMENT '状态 0：失败 1：成功', + params varchar(200) COMMENT '参数', + create_time datetime COMMENT '创建时间', + primary key (id) +) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT ='短信日志'; \ No newline at end of file diff --git a/fast-boot-module/fast-boot-message/pom.xml b/fast-boot-module/fast-boot-message/pom.xml new file mode 100644 index 0000000..44324e3 --- /dev/null +++ b/fast-boot-module/fast-boot-message/pom.xml @@ -0,0 +1,19 @@ + + + net.maku + fast-boot-module + ${revision} + + 4.0.0 + fast-boot-message + jar + + + + net.maku + fast-framework + ${revision} + + + + \ No newline at end of file diff --git a/fast-boot-module/pom.xml b/fast-boot-module/pom.xml index dcd99c8..1d5ca4f 100644 --- a/fast-boot-module/pom.xml +++ b/fast-boot-module/pom.xml @@ -10,6 +10,7 @@ fast-boot-quartz + fast-boot-message \ No newline at end of file diff --git a/fast-framework/src/main/java/net/maku/framework/common/utils/RedisKeys.java b/fast-framework/src/main/java/net/maku/framework/common/utils/RedisKeys.java index 2cbea83..185c283 100644 --- a/fast-framework/src/main/java/net/maku/framework/common/utils/RedisKeys.java +++ b/fast-framework/src/main/java/net/maku/framework/common/utils/RedisKeys.java @@ -21,24 +21,4 @@ public class RedisKeys { return "oauth:code:" + code; } - /** - * 微信小程序授权key - * - * @param key - * @return - */ - public static String getWxMpAuthKey(String key) { - return "wx:mp:auth:" + key; - } - - /** - * 微信小程序授权类型key - * - * @param key - * @return - */ - public static String getWxMpAuthTypeKey(String key) { - return "wx:mp:auth:type:" + key; - } - } diff --git a/fast-server/pom.xml b/fast-server/pom.xml index 20e22cc..81f944e 100644 --- a/fast-server/pom.xml +++ b/fast-server/pom.xml @@ -21,6 +21,11 @@ net.maku + fast-boot-message + ${revision} + + + net.maku fast-boot-system ${revision} diff --git a/fast-server/src/main/resources/application-dev.yml b/fast-server/src/main/resources/application-dev.yml index ccfed9b..51371e6 100644 --- a/fast-server/src/main/resources/application-dev.yml +++ b/fast-server/src/main/resources/application-dev.yml @@ -11,8 +11,8 @@ spring: username: fast password: 123456 # driver-class-name: dm.jdbc.driver.DmDriver -# url: jdbc:dm://192.168.101.28:5236/fast_boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true -# username: fast +# url: jdbc:dm://192.168.3.19:5236/fast_boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true +# username: fast_boot # password: 12345678 hikari: connection-timeout: 30000 # 等待连接池分配链接的最大时长（毫秒），超过这个时长还没有可用的连接则发生 SQLException，默认：30 秒