diff --git a/Dockerfile b/Dockerfile index 02562f42a001d14ad0aa5cd5702dd62f2fdfdbe9..e34a3706947de6bd88442a94f3119c4e0617e4bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # java8基础镜像 -FROM openjdk:8-jre +FROM registry.cn-beijing.aliyuncs.com/xxm1995/java8 # 作者信息 MAINTAINER xxm1995@outlook.com @@ -8,8 +8,8 @@ MAINTAINER xxm1995@outlook.com ENV TZ=Asia/Shanghai RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -# jvm启动参数, 启动内存256M,最大内存1G,使用G1垃圾回收器 -ENV JAVA_OPTS="-Xms256m -Xmx1G -XX:+UseG1GC -Djava.security.egd=file:/dev/./urandom" +# jvm启动参数, 启动内存256M,最大内存1G,使用G1垃圾回收器, 同时读取外置日志配置 +ENV JAVA_OPTS="-Xms256m -Xmx1G -XX:+UseG1GC -Djava.security.egd=file:/dev/./urandom -Dlogging.config=./logback-spring.xml" # 工作目录 WORKDIR / @@ -22,3 +22,4 @@ ADD bootx-start/target/bootx-start.jar bootx-start.jar # 执行启动命令 CMD java $JAVA_OPTS -jar bootx-start.jar + diff --git a/README.md b/README.md index a2ef91a3ff0216826b55b3ef7379f65f519330fd..8823950b9994e04cedde4881959d8e387007b8fc 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# Bootx-Platform (v1.3.1-园博园) +# Bootx-Platform (v1.3.3-园博园)

star - Build Status + Build Status Build Status - Downloads + Downloads

@@ -23,11 +23,12 @@ - 可视化大屏使用 [Go-VIew](https://gitee.com/dromara/go-view) 作为基础框架 - 移动端使用 [Taro](https://taro.jd.com/)、[NutUI](https://nutui.jd.com/) vue3+TS为技术栈。 -## 🍁子项目 +## 🍁 Bootx 项目合集 +- Bootx-Platform:单体版脚手架 [Gitee地址](https://gitee.com/bootx/bootx-platform) +- Bootx-Cloud:微服务版脚手架 [Gitee地址](https://gitee.com/bootx/bootx-cloud) - dax-pay:开源支付系统 [Gitee地址](https://gitee.com/bootx/dax-pay) -- bpm-plus:工作流办公平台[Gitee地址](https://gitee.com/bootx/bpm-plus) +- bpm-plus:协同办公系统 [Gitee地址](https://gitee.com/bootx/bpm-plus) - mybatis-table-modify:数据表结构管理 [Gitee地址](https://gitee.com/bootx/mybatis-table-modify) -- 待命名:可视化大屏 ## 项目Maven坐标 > 项目各模块都已经发布到maven中央仓库中,进行二开时可以对不进行更改的模块,使用Maven方式进行引入,方便后续进行版本升级 @@ -46,7 +47,7 @@ - 系统演示地址:[管理平台(vue3)](http://v3.platform.bootx.cn/)、[可视化大屏](http://visualization.platform.bootx.cn/) - 前端项目地址:[前端项目(vue3)](https://gitee.com/bootx/bootx-platform-vue3)、[可视化大屏](https://gitee.com/bootx/bootx-platform-visualization)、[前端项目(vue2只维护不再更新)](https://gitee.com/bootx/bootx-platform-ui) - 移动端项目地址:[移动端项目(taro+vue3+ts)](https://gitee.com/xucun/bootx-platform-mobile) -- 日志收集:[[PlumeLog](http://platform.dev.bootx.cn:8080/plumelog/#/) +- 日志收集:[PlumeLog](http://139.198.29.219:8891/) - 项目文档:[项目文档(GITEE)](https://bootx.gitee.io/)、[项目文档(备用)](https://doc.bootx.cn/) - 更新日志:[更新日志](./_doc/ChangeLog.md) @@ -76,12 +77,8 @@ Spring Boot后端: [后端启动流程](https://bootx.gitee.io/doc/overview/config/项目启动.html#后端启动) -Vue2前端: [Vue2前端启动流程](https://bootx.gitee.io/doc/overview/config/%E9%A1%B9%E7%9B%AE%E5%90%AF%E5%8A%A8.html#环境准备) - Vue3后端: [Vue3前端启动流程](https://bootx.gitee.io/doc/overview/config/%E9%A1%B9%E7%9B%AE%E5%90%AF%E5%8A%A8.html#环境准备-1) -可视化大屏: [可视化大屏启动流程](https://bootx.gitee.io/doc/overview/) - ## 🥞项目模块结构 ```lua bootx-platform @@ -122,18 +119,12 @@ bootx-platform ├── bootx-services -- 业务服务模块 ├── service-baseapi -- 基础api功能服务 ├── service-iam -- 身份识别与访问管理 + ├── service-miniapp -- 小程序服务 ├── service-notice -- 消息通知服务 ├── service-visualization -- 可视化大屏管理 ├── bootx-start -- 启动模块 ``` -## 🥂 Bootx 项目合集 -- Bootx-Platform:单体版脚手架 [Gitee地址](https://gitee.com/bootx/bootx-platform) -- Bootx-Cloud:微服务版脚手架 [Gitee地址](https://gitee.com/bootx/bootx-cloud) -- dax-pay:开源支付系统 [Gitee地址](https://gitee.com/bootx/dax-pay) -- bpm-plus:开源支付系统 [Gitee地址](https://gitee.com/bootx/bpm-plus) -- mybatis-table-modify:数据表结构管理 [Gitee地址](https://gitee.com/bootx/mybatis-table-modify) - ## 🥪 关于我们 QQ扫码加入QQ交流群 diff --git a/_config/sql/bootx-platform.sql b/_config/sql/bootx-platform.sql index 0fb97592923089be8c0c3a9133671c642b4f4360..73508a3a144b2f1dec6bc2b891b99798b0afa980 100644 --- a/_config/sql/bootx-platform.sql +++ b/_config/sql/bootx-platform.sql @@ -2,13 +2,11 @@ Navicat Premium Data Transfer Source Server Type : MySQL - Source Server Version : 50735 Target Server Type : MySQL - Target Server Version : 50735 File Encoding : 65001 - Date: 07/06/2023 15:15:39 + Date: 08/08/2023 15:09:13 */ SET NAMES utf8mb4; @@ -3383,9 +3381,9 @@ CREATE TABLE `base_dict` ( `group_tag` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '分类标签', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NULL DEFAULT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -3396,7 +3394,7 @@ CREATE TABLE `base_dict` ( -- ---------------------------- INSERT INTO `base_dict` VALUES (1422929378374828033, 'Sex', '性别', b'1', '基础属性', '性别', 0, '2021-08-04 22:36:15', 1399985191002447872, '2022-05-11 19:48:40', 0, 6); INSERT INTO `base_dict` VALUES (1425744045414772737, 'MenuType', '菜单类型', b'1', '系统属性', '菜单类型', 0, '2021-08-12 17:00:44', 1399985191002447872, '2022-05-11 19:48:44', 0, 4); -INSERT INTO `base_dict` VALUES (1430063572491411456, 'loginType', '字典类型', b'1', NULL, '字典类型', 1399985191002447872, '2021-08-24 15:05:00', 1399985191002447872, '2021-08-24 15:05:00', 1, 2); +INSERT INTO `base_dict` VALUES (1430063572491411456, 'loginType', '字典类型', b'1', '基础属性', '字典类型', 1399985191002447872, '2021-08-24 15:05:00', 1399985191002447872, '2021-08-24 15:05:00', 1, 2); INSERT INTO `base_dict` VALUES (1435829999592759296, 'UserStatusCode', '用户状态码', b'1', '系统属性', '用户状态码', 1399985191002447872, '2021-09-09 12:58:43', 1399985191002447872, '2022-05-11 19:48:56', 0, 2); INSERT INTO `base_dict` VALUES (1435838066191458304, 'LogBusinessType', '业务操作类型', b'1', '系统属性', '操作日志记录的业务操作类型', 1399985191002447872, '2021-09-09 13:30:46', 1399985191002447872, '2022-05-11 19:49:00', 0, 2); INSERT INTO `base_dict` VALUES (1438078864509317120, 'MailSecurityCode', '邮箱安全方式编码', b'1', '消息服务', '邮箱安全方式编码', 1399985191002447872, '2021-09-15 17:54:54', 1399985191002447872, '2022-05-11 19:49:06', 0, 2); @@ -3404,28 +3402,12 @@ INSERT INTO `base_dict` VALUES (1439961232651034624, 'MessageTemplateCode', '消 INSERT INTO `base_dict` VALUES (1452836604783845376, 'SocialType', '三方系统类型', b'1', '系统属性', '三方系统类型', 1399985191002447872, '2021-10-26 11:16:54', 1399985191002447872, '2022-05-11 19:48:28', 0, 3); INSERT INTO `base_dict` VALUES (1452843488735621120, 'ParamType', '参数类型', b'1', '系统属性', '参数类型', 1399985191002447872, '2021-10-26 11:44:15', 1399985191002447872, '2022-05-11 19:48:21', 0, 2); INSERT INTO `base_dict` VALUES (1496024933900169216, 'Political', '政治面貌', b'1', '基础数据', '政治面貌', 1399985191002447872, '2022-02-22 15:31:54', 1399985191002447872, '2022-05-11 19:48:04', 0, 1); -INSERT INTO `base_dict` VALUES (1496722894707728384, 'PayChannel', '支付通道', b'1', '支付服务', '支付宝, 微信, 云闪付等', 1399985191002447872, '2022-02-24 13:45:21', 1399985191002447872, '2022-05-11 19:47:51', 0, 1); -INSERT INTO `base_dict` VALUES (1496723207565058048, 'PayWay', '支付方式', b'1', '支付服务', '扫码支付、Wap、App支付等', 1399985191002447872, '2022-02-24 13:46:35', 1399985191002447872, '2022-05-11 19:47:46', 0, 1); -INSERT INTO `base_dict` VALUES (1497140849954185216, 'PayStatus', '支付状态', b'1', '支付服务', '支付中,成功,失败等', 1399985191002447872, '2022-02-25 17:26:09', 1399985191002447872, '2022-05-11 19:47:40', 0, 2); -INSERT INTO `base_dict` VALUES (1501031423232937984, 'AsyncPayChannel', '异步支付通道', b'1', '支付服务', '如微信支付宝云闪付等第三方支付', 1399985191002447872, '2022-03-08 11:05:54', 1399985191002447872, '2022-05-11 19:47:37', 0, 1); -INSERT INTO `base_dict` VALUES (1502276739978473472, 'WalletStatus', '钱包状态', b'1', '支付服务', '钱包状态', 1399985191002447872, '2022-03-11 21:34:20', 1399985191002447872, '2022-05-11 19:47:33', 0, 2); -INSERT INTO `base_dict` VALUES (1502624342339448832, 'WalletOperation', '钱包日志操作类型', b'1', NULL, '', 1399985191002447872, '2022-03-12 20:35:35', 1399985191002447872, '2022-03-12 20:35:35', 1, 0); -INSERT INTO `base_dict` VALUES (1502624515799085056, 'WalletLogType', '钱包日志类型', b'1', '支付服务', '钱包日志类型', 1399985191002447872, '2022-03-12 20:36:17', 1399985191002447872, '2022-05-11 19:47:29', 0, 1); -INSERT INTO `base_dict` VALUES (1502624632392347648, 'WalletLogOperation', '钱包日志操作类型', b'1', '支付服务', '钱包日志操作类型', 1399985191002447872, '2022-03-12 20:36:44', 1399985191002447872, '2022-05-11 19:47:21', 0, 1); -INSERT INTO `base_dict` VALUES (1503340128037212160, 'VoucherStatus', '储值卡状态', b'1', '支付服务', '储值卡状态', 1399985191002447872, '2022-03-14 19:59:52', 1399985191002447872, '2022-05-11 19:47:12', 0, 1); -INSERT INTO `base_dict` VALUES (1524356168611188736, 'input', '手工输入', b'1', '商品服务', '', 1399985191002447872, '2022-05-11 19:50:06', 1399985191002447872, '2022-05-11 19:50:06', 1, 0); -INSERT INTO `base_dict` VALUES (1524356376518643712, 'GoodsParamType', '参数类型', b'1', '商品服务', '列表/手动输入', 1399985191002447872, '2022-05-11 19:50:56', 1399985191002447872, '2022-05-14 23:05:41', 0, 1); -INSERT INTO `base_dict` VALUES (1546757092010078208, 'PayNotifyProcess', '支付回调处理状态', b'1', '支付服务', '成功/忽略/失败', 1399985191002447872, '2022-07-12 15:23:23', 1399985191002447872, '2022-07-12 15:23:53', 0, 1); INSERT INTO `base_dict` VALUES (1556996322223968256, 'WeChatMediaType', '微信媒体类型', b'1', '微信', '微信媒体类型', 1399985191002447872, '2022-08-09 21:30:25', 1399985191002447872, '2022-08-09 21:30:26', 0, 0); INSERT INTO `base_dict` VALUES (1561003021674987520, 'SiteMessageReceive', '消息接收类型', b'1', '站内信', '站内信接收类型', 1399985191002447872, '2022-08-20 22:51:37', 1399985191002447872, '2022-08-20 22:51:37', 0, 0); INSERT INTO `base_dict` VALUES (1561003189111603200, 'SiteMessageState', '消息发布状态', b'1', '站内信', '站内信消息发布状态', 1399985191002447872, '2022-08-20 22:52:17', 1399985191002447872, '2022-08-20 22:52:17', 0, 0); -INSERT INTO `base_dict` VALUES (1562696107020230656, 'BpmModelPublish', '工作流模型发布状态', b'1', '工作流', '工作流模型发布状态', 1399985191002447872, '2022-08-25 14:59:20', 1399985191002447872, '2022-08-25 15:27:55', 0, 1); -INSERT INTO `base_dict` VALUES (1563083969989423104, 'BpmTaskAssignType', '工作流处理人分配类型', b'1', '工作流', '流程任务处理人分配类型', 1399985191002447872, '2022-08-26 16:40:34', 1399985191002447872, '2022-08-26 16:40:53', 0, 1); -INSERT INTO `base_dict` VALUES (1567091641298386944, 'BpmTaskState', '流程任务状态', b'1', '工作流', '流程任务状态', 1399985191002447872, '2022-09-06 18:05:37', 1399985191002447872, '2022-09-06 18:05:47', 0, 1); -INSERT INTO `base_dict` VALUES (1570343684024705024, 'BpmTaskResult', '流程任务处理结果', b'1', '工作流', '流程任务处理结果', 1399985191002447872, '2022-09-15 17:28:05', 1414143554414059520, '2022-10-19 23:13:40', 0, 1); -INSERT INTO `base_dict` VALUES (1570764395519111168, 'BpmInstanceState', '流程实例状态', b'1', '工作流', '流程实例状态', 1399985191002447872, '2022-09-16 21:19:50', 1414143554414059520, '2022-10-19 23:13:33', 0, 1); INSERT INTO `base_dict` VALUES (1589527951317389312, 'DataScopePerm', '数据范围权限', b'1', '系统属性', '数据范围权限', 1414143554414059520, '2022-11-07 15:59:30', 1399985191002447872, '2022-12-09 22:09:25', 0, 3); INSERT INTO `base_dict` VALUES (1633393287952257024, 'DatabaseType', '数据库类型', b'1', '开发', '数据库类型', 1414143554414059520, '2023-03-08 17:04:41', 1414143554414059520, '2023-03-08 17:04:41', 0, 0); +INSERT INTO `base_dict` VALUES (1688742690398617600, 'smsChannel', '短信渠道商', b'1', '消息服务', '短信渠道商', 1414143554414059520, '2023-08-08 10:43:27', 1414143554414059520, '2023-08-08 10:43:27', 0, 0); -- ---------------------------- -- Table structure for base_dict_item @@ -3441,9 +3423,9 @@ CREATE TABLE `base_dict_item` ( `sort_no` double(8, 2) NOT NULL COMMENT '排序', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE, @@ -3497,85 +3479,11 @@ INSERT INTO `base_dict_item` VALUES (1496027369796743168, 1496024933900169216, ' INSERT INTO `base_dict_item` VALUES (1496027408141070336, 1496024933900169216, 'Political', '11', '台盟盟员', b'1', 11.00, '', 1399985191002447872, '2022-02-22 15:41:44', 1399985191002447872, '2022-02-22 15:41:44', 0, 0); INSERT INTO `base_dict_item` VALUES (1496027456849522688, 1496024933900169216, 'Political', '12', '无党派人士', b'1', 12.00, '', 1399985191002447872, '2022-02-22 15:41:55', 1399985191002447872, '2022-02-22 15:41:55', 0, 0); INSERT INTO `base_dict_item` VALUES (1496027516639326208, 1496024933900169216, 'Political', '13', '群众', b'1', 13.00, '', 1399985191002447872, '2022-02-22 15:42:09', 1399985191002447872, '2022-02-22 15:42:10', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780500696539136, 1496722894707728384, 'PayChannel', '1', '支付宝', b'1', 1.00, '', 1399985191002447872, '2022-02-24 17:34:15', 1399985191002447872, '2022-03-08 11:02:59', 0, 3); -INSERT INTO `base_dict_item` VALUES (1496780576818962432, 1496722894707728384, 'PayChannel', '2', '微信', b'1', 2.00, '', 1399985191002447872, '2022-02-24 17:34:33', 1399985191002447872, '2022-03-08 11:04:00', 0, 2); -INSERT INTO `base_dict_item` VALUES (1496780712492113920, 1496723207565058048, 'PayWay', '1', 'wap支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:05', 1399985191002447872, '2022-02-24 17:35:05', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780757647990784, 1496723207565058048, 'PayWay', '2', '应用支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:16', 1399985191002447872, '2022-02-24 17:35:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780799691694080, 1496723207565058048, 'PayWay', '3', 'web支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:26', 1399985191002447872, '2022-02-24 17:35:26', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780838451257344, 1496723207565058048, 'PayWay', '4', '二维码扫码支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:35', 1399985191002447872, '2022-02-24 17:35:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780876388737024, 1496723207565058048, 'PayWay', '5', '付款码支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:44', 1399985191002447872, '2022-02-24 17:35:44', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141630803566592, 1497140849954185216, 'PayStatus', '3', '支付取消', b'1', 0.00, '', 1399985191002447872, '2022-02-25 17:29:15', 1399985191002447872, '2022-02-25 17:29:15', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141652379066368, 1497140849954185216, 'PayStatus', '2', '失败', b'1', 0.00, '', 1399985191002447872, '2022-02-25 17:29:20', 1399985191002447872, '2022-02-25 17:29:20', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141681915355136, 1497140849954185216, 'PayStatus', '1', '成功', b'1', 0.00, '', 1399985191002447872, '2022-02-25 17:29:27', 1399985191002447872, '2022-02-25 17:29:27', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141712743489536, 1497140849954185216, 'PayStatus', '0', '支付中', b'1', 0.00, '', 1399985191002447872, '2022-02-25 17:29:35', 1399985191002447872, '2022-02-25 17:29:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497506810439892992, 1497140849954185216, 'PayStatus', '4', '部分退款', b'1', 1.00, '部分退款', 1399985191002447872, '2022-02-26 17:40:21', 1399985191002447872, '2022-03-04 21:22:46', 0, 7); -INSERT INTO `base_dict_item` VALUES (1499367587857694720, 1497140849954185216, 'PayStatus', '5', '已退款', b'1', 2.00, '完全退款', 1399985191002447872, '2022-03-03 20:54:25', 1399985191002447872, '2022-03-04 21:22:49', 0, 3); -INSERT INTO `base_dict_item` VALUES (1501030031432847360, 1496722894707728384, 'PayChannel', '3', '云闪付', b'1', 3.00, '', 1399985191002447872, '2022-03-08 11:00:22', 1399985191002447872, '2022-03-08 11:04:07', 0, 2); -INSERT INTO `base_dict_item` VALUES (1501030073489133568, 1496722894707728384, 'PayChannel', '4', '现金', b'1', 4.00, '', 1399985191002447872, '2022-03-08 11:00:32', 1399985191002447872, '2022-03-08 11:04:10', 0, 2); -INSERT INTO `base_dict_item` VALUES (1501030108314439680, 1496722894707728384, 'PayChannel', '5', '钱包', b'1', 5.00, '', 1399985191002447872, '2022-03-08 11:00:40', 1399985191002447872, '2022-03-08 11:04:14', 0, 2); -INSERT INTO `base_dict_item` VALUES (1501031490513768448, 1501031423232937984, 'AsyncPayChannel', '3', '云闪付', b'1', 0.00, '', 1399985191002447872, '2022-03-08 11:06:10', 1399985191002447872, '2022-03-08 11:06:10', 0, 0); -INSERT INTO `base_dict_item` VALUES (1501031518208757760, 1501031423232937984, 'AsyncPayChannel', '2', '微信', b'1', 0.00, '', 1399985191002447872, '2022-03-08 11:06:16', 1399985191002447872, '2022-03-08 11:06:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1501031544360243200, 1501031423232937984, 'AsyncPayChannel', '1', '支付宝', b'1', 0.00, '', 1399985191002447872, '2022-03-08 11:06:23', 1399985191002447872, '2022-03-08 11:06:23', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502276841057005568, 1502276739978473472, 'WalletStatus', '2', '禁用', b'1', 0.00, '', 1399985191002447872, '2022-03-11 21:34:45', 1399985191002447872, '2022-03-11 21:34:45', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502276862108217344, 1502276739978473472, 'WalletStatus', '1', '正常', b'1', 0.00, '', 1399985191002447872, '2022-03-11 21:34:50', 1399985191002447872, '2022-03-11 21:34:50', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502624716257456128, 1502624515799085056, 'WalletLogType', '1', '开通', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:37:04', 1399985191002447872, '2022-03-12 20:37:04', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502624931978899456, 1502624515799085056, 'WalletLogType', '2', '主动充值', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:37:56', 1399985191002447872, '2022-03-12 20:37:56', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502624956209393664, 1502624515799085056, 'WalletLogType', '3', '自动充值', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:02', 1399985191002447872, '2022-03-12 20:38:02', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625014719934464, 1502624515799085056, 'WalletLogType', '4', '余额变动', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:16', 1399985191002447872, '2022-03-12 20:38:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625053097816064, 1502624515799085056, 'WalletLogType', '5', '支付', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:25', 1399985191002447872, '2022-03-12 20:38:25', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625091639275520, 1502624515799085056, 'WalletLogType', '6', '系统扣除余额', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:34', 1399985191002447872, '2022-03-12 20:38:34', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625123725701120, 1502624515799085056, 'WalletLogType', '7', '退款', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:42', 1399985191002447872, '2022-03-12 20:38:42', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625783145787392, 1502624632392347648, 'WalletLogOperation', '1', '系统操作', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:41:19', 1399985191002447872, '2022-03-12 20:41:19', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625814837948416, 1502624632392347648, 'WalletLogOperation', '2', '管理员操作', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:41:26', 1399985191002447872, '2022-03-12 20:41:26', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625850355314688, 1502624632392347648, 'WalletLogOperation', '3', '用户操作', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:41:35', 1399985191002447872, '2022-03-12 20:41:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1503340241493135360, 1503340128037212160, 'VoucherStatus', '1', '启用', b'1', 0.00, '', 1399985191002447872, '2022-03-14 20:00:19', 1399985191002447872, '2022-03-14 20:00:19', 0, 0); -INSERT INTO `base_dict_item` VALUES (1503340326645895168, 1503340128037212160, 'VoucherStatus', '2', '停用', b'1', 0.00, '', 1399985191002447872, '2022-03-14 20:00:39', 1399985191002447872, '2022-03-14 20:00:39', 0, 0); -INSERT INTO `base_dict_item` VALUES (1505112357976612864, 1496722894707728384, 'PayChannel', '6', '储值卡', b'1', 0.00, '', 1399985191002447872, '2022-03-19 17:22:04', 1399985191002447872, '2022-03-19 17:22:04', 0, 0); -INSERT INTO `base_dict_item` VALUES (1524356452720758784, 1524356376518643712, 'GoodsParamType', 'input', '手工录入', b'1', 0.00, '', 1399985191002447872, '2022-05-11 19:51:14', 1399985191002447872, '2022-05-11 19:51:14', 0, 0); -INSERT INTO `base_dict_item` VALUES (1524356510157557760, 1524356376518643712, 'GoodsParamType', 'select', '列表选择', b'1', 0.00, '', 1399985191002447872, '2022-05-11 19:51:28', 1399985191002447872, '2022-05-11 19:51:28', 0, 0); -INSERT INTO `base_dict_item` VALUES (1546757293592522752, 1546757092010078208, 'PayNotifyProcess', '0', '失败', b'1', 0.00, '', 1399985191002447872, '2022-07-12 15:24:11', 1399985191002447872, '2022-07-12 15:24:11', 0, 0); -INSERT INTO `base_dict_item` VALUES (1546757327901929472, 1546757092010078208, 'PayNotifyProcess', '1', '成功', b'1', -1.00, '', 1399985191002447872, '2022-07-12 15:24:19', 1399985191002447872, '2022-07-12 15:31:38', 0, 2); -INSERT INTO `base_dict_item` VALUES (1546757375637303296, 1546757092010078208, 'PayNotifyProcess', '2', '忽略', b'1', 0.00, '', 1399985191002447872, '2022-07-12 15:24:30', 1399985191002447872, '2022-07-12 15:24:30', 0, 0); -INSERT INTO `base_dict_item` VALUES (1556996422006460416, 1556996322223968256, 'WeChatMediaType', 'news', '新闻', b'1', 0.00, '', 1399985191002447872, '2022-08-09 21:30:49', 1399985191002447872, '2022-08-09 21:30:49', 1, 0); -INSERT INTO `base_dict_item` VALUES (1556996472661069824, 1556996322223968256, 'WeChatMediaType', 'voice', '语音', b'1', 0.00, '', 1399985191002447872, '2022-08-09 21:31:01', 1399985191002447872, '2022-08-09 21:31:01', 0, 0); -INSERT INTO `base_dict_item` VALUES (1556996501417218048, 1556996322223968256, 'WeChatMediaType', 'image', '图片', b'1', 0.00, '', 1399985191002447872, '2022-08-09 21:31:08', 1399985191002447872, '2022-08-09 21:31:08', 0, 0); -INSERT INTO `base_dict_item` VALUES (1556996529565192192, 1556996322223968256, 'WeChatMediaType', 'video', '视频', b'1', 0.00, '', 1399985191002447872, '2022-08-09 21:31:15', 1399985191002447872, '2022-08-09 21:31:15', 0, 0); -INSERT INTO `base_dict_item` VALUES (1561003235710320640, 1561003189111603200, 'SiteMessageState', 'user', '指定用户', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:52:28', 1399985191002447872, '2022-08-20 22:52:28', 1, 0); -INSERT INTO `base_dict_item` VALUES (1561003279322693632, 1561003189111603200, 'SiteMessageState', 'all', '全部用户', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:52:38', 1399985191002447872, '2022-08-20 22:52:39', 1, 0); INSERT INTO `base_dict_item` VALUES (1561003368762032128, 1561003021674987520, 'SiteMessageReceive', 'user', '指定用户', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:53:00', 1399985191002447872, '2022-08-20 22:53:00', 0, 0); INSERT INTO `base_dict_item` VALUES (1561003399778910208, 1561003021674987520, 'SiteMessageReceive', 'all', '全部用户', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:53:07', 1399985191002447872, '2022-08-20 22:53:24', 0, 1); INSERT INTO `base_dict_item` VALUES (1561003539772194816, 1561003189111603200, 'SiteMessageState', 'sent', '已发送', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:53:41', 1399985191002447872, '2022-08-20 22:53:41', 0, 0); INSERT INTO `base_dict_item` VALUES (1561003575608328192, 1561003189111603200, 'SiteMessageState', 'cancel', '撤销', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:53:49', 1399985191002447872, '2022-08-20 22:53:49', 0, 0); INSERT INTO `base_dict_item` VALUES (1561245469535080448, 1561003189111603200, 'SiteMessageState', 'draft', '草稿', b'1', 0.00, '', 1399985191002447872, '2022-08-21 14:55:01', 1399985191002447872, '2022-08-21 14:55:01', 0, 0); -INSERT INTO `base_dict_item` VALUES (1562696390043475968, 1562696107020230656, 'BpmModelPublish', 'published', '已发布', b'1', 0.00, '', 1399985191002447872, '2022-08-25 15:00:28', 1399985191002447872, '2022-08-25 15:00:28', 0, 0); -INSERT INTO `base_dict_item` VALUES (1562696420561231872, 1562696107020230656, 'BpmModelPublish', 'unpublished', '未发布', b'1', 0.00, '未上传xml文档', 1399985191002447872, '2022-08-25 15:00:35', 1399985191002447872, '2022-08-25 15:28:09', 0, 1); -INSERT INTO `base_dict_item` VALUES (1562703450588028928, 1562696107020230656, 'BpmModelPublish', 'unpublishedXml', '未发布(已上传BPMN)', b'1', 0.00, '有xml文档', 1399985191002447872, '2022-08-25 15:28:31', 1399985191002447872, '2022-08-25 15:34:45', 0, 1); -INSERT INTO `base_dict_item` VALUES (1563087300157747200, 1563083969989423104, 'BpmTaskAssignType', 'user', '用户', b'1', 0.00, '', 1399985191002447872, '2022-08-26 16:53:48', 1399985191002447872, '2022-09-06 22:50:15', 0, 1); -INSERT INTO `base_dict_item` VALUES (1567091825981980672, 1567091641298386944, 'BpmTaskState', 'running', '处理中', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:06:21', 1399985191002447872, '2022-09-06 18:06:21', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567091863017684992, 1567091641298386944, 'BpmTaskState', 'pass', '通过', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:06:30', 1399985191002447872, '2022-09-06 18:06:30', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567091902414782464, 1567091641298386944, 'BpmTaskState', 'reject', '驳回', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:06:39', 1399985191002447872, '2022-09-06 18:06:51', 0, 1); -INSERT INTO `base_dict_item` VALUES (1567091993569591296, 1567091641298386944, 'BpmTaskState', 'back', '退回', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:07:01', 1399985191002447872, '2022-09-06 18:07:01', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567092037261656064, 1567091641298386944, 'BpmTaskState', 'retrieve', '取回', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:07:12', 1399985191002447872, '2022-09-06 18:07:22', 0, 1); -INSERT INTO `base_dict_item` VALUES (1567092124226355200, 1567091641298386944, 'BpmTaskState', 'skip', '跳过', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:07:32', 1399985191002447872, '2022-09-06 18:07:32', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567163310103564288, 1563083969989423104, 'BpmTaskAssignType', 'userGroup', '用户组', b'1', 0.00, '', 1399985191002447872, '2022-09-06 22:50:24', 1399985191002447872, '2022-09-06 22:50:24', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567163343288897536, 1563083969989423104, 'BpmTaskAssignType', 'role', '角色', b'1', 0.00, '', 1399985191002447872, '2022-09-06 22:50:32', 1399985191002447872, '2022-09-06 22:50:32', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567163380693700608, 1563083969989423104, 'BpmTaskAssignType', 'deptMember', '部门成员', b'1', 0.00, '', 1399985191002447872, '2022-09-06 22:50:41', 1399985191002447872, '2022-09-06 22:50:41', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567163412960481280, 1563083969989423104, 'BpmTaskAssignType', 'deptLeader', '部门的负责人', b'1', 0.00, '', 1399985191002447872, '2022-09-06 22:50:49', 1399985191002447872, '2022-09-06 22:50:49', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567175558888923136, 1563083969989423104, 'BpmTaskAssignType', 'roleGroup', '角色组', b'1', 0.00, '', 1399985191002447872, '2022-09-06 23:39:05', 1399985191002447872, '2022-09-06 23:39:05', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567178994242002944, 1563083969989423104, 'BpmTaskAssignType', 'sponsor', '发起人', b'1', 0.00, '', 1399985191002447872, '2022-09-06 23:52:44', 1399985191002447872, '2022-09-06 23:52:44', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567179143576002560, 1563083969989423104, 'BpmTaskAssignType', 'select', '用户手动选择', b'1', 0.00, '', 1399985191002447872, '2022-09-06 23:53:19', 1399985191002447872, '2022-09-07 00:01:22', 0, 1); -INSERT INTO `base_dict_item` VALUES (1570343731634249728, 1570343684024705024, 'BpmTaskResult', 'pass', '通过', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:16', 1399985191002447872, '2022-09-15 17:28:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343761636106240, 1570343684024705024, 'BpmTaskResult', 'notPass', '不通过', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:23', 1399985191002447872, '2022-09-15 17:28:23', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343788056027136, 1570343684024705024, 'BpmTaskResult', 'abstain', '弃权', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:29', 1399985191002447872, '2022-09-15 17:28:29', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343826018672640, 1570343684024705024, 'BpmTaskResult', 'reject', '驳回', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:38', 1399985191002447872, '2022-09-15 17:28:38', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343873737269248, 1570343684024705024, 'BpmTaskResult', 'back', '退回', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:50', 1399985191002447872, '2022-09-15 17:28:50', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343913918701568, 1570343684024705024, 'BpmTaskResult', 'retrieve', '取回', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:59', 1399985191002447872, '2022-09-15 17:28:59', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570685888076120064, 1570343684024705024, 'BpmTaskResult', 'autoFinish', '自动完成', b'1', 0.00, '', 1399985191002447872, '2022-09-16 16:07:52', 1399985191002447872, '2022-09-16 16:08:02', 0, 1); -INSERT INTO `base_dict_item` VALUES (1570764765255397376, 1570764395519111168, 'BpmInstanceState', 'running', '运行中', b'1', 0.00, '', 1399985191002447872, '2022-09-16 21:21:18', 1399985191002447872, '2022-12-09 22:15:46', 0, 2); -INSERT INTO `base_dict_item` VALUES (1570764802047832064, 1570764395519111168, 'BpmInstanceState', 'finish', '已完成', b'1', 0.00, '', 1399985191002447872, '2022-09-16 21:21:27', 1399985191002447872, '2022-09-16 21:21:27', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570764836319490048, 1570764395519111168, 'BpmInstanceState', 'cancel', '取消', b'1', 0.00, '', 1399985191002447872, '2022-09-16 21:21:35', 1399985191002447872, '2022-09-16 21:21:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570784215744585728, 1570343684024705024, 'BpmTaskResult', 'cancel', '取消', b'1', 0.00, '', 1399985191002447872, '2022-09-16 22:38:35', 1399985191002447872, '2022-09-16 22:38:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570784331511570432, 1567091641298386944, 'BpmTaskState', 'cancel', '取消', b'1', 0.00, '', 1399985191002447872, '2022-09-16 22:39:03', 1399985191002447872, '2022-09-16 22:39:03', 0, 0); INSERT INTO `base_dict_item` VALUES (1573665422392098816, 1439961232651034624, 'MessageTemplateCode', '0', '站内信', b'1', -11.00, 'SITE', 1399985191002447872, '2022-09-24 21:27:29', 1399985191002447872, '2022-09-24 21:27:39', 0, 1); INSERT INTO `base_dict_item` VALUES (1589528254477488128, 1589527951317389312, 'DataScopePerm', '7', '所在及下级部门', b'1', 0.00, '', 1414143554414059520, '2022-11-07 16:00:43', 1414143554414059520, '2022-11-07 16:00:43', 0, 0); INSERT INTO `base_dict_item` VALUES (1589528283539820544, 1589527951317389312, 'DataScopePerm', '6', '所在部门', b'1', 0.00, '', 1414143554414059520, '2022-11-07 16:00:49', 1414143554414059520, '2022-11-07 16:00:49', 0, 0); @@ -3587,6 +3495,16 @@ INSERT INTO `base_dict_item` VALUES (1589528423956729856, 1589527951317389312, ' INSERT INTO `base_dict_item` VALUES (1633403429028536320, 1633393287952257024, 'DatabaseType', 'mysql', 'MySQL', b'1', 1.00, '', 1414143554414059520, '2023-03-08 17:44:59', 1414143554414059520, '2023-03-08 17:44:59', 0, 0); INSERT INTO `base_dict_item` VALUES (1633403459470794752, 1633393287952257024, 'DatabaseType', 'oracle', 'Oracle', b'1', 2.00, '', 1414143554414059520, '2023-03-08 17:45:07', 1414143554414059520, '2023-03-08 17:45:07', 0, 0); INSERT INTO `base_dict_item` VALUES (1633403498695925760, 1633393287952257024, 'DatabaseType', 'mssql', 'SQLServer', b'1', 3.00, '', 1414143554414059520, '2023-03-08 17:45:16', 1414143554414059520, '2023-03-08 17:45:16', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742732891111424, 1688742690398617600, 'smsChannel', 'alibaba', '阿里云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:43:38', 1414143554414059520, '2023-08-08 10:43:38', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742768479780864, 1688742690398617600, 'smsChannel', 'huawei', '华为云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:43:46', 1414143554414059520, '2023-08-08 10:43:46', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742808027873280, 1688742690398617600, 'smsChannel', 'yunpian', '云片', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:43:55', 1414143554414059520, '2023-08-08 10:43:56', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742840626003968, 1688742690398617600, 'smsChannel', 'tencent', '腾讯云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:03', 1414143554414059520, '2023-08-08 10:44:03', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742872506908672, 1688742690398617600, 'smsChannel', 'uni_sms', '合一短信', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:11', 1414143554414059520, '2023-08-08 10:44:11', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742905553829888, 1688742690398617600, 'smsChannel', 'jd_cloud', '京东云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:19', 1414143554414059520, '2023-08-08 10:44:19', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742954715267072, 1688742690398617600, 'smsChannel', 'cloopen', '容联云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:30', 1414143554414059520, '2023-08-08 10:44:30', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742990446542848, 1688742690398617600, 'smsChannel', 'emay', '亿美软通', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:39', 1414143554414059520, '2023-08-08 10:44:39', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688743032297308160, 1688742690398617600, 'smsChannel', 'ctyun', '天翼云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:49', 1414143554414059520, '2023-08-08 10:44:49', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688743065205817344, 1688742690398617600, 'smsChannel', 'netease', '网易云信', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:57', 1414143554414059520, '2023-08-08 10:44:57', 0, 0); -- ---------------------------- -- Table structure for base_dynamic_data_source @@ -3605,9 +3523,9 @@ CREATE TABLE `base_dynamic_data_source` ( `db_password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '密码', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3628,9 +3546,9 @@ CREATE TABLE `base_dynamic_form` ( `value` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '表单内容', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -3651,9 +3569,9 @@ CREATE TABLE `base_key_value` ( `key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数键名', `value` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数值', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -3677,9 +3595,9 @@ CREATE TABLE `base_param` ( `internal` bit(1) NOT NULL COMMENT '内置参数', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -3692,7 +3610,7 @@ INSERT INTO `base_param` VALUES (1452842684284891136, '测试', 'test.v1', '123' INSERT INTO `base_param` VALUES (1500338438182789120, '结算台聚合支付请求地址', 'CashierAggregateUrl', 'http://127.0.0.1/api/', 1, b'1', b'1', '', 1399985191002447872, '2022-03-06 13:12:13', 1399985191002447872, '2022-05-01 15:03:03', 0, 3); INSERT INTO `base_param` VALUES (1520668030248361984, '文件服务器地址', 'FileServerUrl', 'http://127.0.0.1:9999', 1, b'1', b'1', '', 1399985191002447872, '2022-05-01 15:34:46', 1399985191002447872, '2022-05-19 12:53:21', 0, 5); INSERT INTO `base_param` VALUES (1529281530059161600, 'websocket服务器地址', 'WebsocketServerUrl', 'ws://127.0.0.1:9999', 1, b'1', b'1', '', 1399985191002447872, '2022-05-25 10:01:44', 1399985191002447872, '2022-05-25 10:01:44', 0, 0); -INSERT INTO `base_param` VALUES (1545765299880448000, '服务器地址', 'ServerUrl', 'http://127.0.0.1:9999', 1, b'1', b'1', '', 1399985191002447872, '2022-07-09 21:42:21', 1399985191002447872, '2022-07-09 21:42:21', 0, 0); +INSERT INTO `base_param` VALUES (1545765299880448000, '服务器地址', 'ServerUrl', 'http://127.0.0.1:9999', 1, b'1', b'1', '优先级高于配置文件内进行的配置', 1399985191002447872, '2022-07-09 21:42:21', 1414143554414059520, '2023-08-05 16:40:05', 0, 1); INSERT INTO `base_param` VALUES (1547511252795912192, '微信jsapi支付回调服务地址', 'JsapiRedirectUrl', 'http://127.0.0.1/api/', 1, b'1', b'1', '', 1414143554414059520, '2022-07-14 17:20:09', 1414143554414059520, '2022-07-14 17:20:09', 0, 0); -- ---------------------------- @@ -3753,9 +3671,9 @@ CREATE TABLE `base_query_sql` ( `params` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'SQL查询参数', `fields` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'SQL查询结果字段', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '乐观锁', `deleted` bit(1) NOT NULL COMMENT '删除标志', PRIMARY KEY (`id`) USING BTREE @@ -3806,9 +3724,9 @@ CREATE TABLE `common_sequence_range` ( `range_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '区间key', `range_value` bigint(20) NOT NULL COMMENT '区间开始值', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3829,9 +3747,9 @@ CREATE TABLE `demo_data_encrypt` ( `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '内容', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3853,9 +3771,9 @@ CREATE TABLE `demo_data_perm` ( `creator_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者名称', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '说明', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3882,9 +3800,9 @@ CREATE TABLE `demo_data_sensitive` ( `email` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '电子邮件', `other` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '其他', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3906,14 +3824,14 @@ CREATE TABLE `demo_super_query` ( `age` int(5) NULL DEFAULT NULL COMMENT '年龄', `vip` bit(1) NULL DEFAULT NULL COMMENT '是否vip', `birthday` date NULL DEFAULT NULL COMMENT '生日', - `work_time` time(0) NULL DEFAULT NULL COMMENT '上班时间', - `registration_time` datetime(0) NULL DEFAULT NULL COMMENT '注册时间', + `work_time` time NULL DEFAULT NULL COMMENT '上班时间', + `registration_time` datetime NULL DEFAULT NULL COMMENT '注册时间', `political` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '政治面貌', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3933,29 +3851,30 @@ INSERT INTO `demo_super_query` VALUES (1496373512871284736, '刘备', 108, b'0', -- ---------------------------- DROP TABLE IF EXISTS `iam_client`; CREATE TABLE `iam_client` ( - `id` bigint(20) NOT NULL, + `id` bigint(20) NOT NULL COMMENT '主键', `code` varchar(21) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编码', `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', `system` bit(1) NOT NULL COMMENT '是否系统内置', `enable` bit(1) NOT NULL COMMENT '是否可用', `login_type_ids` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '关联登录方式\r\n', `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', + `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', + `version` int(11) NOT NULL COMMENT '乐观锁', + `deleted` bit(1) NOT NULL DEFAULT 0 COMMENT '删除标志', + `default_endow` bit(1) NULL DEFAULT NULL COMMENT '新注册的用户是否默认赋予该终端', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '认证终端' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of iam_client -- ---------------------------- -INSERT INTO `iam_client` VALUES (1430430071299207168, 'admin', 'pc管理端', b'1', b'1', '1430430071299207168,1435138582839009280,1430478946919653376,1542091599907115008,1542804450312122368,1543126042909016064', 'pc浏览器', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-07-02 14:55:11', 4, 0); -INSERT INTO `iam_client` VALUES (1430430071299207169, 'h5', 'h5端', b'1', b'1', '1430430071299207168,1435138582839009280', '手机wap', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-06-29 18:31:45', 1, 0); -INSERT INTO `iam_client` VALUES (1580487061605175296, 'adminv3', 'pc管理端(vue3版)', b'0', b'1', '1430430071299207168,1430478946919653376,1435138582839009280,1542091599907115008,1542804450312122368,1543126042909016064', 'vue3版本', 1399985191002447872, '2022-10-13 17:14:14', 1399985191002447872, '2022-10-13 17:14:25', 1, 0); -INSERT INTO `iam_client` VALUES (1626840094767714304, 'GoView', '可视化平台', b'0', b'1', '1430430071299207168', '', 1414143554414059520, '2023-02-18 15:04:38', 1414143554414059520, '2023-02-18 15:04:38', 0, 0); +INSERT INTO `iam_client` VALUES (1430430071299207168, 'admin', 'pc管理端', b'1', b'1', '1430430071299207168,1435138582839009280,1430478946919653376,1542091599907115008,1542804450312122368,1543126042909016064', 'pc浏览器', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-07-02 14:55:11', 4, b'0', NULL); +INSERT INTO `iam_client` VALUES (1430430071299207169, 'h5', 'h5端', b'1', b'1', '1430430071299207168,1435138582839009280', '手机wap', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-06-29 18:31:45', 1, b'0', NULL); +INSERT INTO `iam_client` VALUES (1580487061605175296, 'adminv3', 'pc管理端(vue3版)', b'0', b'1', '1430430071299207168,1430478946919653376,1435138582839009280,1542091599907115008,1542804450312122368,1543126042909016064', 'vue3版本', 1399985191002447872, '2022-10-13 17:14:14', 1414143554414059520, '2023-08-02 14:28:37', 2, b'0', b'1'); +INSERT INTO `iam_client` VALUES (1626840094767714304, 'GoView', '可视化平台', b'0', b'1', '1430430071299207168', '', 1414143554414059520, '2023-02-18 15:04:38', 1414143554414059520, '2023-02-18 15:04:38', 0, b'0', NULL); -- ---------------------------- -- Table structure for iam_data_scope @@ -3968,9 +3887,9 @@ CREATE TABLE `iam_data_scope` ( `type` int(4) NOT NULL COMMENT '类型', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '说明', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4041,9 +3960,9 @@ CREATE TABLE `iam_dept` ( `address` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '地址', `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4083,9 +4002,9 @@ CREATE TABLE `iam_login_type` ( `enable` bit(1) NOT NULL COMMENT '是否可用', `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4130,9 +4049,9 @@ CREATE TABLE `iam_perm_menu` ( `admin` bit(1) NOT NULL COMMENT '系统菜单', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4271,6 +4190,9 @@ INSERT INTO `iam_perm_menu` VALUES (1623494586215579648, 'admin', 15522079825107 INSERT INTO `iam_perm_menu` VALUES (1629039360928075776, 'adminv3', 1582276341792985088, '可视化大屏', 'ProjectInfoList', NULL, b'0', '', b'0', b'0', '/modules/develop/report/ProjectInfoList', NULL, '/develop/report', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-02-24 16:43:44', 1414143554414059520, '2023-02-24 16:44:17', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1631946120891707392, 'admin', 1552207982510706688, '可视化大屏', 'ProjectInfoList', NULL, b'0', '', b'0', b'0', 'develop/report/ProjectInfoList', NULL, '/develop/report', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2023-03-04 17:14:10', 1399985191002447872, '2023-03-04 17:14:10', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1635274568758435840, 'adminv3', 1582276341792985088, 'SQL查询语句', 'QuerySqlList', NULL, b'0', '', b'0', b'0', '/modules/develop/query/QuerySqlList', NULL, '/develop/querySql', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-03-13 21:40:14', 1414143554414059520, '2023-03-13 21:43:05', 2, 0); +INSERT INTO `iam_perm_menu` VALUES (1687369862646558720, 'adminv3', 1582275984849326080, '短信管理', 'Sms', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/notice/sms', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-08-04 15:48:20', 1414143554414059520, '2023-08-04 15:48:32', 1, 0); +INSERT INTO `iam_perm_menu` VALUES (1687370142234669056, 'adminv3', 1687369862646558720, '短信配置', 'SmsChannelConfigList', NULL, b'0', '', b'0', b'0', '/modules/notice/sms/config/SmsChannelConfigList', NULL, '/notice/sms/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-08-04 15:49:26', 1414143554414059520, '2023-08-04 15:49:26', 0, 0); +INSERT INTO `iam_perm_menu` VALUES (1687370277496778752, 'adminv3', 1687369862646558720, '短信模板', 'SmsTemplateList', NULL, b'0', '', b'0', b'0', '/modules/notice/sms/template/SmsTemplateList', NULL, '/notice/sms/template', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-08-04 15:49:59', 1414143554414059520, '2023-08-04 15:50:38', 1, 0); -- ---------------------------- -- Table structure for iam_perm_path @@ -4310,9 +4232,9 @@ CREATE TABLE `iam_role` ( `internal` bit(1) NOT NULL COMMENT '是否系统内置', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '说明', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4407,14 +4329,14 @@ CREATE TABLE `iam_user_expand_info` ( `sex` int(4) NULL DEFAULT NULL COMMENT '性别', `birthday` date NULL DEFAULT NULL COMMENT '生日', `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '头像', - `last_login_time` datetime(0) NULL DEFAULT NULL COMMENT '上次登录时间', - `current_login_time` datetime(0) NULL DEFAULT NULL COMMENT '本次登录时间', + `last_login_time` datetime NULL DEFAULT NULL COMMENT '上次登录时间', + `current_login_time` datetime NULL DEFAULT NULL COMMENT '本次登录时间', `initial_password` bit(1) NOT NULL COMMENT '是否初始密码', - `last_change_password_time` datetime(0) NULL DEFAULT NULL COMMENT '上次修改密码时间', + `last_change_password_time` datetime NULL DEFAULT NULL COMMENT '上次修改密码时间', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4446,12 +4368,12 @@ CREATE TABLE `iam_user_info` ( `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '头像', `source` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '注册来源', `admin` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否超级管理员', - `register_time` datetime(0) NULL DEFAULT NULL COMMENT '注册时间', + `register_time` datetime NULL DEFAULT NULL COMMENT '注册时间', `status` tinyint(4) NOT NULL COMMENT '账号状态', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4499,9 +4421,9 @@ CREATE TABLE `iam_user_third` ( `ding_talk_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '钉钉唯一标识', `we_com_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企业微信唯一标识', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE, @@ -4525,9 +4447,9 @@ CREATE TABLE `iam_user_third_info` ( `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '用户头像', `third_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '关联第三方平台的用户id', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE, INDEX `pk_user_client`(`user_id`, `client_code`) USING BTREE COMMENT '用户id和终端code' @@ -4554,9 +4476,9 @@ CREATE TABLE `notice_mail_config` ( `activity` tinyint(1) NULL DEFAULT 0 COMMENT '是否默认配置,0:否。1:是', `security_type` int(2) NULL DEFAULT NULL COMMENT '安全传输方式 1:plain 2:tls 3:ssl', `creator` bigint(18) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(18) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NULL DEFAULT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -4575,12 +4497,12 @@ CREATE TABLE `notice_message_template` ( `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编码', `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', `data` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '模板数据', - `type` int(11) NULL DEFAULT NULL COMMENT '模板类型', + `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板类型', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4589,15 +4511,15 @@ CREATE TABLE `notice_message_template` ( -- ---------------------------- -- Records of notice_message_template -- ---------------------------- -INSERT INTO `notice_message_template` VALUES (1424936204932169730, 'cs', '测试', 'hello ${msg}6666666666666666666666666666', 1, '测试模板', 0, '2021-08-10 11:30:40', 0, '2021-08-10 11:30:40', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573951326893510656, 'BpmTaskCreated', '流程任务创建事件', '流程任务创建事件', 0, '', 1399985191002447872, '2022-09-25 16:23:34', 1399985191002447872, '2022-09-25 16:23:34', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573951515616219136, 'BpmTaskAssignCreated', '流程任务更改处理人事件(新处理人)', '流程任务更改处理人事件(新处理人)', 0, '', 1399985191002447872, '2022-09-25 16:24:19', 1399985191002447872, '2022-09-25 16:27:09', 1, 0); -INSERT INTO `notice_message_template` VALUES (1573952505056727040, 'BpmTaskAssignCancel', '流程任务更改处理人事件(原处理人)', '流程任务更改处理人事件(原处理人)', 0, '', 1399985191002447872, '2022-09-25 16:28:14', 1399985191002447872, '2022-09-25 16:28:14', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573952568654958592, 'BpmTaskCancel', '流程任务取消事件', '流程任务取消事件', 0, '', 1399985191002447872, '2022-09-25 16:28:30', 1399985191002447872, '2022-09-25 16:28:30', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573952621826150400, 'BpmTaskReject', '流程任务驳回事件', '流程任务驳回事件', 0, '', 1399985191002447872, '2022-09-25 16:28:42', 1399985191002447872, '2022-09-25 16:28:42', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573952709432578048, 'BpmInstanceCompleted', '流程完成时通知发起人', '流程完成时通知发起人', 0, '', 1399985191002447872, '2022-09-25 16:29:03', 1399985191002447872, '2022-09-25 16:29:03', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573952762507300864, 'BpmInstanceCancel', '流程取消时通知发起人', '流程取消时通知发起人', 0, '', 1399985191002447872, '2022-09-25 16:29:16', 1399985191002447872, '2022-09-25 16:29:16', 0, 0); -INSERT INTO `notice_message_template` VALUES (1580083314274070528, 'BpmTaskBack', '流程任务回退事件', '流程任务驳回事件', 0, '', 1399985191002447872, '2022-10-12 14:29:53', 1399985191002447872, '2022-10-12 14:30:11', 1, 0); +INSERT INTO `notice_message_template` VALUES (1424936204932169730, 'cs', '测试', 'hello ${msg}6666666666666666666666666666', '1', '测试模板', 0, '2021-08-10 11:30:40', 0, '2021-08-10 11:30:40', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573951326893510656, 'BpmTaskCreated', '流程任务创建事件', '流程任务创建事件', '0', '', 1399985191002447872, '2022-09-25 16:23:34', 1399985191002447872, '2022-09-25 16:23:34', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573951515616219136, 'BpmTaskAssignCreated', '流程任务更改处理人事件(新处理人)', '流程任务更改处理人事件(新处理人)', '0', '', 1399985191002447872, '2022-09-25 16:24:19', 1399985191002447872, '2022-09-25 16:27:09', 1, 0); +INSERT INTO `notice_message_template` VALUES (1573952505056727040, 'BpmTaskAssignCancel', '流程任务更改处理人事件(原处理人)', '流程任务更改处理人事件(原处理人)', '0', '', 1399985191002447872, '2022-09-25 16:28:14', 1399985191002447872, '2022-09-25 16:28:14', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573952568654958592, 'BpmTaskCancel', '流程任务取消事件', '流程任务取消事件', '0', '', 1399985191002447872, '2022-09-25 16:28:30', 1399985191002447872, '2022-09-25 16:28:30', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573952621826150400, 'BpmTaskReject', '流程任务驳回事件', '流程任务驳回事件', '0', '', 1399985191002447872, '2022-09-25 16:28:42', 1399985191002447872, '2022-09-25 16:28:42', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573952709432578048, 'BpmInstanceCompleted', '流程完成时通知发起人', '流程完成时通知发起人', '0', '', 1399985191002447872, '2022-09-25 16:29:03', 1399985191002447872, '2022-09-25 16:29:03', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573952762507300864, 'BpmInstanceCancel', '流程取消时通知发起人', '流程取消时通知发起人', '0', '', 1399985191002447872, '2022-09-25 16:29:16', 1399985191002447872, '2022-09-25 16:29:16', 0, 0); +INSERT INTO `notice_message_template` VALUES (1580083314274070528, 'BpmTaskBack', '流程任务回退事件', '流程任务驳回事件', '0', '', 1399985191002447872, '2022-10-12 14:29:53', 1399985191002447872, '2022-10-12 14:30:11', 1, 0); -- ---------------------------- -- Table structure for notice_site_message @@ -4609,15 +4531,15 @@ CREATE TABLE `notice_site_message` ( `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '消息内容', `sender_id` bigint(20) NULL DEFAULT NULL COMMENT '发送者id', `sender_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发送者姓名', - `sender_time` datetime(0) NULL DEFAULT NULL COMMENT '发送时间', + `sender_time` datetime NULL DEFAULT NULL COMMENT '发送时间', `receive_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '消息类型', `send_state` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布状态', - `efficient_time` datetime(0) NULL DEFAULT NULL COMMENT '截至有效期', - `cancel_time` datetime(0) NULL DEFAULT NULL COMMENT '撤回时间', + `efficient_time` datetime NULL DEFAULT NULL COMMENT '截至有效期', + `cancel_time` datetime NULL DEFAULT NULL COMMENT '撤回时间', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4636,9 +4558,9 @@ CREATE TABLE `notice_site_message_user` ( `message_id` bigint(20) NOT NULL COMMENT '消息id', `receive_id` bigint(20) NOT NULL COMMENT '接收者id', `have_read` bit(1) NOT NULL COMMENT '已读/未读', - `read_time` datetime(0) NULL DEFAULT NULL COMMENT '已读时间', + `read_time` datetime NULL DEFAULT NULL COMMENT '已读时间', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `uni_receive_message`(`receive_id`, `message_id`) USING BTREE COMMENT '接收人和消息联合索引', @@ -4659,17 +4581,21 @@ INSERT INTO `notice_site_message_user` VALUES (1561379841968648192, 156136589480 DROP TABLE IF EXISTS `notice_sms_channel_config`; CREATE TABLE `notice_sms_channel_config` ( `id` bigint(20) NOT NULL COMMENT '主键', - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '渠道编码', - `signature` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '短信签名', - `api_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '短信ApiKey', - `api_secret` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '短信Api秘钥', - `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '回调地址', + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '渠道类型编码', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '乐观锁', `deleted` bit(1) NOT NULL COMMENT '删除标志', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '渠道类型名称', + `state` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态', + `access_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'AccessKey', + `config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '配置字符串', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `access_secret` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'AccessSecret', + `image` bigint(20) NULL DEFAULT NULL COMMENT '图片', + `sort_no` double(10, 0) NULL DEFAULT NULL COMMENT '排序', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '短信渠道配置' ROW_FORMAT = DYNAMIC; @@ -4692,9 +4618,9 @@ CREATE TABLE `notice_sms_config` ( `from_num` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, `is_default` tinyint(1) NULL DEFAULT 0 COMMENT '是否默认配置,0:否。1:是', `creator` bigint(18) NULL DEFAULT NULL, - `create_time` datetime(0) NULL DEFAULT NULL, + `create_time` datetime NULL DEFAULT NULL, `last_modifier` bigint(18) NULL DEFAULT NULL, - `last_modified_time` datetime(0) NULL DEFAULT NULL, + `last_modified_time` datetime NULL DEFAULT NULL, `version` int(10) NULL DEFAULT NULL, `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `secret` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, @@ -4707,6 +4633,29 @@ CREATE TABLE `notice_sms_config` ( -- Records of notice_sms_config -- ---------------------------- +-- ---------------------------- +-- Table structure for notice_sms_template +-- ---------------------------- +DROP TABLE IF EXISTS `notice_sms_template`; +CREATE TABLE `notice_sms_template` ( + `id` bigint(20) NOT NULL COMMENT '主键', + `supplier_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '短信渠道商类型', + `template_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '短信渠道商类型', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '短信模板名称', + `content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '短信模板内容', + `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', + `version` int(11) NOT NULL COMMENT '乐观锁', + `deleted` bit(1) NOT NULL COMMENT '删除标志', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '短信模板配置' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of notice_sms_template +-- ---------------------------- + -- ---------------------------- -- Table structure for notice_wechat_config -- ---------------------------- @@ -4720,9 +4669,9 @@ CREATE TABLE `notice_wechat_config` ( `corp_secret` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, `is_default` tinyint(1) NULL DEFAULT 0 COMMENT '是否默认配置,0:否。1:是', `creator` bigint(18) NULL DEFAULT NULL, - `create_time` datetime(0) NULL DEFAULT NULL, + `create_time` datetime NULL DEFAULT NULL, `last_modifier` bigint(18) NULL DEFAULT NULL, - `last_modified_time` datetime(0) NULL DEFAULT NULL, + `last_modified_time` datetime NULL DEFAULT NULL, `version` int(10) NULL DEFAULT NULL, `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4980,9 +4929,9 @@ CREATE TABLE `report_project_info` ( `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '报表内容', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '乐观锁', `deleted` bit(1) NOT NULL COMMENT '删除标志', `index_image` bigint(20) NULL DEFAULT NULL COMMENT '预览图片id', @@ -5002,9 +4951,9 @@ CREATE TABLE `report_project_info_publish` ( `id` bigint(20) NOT NULL COMMENT '主键', `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '报表内容', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '乐观锁', `deleted` bit(1) NOT NULL COMMENT '删除标志', PRIMARY KEY (`id`) USING BTREE @@ -5027,7 +4976,7 @@ CREATE TABLE `starter_audit_data_version` ( `change_content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '数据更新内容', `version` int(10) NOT NULL COMMENT '版本', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据版本日志' ROW_FORMAT = DYNAMIC; @@ -5053,7 +5002,7 @@ CREATE TABLE `starter_audit_login_log` ( `os` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作系统', `browser` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '浏览器类型', `msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提示消息', - `login_time` datetime(0) NULL DEFAULT NULL COMMENT '访问时间', + `login_time` datetime NULL DEFAULT NULL COMMENT '访问时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '登陆日志' ROW_FORMAT = DYNAMIC; @@ -5080,7 +5029,7 @@ CREATE TABLE `starter_audit_operate_log` ( `operate_return` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '返回参数', `success` bit(1) NULL DEFAULT NULL COMMENT '是否成功', `error_msg` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '错误提示', - `operate_time` datetime(0) NULL DEFAULT NULL COMMENT '操作时间', + `operate_time` datetime NULL DEFAULT NULL COMMENT '操作时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志' ROW_FORMAT = DYNAMIC; @@ -5130,6 +5079,21 @@ CREATE TABLE `starter_ding_robot_config` ( -- Records of starter_ding_robot_config -- ---------------------------- +-- ---------------------------- +-- Table structure for starter_file_data +-- ---------------------------- +DROP TABLE IF EXISTS `starter_file_data`; +CREATE TABLE `starter_file_data` ( + `id` bigint(20) NOT NULL COMMENT '主键', + `base64` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT 'base64方式存储', + `data` longblob NULL COMMENT 'base64方式存储', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '上传文件数据' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of starter_file_data +-- ---------------------------- + -- ---------------------------- -- Table structure for starter_file_upload_info -- ---------------------------- @@ -5143,7 +5107,7 @@ CREATE TABLE `starter_file_upload_info` ( `file_size` bigint(20) NULL DEFAULT NULL COMMENT '文件大小', `external_storage_id` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '外部关联id', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '上传文件信息' ROW_FORMAT = DYNAMIC; @@ -5164,9 +5128,9 @@ CREATE TABLE `starter_quartz_job` ( `state` int(4) NULL DEFAULT NULL COMMENT '状态', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -5188,10 +5152,10 @@ CREATE TABLE `starter_quartz_job_log` ( `class_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理器全限定名', `success` bit(1) NOT NULL COMMENT '是否执行成功', `error_message` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误信息', - `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间', - `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间', + `start_time` datetime NULL DEFAULT NULL COMMENT '开始时间', + `end_time` datetime NULL DEFAULT NULL COMMENT '结束时间', `duration` bigint(255) NULL DEFAULT NULL COMMENT '执行时长', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '任务执行日志' ROW_FORMAT = DYNAMIC; @@ -5230,7 +5194,7 @@ CREATE TABLE `starter_wx_fans` ( `id` bigint(20) NOT NULL, `openid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '关联OpenId', `subscribe_status` bit(1) NULL DEFAULT NULL COMMENT '订阅状态', - `subscribe_time` datetime(0) NULL DEFAULT NULL COMMENT '订阅时间', + `subscribe_time` datetime NULL DEFAULT NULL COMMENT '订阅时间', `nickname` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '昵称', `sex` varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '性别', `language` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '语言', @@ -5257,9 +5221,9 @@ CREATE TABLE `starter_wx_menu` ( `remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注', `publish` bit(1) NOT NULL COMMENT '是否发布', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(11) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -5285,9 +5249,9 @@ CREATE TABLE `starter_wx_template` ( `content` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板内容', `example` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '示例', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `inx_`(`template_id`) USING BTREE COMMENT '模板id' diff --git a/_doc/ChangeLog.md b/_doc/ChangeLog.md index 36aa8b954578b8bced6e58ccad7545415cbd56db..051a20f34e1b64a71644cd5758f54a449a29842f 100644 --- a/_doc/ChangeLog.md +++ b/_doc/ChangeLog.md @@ -1,4 +1,16 @@ # CHANGELOG +## [v1.3.3] 一号线-园博园 +- 新增: 添加短信配置, 集成SMS4J, 支持分渠道配置 +- 新增: 新版自定义表单集成(epic-designer尚处于测试版) +- 新增: 各种事件通知, 用户相关/角色相关/短信渠道配置相关 +- 新增: vxe暗黑模式适配 +- 优化: 终端可以设置新注册用户是否默认拥有该终端的权限 +- 优化: 删除工作流和支付相关代码 +- fix: JacksonUtil标识未生效 +## [v1.3.2] 一号线-园博园 +- 新增: 查询生成器支持排序 +- 优化: 版本依赖升级 +- fix: 多数据源加载时机不对, 与flyway冲突 ## [v1.3.1] 一号线-园博园 - 新增: 代码生成器支持多数据源 - 新增: 多数据源增加启动时自动加载配置 @@ -83,7 +95,7 @@ - 数据字段翻译功能支持字典翻译 - 中国行政区划信息扩展至五级,支持村庄社区 - 优化 TreeBuildUtil优化Children的生成 -- fix plumelog新版本有问题(实时日志不显示), 回滚版本 +- fiplumelog新版本有问题(实时日志不显示), 回滚版本 **Vue3更新** - 中国行政区划演示 - 幂等接口演示 @@ -148,7 +160,7 @@ - 优化: redisson启动机制修改, 不再会导致项目无法启动 - 优化: 钱包报错提示优化 - 优化: vue3模板调整 -- fix ts映射字段类型缺失 +- fits映射字段类型缺失 **Vue3进度** - 新增: 企业微信机器人和钉钉机器人配置 @@ -262,8 +274,8 @@ - 增加流程回退处理 - 优化用户基础信息修改 - 优化消息通知内容显示 -- fix 系统内置终端不允许删除 -- fix addable/editable/showable, 状态不随动问题 +- fi系统内置终端不允许删除 +- fiaddable/editable/showable, 状态不随动问题 **Vue3进度** - 移植 终端管理, 增加登录方式 功能 @@ -296,7 +308,7 @@ - 优化重写多实例任务Behavior结束条件 - 优化拆分ApplyFormShow前端组件 - 优化多实例任务记录多实例关联id -- fix 流程节点人员分类信息丢失 +- fi流程节点人员分类信息丢失 ## [v1.1.2] 一号线-工研院 - 增加流程节点人员基础分配类型,新增发起人、指定用户、指定角色、运行时指定等方式 - 增加跳过当前节点配置 @@ -479,7 +491,7 @@ - 优化: 前端修改密码时的提示 - 优化: 字典翻译工具类增加异步方法,解决获取不到字典项的问题 - 优化: 日志文件同时输出log格式文件,保留日期更改为30天 -- fix 字典项分页查询报错 +- fi字典项分页查询报错 ## [v1.1.0-alpha-4] 一号线-工研院.预览版4 - 升级Spring boot 2.6.2、Mybatis Plus 3.5.0 @@ -498,8 +510,8 @@ - 优化: 角色管理给分配菜单权限支持搜索 - 优化: 部门机构支持搜索 - 优化: 部门删除时发送事件,用到部门的地方进行了处理 -- fix 路径误拦截问题 -- fix 云效构建后登录报序列化错误 +- fi路径误拦截问题 +- fi云效构建后登录报序列化错误 ## [v1.1.0-alpha-3] 一号线-工研院.预览版3 - 升级Spring boot 2.6.x diff --git a/_doc/Task.md b/_doc/Task.md new file mode 100644 index 0000000000000000000000000000000000000000..a2f67693dee0bf9641da098c92c1ee1ad4b30a35 --- /dev/null +++ b/_doc/Task.md @@ -0,0 +1,22 @@ +## 1.3.4 +- MiniApp添加用户协议/隐私协议等(富文本) +- 小程序工单功能 +- 小程序日报功能 +- 小程序用户反馈功能 +- 敏感字功能 +## 1.3.x +- PostgreSQL 数据库适配 +- 添加短信模板功能, 可以与各短信商渠道进行同步 +- 优化异常类,将各种异常类进行拆分出来 +- 优化参数校验, 将各种入参进行校验 +- 代码生成模板支持配置 +- 代码生成支持预览 +- Sql查询功能 +- 支持预览编辑完成的富文本 +- 添加配置备份功能(菜单/系统参数/字典), csv方式 +- 添加各种导入和导出功能 +- 导入数据支持选择: 跳过, 覆盖, 报错 +- 添加各种批量操作功能 +- 一键缓存同步和更新操作(字典/参数) +- 加密模块支持主键加密 +- Knife4j移植官方basic认证功能 diff --git a/_license/LICENSE.md b/_license/LICENSE.md index 19fcc34a6af32c2e621b3db906543dc8c934212c..134452162e2b83668fbfcfd0b64d8027364b0474 100644 --- a/_license/LICENSE.md +++ b/_license/LICENSE.md @@ -41,3 +41,9 @@ https://gitee.com/xiaoym/knife4j easy_trans 一个注解搞定数据翻译: https://gitee.com/dromara/easy_trans + +vxe-table暗黑主题灵感 +https://github.com/adoin + +DFA算法实现的敏感词过滤工具,支持Skip参数控制敏感词干扰噪音,支持白名单跳过白名单词汇,支持在线添加和删除敏感词,管理敏感词库: +https://gitee.com/humingzhang/wordfilter diff --git a/_license/wordfilter/LICENSE b/_license/wordfilter/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..261eeb9e9f8b2b4b0d119366dda99c6fd7d35c64 --- /dev/null +++ b/_license/wordfilter/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/bootx-common-core/pom.xml b/bootx-common-core/pom.xml index 95059d544203967e811ded55b139a1506ad36fc6..7afde8dba90ac513c287c16b07448a82be8026ff 100644 --- a/bootx-common-core/pom.xml +++ b/bootx-common-core/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/BigField.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/BigField.java index 802e8a50021bd922725be7e827bdfee3631c12b9..e96becfe5cec7267c628a97e580a8a1e47423ef8 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/BigField.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/BigField.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 大字段注解 * * @author xxm - * @date 2021/10/24 + * @since 2021/10/24 */ @Target({ ElementType.PARAMETER, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/CountTime.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/CountTime.java index dca870e4826135e397bc9691b69c40af65f5aee1..87cd1029d37d742152ed31db382429a7b861c042 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/CountTime.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/CountTime.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 获取程序执行时间注解 * * @author xxm - * @date 2020/12/22 + * @since 2020/12/22 */ @Target({ ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/DataVersionLog.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/DataVersionLog.java index 5f6a8cb5ba37106b2e335041e2b7865803959958..e4f1eef2c72491dca397e9e387d538f2af650a38 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/DataVersionLog.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/DataVersionLog.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 数据版本日志 * * @author xxm - * @date 2023/1/2 + * @since 2023/1/2 */ @Target({ ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/EncryptionField.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/EncryptionField.java index 7b29b65baa0dea6df45aa14717d1c23042916c10..7fbf1af7573f72f0767e1320bc4c09c1e9957232 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/EncryptionField.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/EncryptionField.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 加密字段注解 * * @author xxm - * @date 2021/11/23 + * @since 2021/11/23 */ @Target({ ElementType.PARAMETER, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Idempotent.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Idempotent.java index 088d33a0204ed3bc00fff035fabb04f96cfec70d..d6ee7eea588c171189dc0a6f57efcc062e652015 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Idempotent.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Idempotent.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 幂等性拦截注解 * * @author xxm - * @date 2021/1/2 + * @since 2021/1/2 */ @Documented @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/JobLog.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/JobLog.java index 11d40fce2bd05df7e3f944ba4e5ababb5207f2d6..dfc1483791fbf6c1334540e05d6646227a8973b9 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/JobLog.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/JobLog.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 定时任务日志 * * @author xxm - * @date 2022/7/12 + * @since 2022/7/12 */ @Target({ ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/NestedPermission.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/NestedPermission.java index 27eb4a994e02d6b51762f4270b5d096744052b52..1e324c37d6b3eaff6aa3878f109b6957170f63f9 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/NestedPermission.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/NestedPermission.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 嵌套权限控制注解,需要配合Permission注解一起使用,在Permission注解声明方法调用其他子方法时, 通过添加本数据来忽略子方法执行时的数据权限拦截 * * @author xxm - * @date 2022/1/2 + * @since 2022/1/2 */ @Target({ ElementType.METHOD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLog.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLog.java index e65caec7ec43755dabd920734013fe8001941246..41da7c5f1aab4e65dbe8f65e0a3cface31a4ca1d 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLog.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLog.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 操作日志注解(支持重复注解) * * @author xxm - * @date 2021/8/13 + * @since 2021/8/13 */ @Target({ ElementType.PARAMETER, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLogs.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLogs.java index fa3cd2ab0f3b146fe7fb9197184ea6ace84ab242..87320186790f807345112adb99995845919b9b34 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLogs.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLogs.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 操作日志注解组 * * @author xxm - * @date 2021/12/20 + * @since 2021/12/20 */ @Target({ ElementType.PARAMETER, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/PermCode.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/PermCode.java index e3b0bd74360093f64325181c0f1b4ca011b77aa1..ac9d10271e934069f81ba209812220b8272f4526 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/PermCode.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/PermCode.java @@ -7,7 +7,7 @@ import java.lang.annotation.*; * 放在数据库实体类及字段上时,会在启用查询字段权限的时候,对用户没有权限码的字段不进行SQL查询 * * @author xxm - * @date 2023/1/22 + * @since 2023/1/22 */ @Target({ ElementType.METHOD, ElementType.FIELD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Permission.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Permission.java index a8aefb35faefdcd199adf13e278a1c2832e93157..235c2e942506f164dd940c6eadce5b3e5ed177eb 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Permission.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Permission.java @@ -7,7 +7,7 @@ import java.lang.annotation.*; * * @see NestedPermission 通常在嵌套方法不启用数据权限时使用 * @author xxm - * @date 2021/12/22 + * @since 2021/12/22 */ @Target({ ElementType.METHOD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/QueryParam.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/QueryParam.java index dd6f0629d0ae53ef326c48fb6e593b5144f73f11..d79dfc3e0b0fa7d49d40360a87b8216ac8eedc2f 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/QueryParam.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/QueryParam.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 查询参数 生效顺序 QueryParams 查询参数字段 > Entity 数据库实体字段 > QueryParams 查询类 > Entity 数据库实体类 * * @author xxm - * @date 2022/12/12 + * @since 2022/12/12 */ @Target({ ElementType.TYPE, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvert.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvert.java index d4ba56d677f48134a95e440888a2a9557ebc30c9..390dc9ea1a29c75da1f4c2bf8e0bec5f9d89617f 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvert.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvert.java @@ -9,7 +9,7 @@ import java.lang.annotation.Target; * 数据库表字段翻译注解 * * @author xxm - * @date 2022/12/14 + * @since 2022/12/14 */ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvertModel.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvertModel.java index b6b69b3c319837449856f531929965a27e977d0b..64ebf42f3c0f6e556bc536ca93042eb2bf586ed5 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvertModel.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvertModel.java @@ -9,7 +9,7 @@ import java.lang.annotation.Target; * 字典转换标示注解, 标注此注解会对对应对象进行字典值转换处理 * * @author xxm - * @date 2022/12/15 + * @since 2022/12/15 */ @Target({ ElementType.METHOD, ElementType.TYPE, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Translate.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Translate.java index c01a8706c25f984326c915453eb47ad48f078a12..74e88cc2a871abb89d18d894ea1bd3754f45ef6d 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Translate.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Translate.java @@ -9,7 +9,7 @@ import java.lang.annotation.Target; * 翻译注解 * * @author xxm - * @date 2022/12/14 + * @since 2022/12/14 */ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TranslationResult.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TranslationResult.java index 1d032191e2f1cb0dc984d780632dc9ec7cc2cad3..3e98d247823eddf86041a9995e7ed15f010b8e65 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TranslationResult.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TranslationResult.java @@ -10,7 +10,7 @@ import java.lang.annotation.Target; * ResResult 使用, 其他场合使用 FieldTranslationService 进行手动处理 * * @author xxm - * @date 2022/12/15 + * @since 2022/12/15 */ @Target({ ElementType.METHOD, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/CommonCode.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/CommonCode.java index 1ada0c4c557c9921e1527c4e25154dc86d321f66..9d41a581c74df27d639e8d4762109f1821da7c94 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/CommonCode.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/CommonCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.core.code; * 公共常量 * * @author xxm - * @date 2020/4/8 10:58 + * @since 2020/4/8 10:58 */ public interface CommonCode { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/ServletCode.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/ServletCode.java index e685b26596b4b008bcfdedbd0be5f82c8255aeff..98c964ac66b4d2a62f2be4df2be726de26fe9d0b 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/ServletCode.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/ServletCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.core.code; * Servlet常量 * * @author xxm - * @date 2022/3/10 + * @since 2022/3/10 */ public interface ServletCode { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/entity/UserDetail.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/entity/UserDetail.java index 4e6c649f3b411006819f75413ccf965f0137f1be..afad5241ec2063a05afa6816169dba9372365ce2 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/entity/UserDetail.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/entity/UserDetail.java @@ -13,7 +13,7 @@ import java.util.List; * 用户信息类 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ @Getter @Setter diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DangerSqlException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DangerSqlException.java index ceee61b96e31d22f2b5adb26f9dcc4e091c3cb72..28adcf2fa5e9a034488b09270c7be53c702c7c64 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DangerSqlException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DangerSqlException.java @@ -6,7 +6,7 @@ import static cn.bootx.platform.common.core.code.CommonErrorCode.DANGER_SQL; * SQL相关异常 * * @author xxm - * @date 2023/3/9 + * @since 2023/3/9 */ public class DangerSqlException extends BizException { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DataNotExistException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DataNotExistException.java index 472ccfb8c1f0cade32f31fbb1129a8767d72faed..7d33c3bff1ced3afe13bbb773a91d67be8a3b0cf 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DataNotExistException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DataNotExistException.java @@ -6,7 +6,7 @@ import static cn.bootx.platform.common.core.code.CommonErrorCode.DATA_NOT_EXIST; * 数据不存在异常 * * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ public class DataNotExistException extends BizException { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/OptimisticLockException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/OptimisticLockException.java index f696bd417c279271c63020a5801fcbc76cd67a73..ec6af041304ce918b14db4addf69e8b927051766 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/OptimisticLockException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/OptimisticLockException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.common.core.code.CommonErrorCode.DATA_OUT_OF_DAT * 乐观锁异常 * * @author xxm - * @date 2020/4/15 14:11 + * @since 2020/4/15 14:11 */ public class OptimisticLockException extends SystemException implements Serializable { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/RepetitiveOperationException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/RepetitiveOperationException.java index e4c9a242a341e22313836df5824f9ad18af582f6..ef2d9ab6d9417aabd96592cdc36b9ba7accfb94c 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/RepetitiveOperationException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/RepetitiveOperationException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.common.core.code.CommonErrorCode.REPETITIVE_OPER * 重复操作异常 * * @author xxm - * @date 2021/1/2 + * @since 2021/1/2 */ public class RepetitiveOperationException extends SystemException implements Serializable { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportOperateException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportOperateException.java index 7a6040daf7c11d51349ed932c107df6a75dd279a..ebd7979640b11a5ededc01c0dbc53a3c03278183 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportOperateException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportOperateException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.common.core.code.CommonErrorCode.UN_SUPPORTED_OP * 不支持的操作异常 * * @author xxm - * @date 2022/7/27 + * @since 2022/7/27 */ public class UnSupportOperateException extends ErrorCodeRuntimeException implements Serializable { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportReadException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportReadException.java index e9b60f4b2fe0dc8dd55dd2025e2965abb8da762c..6bb18bd033a4bd3d6cada008ef1be144a94a02fb 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportReadException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportReadException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.common.core.code.CommonErrorCode.UN_SUPPORTED_RE * 不支持的读取操作 * * @author xxm - * @date 2020/4/10 14:05 + * @since 2020/4/10 14:05 */ public class UnSupportReadException extends BizException implements Serializable { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/CollectorsFunction.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/CollectorsFunction.java index 57c43ad5edb30d95aa12c2d397ac5c54b3ddbfa1..910cd807c564e73bc48b8fcfd549a687a947b728 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/CollectorsFunction.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/CollectorsFunction.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.core.function; * stream流处理时进行Collectors时的函数 * * @author xxm - * @date 2023/3/12 + * @since 2023/3/12 */ public interface CollectorsFunction { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/EntityBaseFunction.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/EntityBaseFunction.java index 096696e50bbda06c81ef6eb830f6a479532783ee..b4fe3ce2ea48346a67bf8b31bc50b2454836a15b 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/EntityBaseFunction.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/EntityBaseFunction.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.core.function; * entity基础方法 * * @author xxm - * @date 2020/11/18 + * @since 2020/11/18 */ public interface EntityBaseFunction { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/ParamService.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/ParamService.java index f6f87bf439b80c654ed53ac2464530b30f2a9a3b..b72ea2c96d3e88f40be1d66512a68b13addd17c4 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/ParamService.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/ParamService.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.core.function; * 参数获取服务(必须有实现类) * * @author xxm - * @date 2022/5/1 + * @since 2022/5/1 */ public interface ParamService { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/SystemKeyValueService.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/SystemKeyValueService.java index 2af97e339061b2bdbdfa6ad799bc0c7711510b65..293c259575f50d56d5d226eb8b162c62a2d22ab2 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/SystemKeyValueService.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/SystemKeyValueService.java @@ -8,7 +8,7 @@ import java.util.List; * kv存储接口 (必须实现) * * @author xxm - * @date 2022/6/13 + * @since 2022/6/13 */ public interface SystemKeyValueService { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/UserDetailService.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/UserDetailService.java index a445f36321446ffb0c88d42fda94044b183f4760..3844865550c9815073e77bfab929fb7a693171e5 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/UserDetailService.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/UserDetailService.java @@ -8,7 +8,7 @@ import java.util.Optional; * 获取用户 * * @author xxm - * @date 2022/8/28 + * @since 2022/8/28 */ public interface UserDetailService { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ErrorResult.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ErrorResult.java index 1a967b941efc04a67573458e0a8a08c3590ec7a4..d3d1422d91b9bff3ff7401c2f93418c3275f56a0 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ErrorResult.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ErrorResult.java @@ -8,7 +8,7 @@ import lombok.Setter; * 错误响应类,携带链路追踪标示 trackId * * @author xxm - * @date 2021/9/9 + * @since 2021/9/9 */ @Getter @Setter diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/PageResult.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/PageResult.java index a0041423e50d948daf390e4f3e95fce4c8b2c401..4cedead3e6d0b014a0c514f05c5cf851e8151fb8 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/PageResult.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/PageResult.java @@ -8,7 +8,7 @@ import java.util.List; * 分页包装类 * * @author xxm - * @date 2020/4/21 14:37 + * @since 2020/4/21 14:37 */ public class PageResult implements Serializable { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/Res.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/Res.java index 671811377447aa6ab3f7bb7ec31ca21b08039c4c..07eb33b4106d411d3a5bca37501167c6c1fcbd85 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/Res.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/Res.java @@ -7,7 +7,7 @@ import static cn.bootx.platform.common.core.code.CommonCode.SUCCESS_CODE; * 返回工具类 * * @author xxm - * @date 2020/1/22 15:29 + * @since 2020/1/22 15:29 */ public class Res { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ResResult.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ResResult.java index 234b3cd0b67b6cd75d358845bd5033c8e95d77e9..b935a92043b4326c8e3058843e597346bc8b4983 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ResResult.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ResResult.java @@ -11,7 +11,7 @@ import java.io.Serializable; * 响应包装类 * * @author xxm - * @date 2020/1/22 15:26 + * @since 2020/1/22 15:26 */ @Getter @Setter diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/BaseDto.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/BaseDto.java index dfaa3728a256eb755cc5dee5fbdce669ff0edf54..e441422f61b876cc8b7e7345f6e0b4d27895d4d0 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/BaseDto.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/BaseDto.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 基础Dto * * @author xxm - * @date 2020/6/1 16:12 + * @since 2020/6/1 16:12 */ @Getter @Setter diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/KeyValue.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/KeyValue.java index de37396db693ff80b1effb81d13735b2c2da78c6..e4b97238726f510d7f8a5be7f9c6b878b34f7b35 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/KeyValue.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/KeyValue.java @@ -10,7 +10,7 @@ import java.io.Serializable; * kv键值对象 * * @author xxm - * @date 2021/5/18 + * @since 2021/5/18 */ @Getter @Setter diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/LabelValue.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/LabelValue.java index d620f85816d6f4aa688b568f88d7ad742c4c92e8..364753597bf435de128e89181f448e595d8d9e0f 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/LabelValue.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/LabelValue.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * LabelValue * * @author xxm - * @date 2022/5/4 + * @since 2022/5/4 */ @Getter @Setter diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/param/OrderParam.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/param/OrderParam.java index 4a99f188fea3e9f1f276af4292f9a4c89218f307..53744de4fc8431df5fbb98e4c93419d6b51bc92d 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/param/OrderParam.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/param/OrderParam.java @@ -8,7 +8,7 @@ import lombok.Setter; * 排序参数 * * @author xxm - * @date 2022/3/10 + * @since 2022/3/10 */ @Getter @Setter diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CertUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CertUtil.java index c3a49524d85d8ac5e65ad8844c80331b023849e1..b8a3444bd9f05272077bc8be5de83b6786ad9409 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CertUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CertUtil.java @@ -13,7 +13,7 @@ import java.security.PublicKey; * 证书工具类 * * @author xxm - * @date 2022/2/24 + * @since 2022/2/24 */ @UtilityClass public class CertUtil { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CollUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CollUtil.java index 3083c67f97e1ffb0b5379e0d92fd577c665ece61..4a31c524a17b49044dc0b2bd74ab8eb7b439f219 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CollUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CollUtil.java @@ -8,7 +8,7 @@ import java.util.Collection; * 集合工具类 * * @author xxm - * @date 2020/11/28 + * @since 2020/11/28 */ @UtilityClass public class CollUtil extends cn.hutool.core.collection.CollUtil { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/FileUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/FileUtil.java index 2352e94ba6175c3175db80b022f26c1b79cbfe4a..312893f3f645abeae5b2c2a65d3e70609d5ecf3a 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/FileUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/FileUtil.java @@ -11,7 +11,7 @@ import java.nio.file.Files; * 文件配置 * * @author xxm - * @date 2022/7/25 + * @since 2022/7/25 */ @UtilityClass public class FileUtil extends cn.hutool.core.io.FileUtil { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/LocalDateTimeUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/LocalDateTimeUtil.java index f34eb982e30364debc64a51638050a78deff6eb1..141ba134441361cb85087e2e37fea70f5a237e44 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/LocalDateTimeUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/LocalDateTimeUtil.java @@ -11,7 +11,7 @@ import java.time.ZoneId; * java8 时间工具类 * * @author xxm - * @date 2020/11/10 + * @since 2020/11/10 */ @UtilityClass public class LocalDateTimeUtil extends cn.hutool.core.date.LocalDateTimeUtil { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ResultConvertUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ResultConvertUtil.java index 3a39113e53c77945982d50ec73a49fb8a9b2d7c6..c1e6a2f8e954a821c31851d6d43b5e958f70d0d5 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ResultConvertUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ResultConvertUtil.java @@ -11,7 +11,7 @@ import java.util.stream.Collectors; * 结果转换工具类工具类 * * @author xxm - * @date 2020/8/27 + * @since 2020/8/27 */ @UtilityClass public class ResultConvertUtil { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/TreeBuildUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/TreeBuildUtil.java index d93c06a87baa89b4662bebd49061f1343d345af2..c67e143fe40e89be7f9d94bccc82fbae1ccb02f3 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/TreeBuildUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/TreeBuildUtil.java @@ -14,7 +14,7 @@ import java.util.stream.Collectors; * 构建数据树工具类 * * @author xxm - * @date 2022/12/24 + * @since 2022/12/24 */ @UtilityClass public class TreeBuildUtil { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ValidationUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ValidationUtil.java index bdff34ac4f7f1d84aa494ed172c2200027596c9b..ae27003c420bf410d0877abec5869ac30df8130c 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ValidationUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ValidationUtil.java @@ -13,7 +13,7 @@ import java.util.Set; * BeanValidation 工具类 * * @author xxm - * @date 2020/5/26 18:14 + * @since 2020/5/26 18:14 */ @UtilityClass public class ValidationUtil { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/validation/ValidationGroup.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/validation/ValidationGroup.java index 0c46e92cfef31e5e47da461449077c999529b8a0..4e55770e6a49fc01fccd665e52c172cfb7914437 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/validation/ValidationGroup.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/validation/ValidationGroup.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.core.validation; * 校验分组 * * @author xxm - * @date 2021/5/7 + * @since 2021/5/7 */ public interface ValidationGroup { diff --git a/bootx-common-starters/common-starter-audit-log/pom.xml b/bootx-common-starters/common-starter-audit-log/pom.xml index 5397f6ea2da630059f66ab007ca2032817720db8..21233564a31d1fe4b757dc103452839799d9fa0b 100644 --- a/bootx-common-starters/common-starter-audit-log/pom.xml +++ b/bootx-common-starters/common-starter-audit-log/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/AuditLogAutoConfiguration.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/AuditLogAutoConfiguration.java index 64fbbc76bc79b6c2bf708a85e5efb43090c21a46..fbf9e514dd3ae9aeb5bb87394e937ddbe490e4f4 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/AuditLogAutoConfiguration.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/AuditLogAutoConfiguration.java @@ -11,7 +11,7 @@ import org.springframework.data.mongodb.repository.config.EnableMongoRepositorie * 审计模块 * * @author xxm - * @date 2021/11/8 + * @since 2021/11/8 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/configuration/DataVersionConfiguration.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/configuration/DataVersionConfiguration.java index 4778e7658c524790fb056467933a1515b7fbc0e7..a719ab95df031115c0e6677f920fa6e80a973579 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/configuration/DataVersionConfiguration.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/configuration/DataVersionConfiguration.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration; /** * @author xxm - * @date 2023/1/2 + * @since 2023/1/2 */ @Configuration public class DataVersionConfiguration { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/DataVersionLogController.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/DataVersionLogController.java index 7960ce4e88bf210713861229ce232cec4ea13691..90979b3e7d0fcfe67b5173a2cd9030eff8b4181e 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/DataVersionLogController.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/DataVersionLogController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ @Tag(name = "数据版本日志") @RestController diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/LoginLogController.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/LoginLogController.java index 414558980a9adb54a87ccef0bff29a6a65ed2690..9c9e1892b25bd92c04b104a9d0b19fd5a224ed5a 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/LoginLogController.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/LoginLogController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2021/9/7 + * @since 2021/9/7 */ @Tag(name = "登录日志") @RestController diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/OperateLogController.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/OperateLogController.java index c7af9edcebebced45e7278f2024982064dfea13e..b34df2ce90db9068a8fe8f9feade5f77a62705ce 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/OperateLogController.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/OperateLogController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; * 操作日志 * * @author xxm - * @date 2021/9/8 + * @since 2021/9/8 */ @Tag(name = "操作日志") @RestController diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/convert/LogConvert.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/convert/LogConvert.java index 7dc4f40d3f43b9e6c42ee0dd56a5151198955782..62cccf4b89e59475ec014167899c0d66e4baa09b 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/convert/LogConvert.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/convert/LogConvert.java @@ -15,7 +15,7 @@ import org.mapstruct.factory.Mappers; * 日志转换 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Mapper public interface LogConvert { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbManager.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbManager.java index 4e3a33e82d9a6b97f9100a66db4ab1c8c659344d..f4fdc0a6ee11446c97f97122c22fd1f985d66bc6 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbManager.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbManager.java @@ -15,7 +15,7 @@ import java.util.Objects; /** * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ @Slf4j @Repository diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbMapper.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbMapper.java index 1172d05f08286918989393489adb948e71a13865..dac4de33fe45acab6cb8d5e75377aefd0fdebfb1 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbMapper.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Select; /** * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ @Mapper public interface DataVersionLogDbMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbManager.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbManager.java index f482fa79dd3661091a134caf9dab270c8e87682c..e6999a2184d23e1d9e184f2ab3f2f87f7e1dabba 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbManager.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbManager.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Repository; * 登录日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Slf4j @Repository diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbMapper.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbMapper.java index 17325885aeb244ffd7107c03e04cfa39c4f7060f..b90720aaf9f67e761a54785881fff323c131491b 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbMapper.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 登录日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Mapper public interface LoginLogDbMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/OperateLogDbManager.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/OperateLogDbManager.java index 3522ad31a017fe5b7da6b8a4933ef99dd628731a..3e9f5c03829dc4f530d289a81bd700fa19b4c151 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/OperateLogDbManager.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/OperateLogDbManager.java @@ -17,7 +17,7 @@ import java.util.Objects; * 操作日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/DataVersionLogDb.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/DataVersionLogDb.java index 57387b6614ea2e60321dbaeb4ffc53a6a9b40610..6ea9b933d8ec6c94325db930032f3f6a497caf81 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/DataVersionLogDb.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/DataVersionLogDb.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; * 数据版本日志 * * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/LoginLogDb.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/LoginLogDb.java index 74628f4bd8da897b6f663fff660c76acf580bfbd..b79631b4df63bb00658968190f815aab92acc303 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/LoginLogDb.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/LoginLogDb.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; * 登录日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/OperateLogDb.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/OperateLogDb.java index fa453e98b18f93bb4ebb2daec00fa1c00aefa521..a1bb18ee677bce34a2386b627999d78869773d6e 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/OperateLogDb.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/OperateLogDb.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; * 操作日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/DataVersionLogDbService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/DataVersionLogDbService.java index 683fdd278a3163e89508117c7867411856857b5a..4147d6955232543422e604f8c29dab5741f47e61 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/DataVersionLogDbService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/DataVersionLogDbService.java @@ -24,7 +24,7 @@ import java.util.Objects; * 数据版本日志数据库实现 * * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/LoginLogDbService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/LoginLogDbService.java index 86e2c8b1ca88adc72d49e4333bfd629a4396e65b..7741d0703fe9b90ec45c540881fdf271e5d1471e 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/LoginLogDbService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/LoginLogDbService.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Service; * 登陆日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/OperateLogDbService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/OperateLogDbService.java index 7977129ea940884142fdded4f3f895d55cbc7f5c..8d1ac8bb79f908d432cf5ea29b139174173562ee 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/OperateLogDbService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/OperateLogDbService.java @@ -20,7 +20,7 @@ import org.springframework.stereotype.Service; * 操作日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/convert/LogConvert.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/convert/LogConvert.java index 192c7451017b094e8f42d2c79842d05fde4a81b9..28bb49c80372951328d18b6826fa7f81302d9663 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/convert/LogConvert.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/convert/LogConvert.java @@ -15,7 +15,7 @@ import org.mapstruct.factory.Mappers; * 日志转换 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Mapper public interface LogConvert { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/DataVersionLogMongoRepository.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/DataVersionLogMongoRepository.java index 06ee8466a2141d23d7ed5c57eb9f7cc145051025..65af59e4cf2575f539783529f8d0e41d76e7b2c1 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/DataVersionLogMongoRepository.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/DataVersionLogMongoRepository.java @@ -7,7 +7,7 @@ import org.springframework.data.mongodb.repository.MongoRepository; * mongo持久化方式 * * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ public interface DataVersionLogMongoRepository extends MongoRepository { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/LoginLogMongoRepository.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/LoginLogMongoRepository.java index b94ef8703c2b70b294be08239f9d8fa97a594c64..5fef2327ba9aa0a503c1e59fd589b49e11bb04e4 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/LoginLogMongoRepository.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/LoginLogMongoRepository.java @@ -7,7 +7,7 @@ import org.springframework.data.mongodb.repository.MongoRepository; * mongo持久化方式 * * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ public interface LoginLogMongoRepository extends MongoRepository { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/OperateLogMongoRepository.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/OperateLogMongoRepository.java index 6fb08c594bdb905ac81d62f9c97840d2ec86e9d1..14b8d1aafdcee89b8ff47f5224ddc091be88bd7d 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/OperateLogMongoRepository.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/OperateLogMongoRepository.java @@ -7,7 +7,7 @@ import org.springframework.data.mongodb.repository.MongoRepository; * mongo持久化方式 * * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ public interface OperateLogMongoRepository extends MongoRepository { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/DataVersionLogMongo.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/DataVersionLogMongo.java index b9da40666ec0ee8f52cbf758cde6fd47f0c6547f..15822d9780f8437dadbd6ee6293416b7679cba3a 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/DataVersionLogMongo.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/DataVersionLogMongo.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; * 数据版本日志 * * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ @Data @FieldNameConstants diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/LoginLogMongo.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/LoginLogMongo.java index 2d461d381a41f70221542cedc024bc8cde036f60..804d5d545cbcaf6a85b5489cdc0faa6348c45826 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/LoginLogMongo.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/LoginLogMongo.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/OperateLogMongo.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/OperateLogMongo.java index ecd3d716766221c429a9761a69733ebc062d3b1a..157cb454478350bc8b419fc36b35b676fccb61a8 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/OperateLogMongo.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/OperateLogMongo.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/DataVersionLogMongoService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/DataVersionLogMongoService.java index 943b58f741aad736eae281a1322d4c700d61e5ec..570014f14916e444ae0d42829e8e4ad342e7a1a0 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/DataVersionLogMongoService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/DataVersionLogMongoService.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; /** * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/LoginLogMongoService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/LoginLogMongoService.java index cfd59eab57726001a5ba55fc7a2e5428e7b4feb3..c1d092f55d7d40f69b8eaa69d859b78cc05d37ef 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/LoginLogMongoService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/LoginLogMongoService.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; * MongoDB存储实现 * * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/OperateLogMongoService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/OperateLogMongoService.java index db2529620bbd07b0ff07c6e319f9a32d97bdaf13..63b65f5cd122a06c2b1800324a02a1b31abee0e5 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/OperateLogMongoService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/OperateLogMongoService.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; * MongoDB存储实现 * * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/DataVersionLogDto.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/DataVersionLogDto.java index cb098453ade26677ddd266e76bd7ee7a939fdab7..076297ba3cc612bd372356a8035d10e57a7d1338 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/DataVersionLogDto.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/DataVersionLogDto.java @@ -8,7 +8,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/LoginLogDto.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/LoginLogDto.java index c5b24ebbc55d2ae34821dc2ddf3d7281dd4d8c2d..6c8a435f849f16622ea15ad6ad9251a2f056f383 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/LoginLogDto.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/LoginLogDto.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; * 登录日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/OperateLogDto.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/OperateLogDto.java index 8f23f82ff21a80622611765eeb6931a2ca9d3cf7..319777b561e38f7f8af8e4ccb421f1df24e62779 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/OperateLogDto.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/OperateLogDto.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 操作日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/DataVersionRecordHandler.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/DataVersionRecordHandler.java index c908c1fc4ec179f6a51cff210c9b73d28af71289..ef915f047fcee40bbcd385953839dca4ddc8ae49 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/DataVersionRecordHandler.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/DataVersionRecordHandler.java @@ -17,7 +17,7 @@ import java.util.*; * 数据变动记录插件 * * @author xxm - * @date 2023/1/8 + * @since 2023/1/8 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/OperateLogAspectHandler.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/OperateLogAspectHandler.java index eafcc1b854525c315298aa4b52d5c644bf5b5953..7164e82080ed1549b4e9b389c91f4d59d991d4e4 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/OperateLogAspectHandler.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/OperateLogAspectHandler.java @@ -35,7 +35,7 @@ import java.util.Optional; * 操作日志切面处理 * * @author xxm - * @date 2021/8/13 + * @since 2021/8/13 */ @Slf4j @Aspect diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpRegion.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpRegion.java index 316ae289475e1bd185600e16d944282a7037085e..8cd05c6cfc557fe337486ecf9bf154feb6f42deb 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpRegion.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpRegion.java @@ -10,7 +10,7 @@ import java.util.List; /** * IP对应地址区域信息 * @author xxm - * @date 2023/4/13 + * @since 2023/4/13 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpToRegionService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpToRegionService.java index 66e0d1a07f69cf4001509e3d3520e570fb0c1da3..e05437992305e22e49450dcc3c13707275046f64 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpToRegionService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpToRegionService.java @@ -17,7 +17,7 @@ import java.util.regex.Matcher; /** * * @author xxm - * @date 2023/4/13 + * @since 2023/4/13 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/DataVersionLogParam.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/DataVersionLogParam.java index 5ebbaabb259174d39607bc58790ca596989ad539..819ffe757c25237e5f2e49893969bb7606535728 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/DataVersionLogParam.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/DataVersionLogParam.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/LoginLogParam.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/LoginLogParam.java index e2ff6aff3a07ae804b0fbf6f74558379693ef7a4..944b73baf47a1e4b17ae9c091b9c42e839886dc9 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/LoginLogParam.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/LoginLogParam.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 登录日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/OperateLogParam.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/OperateLogParam.java index 7fae648bfae07ca22d2ed411303e0c59e9afab48..b8f0e35ef7d44b774cdf4e7c40b7fb1715428ec5 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/OperateLogParam.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/OperateLogParam.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 操作日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/properties/AuditLogProperties.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/properties/AuditLogProperties.java index 7eda363b84daf5dd2a8f45b4332d75030113a575..7275d28a4ccbc63fea7969ee9dd38f6834055331 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/properties/AuditLogProperties.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/properties/AuditLogProperties.java @@ -8,7 +8,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * 审计日志配置 * * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ @Getter @Setter diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/DataVersionLogService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/DataVersionLogService.java index e9eba4f2e762b72062f6809b937f55a782b025b5..c59b7addfb5f4528f54f8d4ed37a1188670a5200 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/DataVersionLogService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/DataVersionLogService.java @@ -11,7 +11,7 @@ import org.springframework.scheduling.annotation.Async; * 数据版本日志 * * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ public interface DataVersionLogService { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/LoginLogService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/LoginLogService.java index 3a24746d41357e152ffdbee82f9a6567f2b3a31f..0ac167dabcb2cf6c194588b1103806fb80481a03 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/LoginLogService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/LoginLogService.java @@ -10,7 +10,7 @@ import org.springframework.scheduling.annotation.Async; * 登陆日志 * * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ public interface LoginLogService { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/OperateLogService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/OperateLogService.java index 9392b2a54faf9993168dc0ed9b63d19deb0eb0d1..e1844dad30b6b5d17b0a11653bf9af5b3ff77082 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/OperateLogService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/OperateLogService.java @@ -10,7 +10,7 @@ import org.springframework.scheduling.annotation.Async; * 操作日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ public interface OperateLogService { diff --git a/bootx-common-starters/common-starter-auth/pom.xml b/bootx-common-starters/common-starter-auth/pom.xml index 09b1ebad61b95024659a3100680e7168efd81c69..f408f0d87372949b6ec235cb9064a11d203e6302 100644 --- a/bootx-common-starters/common-starter-auth/pom.xml +++ b/bootx-common-starters/common-starter-auth/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.3.1 + 1.3.3 4.0.0 common-starter-auth diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/AuthAutoConfiguration.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/AuthAutoConfiguration.java index 6759a6357eed50c5b30a2929e653738bd7c41f8f..daa42261144720931a845bfca2875bb758ffbefe 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/AuthAutoConfiguration.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/AuthAutoConfiguration.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * 认证相关 * * @author xxm - * @date 2022/1/27 + * @since 2022/1/27 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/AbstractAuthentication.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/AbstractAuthentication.java index b49e61df463c1f8617da54c8cc4407aa44d1e26b..72b49f0b2ec4c6952944d9b17ff653a4753ef8db 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/AbstractAuthentication.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/AbstractAuthentication.java @@ -14,7 +14,7 @@ import java.util.Objects; * 抽象认证器 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ public interface AbstractAuthentication { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthClientService.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthClientService.java index 982e2f857152ace64c41f41f8d47629f7b4023b3..55e25f91d40e119b3f2f62f4b55dfa689fc0e794 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthClientService.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthClientService.java @@ -6,7 +6,7 @@ import cn.bootx.platform.starter.auth.entity.AuthClient; * 获取认证终端 * * @author xxm - * @date 2022/6/27 + * @since 2022/6/27 */ public interface GetAuthClientService { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthLoginTypeService.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthLoginTypeService.java index 47d6eb88c5f822e32bba1545f66f63ff27bac998..5105fc9abb33b47e2b5937db4373b398f2cae9fc 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthLoginTypeService.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthLoginTypeService.java @@ -6,7 +6,7 @@ import cn.bootx.platform.starter.auth.entity.AuthLoginType; * 获取认证登录方式对象服务 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ public interface GetAuthLoginTypeService { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/OpenIdAuthentication.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/OpenIdAuthentication.java index 6d72ba283da8c0eebf918f6dde524c2b7aee6c36..08c322b4c82f5c3c7ad45886e4d1c647090efea7 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/OpenIdAuthentication.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/OpenIdAuthentication.java @@ -8,7 +8,7 @@ import me.zhyd.oauth.model.AuthUser; * OpenId登录认证器 (微信/钉钉/飞书/QQ/企微等) * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ public interface OpenIdAuthentication extends AbstractAuthentication { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/RouterCheck.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/RouterCheck.java index a64c26476227ab5b8f3b96c4e5b74c6992e48e25..2f488a1b5977a3aa10d079d4742059e106e0219e 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/RouterCheck.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/RouterCheck.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.auth.authentication; * 路由拦截检查 * * @author xxm - * @date 2021/12/21 + * @since 2021/12/21 */ public interface RouterCheck { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/UsernamePasswordAuthentication.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/UsernamePasswordAuthentication.java index 4dcd6116ae280cf2552d13f10df421c03d9a324a..c49250941c12c0a0060fb0ba50b393d8162c0d1a 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/UsernamePasswordAuthentication.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/UsernamePasswordAuthentication.java @@ -6,7 +6,7 @@ import cn.bootx.platform.starter.auth.code.AuthLoginTypeCode; * 用户密码认证方式 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ public interface UsernamePasswordAuthentication extends AbstractAuthentication { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheFilter.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheFilter.java index ef502cec92515c818897807590aa384a04596629..8e918a21e01c4ee97edae79c5224323595cd3dc2 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheFilter.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheFilter.java @@ -16,7 +16,7 @@ import java.io.IOException; * session缓存,用来减少一个请求中多次获取用户信息导致的多次访问redis * * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @Order(value = Integer.MIN_VALUE + 1) @Component diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheLocal.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheLocal.java index 4e3103271f85893ab727443ad85fcfd8bec67eba..273fa8557a069806613051c12ed9e7a9d31fd954 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheLocal.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheLocal.java @@ -7,7 +7,7 @@ import com.alibaba.ttl.TransmittableThreadLocal; * 会话缓存线程存储 * * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ public final class SessionCacheLocal { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/code/AuthLoginTypeCode.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/code/AuthLoginTypeCode.java index db3421d034b10ddc632ddbd02a04ae159fa2e6c4..2fa7aec9ea056c6f1d8228265aa0597d13fcde54 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/code/AuthLoginTypeCode.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/code/AuthLoginTypeCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.auth.code; * 认证录方式 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ public interface AuthLoginTypeCode { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/AuthProperties.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/AuthProperties.java index e85b6c6f17e24c408b58bb68c51c651fbe262473..85a0bed92d48dbf6a264dca874eb5f389867d765 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/AuthProperties.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/AuthProperties.java @@ -12,7 +12,7 @@ import java.util.List; * 认证配置参数 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ @Getter @Setter diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/SaTokenConfigure.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/SaTokenConfigure.java index b1ea5c40c06141e67dc8a57b973fa1283b83361d..d3ca01cbb8bfb945900216971a6a86977ac415af 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/SaTokenConfigure.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/SaTokenConfigure.java @@ -15,7 +15,7 @@ import java.util.Collections; * sa-token * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ @EnableConfigurationProperties(AuthProperties.class) @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenEndpoint.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenEndpoint.java index 4dabbd3cc4ecfd6c2606622d80bd13a90423eeb7..09f63d98d79ae2495bbc99d311b6caa0b6ffdb2a 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenEndpoint.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenEndpoint.java @@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletResponse; * 基础登录退出操作 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ @Tag(name = "认证相关") @RestController diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenService.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenService.java index d11426f530802489d0d51c232182c53c8f626728..df9b3f27e4b6c781a136cfeb088fba91346dc747 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenService.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenService.java @@ -32,7 +32,7 @@ import java.util.List; * 认证相关服务 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthClient.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthClient.java index ccfc98576bfc51990320872b6adbba64b112a5f5..51e15d374f6293e551dcd3e6a8bd1c4192f91e74 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthClient.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthClient.java @@ -9,7 +9,7 @@ import java.util.List; * 认证应用 * * @author xxm - * @date 2022/6/27 + * @since 2022/6/27 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthInfoResult.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthInfoResult.java index c982ab18f0aeae09ff50a339207ca6c2d9ae5f76..988a5cec5f3d3f99ea1112089a1e233d8469b8f0 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthInfoResult.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthInfoResult.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 认证返回结果 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthLoginType.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthLoginType.java index 2f4ac9c387df5031ec13b0cd2e3a299ecf749616..415dd6af7ac278cae5657c409b38bbc90c474104 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthLoginType.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthLoginType.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/LoginAuthContext.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/LoginAuthContext.java index ad61b904836429b079f653ca207efebca18a18a0..67e0dd912c343ff9b645b6c9cc710ae95ee82e6c 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/LoginAuthContext.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/LoginAuthContext.java @@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull; * 认证上下文 * * @author xxm - * @date 2022/4/23 + * @since 2022/4/23 */ @Getter @Setter diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/ThirdAuthCode.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/ThirdAuthCode.java index 2a0bd7f796e35ebe65ee16f98e1cc4ad34412ba3..5f64f4ccc729dffe1d7f5f29548e81fc589da455 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/ThirdAuthCode.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/ThirdAuthCode.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 三方登录认证码 * * @author xxm - * @date 2022/6/29 + * @since 2022/6/29 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotEnableException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotEnableException.java index 5dc68d3cbac3c5533206355170b386e05e9c89da..d464478b7254b665a391c0cb79121b36c7f16bec 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotEnableException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotEnableException.java @@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.exception.BizException; * 应用被停用 * * @author xxm - * @date 2022/6/27 + * @since 2022/6/27 */ public class ApplicationNotEnableException extends BizException { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotFoundException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotFoundException.java index fa2f8cf0a2cdfdb84c2bfe5ec0407342dcf41611..3d56f966d12cd78059cd14e8b9196cff9c5d339e 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotFoundException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotFoundException.java @@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.exception.BizException; * 应用不存在 * * @author xxm - * @date 2022/6/27 + * @since 2022/6/27 */ public class ApplicationNotFoundException extends BizException { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotEnableException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotEnableException.java index 6042c1679849be56c3e18c34118f33a7d02032ee..2df7c0a6c276bab1b8a75d95b7f2e3ed4b5cd33b 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotEnableException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotEnableException.java @@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.exception.BizException; * 终端方式被停用 * * @author xxm - * @date 2021/9/7 + * @since 2021/9/7 */ public class ClientNotEnableException extends BizException { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotFoundException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotFoundException.java index 95dc627b6d7c34992288cdb834e05c8670497242..bef5144fd8551a2cc4c2616d502ca0fef09434cb 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotFoundException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotFoundException.java @@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.exception.BizException; * 终端不存在 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ public class ClientNotFoundException extends BizException { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LoginFailureException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LoginFailureException.java index cf1dd9de28996850e26eefe6d599121ba6bb0581..2f187bb4bd840ee625e73f65dae6c977324c73e2 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LoginFailureException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LoginFailureException.java @@ -7,7 +7,7 @@ import lombok.Getter; * 登录错误异常 * * @author xxm - * @date 2021/8/13 + * @since 2021/8/13 */ @Getter public class LoginFailureException extends BizException { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LonginTypeNotFoundException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LonginTypeNotFoundException.java index af90a7fe2c0279c2212655f7f96867e3d2634a76..53f3ce7d71600859cf8c59b447f4d1f0a959e2eb 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LonginTypeNotFoundException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LonginTypeNotFoundException.java @@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.exception.BizException; * 登录方式不存在 * * @author xxm - * @date 2022/11/6 + * @since 2022/11/6 */ public class LonginTypeNotFoundException extends BizException { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/NotLoginException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/NotLoginException.java index 11cb667e4db63feac3bb46b3e3f7f71221b7c4bf..2e6d3e1e8a14f30379c86b8b1483361690c7cc0e 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/NotLoginException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/NotLoginException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.common.core.code.CommonErrorCode.AUTHENTICATION_ * 未登录异常 * * @author xxm - * @date 2021/12/22 + * @since 2021/12/22 */ public class NotLoginException extends BizException { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/RouterCheckException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/RouterCheckException.java index 62461c3b4b775c1cc9cac89a177e7750025b7906..fb340cc70deba8827fb7b49f411cb989eebf1b34 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/RouterCheckException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/RouterCheckException.java @@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.exception.BizException; * 路径检查异常 * * @author xxm - * @date 2021/12/21 + * @since 2021/12/21 */ public class RouterCheckException extends BizException { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/UserNotFoundException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/UserNotFoundException.java index bea39bf03fe230cca7c0f2320398be30deaae18d..10accb6861dc9c0b2c201d80379ac4f52effa4f0 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/UserNotFoundException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/UserNotFoundException.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.auth.exception; * 用户未找到异常 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ public class UserNotFoundException extends LoginFailureException { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginFailureHandler.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginFailureHandler.java index 018eea25f71fe957e2cf41f9f430cdf2d025a295..220e24d9ef11e93170f7bf4ac560bbdfa494c87f 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginFailureHandler.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginFailureHandler.java @@ -6,10 +6,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; /** - * 登录失败处理器 + * 登录失败处理器接口 * * @author xxm - * @date 2021/8/13 + * @since 2021/8/13 */ public interface LoginFailureHandler { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginSuccessHandler.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginSuccessHandler.java index 13134dc11908f1f4729d2870e341a5921873d37d..a3c032a0c65592707326103239e0cd3abbf53792 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginSuccessHandler.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginSuccessHandler.java @@ -6,10 +6,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; /** - * 登录成功处理器 + * 登录成功处理器接口 * * @author xxm - * @date 2021/8/13 + * @since 2021/8/13 */ public interface LoginSuccessHandler { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/OpenIdAuthenticationHandler.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/OpenIdAuthenticationHandler.java index b555dbe7d4a765d7224ee5dec1aa2b6caf1e3e22..2e5c5c2891a79765a8b739f1d0d52c3476e11895 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/OpenIdAuthenticationHandler.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/OpenIdAuthenticationHandler.java @@ -15,7 +15,7 @@ import java.util.List; * OpenID登录处理器 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaExceptionHandler.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaExceptionHandler.java index e09155432ed776cc7aabea3cf63400d47c994250..ea6e46f1d42763612d8e51e46548072a5accf333 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaExceptionHandler.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaExceptionHandler.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; * 过滤SaTokenException,需要运行在 RestExceptionHandler 之前 * * @author xxm - * @date 2021/8/5 + * @since 2021/8/5 */ @Order(Ordered.LOWEST_PRECEDENCE - 1) @Slf4j diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaRouteHandler.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaRouteHandler.java index 1be1e57d8518b10671f46d6c8638a5f44f82c9ab..0f9e8d7d2b2336cd94df4d392c992ec1d3651420 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaRouteHandler.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaRouteHandler.java @@ -17,7 +17,7 @@ import java.util.List; * 鉴权路由配置类 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAdminUserRouterCheck.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAdminUserRouterCheck.java index 30c386a302ed10cae28cc33661c35c79cd47b9e5..f4498114270b8831bb4e8c3ae06bcdc1301af1e5 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAdminUserRouterCheck.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAdminUserRouterCheck.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; * 超级管理员跳过各种限制 * * @author xxm - * @date 2022/5/27 + * @since 2022/5/27 */ @Component @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAnnotationRouterCheck.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAnnotationRouterCheck.java index a3ee55760c4007feee30f5ce3ccc544822f1434d..1b83eb09598c727cbffb1cbd75f8601ac04c2caf 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAnnotationRouterCheck.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAnnotationRouterCheck.java @@ -12,7 +12,7 @@ import java.util.Objects; * 注解方式过滤 * * @author xxm - * @date 2021/12/21 + * @since 2021/12/21 */ @Component public class IgnoreAnnotationRouterCheck implements RouterCheck { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserDto.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserDto.java index a0602895c725770bae15c746e248cee2ba24d568..252f2b69675699824aa51af96c30bae56e76931a 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserDto.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserDto.java @@ -9,7 +9,7 @@ import java.util.List; /** * @author xxm - * @date 2021/9/8 + * @since 2021/9/8 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserService.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserService.java index d8bd5927b86046b4547666c41e795e5f9674a3a6..81e0dd5cd0ad3945ce6f9cc8915c3655f25f0a89 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserService.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserService.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; * 在线用户 * * @author xxm - * @date 2021/9/8 + * @since 2021/9/8 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/redis/SaTokenRedisProperties.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/redis/SaTokenRedisProperties.java index b01f03b0687562ab752f863da0e4c8fb5dd4bd94..096bca000aa0729f9a799300e9e29f66caeca419 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/redis/SaTokenRedisProperties.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/redis/SaTokenRedisProperties.java @@ -7,7 +7,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * sa-token Redis 插件配置 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @ConfigurationProperties(prefix = "sa-token.plugins.redis") public class SaTokenRedisProperties { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/PasswordEncoder.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/PasswordEncoder.java index 27c36a05be410e64fd62e166d2b9c6e56cd851a0..e498e35968172eab70e33556f5ed77b0a604286a 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/PasswordEncoder.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/PasswordEncoder.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; * 密码编码器 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/SecurityUtil.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/SecurityUtil.java index 44475eede1828aea3780adb2adb50e91e5ba81a0..e78671554db3feab42f1c9a5f9c064e2f2542700 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/SecurityUtil.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/SecurityUtil.java @@ -17,7 +17,7 @@ import java.util.Optional; * 安全工具类 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @UtilityClass public class SecurityUtil { diff --git a/bootx-common-starters/common-starter-code-gen/pom.xml b/bootx-common-starters/common-starter-code-gen/pom.xml index e1769a16d0ab12dbc16f8ea83dcbef2243af60ac..7a72e9f36b217ecf32d57e88cab585bb7bbfe1e3 100644 --- a/bootx-common-starters/common-starter-code-gen/pom.xml +++ b/bootx-common-starters/common-starter-code-gen/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/CodeGenAutoConfiguration.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/CodeGenAutoConfiguration.java index 97bb0a36cbdbac42fa61ca00e5d980e76c1844b3..9c1fb3e3ab53577e1d1946d6199453dddd685869 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/CodeGenAutoConfiguration.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/CodeGenAutoConfiguration.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.ComponentScan; * 代码生成 * * @author xxm - * @date 2022/1/27 + * @since 2022/1/27 */ @ComponentScan @MapperScan(annotationClass = Mapper.class) diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenColumnTypeEnum.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenColumnTypeEnum.java index 71e13345094c66b50d09e2d7b6b3ccc496c7df92..de604375f70b0949b65c634b74f029150e23b67a 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenColumnTypeEnum.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenColumnTypeEnum.java @@ -11,7 +11,7 @@ import java.util.Objects; * 数据库字段类型与java类型映射 * * @author xxm - * @date 2022/2/17 + * @since 2022/2/17 */ @Getter @AllArgsConstructor diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenTemplateVmEnum.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenTemplateVmEnum.java index e7fc5172cc565d6a429f8a8ae2a6fe4fbd56fe8a..bf50054f8f011c74c2d66e4983c6c7a160870ffa 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenTemplateVmEnum.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenTemplateVmEnum.java @@ -11,7 +11,7 @@ import java.util.Objects; * 代码生成模板枚举 * * @author xxm - * @date 2022/2/17 + * @since 2022/2/17 */ @Getter @AllArgsConstructor diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/CodeGeneratorController.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/CodeGeneratorController.java index 007db3f73c08572c6677c2c88428f0506b808601..a463ea383f89c6272457a03251c9bc6af687e2dc 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/CodeGeneratorController.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/CodeGeneratorController.java @@ -20,7 +20,7 @@ import java.util.List; * 代码生成 * * @author xxm - * @date 2022/2/17 + * @since 2022/2/17 */ @Tag(name = "代码生成") @RestController diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java index 6efe27c9641aec5f7aa4aae8d8349087a3d903a2..dad28571cfe44c9d6ee61911f0f1a93a1ad70a4f 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java @@ -21,7 +21,7 @@ import java.util.List; /** * @author xxm - * @date 2022/1/27 + * @since 2022/1/27 */ @Tag(name = "数据库表信息") @RestController diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dao/DatabaseTableMapper.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dao/DatabaseTableMapper.java index 1e25a34f6f3a3c0971897976fa92fe08289f443c..9cbdd36d26b5aa4d3b20c91c51f02eb81aa4dab3 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dao/DatabaseTableMapper.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dao/DatabaseTableMapper.java @@ -16,7 +16,7 @@ import java.util.Optional; * 表信息查询 * * @author xxm - * @date 2022/1/27 + * @since 2022/1/27 */ @Mapper public interface DatabaseTableMapper { diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/domain/CodeGenData.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/domain/CodeGenData.java index 9e5a955b9ffbc507b3d9360b24a436016d1d4302..65fe4a963f9012f1d0b0425ffca36af9fad317a0 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/domain/CodeGenData.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/domain/CodeGenData.java @@ -11,7 +11,7 @@ import java.util.List; * 代码生成所需的参数数据 * * @author xxm - * @date 2022/8/1 + * @since 2022/8/1 */ @Data @Accessors(chain = true) @@ -72,7 +72,7 @@ public class CodeGenData { * 行信息 * * @author xxm - * @date 2022/8/1 + * @since 2022/8/1 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/CodeGenPreview.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/CodeGenPreview.java index 1ba3d3b6394e856be9a927077057fb25d406703f..3c7fdc8884a6d2dc6d0fb2e6c9bc05e44a258ab7 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/CodeGenPreview.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/CodeGenPreview.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 代码预览 * * @author xxm - * @date 2022/2/18 + * @since 2022/2/18 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/TableGenParamDto.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/TableGenParamDto.java index f67d14bd0ef42a19073204dc82391975ae178526..629e80151117947c6233cee971fd5f3ea47d56ba 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/TableGenParamDto.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/TableGenParamDto.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 代码生成相关参数信息 * * @author xxm - * @date 2022/8/2 + * @since 2022/8/2 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/CodeGenConfig.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/CodeGenConfig.java index 8249c3bb36487cf110b56e283f7c6070255e7d3e..fc4a2f5e5900e69d715e51bce8224a0d09df77e6 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/CodeGenConfig.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/CodeGenConfig.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 代码生成配置 * * @author xxm - * @date 2022/6/13 + * @since 2022/6/13 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseColumn.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseColumn.java index 6ca69190e7588c56d22a8044ce4b8db05a9628c7..716210b9d3822b3682777392274f876f6629d88c 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseColumn.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseColumn.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 数据库行信息 * * @author xxm - * @date 2022/1/27 + * @since 2022/1/27 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseTable.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseTable.java index a12b2e4893d82719a3d24fcb6f8548f96f2bc592..86ccf142b813480d60123ffef71d592f89850c25 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseTable.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseTable.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 表信息 * * @author xxm - * @date 2022/1/27 + * @since 2022/1/27 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/param/CodeGenParam.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/param/CodeGenParam.java index 0111ce0cbca3a79ad4f4f20952de00a74949d03b..aa3ac0c40a32f4bd329698d3fa66441fbfa85898 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/param/CodeGenParam.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/param/CodeGenParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 代码生成参数 * * @author xxm - * @date 2022/2/18 + * @since 2022/2/18 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java index dfb9e3c8ac236b57f36920671768296a84913198..9d337349ff0a749d98a5e3bc765f3bf0db4f4f84 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java @@ -16,7 +16,6 @@ import cn.hutool.core.text.NamingCase; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -42,7 +41,7 @@ import java.util.zip.ZipOutputStream; * 代码生成模板 * * @author xxm - * @date 2022/1/27 + * @since 2022/1/27 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java index 562ae2b126b0561f9a375ce653b032b3543cdf63..7ab50f03a51f7287090ab560562022a0aca2a798 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java @@ -26,7 +26,7 @@ import java.util.List; * 数据库信息服务类型 * * @author xxm - * @date 2022/1/27 + * @since 2022/1/27 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/util/CodeGenUtil.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/util/CodeGenUtil.java index d8e83e90b9e48bc53500ac3d196c48cfdeaa9681..a394a682916a8d6982378e044ecc4f258dd30a09 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/util/CodeGenUtil.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/util/CodeGenUtil.java @@ -7,7 +7,7 @@ import lombok.experimental.UtilityClass; * 代码生成工具类 * * @author xxm - * @date 2022/8/2 + * @since 2022/8/2 */ @UtilityClass public class CodeGenUtil { diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm index e9d8e53477afb1614588dcc5cb32cf2da4583579..fad161c6eef4af44554b9e4afa1a65d40904a1ff 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm @@ -17,7 +17,7 @@ import java.util.List; /** * ${comments} * @author ${author} - * @date ${datetime} + * @since ${datetime} */ @Tag(name ="${comments}") @RestController diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/convert.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/convert.java.vm index 87e2aa77f1b8dc870b9a19b824ebe3f5d33fbd16..1ad55ca1c1e0685824520153fd6c3705024a8330 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/convert.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/convert.java.vm @@ -9,7 +9,7 @@ import org.mapstruct.factory.Mappers; /** * ${comments} * @author ${author} - * @date ${datetime} + * @since ${datetime} */ @Mapper public interface ${entityUpName}Convert { @@ -19,4 +19,4 @@ public interface ${entityUpName}Convert { ${entityUpName}Dto convert(${entityUpName} in); -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/dto.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/dto.java.vm index 95c4a8f548a11f2b64b8cb46678539a85640a210..b128d59760218d99000ffe020b8bd64beb273fbe 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/dto.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/dto.java.vm @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; /** * ${comments} * @author ${author} - * @date ${datetime} + * @since ${datetime} */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/entity.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/entity.java.vm index dccc5fb7b9006f20cf93cf0a492436ac69045ea7..272b65c4a6b25167642fbc05766563070052385a 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/entity.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/entity.java.vm @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * ${comments} * @author ${author} -* @date ${datetime} +* @since ${datetime} */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm index bc113790cb9dafd5f8a49f245e4fdbc2b84e1c84..321d8e06f861b3ff05004fcd31f540c27616768d 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm @@ -16,7 +16,7 @@ import org.springframework.stereotype.Repository; /** * ${comments} * @author ${author} - * @date ${datetime} + * @since ${datetime} */ @Repository @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/mapper.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/mapper.java.vm index ff2a74d63f3307007e6c690e405d834b25c239df..908e15ec86d63024327b4481b93c59cfc60d68d0 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/mapper.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/mapper.java.vm @@ -7,8 +7,8 @@ import org.apache.ibatis.annotations.Mapper; /** * ${comments} * @author ${author} - * @date ${datetime} + * @since ${datetime} */ @Mapper public interface ${entityUpName}Mapper extends BaseMapper<${entityUpName}> { -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/param.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/param.java.vm index 3317c54a62301abc87b518f97f5a2c977f0b5877..ddae2982cb97bb1dde696ed80a352dff5af2ce0f 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/param.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/param.java.vm @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; /** * ${comments} * @author ${author} - * @date ${datetime} + * @since ${datetime} */ @Data @Schema(title = "${comments}") diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm index dca787572be2409423b1324ae08744baf9396960..23d54eb064f27f4028591a8b1a8dd52e7b96812f 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm @@ -20,7 +20,7 @@ import java.util.List; /** * ${comments} * @author ${author} - * @date ${datetime} + * @since ${datetime} */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-data-perm/pom.xml b/bootx-common-starters/common-starter-data-perm/pom.xml index 60e964ebaa604438148614dcb58e1c4104fd47e6..950a73b077c29ec1b6e1c850069404a8d5e2ef79 100644 --- a/bootx-common-starters/common-starter-data-perm/pom.xml +++ b/bootx-common-starters/common-starter-data-perm/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/DataPermAutoConfiguration.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/DataPermAutoConfiguration.java index cf2b8e39805b358e85cf7c1e9a5b7691e85a05c6..2758dab615d6f8946ed367d2d65c36ff8ccedd4f 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/DataPermAutoConfiguration.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/DataPermAutoConfiguration.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.ComponentScan; * 数据权限 * * @author xxm - * @date 2021/11/23 + * @since 2021/11/23 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/code/DataScopeEnum.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/code/DataScopeEnum.java index eeb8257d184ac0c1335935e7dddc8a43b6c39183..3963f835d8ee50fe6c01bee595fe558ed614de9c 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/code/DataScopeEnum.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/code/DataScopeEnum.java @@ -10,7 +10,7 @@ import java.util.Arrays; * 数据范围权限类型 * * @author xxm - * @date 2021/12/22 + * @since 2021/12/22 */ @Getter @AllArgsConstructor diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DataPermProperties.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DataPermProperties.java index 5deb7019e0032361efcf46acdcb9b765e3be0e80..530bb97e3f6c5af67b7357f1affad6b91419d19c 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DataPermProperties.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DataPermProperties.java @@ -8,7 +8,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * 数据权限配置 * * @author xxm - * @date 2021/12/3 + * @since 2021/12/3 */ @Getter @Setter diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DatePermConfiguration.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DatePermConfiguration.java index a820205ceb078fff431e1d688a1609f035f4a3ee..c324b05cf86c0e670183e3c726a5070143ff26e7 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DatePermConfiguration.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DatePermConfiguration.java @@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration; * 数据权限配置 * * @author xxm - * @date 2021/12/21 + * @since 2021/12/21 */ @Configuration @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/DecryptInterceptor.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/DecryptInterceptor.java index b4da845f846ca4b3a8ce573452007657330b8bd9..486f3065e1219aa295015aea68fc9ee66c29312a 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/DecryptInterceptor.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/DecryptInterceptor.java @@ -26,7 +26,7 @@ import java.util.Objects; * 数据字段解密插件 * * @author xxm - * @date 2021/11/23 + * @since 2021/11/23 */ @Slf4j @Intercepts(@Signature(type = ResultSetHandler.class, method = "handleResultSets", args = { Statement.class })) diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/EncryptInterceptor.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/EncryptInterceptor.java index 1045250ba52e225f8ecd12d85a4c1d5b8a4c1941..2dfb9c396774079ea115eae0828fc4275fa4be62 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/EncryptInterceptor.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/EncryptInterceptor.java @@ -24,7 +24,7 @@ import java.util.Objects; * 数据字段解密插件 * * @author xxm - * @date 2021/11/23 + * @since 2021/11/23 */ @Slf4j @Intercepts(@Signature(type = Executor.class, method = "update", args = { MappedStatement.class, Object.class })) diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/exception/NotLoginPermException.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/exception/NotLoginPermException.java index bbe67637544d354ffc3088a370711859d15c165d..74abcb9980fee054db2575055916d169494d0723 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/exception/NotLoginPermException.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/exception/NotLoginPermException.java @@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.exception.BizException; * 未登录无法进行数据鉴权异常 * * @author xxm - * @date 2022/5/5 + * @since 2022/5/5 */ public class NotLoginPermException extends BizException { diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/handler/DataPermAspectHandler.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/handler/DataPermAspectHandler.java index 485f4af8391367850cdce41a084195eb759b2109..cee97214aa108b06bd03ea225e482a95f2f6c4a9 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/handler/DataPermAspectHandler.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/handler/DataPermAspectHandler.java @@ -18,7 +18,7 @@ import java.util.Objects; * 忽略权限控制切面处理类 * * @author xxm - * @date 2021/12/22 + * @since 2021/12/22 */ @Slf4j @Aspect diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/local/DataPermContextHolder.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/local/DataPermContextHolder.java index 992d94363f51378b608d6696adfb593658ab1132..b9e424173e39c2a5589e804d038009910865f879 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/local/DataPermContextHolder.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/local/DataPermContextHolder.java @@ -11,7 +11,7 @@ import java.util.Optional; * 忽略鉴权数据上下文 * * @author xxm - * @date 2021/12/22 + * @since 2021/12/22 */ public class DataPermContextHolder { diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScope.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScope.java index 6c6485e81524f635009245a0f89f2170d57fd82b..a0867cd8b9e0a73f72a325eb6cfc10ffcc023ad9 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScope.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScope.java @@ -10,7 +10,7 @@ import java.util.Set; * 数据权限范围参数 * * @author xxm - * @date 2021/12/22 + * @since 2021/12/22 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScopeHandler.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScopeHandler.java index ccb83e37d8690b4626c04e379e12a0d5b6a33074..8e9dac81b2edd9e6b1820088f715a63d3c177672 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScopeHandler.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScopeHandler.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.data.perm.scope; * 数据范围权限业务实现接口 * * @author xxm - * @date 2021/12/22 + * @since 2021/12/22 */ public interface DataPermScopeHandler { diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataScopeInterceptor.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataScopeInterceptor.java index 690ee265475097740795a48821efc64ec25ea703..14c4b3711ccfeba4b1657e6fce04c2cbc60d71b8 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataScopeInterceptor.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataScopeInterceptor.java @@ -47,7 +47,7 @@ import java.util.stream.Collectors; * 数据权限处理器 * * @author xxm - * @date 2021/12/22 + * @since 2021/12/22 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermHandler.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermHandler.java index 01cced0eed998a402b0875826ea5b72d52d85f15..c8ba8f06c59e42609111eee7bf92075f78bd2cab 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermHandler.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermHandler.java @@ -8,7 +8,7 @@ import java.util.List; * 数据字段权限业务实现接口 * * @author xxm - * @date 2023/1/21 + * @since 2023/1/21 */ public interface SelectFieldPermHandler { diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermInterceptor.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermInterceptor.java index 181f64ec179ca9caac2b1888d5b60dd4def66845..fcf43c08510ce2a47437bb67505ce988241b5d62 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermInterceptor.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermInterceptor.java @@ -30,7 +30,7 @@ import java.util.Objects; * 查询字段权限处理器 * * @author xxm - * @date 2022/12/29 + * @since 2022/12/29 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfo.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfo.java index 9a1079313008a443297ee992b489ca927869c7e4..863133be66b189b3c404fdcdb29fe69ee3222334 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfo.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfo.java @@ -10,7 +10,7 @@ import java.lang.annotation.RetentionPolicy; * 敏感信息过滤 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @Retention(RetentionPolicy.RUNTIME) @JacksonAnnotationsInside @@ -36,7 +36,7 @@ public @interface SensitiveInfo { * 敏感信息 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ enum SensitiveType { diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfoSerialize.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfoSerialize.java index 415d262ce20c4c30641c27dd95ebf80c2055c37a..9e8f9d40f374c2943fe7158fbc6e31b5c6089726 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfoSerialize.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfoSerialize.java @@ -19,7 +19,7 @@ import java.util.Objects; * 敏感信息脱敏序列化 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @AllArgsConstructor @NoArgsConstructor diff --git a/bootx-common-starters/common-starter-dingtalk/pom.xml b/bootx-common-starters/common-starter-dingtalk/pom.xml index 0119bbf3b19f3ca50d821a397ecf2f6d4816c33e..80cc29b92be944c398b0f9db16c54fefbb25db47 100644 --- a/bootx-common-starters/common-starter-dingtalk/pom.xml +++ b/bootx-common-starters/common-starter-dingtalk/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/DingTalkAutoConfiguration.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/DingTalkAutoConfiguration.java index 943743a57c974f8e02dfac035e74545a35f61ede..48cdf45a27b03f2f2372e5211670470b83ae668a 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/DingTalkAutoConfiguration.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/DingTalkAutoConfiguration.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.ComponentScan; * 钉钉对接 * * @author xxm - * @date 2022/4/2 + * @since 2022/4/2 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkCode.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkCode.java index bfafaa416d3e3fdaffd2b5dbd0136d39b3e6da6f..85f12e81e54f2bb383c77c58cc9e258eede9dec0 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkCode.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.dingtalk.code; * 钉钉消息类型 * * @author xxm - * @date 2020/11/30 + * @since 2020/11/30 */ public interface DingTalkCode { diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkNoticeCode.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkNoticeCode.java index 2d850ca58ff511ab13d7e1266f9d77aece9bc143..45e942666d68edeeebe3db63ac76b97fd5b1041c 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkNoticeCode.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkNoticeCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.dingtalk.code; * 钉钉通知消息常量 * * @author xxm - * @date 2022/4/2 + * @since 2022/4/2 */ public interface DingTalkNoticeCode { diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/configuration/DingTalkProperties.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/configuration/DingTalkProperties.java index 27f67f084dfe75f557c1f761f3e150c750da11c5..ee8f4aff7e15b2df36b91c6a5eadc0c97be2bb38 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/configuration/DingTalkProperties.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/configuration/DingTalkProperties.java @@ -8,7 +8,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * 钉钉应用配置 * * @author xxm - * @date 2022/7/15 + * @since 2022/7/15 */ @Getter @Setter diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/controller/DingRobotConfigController.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/controller/DingRobotConfigController.java index 2ff96f1207652aebb86d9efe6a938110685ea7ca..07d8806ba0481a58b3c7791f4abecf6ba44e9882 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/controller/DingRobotConfigController.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/controller/DingRobotConfigController.java @@ -16,7 +16,7 @@ import java.util.List; /** * @author xxm - * @date 2021/9/25 + * @since 2021/9/25 */ @Tag(name = "钉钉机器人配置") @RestController diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/DingTalkResult.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/DingTalkResult.java index 00276c248f5c9c658bbbef5b4828b3c78b5aa846..ceb76aad358330e7896866f7d734ebcf8f9e4ef9 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/DingTalkResult.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/DingTalkResult.java @@ -11,7 +11,7 @@ import java.io.Serializable; * 钉钉响应结果 * * @author xxm - * @date 2020/11/30 + * @since 2020/11/30 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/MediaResult.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/MediaResult.java index 435932ce213c43c7ed40ae284d7e89ed994c4619..c9cc569821911e1a97f361d7503a6afe6e9bd918 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/MediaResult.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/MediaResult.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; * 钉钉媒体上传返回类 * * @author xxm - * @date 2022/7/25 + * @since 2022/7/25 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/service/DingAccessService.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/service/DingAccessService.java index f5cf1e1a4213a7bb7f8aeffd3ef5b80beabd7957..c5d658d5ec330878a95d72b8c55037c9f1e2f849 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/service/DingAccessService.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/service/DingAccessService.java @@ -26,7 +26,7 @@ import static cn.bootx.platform.starter.dingtalk.code.DingTalkCode.*; * 钉钉访问凭证 * * @author xxm - * @date 2022/4/2 + * @since 2022/4/2 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Manager.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Manager.java index f698aeab7aa74b3fe3a9b9b486e19cb11a672981..1ba98a15efd6438a3b3255a3a5c3357202c80214 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Manager.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Manager.java @@ -12,7 +12,7 @@ import java.util.Optional; * 钉钉 * * @author xxm - * @date 2022/7/26 + * @since 2022/7/26 */ @Slf4j @Repository diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Mapper.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Mapper.java index a05919de6d31c96c3b0cdd5c985f96b4916da37f..6d9ae7c6fd3703f6483118dce48f6e51087f2c2c 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Mapper.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Mapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/7/26 + * @since 2022/7/26 */ @Mapper public interface DingMediaMd5Mapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/entity/DingMediaMd5.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/entity/DingMediaMd5.java index 6d643857ec6a4bb8d49d1ed099b2674973456e48..6b9800f4908fb50837db130007f7fcd4c3e72564 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/entity/DingMediaMd5.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/entity/DingMediaMd5.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 钉钉媒体文件MD5值关联关系 * * @author xxm - * @date 2022/7/26 + * @since 2022/7/26 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaMd5Service.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaMd5Service.java index 95f2ec687da842a1f395706b9c464440d3a2b8a7..cd4c27d11fc3dbe1950f317f1a1c474d7dfa4d3a 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaMd5Service.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaMd5Service.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; /** * @author xxm - * @date 2022/7/26 + * @since 2022/7/26 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaService.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaService.java index 7d25395669e08894964f85b68a055df50b2e6f70..0bd7b1dd25677d118207fc252d05985ed47976b5 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaService.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaService.java @@ -29,7 +29,7 @@ import static cn.bootx.platform.starter.dingtalk.code.DingTalkCode.*; * 钉钉媒体文件管理 * * @author xxm - * @date 2022/7/25 + * @since 2022/7/25 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/ChatNoticeResult.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/ChatNoticeResult.java index de126c275754368ea14369a0971e88ef1f5da01b..6494bc73de35b8930f4fdc163c8c2ae766dfa336 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/ChatNoticeResult.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/ChatNoticeResult.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/7/20 + * @since 2022/7/20 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/CorpNoticeResult.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/CorpNoticeResult.java index 7f6661a8b307ce328c17302f7eec5fe175b2debb..89a42eeb3d7eb8c1734346b442b8462378bf4a36 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/CorpNoticeResult.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/CorpNoticeResult.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; * 钉钉消息响应 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/service/DingNoticeService.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/service/DingNoticeService.java index a5d431c26c53f68876e68763ab5915703c150bcf..34d689ee3a6e567fdcdd0482956162cf9ada8ed5 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/service/DingNoticeService.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/service/DingNoticeService.java @@ -21,7 +21,7 @@ import static cn.bootx.platform.starter.dingtalk.code.DingTalkCode.*; * 钉钉通知发送服务 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/convert/DingRobotConvert.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/convert/DingRobotConvert.java index e6dac6d62699410d5e2cc58e72f761cf348fdae3..a6b586b6127bda620f40d9602e6d293a37b66b8b 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/convert/DingRobotConvert.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/convert/DingRobotConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 钉钉相关类转换 * * @author xxm - * @date 2021/8/5 + * @since 2021/8/5 */ @Mapper public interface DingRobotConvert { diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigManager.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigManager.java index 454392aa2831ed165340252feaedaaccdbfba11f..be0f01b21fd57fea777473e997ea46d963ed1f4e 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigManager.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigManager.java @@ -17,7 +17,7 @@ import java.util.Optional; * 钉钉机器人 * * @author xxm - * @date 2020/11/29 + * @since 2020/11/29 */ @Repository @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigMapper.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigMapper.java index 7144aa0c51db88bf0e27da441c8eea3e414b946f..f1514179172ef4623a11ac948c87a779ec15c74b 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigMapper.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 钉钉机器人配置 * * @author xxm - * @date 2021/8/5 + * @since 2021/8/5 */ @Mapper public interface DingRobotConfigMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/entity/DingRobotConfig.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/entity/DingRobotConfig.java index 7880a76bc63c2356e1448434a071b893f5ca7055..2532efee002fd8bc3c03c5eca2f7cd08985c054f 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/entity/DingRobotConfig.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/entity/DingRobotConfig.java @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; * 钉钉机器人配置 * * @author xxm - * @date 2020/11/29 + * @since 2020/11/29 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotConfigService.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotConfigService.java index 75a645c57424c85571f41a6b5511d51a56d49ca7..72d4781e99896082725021ab9fa8cf71e18a0684 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotConfigService.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotConfigService.java @@ -23,7 +23,7 @@ import java.util.List; * 钉钉机器人消息发送 * * @author xxm - * @date 2020/11/29 + * @since 2020/11/29 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotSendService.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotSendService.java index 920d38841398d40961a418bf0952af8dd732be23..3cf1278438c233eddf2b167a872f5a91c92a2830 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotSendService.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotSendService.java @@ -24,7 +24,7 @@ import static cn.bootx.platform.starter.dingtalk.code.DingTalkCode.SUCCESS_CODE; * 钉钉机器人消息发送 * * @author xxm - * @date 2020/11/29 + * @since 2020/11/29 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/entity/UserIdResult.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/entity/UserIdResult.java index f3190ea291ae11c42b7610e2adf25d3cb684567e..82bb8f8644b94589bd933a274e7b9df045fce02d 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/entity/UserIdResult.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/entity/UserIdResult.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/7/21 + * @since 2022/7/21 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/service/DingUserService.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/service/DingUserService.java index 72e5cd83d9e10c5bdbc171a977e72611217298c9..83a409027fb7c4bb81f138b2ec1b4cf13663047e 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/service/DingUserService.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/service/DingUserService.java @@ -22,7 +22,7 @@ import static cn.bootx.platform.starter.dingtalk.code.DingTalkCode.*; * 钉钉用户信息 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/ChatNotice.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/ChatNotice.java index 1741c4cc02554b36ecead2ea7ca9aa780b1b9bcf..6d8c0e3a58cfabc23ee785e1ca14d447d9dde28e 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/ChatNotice.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/ChatNotice.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; * 钉钉发送企业群消息参数 * * @author xxm - * @date 2022/7/20 + * @since 2022/7/20 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/CorpNotice.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/CorpNotice.java index 1e19e88d7344c3bb50eb947d6849b4306c0fe0ba..7023a4d408d18a7a7b7a283701ae6e1389901406 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/CorpNotice.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/CorpNotice.java @@ -15,7 +15,7 @@ import java.util.Map; * 钉钉发送工作通知参数 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/RecallCorpNotice.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/RecallCorpNotice.java index 9c24d194057ac1da97d9bdbff3f662bdf480d476..805cbe728dc766916935aa5b68e054cc8e0ca2af 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/RecallCorpNotice.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/RecallCorpNotice.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 钉钉撤回工作通知 * * @author xxm - * @date 2022/7/20 + * @since 2022/7/20 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/UpdateCorpNotice.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/UpdateCorpNotice.java index 48038f10335471f54efcb8a9eae53e7e81a3df37..d6e0363049d7c847325eb504760c5527e511a89d 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/UpdateCorpNotice.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/UpdateCorpNotice.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 钉钉 更新工作通知状态栏 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ActionCardMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ActionCardMsg.java index b40d86664ab843c4bb1fc1461d7997ac74f6b5af..20ee7b85a59cc9363dc1f632fba035e3fdd52612 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ActionCardMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ActionCardMsg.java @@ -12,7 +12,7 @@ import java.util.List; * 钉钉卡片消息 * * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/At.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/At.java index 5a4cc50053db46e35b02bb2688e178ae7505c81c..3aef39823c2ba26b8b3b3cf2dcd47949c1224c41 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/At.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/At.java @@ -13,7 +13,7 @@ import java.util.List; * 钉钉At * * @author xxm - * @date 2020/11/29 + * @since 2020/11/29 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/DingMedia.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/DingMedia.java index c2fa7336214728a9d8b16b3866d561cf6cda6776..28012efd3f0b1e4232317618190eadbec73f3203 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/DingMedia.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/DingMedia.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; * 钉钉图片 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/FileMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/FileMsg.java index fbbebed198fa22a9cb2d6d95ff4a79a3721cb1c9..d948b44d51360cd1d5d742c65d5bc1d3db242004 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/FileMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/FileMsg.java @@ -12,7 +12,7 @@ import java.io.Serializable; * 钉钉图片通知 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ImageMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ImageMsg.java index d8df2966534a12f672ee8c2c70fca09cf3e69d27..a1fa6cb82c271191b11b33456b0ca9afaeede71d 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ImageMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ImageMsg.java @@ -12,7 +12,7 @@ import java.io.Serializable; * 钉钉图片通知 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/LinkMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/LinkMsg.java index 51e311c2317c0766e38dfbe7491ff916f1531e04..20b1ab0c7bba81a71d64201ceda7474d7e5e05b2 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/LinkMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/LinkMsg.java @@ -13,7 +13,7 @@ import java.io.Serializable; * 钉钉链接消息 * * @author xxm - * @date 2020/11/30 + * @since 2020/11/30 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/MarkdownMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/MarkdownMsg.java index 7e6f5b28ebd947fa7e6c68364ca8c4931b827e95..40548c1d5f78eedc1b276df19c7c63866e6553c7 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/MarkdownMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/MarkdownMsg.java @@ -14,7 +14,7 @@ import java.util.List; * 钉钉markdown消息 * * @author xxm - * @date 2020/11/30 + * @since 2020/11/30 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/Msg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/Msg.java index 6deaccfaaa5839dd8cf76e24eb05b7679685d345..656371c4b71388cfc1698afde09300c3b3826e0b 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/Msg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/Msg.java @@ -14,7 +14,7 @@ import java.io.Serializable; * 钉钉消息 * * @author xxm - * @date 2020/11/30 + * @since 2020/11/30 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/OaMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/OaMsg.java index 78cea3c2b186ca71cc8f06860b3b753bd2466189..fbaab9131aef2dcc4a15176336554daeee54ef50 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/OaMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/OaMsg.java @@ -14,7 +14,7 @@ import java.util.List; * 钉钉OA消息 * * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/TextMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/TextMsg.java index 0f79ceb893e0d10b39b5dfabe8638d993841a5b7..72e71d0425c9cade29b2017bcc280c4f4e5216f3 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/TextMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/TextMsg.java @@ -12,7 +12,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/11/29 + * @since 2020/11/29 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/VoiceMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/VoiceMsg.java index b1296a2a5be8345d12ed49adf01cc904c28c4d1d..d4b95c511a072282ddaf23ca6114f71c2621618f 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/VoiceMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/VoiceMsg.java @@ -15,7 +15,7 @@ import java.io.Serializable; * 钉钉语音消息 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/robot/DingRobotConfigParam.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/robot/DingRobotConfigParam.java index 10039483791774ea439e0877670dd6b9df5b0dc1..620604d8c6c6947df9b83041da6398d948c08020 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/robot/DingRobotConfigParam.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/robot/DingRobotConfigParam.java @@ -8,7 +8,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2021/8/5 + * @since 2021/8/5 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/util/DingTalkUtil.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/util/DingTalkUtil.java index b5f9fc7f403b07149854893d089446d8d187d452..ba4494ed058af8f89f351199d4cd527821a3e905 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/util/DingTalkUtil.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/util/DingTalkUtil.java @@ -15,7 +15,7 @@ import java.security.NoSuchAlgorithmException; * 钉钉工具类 * * @author xxm - * @date 2022/4/2 + * @since 2022/4/2 */ @Slf4j @UtilityClass diff --git a/bootx-common-starters/common-starter-file/pom.xml b/bootx-common-starters/common-starter-file/pom.xml index 09f2f3d74e7b02032b3fa59a43d8dcd4f42b7739..389749e83770a1206e7920aa0bd081bd758189b3 100644 --- a/bootx-common-starters/common-starter-file/pom.xml +++ b/bootx-common-starters/common-starter-file/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.1 + 1.3.3 4.0.0 @@ -25,6 +25,11 @@ spring-boot-starter-data-mongodb true + + cn.bootx + mybatis-table-modify-mysql-boot-starter + provided + cn.bootx.platform common-mybatis-plus @@ -35,6 +40,7 @@ io.minio minio ${minio.version} + true diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/FileAutoConfiguration.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/FileAutoConfiguration.java index 13db208dc83d5f7c6703ffcf456001305c4d71a0..fea14281ab834ecd5044c35180527ecf7ba6392b 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/FileAutoConfiguration.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/FileAutoConfiguration.java @@ -11,7 +11,7 @@ import org.springframework.data.mongodb.repository.config.EnableMongoRepositorie * 文件管理 * * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/code/FileUploadTypeEnum.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/code/FileUploadTypeEnum.java index c0588edeefaea449652739584fa1dc7f1c6245c1..113361c5489c38d9846dd90ded8e4f783a297154 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/code/FileUploadTypeEnum.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/code/FileUploadTypeEnum.java @@ -4,12 +4,14 @@ package cn.bootx.platform.starter.file.code; * 文件上传类型 * * @author xxm - * @date 2022/1/14 + * @since 2022/1/14 */ public enum FileUploadTypeEnum { /** 本地存储 */ LOCAL, + /** 数据库存储 */ + JDBC, /** Mongo存储 */ MONGO, /** minio存储 */ diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadConfiguration.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadConfiguration.java index 198f98c65c18a98b0e9d568ab49b1478cd6bb4dc..d8337c5193ca8b7cdf90a09a0df376bb170c1b20 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadConfiguration.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadConfiguration.java @@ -12,7 +12,7 @@ import org.springframework.data.mongodb.gridfs.GridFsTemplate; * 文件上传配置 * * @author xxm - * @date 2022/2/15 + * @since 2022/2/15 */ @Configuration @ConditionalOnClass(name="org.springframework.data.mongodb.gridfs.GridFsTemplate") diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java index bd2474a837b9e2e402b2497bd0afdab29113766e..7e24f6268bbaec54678c40f53a8c8f33c77f1ab8 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java @@ -11,7 +11,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * 文件上传配置 * * @author xxm - * @date 2022/1/14 + * @since 2022/1/14 */ @Data @Accessors(chain = true) @@ -29,6 +29,9 @@ public class FileUploadProperties { /** 本地存储 */ private Local local = new Local(); + /** 数据库存储 */ + private JDBC jdbc = new JDBC(); + /** mongo存储配置 */ private Mongo mongo = new Mongo(); @@ -47,6 +50,18 @@ public class FileUploadProperties { } + /** + * 数据库存储 + */ + @Getter + @Setter + public static class JDBC { + + /** 是否以Base64方式进行存储 */ + private boolean base64 = false; + + } + /** * mongo存储配置 */ diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java index a1bf2f111337933b1137e86861f92c3bfcc00906..65c9ea25653fdf479b8153f71e0811573112ebf4 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java @@ -21,7 +21,7 @@ import java.io.IOException; * 文件上传 * * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @IgnoreAuth @Tag(name = "文件上传") @@ -46,6 +46,13 @@ public class FIleUpLoadController { return Res.ok(uploadService.upload(file, fileName)); } + @Operation(summary = "删除") + @DeleteMapping("/delete") + public ResResult delete(Long id){ + uploadService.delete(id); + return Res.ok(); + } + @Operation(summary = "获取文件预览地址") @GetMapping("getFilePreviewUrl") public ResResult getFilePreviewUrl(Long id) { diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/convert/FileConvert.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/convert/FileConvert.java index 0aa5e04c10dd3c1c88d2d48cd0d445f489a39945..19a6e719075f35f04473621e5f81f89c18fe8dec 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/convert/FileConvert.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/convert/FileConvert.java @@ -7,7 +7,7 @@ import org.mapstruct.factory.Mappers; /** * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @Mapper public interface FileConvert { diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/JdbcFileDataManager.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/JdbcFileDataManager.java new file mode 100644 index 0000000000000000000000000000000000000000..352843fe9c9a407cdb14b7f4697def72fb55b01f --- /dev/null +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/JdbcFileDataManager.java @@ -0,0 +1,14 @@ +package cn.bootx.platform.starter.file.dao; + +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.starter.file.entity.JdbcFileData; +import org.springframework.stereotype.Repository; + +/** + * + * @author xxm + * @since 2023/8/5 + */ +@Repository +public class JdbcFileDataManager extends BaseManager { +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionMapper.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/JdbcFileDataMapper.java similarity index 40% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionMapper.java rename to bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/JdbcFileDataMapper.java index fb0bfecae695dfe756077d98127e502432112b88..61a6deca491cd962ff44acadb8da97f5fa50e4bd 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionMapper.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/JdbcFileDataMapper.java @@ -1,16 +1,14 @@ -package cn.bootx.platform.baseapi.core.app.dao; +package cn.bootx.platform.starter.file.dao; -import cn.bootx.platform.baseapi.core.app.entity.AppVersion; +import cn.bootx.platform.starter.file.entity.JdbcFileData; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; /** - * app版本 * * @author xxm - * @date 2021/8/9 + * @since 2023/8/5 */ @Mapper -public interface AppVersionMapper extends BaseMapper { - +public interface JdbcFileDataMapper extends BaseMapper { } diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileManager.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileManager.java index 47919e0daa7a2a36cfd2193427feb32ca55ddb6c..7232ab4a2ea3f53dbdb11e7003c0ae78d0cd1d57 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileManager.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileManager.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Repository; /** * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @Slf4j @Repository diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileMapper.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileMapper.java index a44cc9e35e2aa1af469dfc5f4073eec1dc60668a..8e3ed31e0866a96863b4d38ba52c1943146e29fb 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileMapper.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @Mapper public interface UpdateFileMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/UpdateFileDto.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/UpdateFileDto.java index bf341876eb2379d5d7fd0689856a2de173bf83bc..23fba3e384f540c99261da7a8ea1426d7643b658 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/UpdateFileDto.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/UpdateFileDto.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 上传文件信息 * * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/JdbcFileData.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/JdbcFileData.java new file mode 100644 index 0000000000000000000000000000000000000000..3a73132131521f70489ba01a4959482303aee937 --- /dev/null +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/JdbcFileData.java @@ -0,0 +1,32 @@ +package cn.bootx.platform.starter.file.entity; + +import cn.bootx.mybatis.table.modify.annotation.DbColumn; +import cn.bootx.mybatis.table.modify.annotation.DbTable; +import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlFieldType; +import cn.bootx.mybatis.table.modify.mybatis.mysq.constants.MySqlFieldTypeEnum; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * 数据库存储上传的文件数据 + * @author xxm + * @since 2023/8/5 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +@DbTable(comment = "上传文件数据") +@TableName("starter_file_data") +public class JdbcFileData extends MpIdEntity { + + @DbColumn(comment = "base64方式存储") + @DbMySqlFieldType(MySqlFieldTypeEnum.LONGTEXT) + private String base64; + + @DbColumn(comment = "base64方式存储") + @DbMySqlFieldType(MySqlFieldTypeEnum.LONGBLOB) + private byte[] data; +} diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UpdateFileInfo.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UpdateFileInfo.java index 2a45fdef38b4811b0bdede09a30dd51ec0cacf54..10f8a7cabb4660205c24cb9a6170711b02233dd3 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UpdateFileInfo.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UpdateFileInfo.java @@ -17,7 +17,7 @@ import java.time.LocalDateTime; * 上传文件信息 * * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UploadFileContext.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UploadFileContext.java index e42bacbf93a24dd0a856db881a5cfb8840b4df32..442a4d54cc848b668007180836ea45dbf5314cf0 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UploadFileContext.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UploadFileContext.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 上传文件上下文 * * @author xxm - * @date 2022/1/20 + * @since 2022/1/20 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java index 57d2cc554591bb0ddc715ee38629a588f40f9bb0..8e5c4cd8982205ee788ef75fcdf941fb56dd3cc7 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java @@ -35,7 +35,7 @@ import java.util.List; * 文件上传管理类 * * @author xxm - * @date 2022/1/14 + * @since 2022/1/14 */ @Slf4j @Service @@ -87,6 +87,21 @@ public class FileUploadService { return uploadInfo.toDto(); } + /** + * 文件删除 + */ + @Transactional(rollbackFor = Exception.class) + public void delete(Long id){ + val uploadType = fileUploadProperties.getUploadType(); + UploadService uploadService = uploadServices.stream() + .filter(s -> s.enable(uploadType)) + .findFirst() + .orElseThrow(() -> new BizException("未找到该类的上传处理器")); + UpdateFileInfo updateFileInfo = updateFileManager.findById(id).orElseThrow(() -> new BizException("文件不存在")); + uploadService.delete(updateFileInfo); + updateFileManager.deleteById(updateFileInfo.getId()); + } + /** * 浏览 */ diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/UploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/UploadService.java index 386d018c2d2c85c8a8461e905c38361a4393fa15..e3e818dfddca865b121b8567b473eecc0334a147 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/UploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/UploadService.java @@ -12,7 +12,7 @@ import java.io.InputStream; * 文件上传接口 * * @author xxm - * @date 2022/1/14 + * @since 2022/1/14 */ public interface UploadService { diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/JdbcUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/JdbcUploadService.java new file mode 100644 index 0000000000000000000000000000000000000000..8e57479abf63f57d36cebfebe2b1e56785ce6340 --- /dev/null +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/JdbcUploadService.java @@ -0,0 +1,117 @@ +package cn.bootx.platform.starter.file.service.impl; + +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.starter.file.code.FileUploadTypeEnum; +import cn.bootx.platform.starter.file.configuration.FileUploadProperties; +import cn.bootx.platform.starter.file.dao.JdbcFileDataManager; +import cn.bootx.platform.starter.file.entity.JdbcFileData; +import cn.bootx.platform.starter.file.entity.UpdateFileInfo; +import cn.bootx.platform.starter.file.entity.UploadFileContext; +import cn.bootx.platform.starter.file.service.UploadService; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.io.IoUtil; +import lombok.RequiredArgsConstructor; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpHeaders; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayInputStream; +import java.io.InputStream; + +/** + * 数据库存储上传文件 + * @author xxm + * @since 2023/8/5 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class JdbcUploadService implements UploadService { + private final JdbcFileDataManager jdbcFileDataManager; + + private final FileUploadProperties fileUploadProperties; + + /** + * 判断启用 + */ + @Override + public boolean enable(FileUploadTypeEnum type) { + return type==FileUploadTypeEnum.JDBC; + } + + /** + * 上传文件 + * + * @param file + * @param context + */ + @SneakyThrows + @Override + public UpdateFileInfo upload(MultipartFile file, UploadFileContext context) { + FileUploadProperties.JDBC jdbc = fileUploadProperties.getJdbc(); + JdbcFileData jdbcFileData; + byte[] bytes = file.getBytes(); + if (jdbc.isBase64()){ + jdbcFileData =new JdbcFileData().setBase64(Base64.encode(bytes)); + } else { + jdbcFileData =new JdbcFileData().setData(bytes); + } + jdbcFileDataManager.save(jdbcFileData); + return new UpdateFileInfo().setExternalStorageId(String.valueOf(jdbcFileData.getId())).setFileSize(file.getSize()); + } + + /** + * 预览文件 + */ + @SneakyThrows + @Override + public void preview(UpdateFileInfo updateFileInfo, HttpServletResponse response) { + FileUploadProperties.JDBC jdbc = fileUploadProperties.getJdbc(); + Long id = Long.valueOf(updateFileInfo.getExternalStorageId()); + JdbcFileData jdbcFileData = jdbcFileDataManager.findById(id) + .orElseThrow(DataNotExistException::new); + InputStream inputStream; + if (jdbc.isBase64()){ + inputStream = new ByteArrayInputStream(Base64.decode(jdbcFileData.getBase64())); + } else { + inputStream = new ByteArrayInputStream(jdbcFileData.getData()); + } + + // 获取响应输出流 + ServletOutputStream os = response.getOutputStream(); + IoUtil.copy(inputStream, os); + response.addHeader(HttpHeaders.CONTENT_DISPOSITION, updateFileInfo.getFileType()); + IoUtil.close(inputStream); + IoUtil.close(os); + + } + + /** + * 下载文件 + */ + @Override + public InputStream download(UpdateFileInfo updateFileInfo) { + FileUploadProperties.JDBC jdbc = fileUploadProperties.getJdbc(); + Long id = Long.valueOf(updateFileInfo.getExternalStorageId()); + JdbcFileData jdbcFileData = jdbcFileDataManager.findById(id) + .orElseThrow(DataNotExistException::new); + if (jdbc.isBase64()){ + return new ByteArrayInputStream(Base64.decode(jdbcFileData.getBase64())); + } else { + return new ByteArrayInputStream(jdbcFileData.getData()); + } + } + + /** + * 删除文件 + */ + @Override + public void delete(UpdateFileInfo updateFileInfo) { + Long id = Long.valueOf(updateFileInfo.getExternalStorageId()); + jdbcFileDataManager.deleteById(id); + } +} diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/LocalUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/LocalUploadService.java index 6f5ec99266186bd0e438d4636b6346b32b343fe3..4cdbf72b20baae134d3a9b16a5f34469ac1dd8fa 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/LocalUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/LocalUploadService.java @@ -29,7 +29,7 @@ import java.util.Optional; * 上传文件本地存储 * * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MinioUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MinioUploadService.java index 6d9a610945f2900e9b4ce0f03e13f9e40273a6fd..09d1b19551376ce6fdcc4b776c0fcf3e058842e1 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MinioUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MinioUploadService.java @@ -10,6 +10,7 @@ import io.minio.*; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; import org.springframework.http.HttpHeaders; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -23,10 +24,11 @@ import java.util.Objects; * minio方式存储文件 * * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @Slf4j @Service +@ConditionalOnMissingClass("io.minio.MinioClient") @RequiredArgsConstructor public class MinioUploadService implements UploadService { @@ -39,11 +41,11 @@ public class MinioUploadService implements UploadService { */ @Override public boolean enable(FileUploadTypeEnum type) { - boolean b = type == FileUploadTypeEnum.MINIO; - if (b) { + boolean initFlag = type == FileUploadTypeEnum.MINIO; + if (initFlag) { this.doInit(); } - return b; + return initFlag; } /** @@ -54,8 +56,7 @@ public class MinioUploadService implements UploadService { public UpdateFileInfo upload(MultipartFile file, UploadFileContext context) { FileUploadProperties.Minio minio = fileUploadProperties.getMinio(); PutObjectArgs putObjectArgs = PutObjectArgs.builder() - .bucket(minio.getBucket()) // bucket - // 必须传递 + .bucket(minio.getBucket()) // bucket必须传递 .contentType(file.getContentType()) .object(context.getFileId() + "." + context.getFileSuffix()) .stream(file.getInputStream(), file.getSize(), -1) // 文件内容 @@ -105,8 +106,7 @@ public class MinioUploadService implements UploadService { public void delete(UpdateFileInfo updateFileInfo) { FileUploadProperties.Minio minio = fileUploadProperties.getMinio(); client.removeObject(RemoveObjectArgs.builder() - .bucket(minio.getBucket()) // bucket - // 必须传递 + .bucket(minio.getBucket()) // bucket必须传递 .object(updateFileInfo.getExternalStorageId()) // 相对路径作为 key .build()); } diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MongoUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MongoUploadService.java index 748a31ab53fe7e25754c65cb43f5cfc78ebfe903..f2ccbc86a3ba74403771e661fc7e70179df2aa6a 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MongoUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MongoUploadService.java @@ -29,7 +29,7 @@ import java.util.Optional; * mongo方式存储文件 * * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/OssUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/OssUploadService.java index e076d2f7dd010504b3b146daf9c6d433c5b75c6c..7d2c752ee4c9880fb455ceb8dd67a57bd33d3085 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/OssUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/OssUploadService.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; * 阿里云OSS上传文件 * * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-monitor/pom.xml b/bootx-common-starters/common-starter-monitor/pom.xml index ea9c3e0eb8716515d1b2405c7ad90154b59a9450..72c247a75c07ff6a394c51864d44f7b625a4bf37 100644 --- a/bootx-common-starters/common-starter-monitor/pom.xml +++ b/bootx-common-starters/common-starter-monitor/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.1 + 1.3.3 4.0.0 jar diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/MonitorAutoConfiguration.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/MonitorAutoConfiguration.java index da3251d9812efc695fe6773238ba66fc9add8038..23318751dafd9ec005d7f7d8b4f6e5c0162b5b8f 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/MonitorAutoConfiguration.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/MonitorAutoConfiguration.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.ComponentScan; * 系统信息监控模块 * * @author xxm - * @date 2022/6/10 + * @since 2022/6/10 */ @ComponentScan @AutoConfiguration diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/controller/SystemMonitorController.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/controller/SystemMonitorController.java index 3af32b7ceedaaf01243fc04fcae2755f3edf2d8e..947c43058724af4818b53ca2a872232414f7313a 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/controller/SystemMonitorController.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/controller/SystemMonitorController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2022/6/10 + * @since 2022/6/10 */ @Tag(name = "系统信息监控") @RestController diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/MongoMonitorResult.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/MongoMonitorResult.java index 88ccd7e11cde7d1d66ab42977330a848faa89544..def02d0c5965aa03af22f89cb66e5a3b90cd2ab7 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/MongoMonitorResult.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/MongoMonitorResult.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * MongoDB监控信息 * * @author xxm - * @date 2022/6/12 + * @since 2022/6/12 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/RedisMonitorResult.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/RedisMonitorResult.java index ae79f43524d534652117be266116a99071bcd831..43ae5b78c6d18ae5490bf0467c72d0c89ccad227 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/RedisMonitorResult.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/RedisMonitorResult.java @@ -11,7 +11,7 @@ import java.util.Properties; * Redis监控信息 * * @author xxm - * @date 2022/6/12 + * @since 2022/6/12 */ @Data @Schema(title = "Redis监控信息") diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/SystemMonitorResult.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/SystemMonitorResult.java index 3b7084f32c3bb8e6ada888d437cd0ea2a60c5d87..838e74e4fb0ece5d35158a56f095ebf14b823ff7 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/SystemMonitorResult.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/SystemMonitorResult.java @@ -34,7 +34,7 @@ import java.util.List; * 系统属性结果 * * @author xxm - * @date 2022/6/10 + * @since 2022/6/10 */ @Data @Schema(title = "系统属性结果") diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/RedisMonitorService.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/RedisMonitorService.java index 0644be078bfae5cc3ebbf6b4cc6b384f77d46cb4..e565e6539d3bcc1c5bce4b5ae93323aeb242f8f7 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/RedisMonitorService.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/RedisMonitorService.java @@ -19,7 +19,7 @@ import java.util.stream.Collectors; * Redis监控信息 * * @author xxm - * @date 2022/6/12 + * @since 2022/6/12 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/SystemMonitorService.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/SystemMonitorService.java index 080b51a8ace0f5f9416d9a1649e4c3bc0234c7b0..81af79d116665a7d3d2d340f5d21fe3a078ada6e 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/SystemMonitorService.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/SystemMonitorService.java @@ -25,7 +25,7 @@ import java.util.concurrent.ThreadPoolExecutor; * 系统信息 * * @author xxm - * @date 2022/6/10 + * @since 2022/6/10 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-quartz/README.md b/bootx-common-starters/common-starter-quartz/README.md index b48e6b359a92808de3d0819d78c1f13f91f8333d..08999dd43f3912de74cd4d4d403e3362e1c0363f 100644 --- a/bootx-common-starters/common-starter-quartz/README.md +++ b/bootx-common-starters/common-starter-quartz/README.md @@ -13,7 +13,7 @@ /** * 测试定时任务 * @author xxm - * @date 2021/11/8 + * @since 2021/11/8 */ @Slf4j public class TestTask implements Job { diff --git a/bootx-common-starters/common-starter-quartz/pom.xml b/bootx-common-starters/common-starter-quartz/pom.xml index 643b5a5e6e4174c131ac10ec1e646fd33e9328de..c20f0927bb67272993c18fb084bf922a9090cf6a 100644 --- a/bootx-common-starters/common-starter-quartz/pom.xml +++ b/bootx-common-starters/common-starter-quartz/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/QuartzJobAutoConfiguration.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/QuartzJobAutoConfiguration.java index e6bd9b685ac98cc75ef1112955d2ccea5d85f1b9..555d5059c5fadb0034388da7b10e1104b3ffae2a 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/QuartzJobAutoConfiguration.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/QuartzJobAutoConfiguration.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.ComponentScan; * 定时任务 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/code/QuartzJobCode.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/code/QuartzJobCode.java index 2035ee40a7ef47e2c1db1e3d3608b5bef0c69ef5..5b3701872e4f853a9654de28b3ab0e353178a09a 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/code/QuartzJobCode.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/code/QuartzJobCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.quartz.code; * 定时任务状态 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ public interface QuartzJobCode { diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/configuration/QuartzProperties.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/configuration/QuartzProperties.java index 9f709451779e5f465e846d248c42d1a6272bf38d..eefaed22a86d4caa2d913336297cdf5f61ef4558 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/configuration/QuartzProperties.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/configuration/QuartzProperties.java @@ -18,7 +18,7 @@ import static org.quartz.impl.jdbcjobstore.Constants.DEFAULT_TABLE_PREFIX; * 支持配置文件自动提示 * * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ @Getter @Setter diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobController.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobController.java index 1f5309b571d199fe1d0b6dba9177343b66005ffd..e28255643114e3c62f6c95220270f37262920432 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobController.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*; * 定时任务 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @Tag(name = "定时任务") @RestController diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobLogController.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobLogController.java index b8f5e39facae93b3bea2991217762940b5b6fa13..ae39fc9bf4ed27624e042ec71cd80eeb5ad874b8 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobLogController.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobLogController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2022/5/2 + * @since 2022/5/2 */ @Tag(name = "定时任务执行日志") @RestController diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/convert/QuartzJobConvert.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/convert/QuartzJobConvert.java index 3528a1827f932df2d90520bb1e2c50c04e712967..95d6c5220da81acf65bbad309a0985c44e887939 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/convert/QuartzJobConvert.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/convert/QuartzJobConvert.java @@ -12,7 +12,7 @@ import org.mapstruct.factory.Mappers; * 定时任务转换 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @Mapper public interface QuartzJobConvert { diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogManager.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogManager.java index 81f3ab490602b2ce9d86c727471b8e5bd194a1dd..7383ff836b25e7ab40f8e517596dabd43b601025 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogManager.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogManager.java @@ -15,7 +15,7 @@ import java.util.Objects; /** * @author xxm - * @date 2022/5/1 + * @since 2022/5/1 */ @Slf4j @Repository diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogMapper.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogMapper.java index 54efefde813031ceeb3575ed0b7f7890b6c9aea6..a166cf3c2a542f53be663cfceecf205e430215ac 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogMapper.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 定时任务日志 * * @author xxm - * @date 2022/5/1 + * @since 2022/5/1 */ @Mapper public interface QuartzJobLogMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobManager.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobManager.java index 0fec09883362852f842f015fa3f8d3736b78d464..eb8cf1b193d16d1b2251fdc44a7c80516943cd2f 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobManager.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobManager.java @@ -17,7 +17,7 @@ import java.util.List; * 定时任务 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @Slf4j @Repository diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobMapper.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobMapper.java index 7c244ee2976e5ed31c354c0e0028b2ed3768a8b9..d8af2adac8fbcffe2f2e069fc4fe70eed6d800e8 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobMapper.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 定时任务 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @Mapper public interface QuartzJobMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/entity/QuartzJob.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/entity/QuartzJob.java index fb53f5522c72e96e19a726d6d40ef66c603db5d6..9213e3b29ffd38fd4c6c99e067d6f5e37ceb9b0b 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/entity/QuartzJob.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/entity/QuartzJob.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; * 定时任务 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/entity/QuartzJobLog.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/entity/QuartzJobLog.java index e5c2ac3255333fb04a50e20f4bd924c8ee4cf222..35727994bed56f9c5f8bac147ca80bc061ddae73 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/entity/QuartzJobLog.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/entity/QuartzJobLog.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; * 任务执行日志 * * @author xxm - * @date 2021/8/20 + * @since 2021/8/20 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/service/QuartzJobLogService.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/service/QuartzJobLogService.java index 7a51e5180d37923720bb1783c2004b46d66a759c..78d35dad66d5f5285e0b506217d55bb499b328c1 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/service/QuartzJobLogService.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/service/QuartzJobLogService.java @@ -19,7 +19,7 @@ import java.time.LocalDateTime; * 定时任务日志 * * @author xxm - * @date 2022/5/1 + * @since 2022/5/1 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/service/QuartzJobService.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/service/QuartzJobService.java index cd98b47556bc8cd440fe85b4581253f4b145f569..35b1c1e90e08d8dcd67e6da83c09a490736bd079 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/service/QuartzJobService.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/service/QuartzJobService.java @@ -31,7 +31,7 @@ import java.util.stream.Collectors; * 定时任务 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/dto/QuartzJobDto.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/dto/QuartzJobDto.java index 9a6bcd97ba87239b45dd6cb73009eda9778422e3..40620970027d6de8b26c8d07a01398711b52a0a2 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/dto/QuartzJobDto.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/dto/QuartzJobDto.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; * 定时任务 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/dto/QuartzJobLogDto.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/dto/QuartzJobLogDto.java index 9bb53589659b6b372d60330e4ed404e1abba3596..5866a8332337453c0a8128f2967d23fe825699f1 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/dto/QuartzJobLogDto.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/dto/QuartzJobLogDto.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 任务执行日志 * * @author xxm - * @date 2021/8/20 + * @since 2021/8/20 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/handler/JobLogAspectHandler.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/handler/JobLogAspectHandler.java index 2a1ec6294fb64fd8110991aeb11805388125a512..fd89430476ca58c0cc95624b1572a1adde2bb590 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/handler/JobLogAspectHandler.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/handler/JobLogAspectHandler.java @@ -19,7 +19,7 @@ import java.util.Optional; * 定时任务日志切面 * * @author xxm - * @date 2022/5/1 + * @since 2022/5/1 */ @Slf4j @Aspect diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/handler/QuartzJobScheduler.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/handler/QuartzJobScheduler.java index c38562690ef030c39b123329d9e1c5903bc6f1bb..18fb35249ed71851b20fb31494c702db4b8ee430 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/handler/QuartzJobScheduler.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/handler/QuartzJobScheduler.java @@ -18,7 +18,7 @@ import java.util.stream.Collectors; * 定时任务调度器 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/param/QuartzJobLogQuery.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/param/QuartzJobLogQuery.java index 2fcc0709d1c5c4b96342db7d5618ea9e80a7ee0d..3573938e2a514e3a24f178c472991430c6ba7b69 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/param/QuartzJobLogQuery.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/param/QuartzJobLogQuery.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/5/2 + * @since 2022/5/2 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/param/QuartzJobParam.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/param/QuartzJobParam.java index 18c30301d343e5db55a524448281359e4844c239..6ffb4d28d44ffd81827e801aff84dfa830a073d0 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/param/QuartzJobParam.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/param/QuartzJobParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 定时任务 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/task/TestTask.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/task/TestTask.java index 8c623fd4d39dd287a7fa851d940a134be05b844c..34d275558a5d195469869b5c9912ade01eb41773 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/task/TestTask.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/task/TestTask.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; * 测试定时任务 * * @author xxm - * @date 2021/11/8 + * @since 2021/11/8 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-wechat/pom.xml b/bootx-common-starters/common-starter-wechat/pom.xml index 23b43cec787dde1a031be195ffebe92a5b8b08df..581c7f41e93a414eed83a9b6b626831eb13afada 100644 --- a/bootx-common-starters/common-starter-wechat/pom.xml +++ b/bootx-common-starters/common-starter-wechat/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/WeChatAutoConfiguration.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/WeChatAutoConfiguration.java index 25fcc2a811569b3b21827d10d31ff455db9750a3..42089c6f8fe405020d2f1dda455af84c002e7a9c 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/WeChatAutoConfiguration.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/WeChatAutoConfiguration.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.ComponentScan; * 微信操作封装 * * @author xxm - * @date 2022/7/15 + * @since 2022/7/15 */ @ComponentScan @MapperScan(annotationClass = Mapper.class) diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/code/WeChatCode.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/code/WeChatCode.java index b1a8f03c2812791d6218b3ba49c7d59cec51182b..edf7660ed60cb6ca5e91f63b4ff39ff52062147f 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/code/WeChatCode.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/code/WeChatCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.wechat.code; * 微信编码 * * @author xxm - * @date 2022/8/5 + * @since 2022/8/5 */ public interface WeChatCode { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatConfiguration.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatConfiguration.java index 1f830932ed63fd67c1c1456e6cb8de913d7f05fe..991a8f630704da3f2388c2edcfc160c1444ff96b 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatConfiguration.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatConfiguration.java @@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration; * 微信配置 * * @author xxm - * @date 2022/7/15 + * @since 2022/7/15 */ @Configuration @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatMessageRouterConfiguration.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatMessageRouterConfiguration.java index 70a6e03987a5572fd8ce4e9e86a75957b55f58d4..9799789b4a5d3c45dc2e00eb04b16ec45702327f 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatMessageRouterConfiguration.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatMessageRouterConfiguration.java @@ -15,7 +15,7 @@ import java.util.List; * 微信信息路由配置 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ @Slf4j @Configuration diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatProperties.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatProperties.java index 47b6fa53f65e413cb3ec734fc7c17ca0a64313a0..7d1c4353607b494e481342f654cc0fb01bd94d9a 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatProperties.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatProperties.java @@ -8,7 +8,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * 微信公众平台配置 * * @author xxm - * @date 2022/7/15 + * @since 2022/7/15 */ @Getter @Setter diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatArticleController.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatArticleController.java index 765380aee21a25b21e9b98be28d3371b8f5abc58..29749eaa6601b3d85e54ed628344c853c36c9d7c 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatArticleController.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatArticleController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2022/8/11 + * @since 2022/8/11 */ @Tag(name = "微信文章管理") @RestController diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMediaController.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMediaController.java index 163b523d69848f40a98a4f24a0789c809315ca0b..bfd82f4eba48aa41e7383256f4b15c59796b1fe8 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMediaController.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMediaController.java @@ -16,7 +16,7 @@ import static me.chanjar.weixin.mp.bean.material.WxMpMaterialNewsBatchGetResult. /** * @author xxm - * @date 2022/8/9 + * @since 2022/8/9 */ @Tag(name = "微信素材管理") @RestController diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMenuController.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMenuController.java index 9fd4bf9c0f44bbe9fdb3b0c1cf3364d70bf629da..1c556776ebcb0d7c106e5c64f02eea05823cc331 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMenuController.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMenuController.java @@ -18,7 +18,7 @@ import java.util.List; * 微信菜单管理 * * @author xxm - * @date 2022/8/6 + * @since 2022/8/6 */ @Tag(name = "微信菜单管理") @RestController diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatPortalController.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatPortalController.java index 644d6ea30ca6432b6f082fb4d4a64cec6c47577c..5028b4a09e629f3f44c7db945cefac300b5fb55d 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatPortalController.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatPortalController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*; * 微信工作台接入入口 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ @IgnoreAuth @Slf4j diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatQrLoginController.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatQrLoginController.java index c9a29a2f4dc09b3bb9be36f7017f1199b24ae819..de3fda8b67a052bb26e0ffc35264550d046aa90f 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatQrLoginController.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatQrLoginController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; * 微信 * * @author xxm - * @date 2022/8/4 + * @since 2022/8/4 */ @IgnoreAuth @Tag(name = "微信扫码登录") diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatTemplateController.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatTemplateController.java index 038ec7b9c7595241c6cc982d8f2b36a072784f55..d618de59bd0326c18f68cc2aa99ffa06f2eb6a3a 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatTemplateController.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatTemplateController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*; /** * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ @Tag(name = "微信模板消息") @RestController diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/article/service/WeChatArticleService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/article/service/WeChatArticleService.java index 77584a3625f7ec3ff2aa647e934948272a9eea6c..ade2a2b157e935ce6b3d0a19522dd8ab465cc617 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/article/service/WeChatArticleService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/article/service/WeChatArticleService.java @@ -14,7 +14,7 @@ import java.util.stream.Collectors; /** * @author xxm - * @date 2022/8/11 + * @since 2022/8/11 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/login/service/WeChatQrLoginService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/login/service/WeChatQrLoginService.java index 4c5602e55ed263ce62712baa4623465a162141f9..19af0f2747a88d793c964b87e3c4c65d9429e420 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/login/service/WeChatQrLoginService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/login/service/WeChatQrLoginService.java @@ -21,7 +21,7 @@ import static cn.bootx.platform.starter.wechat.code.WeChatCode.*; * 扫码事件 * * @author xxm - * @date 2022/8/4 + * @since 2022/8/4 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/media/service/WeChatMediaService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/media/service/WeChatMediaService.java index 14c55c64ef92eb7af2fe257dd151ca05991fd2f5..bfbb2095e390eeb11309ff162b2a07ee523b59f3 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/media/service/WeChatMediaService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/media/service/WeChatMediaService.java @@ -28,7 +28,7 @@ import java.util.stream.Collectors; * 素材管理 * * @author xxm - * @date 2022/8/9 + * @since 2022/8/9 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/convert/WeChatMenuConvert.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/convert/WeChatMenuConvert.java index 2390c680eb2a116e49c36b31c6232f0755082d4c..0b27d7196b0495936952f0e2a77240f42c45699a 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/convert/WeChatMenuConvert.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/convert/WeChatMenuConvert.java @@ -12,7 +12,7 @@ import org.mapstruct.factory.Mappers; * 微信自定义菜单 * * @author xxm - * @date 2022-08-08 + * @since 2022-08-08 */ @Mapper public interface WeChatMenuConvert { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuManager.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuManager.java index 7f5244cc3d984e5d9ed35d98c636ee9c55add592..d60b693f82825f364a47f20a0023b9c7d53bcd7d 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuManager.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuManager.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Repository; * 微信自定义菜单 * * @author xxm - * @date 2022-08-08 + * @since 2022-08-08 */ @Repository @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuMapper.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuMapper.java index a9138a44883566931d832ccc51971988b270ebc5..6934ab0e6cf0c0da78b5df297668e239297e0a8b 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuMapper.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 微信自定义菜单 * * @author xxm - * @date 2022-08-08 + * @since 2022-08-08 */ @Mapper public interface WeChatMenuMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/domin/WeChatMenuInfo.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/domin/WeChatMenuInfo.java index 2d30fcfa034a35eb90afaa05f8765388c835f279..aeb482c91cb1885f5f4518d82c7c9cc891727ec4 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/domin/WeChatMenuInfo.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/domin/WeChatMenuInfo.java @@ -15,7 +15,7 @@ import java.util.stream.Collectors; * 微信自定义菜单 * * @author xxm - * @date 2022/8/8 + * @since 2022/8/8 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/entity/WeChatMenu.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/entity/WeChatMenu.java index bfd549648abb4698e0630c9dc054bcc9ee2f034f..b983003c860d91c0bfa0533a14d55ac7f33d5f51 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/entity/WeChatMenu.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/entity/WeChatMenu.java @@ -18,7 +18,7 @@ import lombok.experimental.Accessors; * 微信自定义菜单 * * @author xxm - * @date 2022-08-08 + * @since 2022-08-08 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/service/WeChatMenuService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/service/WeChatMenuService.java index 16616b1322e34bb747e3df2135e549dd3529be6a..b1b5ace7382cd528e7bc86b2c9cbebbbcd7efa86 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/service/WeChatMenuService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/service/WeChatMenuService.java @@ -29,7 +29,7 @@ import java.util.List; * 微信菜单 * * @author xxm - * @date 2022/8/6 + * @since 2022/8/6 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/convert/WeChatTemplateConvert.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/convert/WeChatTemplateConvert.java index 4f65a68e3a3b0e25b8792ca2ca0401174a57d6e5..1b2ab3a1bb6223dc26162e0979d902d10e901d58 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/convert/WeChatTemplateConvert.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/convert/WeChatTemplateConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; /** * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Mapper public interface WeChatTemplateConvert { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateManager.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateManager.java index 57f9bf65e7bcec886178fbef50a05d34f50cf74e..888a9b30183770502c3dff09cec7656c5b029749 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateManager.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateManager.java @@ -16,7 +16,7 @@ import java.util.Optional; /** * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Slf4j @Repository diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateMapper.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateMapper.java index 15e67848e0c18507868bc16a80423a38074bd245..6cafda229f6617f963aabd81eea91bb22ef67046 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateMapper.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Mapper public interface WeChatTemplateMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/entity/WeChatTemplate.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/entity/WeChatTemplate.java index e174692bd567d4c35eb8d35dc940399b25f34655..54b835f8adab5ace893b1ec6e98a6d5d2c678d25 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/entity/WeChatTemplate.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/entity/WeChatTemplate.java @@ -18,7 +18,7 @@ import me.chanjar.weixin.mp.bean.template.WxMpTemplate; * 微信消息模板 * * @author xxm - * @date 2022-08-03 + * @since 2022-08-03 */ @FieldNameConstants @EqualsAndHashCode(callSuper = true) diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WeChatTemplateService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WeChatTemplateService.java index 985dfc533eaa28b9a80996b69f155cc332190e8f..b91c750740b0cd725f8b2b8f971e66819b0d4878 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WeChatTemplateService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WeChatTemplateService.java @@ -33,7 +33,7 @@ import java.util.stream.Collectors; * 微信消息模板 * * @author xxm - * @date 2022/7/15 + * @since 2022/7/15 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WechatNoticeService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WechatNoticeService.java index f8e51a967727de7154598bd8ccbcfd89e8e3f272..83eae983fb7d2d972ece7a7c9ea45bedd923f803 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WechatNoticeService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WechatNoticeService.java @@ -20,7 +20,7 @@ import java.util.stream.Collectors; * 微信消息通知功能 * * @author xxm - * @date 2022/7/15 + * @since 2022/7/15 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/portal/service/WeChatPortalService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/portal/service/WeChatPortalService.java index c4250101f66818b399ddd90a58a990f0881c7579..6b8d7c233bb16359030af4cfaa6e01e883390ded 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/portal/service/WeChatPortalService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/portal/service/WeChatPortalService.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; * 微信门户处理 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/convert/WechatFansConvert.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/convert/WechatFansConvert.java index c6754d644ab5eb9a2f9add8246e6d0b3df7d4056..125f468648b7d67ce9a5db585585b7bce18e85dd 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/convert/WechatFansConvert.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/convert/WechatFansConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 微信公众号粉丝 * * @author xxm - * @date 2022-07-16 + * @since 2022-07-16 */ @Mapper public interface WechatFansConvert { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansManager.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansManager.java index 7c2d60f77e46fb573a52407004e4ed554e6278a9..e526a91bbb1c102df01a44081da1f23f8edd40ff 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansManager.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansManager.java @@ -16,7 +16,7 @@ import java.util.Optional; * 微信公众号粉丝 * * @author xxm - * @date 2022-07-16 + * @since 2022-07-16 */ @Repository @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansMapper.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansMapper.java index 963a475cae850ad5bfbeaa3d84e1323dd17a9d86..fcea7f9e784c35c363c8a463fb58b2c05f455c53 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansMapper.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 微信公众号粉丝 * * @author xxm - * @date 2022-07-16 + * @since 2022-07-16 */ @Mapper public interface WechatFansMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/entity/WechatFans.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/entity/WechatFans.java index d5d4bc38a2031739d7aad1572581859b20e6aa1b..ce1a61eace896a816bbca049a08dd4493c67c709 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/entity/WechatFans.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/entity/WechatFans.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; * 微信粉丝 * * @author xxm - * @date 2022/7/15 + * @since 2022/7/15 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/service/WeChatUserService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/service/WeChatUserService.java index 9f6fa28ddf5287230ee58b2d92de05afb1aab97c..7da1a592ca57dc3564d5eb8843c587e1edab8d29 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/service/WeChatUserService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/service/WeChatUserService.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; * 微信用户相关接口 (获取不到详细信息了) * * @author xxm - * @date 2022/7/15 + * @since 2022/7/15 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/article/WeChatArticleDto.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/article/WeChatArticleDto.java index 0fda6f7ce4a96605de3edb6e3c3e161c50d7d76d..c7b145a7df7c816307caf7ec638691fd487ed45f 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/article/WeChatArticleDto.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/article/WeChatArticleDto.java @@ -15,7 +15,7 @@ import java.util.stream.Collectors; * 微信文章 * * @author xxm - * @date 2022/8/12 + * @since 2022/8/12 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/login/WeChatLoginQrCode.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/login/WeChatLoginQrCode.java index 7e9990118b561edbca58e3a187391f4c9c0d3db1..adab6d5ffc57e9e5ad686b8fde3837db4efd909b 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/login/WeChatLoginQrCode.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/login/WeChatLoginQrCode.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/8/4 + * @since 2022/8/4 */ @Data @AllArgsConstructor diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/media/WeChatMediaDto.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/media/WeChatMediaDto.java index af0a1b02435511a952fa41c5e8d766094a9448f7..850a302862d76aa9b4c35d5bd7750ada97ed8c12 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/media/WeChatMediaDto.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/media/WeChatMediaDto.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2022/8/12 + * @since 2022/8/12 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/menu/WeChatMenuDto.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/menu/WeChatMenuDto.java index 5955b832ad5961c7ef77efd3aca87dff991fab07..e9a93a59e66521a7573a470f0842f0cd300e40a4 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/menu/WeChatMenuDto.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/menu/WeChatMenuDto.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; * 微信自定义菜单 * * @author xxm - * @date 2022-08-08 + * @since 2022-08-08 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/notice/WeChatTemplateDto.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/notice/WeChatTemplateDto.java index 01d0a7f4c5df927f0009c60d8695493f4e46fd57..c2a42b8d703b29370c858456cd1e8314f22af811 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/notice/WeChatTemplateDto.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/notice/WeChatTemplateDto.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 微信消息模板 * * @author xxm - * @date 2022-08-03 + * @since 2022-08-03 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/user/WechatFansDto.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/user/WechatFansDto.java index 836b17ce1fa6e76cbe9a6483259c7046727e1edc..a0024f9ef73a39df0ac0d165ca5e6f515d055b33 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/user/WechatFansDto.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/user/WechatFansDto.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 微信公众号粉丝 * * @author xxm - * @date 2022-07-16 + * @since 2022-07-16 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/event/WeChatQrScanEvent.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/event/WeChatQrScanEvent.java index d5a08783752c6f628bb14e4eb754e4b97889d2df..b055a405a6bf4d2522967356f44c69fc40199514 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/event/WeChatQrScanEvent.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/event/WeChatQrScanEvent.java @@ -7,7 +7,7 @@ import org.springframework.context.ApplicationEvent; * 微信扫码关注事件 * * @author xxm - * @date 2022/8/4 + * @since 2022/8/4 */ @Getter public class WeChatQrScanEvent extends ApplicationEvent { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMpMessageHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMpMessageHandler.java index 1d5c974a27f8a1d327d7baeee3cf3b26ad456447..c49f32a550e9de08e89619834c6195e143ff060c 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMpMessageHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMpMessageHandler.java @@ -8,7 +8,7 @@ import me.chanjar.weixin.mp.constant.WxMpEventConstants; * 处理微信推送消息的处理器接口 (进行微封装) * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ public interface WeChatMpMessageHandler extends WxMpMessageHandler { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMsgHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMsgHandler.java index 1717d7da62a2bb4450b048b7a946fee67275c7d5..e2aa40b405356265654019679ff524e8010eafa5 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMsgHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMsgHandler.java @@ -16,7 +16,7 @@ import java.util.Map; * 微信接受文本消息处理 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatQrScanHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatQrScanHandler.java index d4fe53ac081ce0b7d7e824563af791f768e60206..e7df4b35cd1320fa036c5df7890835a5b8118ff6 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatQrScanHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatQrScanHandler.java @@ -21,7 +21,7 @@ import java.util.Objects; * 微信扫码事件 * * @author xxm - * @date 2022/8/4 + * @since 2022/8/4 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatSubscribeHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatSubscribeHandler.java index 758aa01eeaae928df98b2ddd8e095978dfcbb1b3..92018552749a0635676901aa740cc477b762d364 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatSubscribeHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatSubscribeHandler.java @@ -20,7 +20,7 @@ import java.util.Objects; * 新增关注订阅消息 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatUnSubscribeHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatUnSubscribeHandler.java index fbb499dd884f6edc58a32e634b15650a6fed933a..e1cd0b82ba545cb57521c60f19f621a40d910905 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatUnSubscribeHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatUnSubscribeHandler.java @@ -15,7 +15,7 @@ import java.util.Map; * 用户取消关注订阅消息 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WechatMenuHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WechatMenuHandler.java index d3dff71c6b74f28a2e467af0c84092f48a556277..d3ebe7a1706d4f8df7ac189cce2e940d252398b3 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WechatMenuHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WechatMenuHandler.java @@ -15,7 +15,7 @@ import java.util.Map; * 菜单点击事件 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrLoginHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrLoginHandler.java index 16e48911f5a0ddc4b98868ae70009deee833a0af..5e9b012a4bdc895351f5dd5c5bccc897cec48bac 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrLoginHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrLoginHandler.java @@ -20,7 +20,7 @@ import static cn.bootx.platform.starter.wechat.code.WeChatCode.QRSCENE_LOGIN; * 微信扫码登录 * * @author xxm - * @date 2023/3/21 + * @since 2023/3/21 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrSceneMsgHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrSceneMsgHandler.java index f24984bcc1ee66e6240538708819a56161d59acd..8bd427f388471c83c1f4ccece12e3ecfcae204f1 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrSceneMsgHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrSceneMsgHandler.java @@ -11,7 +11,7 @@ import java.util.Map; * 微信扫码消息处理 * * @author xxm - * @date 2023/3/21 + * @since 2023/3/21 */ public interface WeChatQrSceneMsgHandler { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/menu/WeChatMenuParam.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/menu/WeChatMenuParam.java index 56f159c9ad2b9544c3187bb10da2b37790577d16..22b950303d10a2ceb2891cbbbf87a8abe2c41716 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/menu/WeChatMenuParam.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/menu/WeChatMenuParam.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; * 微信自定义菜单 * * @author xxm - * @date 2022-08-08 + * @since 2022-08-08 */ @Data @Schema(title = "微信自定义菜单") diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/notice/WeChatTemplateParam.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/notice/WeChatTemplateParam.java index 9cfcd12bb80e177b595ee6a89732db34131c9ddc..53bfe8e9ea921a554bb216c129f5b8545ae1b11e 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/notice/WeChatTemplateParam.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/notice/WeChatTemplateParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 微信消息模板 * * @author xxm - * @date 2022-08-03 + * @since 2022-08-03 */ @Data @Schema(title = "微信消息模板") diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/portal/WeChatPortalParam.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/portal/WeChatPortalParam.java index 4e40f153278d91f88e246c7dd2e2d76c351170e8..8e3aec90b5f5ebce3df9138749ce71d5982fa161 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/portal/WeChatPortalParam.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/portal/WeChatPortalParam.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.wechat.param.portal; * 微信返回的消息入参 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ public class WeChatPortalParam { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/user/WechatFansParam.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/user/WechatFansParam.java index 647203f938019afc3ea862f88be8a0ab2c49160d..17b198b9e3f07ab86ebae2df6876846905dc0de6 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/user/WechatFansParam.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/user/WechatFansParam.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 微信公众号粉丝 * * @author xxm - * @date 2022-07-16 + * @since 2022-07-16 */ @Data @Schema(title = "微信公众号粉丝") diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/util/WeChatUtil.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/util/WeChatUtil.java index b9c6dfe15a0e4e6d1733e1d9ce933dc9585da050..9995319cc2c9861b3e7224c252a997ba63cbdca6 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/util/WeChatUtil.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/util/WeChatUtil.java @@ -7,7 +7,7 @@ import lombok.experimental.UtilityClass; * 微信工具类 * * @author xxm - * @date 2022/8/5 + * @since 2022/8/5 */ @UtilityClass public class WeChatUtil { diff --git a/bootx-common-starters/common-starter-wecom/pom.xml b/bootx-common-starters/common-starter-wecom/pom.xml index 5eebd87de8c2e9a88e79eb20f7c7e606ca579d59..4e9bdb3993578e4182faf76ef77211884b8f71d3 100644 --- a/bootx-common-starters/common-starter-wecom/pom.xml +++ b/bootx-common-starters/common-starter-wecom/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.3.1 + 1.3.3 4.0.0 jar diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/WeComAutoConfiguration.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/WeComAutoConfiguration.java index 88b5b69c7cf9341366dfbade367acc0e2753ddf9..1f2b4f742b95f054ad4fd1f1649898b9e62112d3 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/WeComAutoConfiguration.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/WeComAutoConfiguration.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.ComponentScan; * 企业微信 * * @author xxm - * @date 2022/7/22 + * @since 2022/7/22 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/code/WeComCode.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/code/WeComCode.java index b27a20959b540bdf78f47b7af3e5889846ab8dee..802a2367f937606eb7b8c48f84af110979744c44 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/code/WeComCode.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/code/WeComCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.wecom.code; * 企微常量 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ public interface WeComCode { diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComConfiguration.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComConfiguration.java index 681ea29659eff42b18c4cc0d3b08732be3568d32..7eb779a1698e84de0725ee06b2370a084c400d50 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComConfiguration.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComConfiguration.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.Configuration; /** * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Configuration @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComProperties.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComProperties.java index 53cd16675bf03c51188b47c458c8e05a905ab792..d3ee837a1c19441073e90623a2aaa5725029ce86 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComProperties.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComProperties.java @@ -8,7 +8,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * 企业微信配置 * * @author xxm - * @date 2022/7/22 + * @since 2022/7/22 */ @Getter @Setter diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/controller/WecomRobotConfigController.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/controller/WecomRobotConfigController.java index dc46a1ff2e6d87dcf7dee782972c4e6921bf52e0..c0cd78d42ba5d684d00e3d3aa89ef9b5b0d6ebc9 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/controller/WecomRobotConfigController.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/controller/WecomRobotConfigController.java @@ -16,7 +16,7 @@ import java.util.List; /** * @author xxm - * @date 2022/7/26 + * @since 2022/7/26 */ @Tag(name = "企业微信机器人配置") @RestController diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/executor/RecallNoticeRequestExecutor.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/executor/RecallNoticeRequestExecutor.java index 86cc1eea8b633a1c1b6f3001afc2bc2a9d64d45e..6283acee16e338651439c9860322ed448b44e6b1 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/executor/RecallNoticeRequestExecutor.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/executor/RecallNoticeRequestExecutor.java @@ -18,7 +18,7 @@ import static cn.bootx.platform.starter.wecom.code.WeComCode.NOTICE_MSG_ID; * 消息撤回请求执行器. * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ public class RecallNoticeRequestExecutor implements RequestExecutor { diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/service/WeComNoticeService.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/service/WeComNoticeService.java index 57c7bdba3abf086b7a28c9bd5066b3f2e373e8a2..9c5f7c721da070741c75a24ba9aa687ee36cf9cb 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/service/WeComNoticeService.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/service/WeComNoticeService.java @@ -24,7 +24,7 @@ import static cn.bootx.platform.starter.wecom.code.WeComCode.NOTICE_RECALL_URL; * 企业微信消息发送 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/convert/WecomRobotConfigConvert.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/convert/WecomRobotConfigConvert.java index 477bcaab7bfdf29bd295f5f97edc358363585a03..35d481edeaac338c85d09af7e34fcada33d0992b 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/convert/WecomRobotConfigConvert.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/convert/WecomRobotConfigConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 企业微信机器人配置 * * @author bootx - * @date 2022-07-23 + * @since 2022-07-23 */ @Mapper public interface WecomRobotConfigConvert { diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/dao/WecomRobotConfigManager.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/dao/WecomRobotConfigManager.java index b3857d1850c161ecf67aa7d53335d00338867450..f69bbd123650a331717fb10a2434b4346f31eb33 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/dao/WecomRobotConfigManager.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/dao/WecomRobotConfigManager.java @@ -17,7 +17,7 @@ import java.util.Optional; * 企业微信机器人配置 * * @author bootx - * @date 2022-07-23 + * @since 2022-07-23 */ @Repository @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/dao/WecomRobotConfigMapper.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/dao/WecomRobotConfigMapper.java index 06bfb14bc8a486a3706601b3d1e44d78561fe6d0..3eee2d08b624690344f52ee74593d760eb153043 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/dao/WecomRobotConfigMapper.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/dao/WecomRobotConfigMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 企业微信机器人配置 * * @author bootx - * @date 2022-07-23 + * @since 2022-07-23 */ @Mapper public interface WecomRobotConfigMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/domin/UploadMedia.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/domin/UploadMedia.java index 8f797d650cdeb99c4eb2008c0056e8f03e317d71..8a4bb67d207bfe8e35176d18424b1108fdb1294a 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/domin/UploadMedia.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/domin/UploadMedia.java @@ -10,7 +10,7 @@ import java.io.InputStream; * 企微文件上传 * * @author xxm - * @date 2022/7/24 + * @since 2022/7/24 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/entity/WecomRobotConfig.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/entity/WecomRobotConfig.java index 0a71922a661f24c02d9652427127a0fa8c7ca265..b38199c7f22c31c6bcd2837aa9f81bb8f9dc2ef9 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/entity/WecomRobotConfig.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/entity/WecomRobotConfig.java @@ -16,7 +16,7 @@ import lombok.experimental.Accessors; * 企业微信机器人配置 * * @author bootx - * @date 2022-07-23 + * @since 2022-07-23 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/executor/RobotMediaFileUploadRequestExecutor.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/executor/RobotMediaFileUploadRequestExecutor.java index 1b7299b68553bd455a44ce6ccdbb95462f0609b0..b8abd006aceb01dbe917c463c6edf5aa9751cab5 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/executor/RobotMediaFileUploadRequestExecutor.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/executor/RobotMediaFileUploadRequestExecutor.java @@ -18,7 +18,7 @@ import java.io.IOException; * 机器人文件素材上传 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ public class RobotMediaFileUploadRequestExecutor implements RequestExecutor { diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WeComRobotNoticeService.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WeComRobotNoticeService.java index 524f1ad8c52b9ef71a808a0ad62fb8d0e0dab769..ee14630e5b7b8e44d0362419657ac73134a54d98 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WeComRobotNoticeService.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WeComRobotNoticeService.java @@ -29,7 +29,7 @@ import static cn.bootx.platform.starter.wecom.code.WeComCode.ROBOT_UPLOAD_URL; * 企微机器人消息通知 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WecomRobotConfigService.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WecomRobotConfigService.java index 33b1a7bbc0f6c58e1ddd748326d28cd4c03da844..c29ab88ed8a9676ba1609f93b44d4bca7e0c4172 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WecomRobotConfigService.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WecomRobotConfigService.java @@ -21,7 +21,7 @@ import java.util.List; * 企业微信机器人配置 * * @author bootx - * @date 2022-07-23 + * @since 2022-07-23 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/dto/robot/WecomRobotConfigDto.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/dto/robot/WecomRobotConfigDto.java index e544899674b4bbd2a896a120896c09a447f170b8..caa743431b21efe2e1d6b3b9d36d81f7d4ff084c 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/dto/robot/WecomRobotConfigDto.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/dto/robot/WecomRobotConfigDto.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; * 企业微信机器人配置 * * @author bootx - * @date 2022-07-23 + * @since 2022-07-23 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/param/robot/WecomRobotConfigParam.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/param/robot/WecomRobotConfigParam.java index 0fa6cb42690e23af18c1363c32bb8897e762fd88..6207c2c6be31c01bcb31b8779ca68aef061df02f 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/param/robot/WecomRobotConfigParam.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/param/robot/WecomRobotConfigParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 企业微信机器人配置 * * @author bootx - * @date 2022-07-23 + * @since 2022-07-23 */ @Data @Schema(title = "企业微信机器人配置") diff --git a/bootx-common-starters/pom.xml b/bootx-common-starters/pom.xml index e86a091433c5beecbcb6c7814ee6bf512a2cedc5..3b798843ce49a4d5e5f3bad611a128b817746089 100644 --- a/bootx-common-starters/pom.xml +++ b/bootx-common-starters/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-cache/pom.xml b/bootx-commons/common-cache/pom.xml index 055d49a1d715d041392ebf4340f8e250d0d6099f..ad555584fa3c0cefdd30cdd845cae9472afccd22 100644 --- a/bootx-commons/common-cache/pom.xml +++ b/bootx-commons/common-cache/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/CacheAutoConfiguration.java b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/CacheAutoConfiguration.java index db4da7ebda3153ba820df6f2e1a22e904b04385b..f63761cad3e431493a0960db3288e2a8452b5634 100644 --- a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/CacheAutoConfiguration.java +++ b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/CacheAutoConfiguration.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * 缓存配置 * * @author xxm - * @date 2022/12/18 + * @since 2022/12/18 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCache.java b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCache.java index e9955cd1df518655d019ada39febfa61dfe99ff1..8952c96bb0e3507c06a0667d2485b0daa4dc822f 100644 --- a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCache.java +++ b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCache.java @@ -11,7 +11,7 @@ import java.util.Objects; * 自定义RedisCache, 缓存值为空不报错 * * @author xxm - * @date 2021/7/6 + * @since 2021/7/6 */ public class BootxRedisCache extends RedisCache { diff --git a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCacheManager.java b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCacheManager.java index 4aac9e5436fff402a1ca722ed5d33f0317fd1684..588e0d4d36ee062490d36e89a324eb8883b2f321 100644 --- a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCacheManager.java +++ b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCacheManager.java @@ -16,7 +16,7 @@ import java.util.Optional; * 自定义Redis缓存管理 * * @author xxm - * @date 2021/6/11 + * @since 2021/6/11 */ public class BootxRedisCacheManager extends RedisCacheManager { diff --git a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingConfiguration.java b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingConfiguration.java index 941ff9cd720f6ee10320b2ce38f3f18e26cecad3..595bd9aa74db8a09222daa4c1f9a1dfedb9e174c 100644 --- a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingConfiguration.java +++ b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingConfiguration.java @@ -25,7 +25,7 @@ import java.time.Duration; * 缓存自动配置 * * @author xxm - * @date 2021/6/11 + * @since 2021/6/11 */ @Configuration @EnableCaching diff --git a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingProperties.java b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingProperties.java index 6551aaafb4e0b345888e7eae7e1ab6f3ff2d353b..45ddc1a60d03d034e4fc517baef89b941a0ca5d5 100644 --- a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingProperties.java +++ b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingProperties.java @@ -11,7 +11,7 @@ import java.util.Map; * spring cache 配置 * * @author xxm - * @date 2021/6/11 + * @since 2021/6/11 */ @Data @Accessors(chain = true) diff --git a/bootx-commons/common-data-translate/pom.xml b/bootx-commons/common-data-translate/pom.xml index bc1b000515e03d4702367e181580cd0b1ae6f388..ba406178a11d3981d228beeb679c7a6244e89d94 100644 --- a/bootx-commons/common-data-translate/pom.xml +++ b/bootx-commons/common-data-translate/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/DataTranslateAutoConfiguration.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/DataTranslateAutoConfiguration.java index d6f98fa42978313aff1809ba084801650f9b18ea..812402f6f6d6517702c8dd90c826260eb80f2979 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/DataTranslateAutoConfiguration.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/DataTranslateAutoConfiguration.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.ComponentScan; * 数据翻译模块 * * @author xxm - * @date 2022/12/27 + * @since 2022/12/27 */ @ComponentScan @AutoConfiguration diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationAnnotationAdvisor.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationAnnotationAdvisor.java index c09399cc86a996bdeb888faee52e54db3b77cc4d..87627aeea1a0f43846819cabcddd2e449382d7f4 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationAnnotationAdvisor.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationAnnotationAdvisor.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; * 字段翻译切入点配置 * * @author xxm - * @date 2022/12/20 + * @since 2022/12/20 */ @Component @RequiredArgsConstructor diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationInterceptor.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationInterceptor.java index a6980fd281f86aa7a0c5ff7d428e7230920a4ff6..ab91ded9aa7123f22e7fa8b4e5b95ab8adad1e44 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationInterceptor.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationInterceptor.java @@ -19,7 +19,7 @@ import java.util.Objects; * 字段翻译切点 * * @author xxm - * @date 2022/12/20 + * @since 2022/12/20 */ @Component @RequiredArgsConstructor diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheFilter.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheFilter.java index 24114714852d81fe1c73f7e3463a2e6ccf597cb5..0ba55529aa4f204bd108fbf4d829da89d9ccde8d 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheFilter.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheFilter.java @@ -16,7 +16,7 @@ import java.io.IOException; * session缓存,用来减少一个请求中多次获取用户信息导致的多次访问redis * * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @Order(value = Integer.MIN_VALUE + 1) @Component diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheLocal.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheLocal.java index 14dcd67f3a5c18112b770a34589539f4ec69e32c..cdd41026c582913b28af8c5b98bcc0027f05ebe2 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheLocal.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheLocal.java @@ -14,7 +14,7 @@ import java.util.Set; * 字典翻译缓存 * * @author xxm - * @date 2023/1/29 + * @since 2023/1/29 */ @Slf4j @Service diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheService.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheService.java index 50da1fb61a58a8a151264af2abf02087c507f057..efe6202b571a69236e3449c42b17f91d6ea7ad86 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheService.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheService.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; /** * @author xxm - * @date 2023/1/30 + * @since 2023/1/30 */ @Slf4j @Service diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/domain/ConvertInfo.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/domain/ConvertInfo.java index e6b37cb5182e5c7b657afac7aff6f51ad386b2c3..83751d611386001d389e654fc8cfe419a307e696 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/domain/ConvertInfo.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/domain/ConvertInfo.java @@ -12,7 +12,7 @@ import java.lang.reflect.Field; * 字段信息 * * @author xxm - * @date 2023/1/31 + * @since 2023/1/31 */ @Getter @Setter diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/TranslationHandler.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/TranslationHandler.java index a54914b9bfe7cb2abe029059c216328c2fd7a6e2..75c3d085839272f9222fecce44e8b0fdff16e577 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/TranslationHandler.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/TranslationHandler.java @@ -8,7 +8,7 @@ import java.lang.reflect.Type; * 字典值翻译接口 * * @author xxm - * @date 2022/12/20 + * @since 2022/12/20 */ public interface TranslationHandler { diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultObjectTranslationHandler.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultObjectTranslationHandler.java index 5ca4002eca0fb334e9e3f5ff25a4a18e3ab6540d..de14acd861764fe510fd457c3bb26edddfaa1975 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultObjectTranslationHandler.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultObjectTranslationHandler.java @@ -16,7 +16,7 @@ import java.util.Map; * ResResult返回类的处理, 泛型 T 不为泛型类 * * @author xxm - * @date 2022/12/20 + * @since 2022/12/20 */ @Component @RequiredArgsConstructor diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageIterableTranslationHandler.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageIterableTranslationHandler.java index 0e9fc1ba34333fafffba3ce633e8f191c6b78981..b9893a680c398110d0c12659192240f59117a3e4 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageIterableTranslationHandler.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageIterableTranslationHandler.java @@ -17,7 +17,7 @@ import java.util.Map; * ResResult返回类的处理, 泛型 T 为 Iterable 的实现, 比如 List * * @author xxm - * @date 2022/12/20 + * @since 2022/12/20 */ @Component @RequiredArgsConstructor diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageTranslationHandler.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageTranslationHandler.java index 491e32f1a6717c00e2a3bd75240f6a2ef17556d9..2ddff40da4622342f3d5ab261e03352f2b88cb03 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageTranslationHandler.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageTranslationHandler.java @@ -19,7 +19,7 @@ import java.util.Map; * ResResult返回类的处理, 泛型 T 为分页类 * * @author xxm - * @date 2022/12/20 + * @since 2022/12/20 */ @Component @RequiredArgsConstructor diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/DictTranslationService.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/DictTranslationService.java index 91b50bc9e0a0d1310f26a945a2188fcdc383c65c..a977671377e643c225a696923f0beee5b5c4d5ff 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/DictTranslationService.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/DictTranslationService.java @@ -2,7 +2,7 @@ package cn.bootx.platform.common.translate.service; /** * @author xxm - * @date 2023/1/29 + * @since 2023/1/29 */ public interface DictTranslationService { diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/FieldTranslationService.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/FieldTranslationService.java index 444565cba3c2b6c2db7720f98c028eebaaa078e8..ba39c3de4a9b49f29a4b7ea11d2e20ffcdf3fde0 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/FieldTranslationService.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/FieldTranslationService.java @@ -26,7 +26,7 @@ import java.util.stream.Collectors; * 翻译服务 * * @author xxm - * @date 2023/1/29 + * @since 2023/1/29 */ @Slf4j @Service diff --git a/bootx-commons/common-eventer/pom.xml b/bootx-commons/common-eventer/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..4b09531828687b6b003f64c13b9828e586030f38 --- /dev/null +++ b/bootx-commons/common-eventer/pom.xml @@ -0,0 +1,16 @@ + + + 4.0.0 + + cn.bootx.platform + bootx-commons + 1.3.3 + + + common-eventer + jar + + + diff --git a/bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/EventAutoConfiguration.java b/bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/EventAutoConfiguration.java new file mode 100644 index 0000000000000000000000000000000000000000..6011e04f4b167721e2023d0f1a60f3ff210103b2 --- /dev/null +++ b/bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/EventAutoConfiguration.java @@ -0,0 +1,16 @@ +package cn.bootx.platform.common.event; + +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.context.properties.ConfigurationPropertiesScan; +import org.springframework.context.annotation.ComponentScan; + +/** + * 简单事件通知封装 + * @author xxm + * @since 2023/7/28 + */ +@ComponentScan +@ConfigurationPropertiesScan +@AutoConfiguration +public class EventAutoConfiguration { +} diff --git a/bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/code/EventTyoeEnum.java b/bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/code/EventTyoeEnum.java new file mode 100644 index 0000000000000000000000000000000000000000..18e375552912b1b24be0c8aaed8f3e501991afd9 --- /dev/null +++ b/bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/code/EventTyoeEnum.java @@ -0,0 +1,9 @@ +package cn.bootx.platform.common.event.code; + +/** + * 事件消息类型 + * @author xxm + * @since 2023/7/28 + */ +public enum EventTyoeEnum { +} diff --git a/bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/domain/AbsBaseEvent.java b/bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/domain/AbsBaseEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..da88feb3a3ee2d972c227d006e51af7929b666cf --- /dev/null +++ b/bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/domain/AbsBaseEvent.java @@ -0,0 +1,9 @@ +package cn.bootx.platform.common.event.domain; + +/** + * 抽象基础时间对象定义 + * @author xxm + * @since 2023/7/28 + */ +public class AbsBaseEvent { +} diff --git a/bootx-commons/common-eventer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-eventer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000000000000000000000000000000000000..ed92b4ccb27de9e2ffa61982f7c853bf9030ffa4 --- /dev/null +++ b/bootx-commons/common-eventer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.bootx.platform.common.event.EventAutoConfiguration diff --git a/bootx-commons/common-exception-handler/pom.xml b/bootx-commons/common-exception-handler/pom.xml index 8d8c670c895ef1f4b62998cb7e6e95f8f2c3aada..2adb989e93a1cee5958e9cff291ae565db9d38ba 100644 --- a/bootx-commons/common-exception-handler/pom.xml +++ b/bootx-commons/common-exception-handler/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.3 4.0.0 common-exception-handler diff --git a/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/ExceptionHandlerAutoConfiguration.java b/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/ExceptionHandlerAutoConfiguration.java index 6db83bac9f7899abd0e67d3f7c021d63ab799836..0e7ce71c4bf315daaea6ccfac664f45497bcbac3 100644 --- a/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/ExceptionHandlerAutoConfiguration.java +++ b/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/ExceptionHandlerAutoConfiguration.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * 异常处理程序 * * @author xxm - * @date 2022/12/18 + * @since 2022/12/18 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/ExceptionHandlerProperties.java b/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/ExceptionHandlerProperties.java index 27e27ab35dc396683a8a6108b11fb7d948855a3a..e8fb36ca7d67dd706cf0dd1648a0fead46c90755 100644 --- a/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/ExceptionHandlerProperties.java +++ b/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/ExceptionHandlerProperties.java @@ -8,7 +8,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * 配置 * * @author xxm - * @date 2021/12/5 + * @since 2021/12/5 */ @Getter @Setter diff --git a/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/RestExceptionHandler.java b/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/RestExceptionHandler.java index 60e971b9ac0db93ede754349118e065141a1785d..f6b84a26c6ed794df4ad558cbad09f0e6d028171 100644 --- a/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/RestExceptionHandler.java +++ b/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/RestExceptionHandler.java @@ -25,7 +25,7 @@ import javax.validation.ValidationException; * Web 项目异常处理 * * @author xxm - * @date 2020/5/8 15:30 + * @since 2020/5/8 15:30 */ @Slf4j @RestControllerAdvice diff --git a/bootx-commons/common-header-holder/pom.xml b/bootx-commons/common-header-holder/pom.xml index 97143b778ae730d485c0a00db10670e96cd0cea0..310e66e9ad61eb46bc19ef2de593f327355bcc07 100644 --- a/bootx-commons/common-header-holder/pom.xml +++ b/bootx-commons/common-header-holder/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/HeaderHolder.java b/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/HeaderHolder.java index 2a0d77d0f07cad8f661ceb405288151b9bb702c2..ed9b46c42aee141a8501c6d0c030aba6e9ec2150 100644 --- a/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/HeaderHolder.java +++ b/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/HeaderHolder.java @@ -14,7 +14,7 @@ import java.util.Objects; * 请求头获取工具类 * * @author xxm - * @date 2020/4/14 15:23 + * @since 2020/4/14 15:23 */ @UtilityClass public class HeaderHolder { diff --git a/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/filter/WebHeaderHolderInterceptor.java b/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/filter/WebHeaderHolderInterceptor.java index ca8077d8d5295a2ae02230b8faaf10b8703881f1..bf761c68a501aaf191e41b701dc7151a8cbddab1 100644 --- a/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/filter/WebHeaderHolderInterceptor.java +++ b/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/filter/WebHeaderHolderInterceptor.java @@ -17,7 +17,7 @@ import java.util.Enumeration; * 请求头保存 * * @author xxm - * @date 2021/4/20 + * @since 2021/4/20 */ @RequiredArgsConstructor @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) diff --git a/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/local/HolderContextHolder.java b/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/local/HolderContextHolder.java index e42e06c2ff3528487e8b6c2da72dc1ef18e03693..605cc701485b586c08123a94dcaa9b063a87af5b 100644 --- a/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/local/HolderContextHolder.java +++ b/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/local/HolderContextHolder.java @@ -11,7 +11,7 @@ import java.util.Optional; * 请求头TTL存储类 * * @author xxm - * @date 2021/4/20 + * @since 2021/4/20 */ public final class HolderContextHolder { diff --git a/bootx-commons/common-idempotency/pom.xml b/bootx-commons/common-idempotency/pom.xml index e4a6dc20c7accd9bac6cbc03087f594c0f400d99..d9d3745a06873c11dfd1c722a2d4e9f64c2344ff 100644 --- a/bootx-commons/common-idempotency/pom.xml +++ b/bootx-commons/common-idempotency/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-idempotency/src/main/java/cn/bootx/platform/common/idempotency/aop/IdempotentAop.java b/bootx-commons/common-idempotency/src/main/java/cn/bootx/platform/common/idempotency/aop/IdempotentAop.java index 93927d3bec8aabcf32a03fbe5ded2d9682eb5ef8..f62ca9f558b57f17c2929bfe4fd558995f19271f 100644 --- a/bootx-commons/common-idempotency/src/main/java/cn/bootx/platform/common/idempotency/aop/IdempotentAop.java +++ b/bootx-commons/common-idempotency/src/main/java/cn/bootx/platform/common/idempotency/aop/IdempotentAop.java @@ -23,7 +23,7 @@ import java.util.Locale; * 幂等处理器切面 * * @author xxm - * @date 2021/08/20 + * @since 2021/08/20 */ @Aspect @Slf4j diff --git a/bootx-commons/common-jackson/pom.xml b/bootx-commons/common-jackson/pom.xml index 2669c223e8a66afa1378e99e853f0d07d4bd922a..51b8342763e807705f459957c9d6ab7ade20b5c8 100644 --- a/bootx-commons/common-jackson/pom.xml +++ b/bootx-commons/common-jackson/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/JacksonAutoConfiguration.java b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/JacksonAutoConfiguration.java index c59159a3a2fefb63a15d562ee62701d3e70f4be4..0c69ecfbf4cfd5f0a1f359233dbad3275c12d4f7 100644 --- a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/JacksonAutoConfiguration.java +++ b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/JacksonAutoConfiguration.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.ComponentScan; * Jackson模块 * * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ @ComponentScan @AutoConfiguration diff --git a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/configuration/JacksonConfiguration.java b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/configuration/JacksonConfiguration.java index 2379a3510b525d0964430cdea5b75084a6c3ee3b..866396bd72457aee29fe5aa37f9721b44bc6d82b 100644 --- a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/configuration/JacksonConfiguration.java +++ b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/configuration/JacksonConfiguration.java @@ -23,7 +23,7 @@ import org.springframework.context.annotation.Primary; * jackson 序列化 * * @author xxm - * @date 2020/4/23 22:28 + * @since 2020/4/23 22:28 */ @Configuration @AutoConfigureBefore(JacksonAutoConfiguration.class) diff --git a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/Java8TimeModule.java b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/Java8TimeModule.java index 9665f9a4d107cf67798d9ab82f6cd1e7989a815b..dfc1d39c81d9529d370a026c8302535e9700bc34 100644 --- a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/Java8TimeModule.java +++ b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/Java8TimeModule.java @@ -18,7 +18,7 @@ import java.time.format.DateTimeFormatter; * java8 时间序列化 * * @author xxm - * @date 2020/4/14 13:33 + * @since 2020/4/14 13:33 */ public class Java8TimeModule extends SimpleModule { diff --git a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/JavaLongTypeModule.java b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/JavaLongTypeModule.java index d6807ab9ee0a12df898bc7d598b2d8d3e48105ef..12d2cba76edd54fd3c1d6817d35081a0e5c99f42 100644 --- a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/JavaLongTypeModule.java +++ b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/JavaLongTypeModule.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; * Long 类型序列化为String * * @author xxm - * @date 2020/4/14 13:35 + * @since 2020/4/14 13:35 */ public class JavaLongTypeModule extends SimpleModule { diff --git a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/util/JacksonUtil.java b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/util/JacksonUtil.java index d810a4535a59026852dccfaa4e75a0383f25d7cc..39e73b3b5f0e9f1ed39f7cdb4ad660742a269678 100644 --- a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/util/JacksonUtil.java +++ b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/util/JacksonUtil.java @@ -12,7 +12,7 @@ import java.util.List; * jackson常用工具类封装 * * @author xxm - * @date 2020/11/29 + * @since 2020/11/29 */ @Slf4j public class JacksonUtil { @@ -29,6 +29,7 @@ public class JacksonUtil { if (objectMapperFlag) { throw new RepetitiveOperationException(); } + objectMapperFlag = true; JacksonUtil.objectMapper = objectMapper; } @@ -36,6 +37,7 @@ public class JacksonUtil { if (typeObjectMapperFlag) { throw new RepetitiveOperationException(); } + typeObjectMapperFlag = true; JacksonUtil.typeObjectMapper = typeObjectMapper; } diff --git a/bootx-commons/common-log/pom.xml b/bootx-commons/common-log/pom.xml index f2bfc0bec628c262571ca805700d1b1d48b0a8bc..96da106df656db3e42bf3b0b22c7f5e86fa25fac 100644 --- a/bootx-commons/common-log/pom.xml +++ b/bootx-commons/common-log/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/LogAutoConfiguration.java b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/LogAutoConfiguration.java index 1ffc3501f15302d2814428625daf53d7ec67e538..48c04bb47cc669c78c2e0e22c65630ab7ba19132 100644 --- a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/LogAutoConfiguration.java +++ b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/LogAutoConfiguration.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * 日志扫描 * * @author xxm - * @date 2022/6/6 + * @since 2022/6/6 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/configuration/LogProperties.java b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/configuration/LogProperties.java index c1cf646c2304920c03ef408d9dbe3896ff179b1e..94065fcf1e64aeabee8370c7b0081f4a415e5a5c 100644 --- a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/configuration/LogProperties.java +++ b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/configuration/LogProperties.java @@ -7,7 +7,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; /** * 日志配置 * @author xxm - * @date 2023/3/29 + * @since 2023/3/29 */ @Getter @Setter diff --git a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/LogTraceHeaderHolderFilter.java b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/LogTraceHeaderHolderFilter.java index a387c3bdb3f0fa968a48bead0c312748e0675d62..cdf583578889cc589d853e7a45e80dc3408bc19b 100644 --- a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/LogTraceHeaderHolderFilter.java +++ b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/LogTraceHeaderHolderFilter.java @@ -20,7 +20,7 @@ import java.io.IOException; * 针对请求生成链路追踪ID * * @author xxm - * @date 2021/4/20 + * @since 2021/4/20 */ @Order(value = Integer.MIN_VALUE) @Component diff --git a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/SensitiveDataLogConverter.java b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/SensitiveDataLogConverter.java index 36095bc63ea8c70a1ea355e67ab8549a672ddac9..8e96a3498e359fd3e3165236de271be62ed8cf5a 100644 --- a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/SensitiveDataLogConverter.java +++ b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/SensitiveDataLogConverter.java @@ -11,7 +11,7 @@ import java.util.Map; * 敏感数据脱敏 * * @author xxm - * @date 2021/1/4 + * @since 2021/1/4 */ public class SensitiveDataLogConverter extends MessageConverter { diff --git a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/plumelog/PlumeLogAutoDeleteLogs.java b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/plumelog/PlumeLogAutoDeleteLogs.java index eabc4615fc72cb6958dbcc3117a6b0fcb8a91bf1..44c3516c6a2fe0d81f64fff8bee55484c357625b 100644 --- a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/plumelog/PlumeLogAutoDeleteLogs.java +++ b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/plumelog/PlumeLogAutoDeleteLogs.java @@ -1,65 +1,65 @@ -package cn.bootx.platform.common.log.plumelog; - -import cn.bootx.platform.common.log.configuration.LogProperties; -import cn.hutool.core.io.FileUtil; -import cn.hutool.core.util.StrUtil; -import com.plumelog.lite.client.IndexUtil; -import com.plumelog.lite.client.InitConfig; -import lombok.RequiredArgsConstructor; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.io.File; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - -/** - * PlumeLog日志删除定时任务的重新实现, 原有的日志清除逻辑是基于Lucene实现的, 文件夹将会残留, 同时还会创建出每个小时的新文件夹 - * @author xxm - * @date 2023/3/29 - */ -@Component -@ConditionalOnClass(name = "com.plumelog.lite.client.InitConfig") -@RequiredArgsConstructor -public class PlumeLogAutoDeleteLogs { - private final LogProperties logProperties; - /** - * 自动删除日志,凌晨0点执行 - */ - @Scheduled(cron = "0 0 0 * * ?") - public void task(){ - LogProperties.PlumeLog plumeLog = logProperties.getPlumeLog(); - if (plumeLog.getKeepDays()<=0){ - return; - } - // 生成不需要删除的日志文件夹名称序列 - Set logDirSeq = IntStream.rangeClosed(0, plumeLog.getKeepDays()) - .mapToObj(i -> IndexUtil.getRunLogIndex(System.currentTimeMillis() - i * InitConfig.MILLS_ONE_DAY)) - .collect(Collectors.toSet()); - - // 每天的日志文件夹进行清理 - File dir = new File(InitConfig.LITE_MODE_LOG_PATH + "/data"); - if (dir.isDirectory()) { - File[] files = dir.listFiles(); - if (Objects.isNull(files)){ - return; - } - for (File file : files) { - // 如果不是日志文件夹, 继续向下执行 - if (!StrUtil.startWith(file.getName(),"")){ - continue; - } - // 如果属于不需要删除的日志, 继续向下执行 - if (logDirSeq.contains(file.getName())){ - continue; - } - // 删除过时的日志文件夹 - FileUtil.del(file); - } - } - } - -} +//package cn.bootx.platform.common.log.plumelog; +// +//import cn.bootx.platform.common.log.configuration.LogProperties; +//import cn.hutool.core.io.FileUtil; +//import cn.hutool.core.util.StrUtil; +//import com.plumelog.lite.client.IndexUtil; +//import com.plumelog.lite.client.InitConfig; +//import lombok.RequiredArgsConstructor; +//import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +//import org.springframework.scheduling.annotation.Scheduled; +//import org.springframework.stereotype.Component; +// +//import java.io.File; +//import java.util.Objects; +//import java.util.Set; +//import java.util.stream.Collectors; +//import java.util.stream.IntStream; +// +///** +// * PlumeLog日志删除定时任务的重新实现, 原有的日志清除逻辑是基于Lucene实现的, 文件夹将会残留, 同时还会创建出每个小时的新文件夹 +// * @author xxm +// * @since 2023/3/29 +// */ +//@Component +//@ConditionalOnClass(name = "com.plumelog.lite.client.InitConfig") +//@RequiredArgsConstructor +//public class PlumeLogAutoDeleteLogs { +// private final LogProperties logProperties; +// /** +// * 自动删除日志,凌晨0点执行 +// */ +// @Scheduled(cron = "0 0 0 * * ?") +// public void task(){ +// LogProperties.PlumeLog plumeLog = logProperties.getPlumeLog(); +// if (plumeLog.getKeepDays()<=0){ +// return; +// } +// // 生成不需要删除的日志文件夹名称序列 +// Set logDirSeq = IntStream.rangeClosed(0, plumeLog.getKeepDays()) +// .mapToObj(i -> IndexUtil.getRunLogIndex(System.currentTimeMillis() - i * InitConfig.MILLS_ONE_DAY)) +// .collect(Collectors.toSet()); +// +// // 每天的日志文件夹进行清理 +// File dir = new File(InitConfig.LITE_MODE_LOG_PATH + "/data"); +// if (dir.isDirectory()) { +// File[] files = dir.listFiles(); +// if (Objects.isNull(files)){ +// return; +// } +// for (File file : files) { +// // 如果不是日志文件夹, 继续向下执行 +// if (!StrUtil.startWith(file.getName(),"")){ +// continue; +// } +// // 如果属于不需要删除的日志, 继续向下执行 +// if (logDirSeq.contains(file.getName())){ +// continue; +// } +// // 删除过时的日志文件夹 +// FileUtil.del(file); +// } +// } +// } +// +//} diff --git a/bootx-commons/common-log/src/main/java/org/slf4j/impl/StaticMDCBinder.java b/bootx-commons/common-log/src/main/java/org/slf4j/impl/StaticMDCBinder.java index 7b4baa76e2d290ed0e173fdfbffccf279678b215..abe6c5c3168a416add96fa39543f5331524340c3 100644 --- a/bootx-commons/common-log/src/main/java/org/slf4j/impl/StaticMDCBinder.java +++ b/bootx-commons/common-log/src/main/java/org/slf4j/impl/StaticMDCBinder.java @@ -6,7 +6,7 @@ import org.slf4j.spi.MDCAdapter; * 静态 MDC 粘合剂 覆盖原始类 * * @author xxm - * @date 2021/8/4 + * @since 2021/8/4 */ public class StaticMDCBinder { diff --git a/bootx-commons/common-log/src/main/java/org/slf4j/impl/TtlMDCAdapter.java b/bootx-commons/common-log/src/main/java/org/slf4j/impl/TtlMDCAdapter.java index 873c2fdde274f49f1ce42952403c93a2a01f8eae..c770e009b08fa2724649bc259e171ec17a23c644 100644 --- a/bootx-commons/common-log/src/main/java/org/slf4j/impl/TtlMDCAdapter.java +++ b/bootx-commons/common-log/src/main/java/org/slf4j/impl/TtlMDCAdapter.java @@ -12,7 +12,7 @@ import java.util.Set; * TTL MDC 适配器 覆盖原始类 * * @author xxm - * @date 2021/8/4 + * @since 2021/8/4 */ public class TtlMDCAdapter implements MDCAdapter { diff --git a/bootx-commons/common-mongo/pom.xml b/bootx-commons/common-mongo/pom.xml index 8d71312b9e935bba5d64361e5178e2bf79a9d0f2..293551c9bd2f132b88f4aed9cd767f4f08b62c89 100644 --- a/bootx-commons/common-mongo/pom.xml +++ b/bootx-commons/common-mongo/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.1 + 1.3.3 4.0.0 common-mongo diff --git a/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/MongoCommonAutoConfiguration.java b/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/MongoCommonAutoConfiguration.java index 93ce76d856e7571e27b82876c0de20543855ae51..a56c3c9425e9f3a189df879d9a13cd9e47dc7842 100644 --- a/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/MongoCommonAutoConfiguration.java +++ b/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/MongoCommonAutoConfiguration.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.ComponentScan; * mongo配置 * * @author xxm - * @date 2022/1/21 + * @since 2022/1/21 */ @ComponentScan @AutoConfiguration diff --git a/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/config/MongoConfiguration.java b/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/config/MongoConfiguration.java index 10006560af7c69e7f765f82ed0d365e3e47f6af8..68c8fc5026be51bb2bb3ff70a71e1c280e45f2b8 100644 --- a/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/config/MongoConfiguration.java +++ b/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/config/MongoConfiguration.java @@ -10,7 +10,7 @@ import org.springframework.data.mongodb.MongoTransactionManager; * mongo相关配置 * * @author xxm - * @date 2022/1/21 + * @since 2022/1/21 */ @Slf4j @Configuration diff --git a/bootx-commons/common-mybatis-plus/pom.xml b/bootx-commons/common-mybatis-plus/pom.xml index b537d380ec6e08a619e7bcda8ed60374ce59be13..06f249b084f3c444ac0212af4439a716053d6a60 100644 --- a/bootx-commons/common-mybatis-plus/pom.xml +++ b/bootx-commons/common-mybatis-plus/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/MybatisPlusCommonAutoConfiguration.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/MybatisPlusCommonAutoConfiguration.java index 7b9819b6e452007d631a0917a69e920465caab64..21b3c5f7fdbf5714de6d5b2c260c1a520a296386 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/MybatisPlusCommonAutoConfiguration.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/MybatisPlusCommonAutoConfiguration.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * mybatis自动配置 * * @author xxm - * @date 2021/7/27 + * @since 2021/7/27 */ @AutoConfiguration @ComponentScan diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpBaseEntity.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpBaseEntity.java index ae7ccf2d281b28b53dc2206c1bbdb72b716c210e..46708cbd6d8a5e73dd6606e760ab9003283431aa 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpBaseEntity.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpBaseEntity.java @@ -12,7 +12,7 @@ import java.io.Serializable; * 基础实体类 (带软删除) * * @author xxm - * @date 2021/7/27 + * @since 2021/7/27 */ @Getter @Setter diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpCreateEntity.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpCreateEntity.java index fe0b318b0e74e64930da887cca7c75b899aa80ff..ba0a8f01731f623d88e57509e262ba6717ad8fae 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpCreateEntity.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpCreateEntity.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2022/7/26 + * @since 2022/7/26 */ @Getter @Setter diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpDelEntity.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpDelEntity.java index f014f9f7011f30108a8c7d3c29742c2143ae1f49..3f8f7d1d281fb6dad92b912725b9547d4b3ac60f 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpDelEntity.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpDelEntity.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; * MP基础类, 真实删除 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Getter @Setter diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpIdEntity.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpIdEntity.java index 515517189499ac4135f2b0924add232c04114f46..c88895094027b1f0be608ab164341f3a582c97a1 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpIdEntity.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpIdEntity.java @@ -13,7 +13,7 @@ import java.io.Serializable; * mybatis plus id实体 * * @author xxm - * @date 2021/8/17 + * @since 2021/8/17 */ @Getter @Setter diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/configuration/MpConfiguration.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/configuration/MpConfiguration.java index 871b917ce4a023b459709a1605a95989f31a8079..b82055ad267b97dff8566a8044faa61de8f03794 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/configuration/MpConfiguration.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/configuration/MpConfiguration.java @@ -15,7 +15,7 @@ import java.util.List; * mybatis自动配置 * * @author xxm - * @date 2021/7/27 + * @since 2021/7/27 */ @Configuration @RequiredArgsConstructor diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/extension/DataChangeRecorderInnerInterceptor.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/extension/DataChangeRecorderInnerInterceptor.java index 00b753696317a66eaf814a6ed7df9c561df72ca5..57ab743bb34fd7164ecedc5ac5986001fe02de5e 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/extension/DataChangeRecorderInnerInterceptor.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/extension/DataChangeRecorderInnerInterceptor.java @@ -55,7 +55,7 @@ import java.util.concurrent.ConcurrentHashMap; * 数据变动记录插件, 基于MP官方进行修改 * * @author xxm - * @date 2023/1/5 + * @since 2023/1/5 */ @Slf4j public class DataChangeRecorderInnerInterceptor implements InnerInterceptor { @@ -649,7 +649,7 @@ public class DataChangeRecorderInnerInterceptor implements InnerInterceptor { * 数据变动记录 * * @author xxm - * @date 2023/1/7 + * @since 2023/1/7 */ @Data public static class DataChangedRecord { diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/IntegerListTypeHandler.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/IntegerListTypeHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..a5afb5b1e55d9cf35644c4bc60de0c0c6a57668c --- /dev/null +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/IntegerListTypeHandler.java @@ -0,0 +1,39 @@ +package cn.bootx.platform.common.mybatisplus.handler; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler; +import org.apache.ibatis.type.JdbcType; +import org.apache.ibatis.type.MappedJdbcTypes; +import org.apache.ibatis.type.MappedTypes; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +/** + * List 的类型转换器类 + * @author xxm + * @since 2023/8/8 + */ +@MappedTypes(List.class) +@MappedJdbcTypes({JdbcType.VARCHAR,JdbcType.LONGVARCHAR}) +public class IntegerListTypeHandler extends AbstractJsonTypeHandler> { + + private static final String COMMA = ","; + + @Override + protected List parse(String value) { + if (StrUtil.isNotBlank(value)){ + int[] longs = StrUtil.splitToInt(value, COMMA); + return Arrays.stream(longs).boxed().collect(Collectors.toList()); + } + return null; + } + + @Override + protected String toJson(List obj) { + return CollUtil.join(obj, COMMA); + + } +} diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/JacksonRawTypeHandler.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/JacksonRawTypeHandler.java index 54c9ebb9922a1e7b52af9ea90fd18eff601aecb0..053c2394941969a4c499df7a91037750d1b35169 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/JacksonRawTypeHandler.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/JacksonRawTypeHandler.java @@ -12,7 +12,7 @@ import org.apache.ibatis.type.MappedTypes; * Jackson 实现 JSON 字段类型处理器, 会记录对象属性类型, 通常用于被容器(List、Set、Map)包装的属性上 * * @author xxm - * @date 2022/7/11 + * @since 2022/7/11 */ @Slf4j @MappedTypes({ Object.class }) diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/LongListTypeHandler.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/LongListTypeHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..5c3393a668c5a688adacf0ec622440616645ac17 --- /dev/null +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/LongListTypeHandler.java @@ -0,0 +1,39 @@ +package cn.bootx.platform.common.mybatisplus.handler; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler; +import org.apache.ibatis.type.JdbcType; +import org.apache.ibatis.type.MappedJdbcTypes; +import org.apache.ibatis.type.MappedTypes; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +/** + * List 的类型转换器类 + * @author xxm + * @since 2023/8/8 + */ +@MappedTypes(List.class) +@MappedJdbcTypes({JdbcType.VARCHAR,JdbcType.LONGVARCHAR}) +public class LongListTypeHandler extends AbstractJsonTypeHandler> { + + private static final String COMMA = ","; + + @Override + protected List parse(String value) { + if (StrUtil.isNotBlank(value)){ + long[] longs = StrUtil.splitToLong(value, COMMA); + return Arrays.stream(longs).boxed().collect(Collectors.toList()); + } + return null; + } + + @Override + protected String toJson(List obj) { + return CollUtil.join(obj, COMMA); + + } +} diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/SnowflakeIdentifierGenerator.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/SnowflakeIdentifierGenerator.java index 9bb639db9e87927984283094f7e142168c3208d7..1cf40a7ce984c6626c5c5ff46028786723188d4a 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/SnowflakeIdentifierGenerator.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/SnowflakeIdentifierGenerator.java @@ -8,7 +8,7 @@ import lombok.RequiredArgsConstructor; * 雪花id生成器 * * @author xxm - * @date 2021/8/18 + * @since 2021/8/18 */ @RequiredArgsConstructor public class SnowflakeIdentifierGenerator implements IdentifierGenerator { diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/StringListTypeHandler.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/StringListTypeHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..13d82667ae832ef5f025069ef97d9319356d3d57 --- /dev/null +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/StringListTypeHandler.java @@ -0,0 +1,40 @@ +package cn.bootx.platform.common.mybatisplus.handler; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler; +import org.apache.ibatis.type.JdbcType; +import org.apache.ibatis.type.MappedJdbcTypes; +import org.apache.ibatis.type.MappedTypes; + +import java.util.List; + +/** + * List 的类型转换器类 + * @author xxm + * @since 2023/8/8 + */ +@MappedTypes(List.class) +@MappedJdbcTypes({JdbcType.VARCHAR,JdbcType.LONGVARCHAR}) +public class StringListTypeHandler extends AbstractJsonTypeHandler> { + private static final String COMMA = ","; + + /** + * 反系列化 + */ + @Override + protected List parse(String value) { + if (StrUtil.isNotBlank(value)){ + return StrUtil.splitTrim(value, COMMA); + } + return null; + } + + /** + * 序列化 + */ + @Override + protected String toJson(List obj) { + return CollUtil.join(obj, COMMA); + } +} diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/impl/BaseManager.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/impl/BaseManager.java index d57c94b4a711c6794bf3b1d0ab0eaf2cc4e510ba..9f81bf0d28b3460cc9e91251ccdab5e399385307 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/impl/BaseManager.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/impl/BaseManager.java @@ -34,7 +34,7 @@ import java.util.function.BiConsumer; * 自定义的基础数据库Manager操作类 类似自带的ServiceImpl类 * * @author xxm - * @date 2020/4/15 14:26 + * @since 2020/4/15 14:26 */ public class BaseManager, T> { diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptor.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptor.java index de233864edf3169c98450d01c60f54e4a70575c4..461f1955809bb3725bba7db48e59fc24307f990f 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptor.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptor.java @@ -7,7 +7,7 @@ import lombok.*; * mp插件包装(支持排序) * * @author xxm - * @date 2021/12/21 + * @since 2021/12/21 */ @Getter @Setter diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptorConfiguration.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptorConfiguration.java index 7ca2402d8744a07a9ff39ecb834fc255e9274ede..b72b78bdad0aa689236e245139478a60dbe0f64f 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptorConfiguration.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptorConfiguration.java @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration; * 插件容器 * * @author xxm - * @date 2021/12/21 + * @since 2021/12/21 */ @Configuration public class MpInterceptorConfiguration { diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/util/MpUtil.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/util/MpUtil.java index d7b4811a6808d2dd59bd8b78d736b2d14e4b6222..fcb146079ae7ea496535717bf53d72c494039ed9 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/util/MpUtil.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/util/MpUtil.java @@ -37,7 +37,7 @@ import java.util.stream.Collectors; * MP工具类 * * @author xxm - * @date 2020/4/21 10:00 + * @since 2020/4/21 10:00 */ public class MpUtil { diff --git a/bootx-commons/common-rabbitmq/pom.xml b/bootx-commons/common-rabbitmq/pom.xml index e7101dadf48f15fbe795b75caba39bbfd0ac1cbc..9c49e2f1e286e8f4d8a94db3173bfd915a0f5a20 100644 --- a/bootx-commons/common-rabbitmq/pom.xml +++ b/bootx-commons/common-rabbitmq/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/RabbitMqCommonAutoConfiguration.java b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/RabbitMqCommonAutoConfiguration.java index 015a0fd8f2af4e7bd74217256b8485d3c6638f77..1b4cf0c33fe73be1379d3d53956f7995ceaaca73 100644 --- a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/RabbitMqCommonAutoConfiguration.java +++ b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/RabbitMqCommonAutoConfiguration.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * RabbitMQ配置 * * @author xxm - * @date 2022/5/3 + * @since 2022/5/3 */ @ComponentScan @AutoConfiguration diff --git a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/ConditionalOnRabbit.java b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/ConditionalOnRabbit.java index 17160cfefde7659373a8b2f8492d2835876d896a..b8b670c80146dfc3dd6d3e8663e17cdda58525d9 100644 --- a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/ConditionalOnRabbit.java +++ b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/ConditionalOnRabbit.java @@ -12,7 +12,7 @@ import java.lang.annotation.*; * 从而避免`RabbitMQ`进行无限尝试重连服务器,导致项目一直抛出异常,影响开发和使用。 * * @author xxm - * @date 2022/12/12 + * @since 2022/12/12 */ @Target({ ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/OnRabbitEnable.java b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/OnRabbitEnable.java index d90e0141ef4a5f5a5039c84acdd3382a3fef0407..8082675fcb745750fade33f3a545e92ebc85a220 100644 --- a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/OnRabbitEnable.java +++ b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/OnRabbitEnable.java @@ -10,7 +10,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; * 判断是否在启用了Rabbit, 用来控制在没启用Rabbit情况下. 不将 @RabbitListener 修饰的监听器注册为Bean, 不然会导致无限尝试重连 * * @author xxm - * @date 2022/12/12 + * @since 2022/12/12 */ public class OnRabbitEnable implements Condition { diff --git a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/BootxRabbitListenerConfigurer.java b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/BootxRabbitListenerConfigurer.java index 162bcbe6516fdb1b7f29a798d415d0d9e66e3721..9dbdc715ef712f5b535dc7b8f96ff1cc8fc1b62d 100644 --- a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/BootxRabbitListenerConfigurer.java +++ b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/BootxRabbitListenerConfigurer.java @@ -10,7 +10,7 @@ import org.springframework.messaging.handler.annotation.support.DefaultMessageHa * Rabbit 侦听器配置器 * * @author xxm - * @date 2021/6/25 + * @since 2021/6/25 */ @Configuration @RequiredArgsConstructor diff --git a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqConfigurer.java b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqConfigurer.java index 211c67b0db25c0a195732f8ce0e2b81d6f361a88..fac5fb2737e87fcd1743b11302f80e0b2aad6abc 100644 --- a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqConfigurer.java +++ b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqConfigurer.java @@ -14,7 +14,7 @@ import org.springframework.messaging.handler.annotation.support.DefaultMessageHa * 消息队列配置 * * @author xxm - * @date 2021/6/25 + * @since 2021/6/25 */ @EnableRabbit @Configuration diff --git a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqProperties.java b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqProperties.java index 9ad3ad434de69402458f6ced61116238f64bd679..91c55d761ececaf85bc9e40f64703a7d837fd72a 100644 --- a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqProperties.java +++ b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqProperties.java @@ -9,7 +9,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * MQTT配置 * * @author xxm - * @date 2022/12/12 + * @since 2022/12/12 */ @Getter @Setter diff --git a/bootx-commons/common-redis-client/pom.xml b/bootx-commons/common-redis-client/pom.xml index f19b6ef562c50be020ef2d0f79339d67c79ae6ba..f76c657367796ee2dc60ffdf456254de407822d4 100644 --- a/bootx-commons/common-redis-client/pom.xml +++ b/bootx-commons/common-redis-client/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisApplication.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisApplication.java index a82f895cc9840d825f383f5ef29ee5deff3655b2..c1b8d839beed2aa872f7d8a4cb238a841de6086f 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisApplication.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisApplication.java @@ -6,7 +6,7 @@ import org.springframework.context.annotation.ComponentScan; * redis配置 * * @author xxm - * @date 2022/5/7 + * @since 2022/5/7 */ @ComponentScan public class RedisApplication { diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisClient.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisClient.java index 4d4af9640d42a28b8c6a13c139915e1673d1af10..4769f76d89ae9590646ee834cc6d7e8d3f791ce8 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisClient.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisClient.java @@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit; * redis请求类 * * @author xxm - * @date 2020/4/9 15:34 + * @since 2020/4/9 15:34 */ @RequiredArgsConstructor public class RedisClient { diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/code/RedisCode.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/code/RedisCode.java index 84878a061929852533539a429d29882bc2230a3e..78c3c770082a4c16f94d8e2d2e01a29ec021bea1 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/code/RedisCode.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/code/RedisCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.redis.code; * redis常量 * * @author xxm - * @date 2022/5/7 + * @since 2022/5/7 */ public interface RedisCode { diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/configuration/RedisAutoConfiguration.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/configuration/RedisAutoConfiguration.java index 1cb50fd60d3d271bdaabfa5b3c63f918c82f653c..a8abd0700f3bd1d8e5dd3e3cc430a4610546c7f6 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/configuration/RedisAutoConfiguration.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/configuration/RedisAutoConfiguration.java @@ -36,15 +36,13 @@ import java.util.stream.Collectors; * Redis配置 * * @author xxm - * @date 2020/4/9 15:40 + * @since 2020/4/9 15:40 */ @Configuration @ConditionalOnClass(StringRedisTemplate.class) @RequiredArgsConstructor public class RedisAutoConfiguration { - private final ObjectMapper objectMapper; - /** * 默认 RedisClient */ @@ -58,7 +56,6 @@ public class RedisAutoConfiguration { /** * 默认 RedisTemplate */ - @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection") @Bean @Primary public RedisTemplate redisTemplate(RedisConnectionFactory redisConnectionFactory, diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredListener.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredListener.java index f741a8d52354284e8231c0942e4fbabb71dd5cb4..abd83f812b27eace96335c1f575aa3f306427bab 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredListener.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredListener.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.redis.listener; * Key过期事件 * * @author xxm - * @date 2022/5/7 + * @since 2022/5/7 */ public interface RedisKeyExpiredListener { diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredReceiver.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredReceiver.java index 084a0313ecda3e8beda0e1ea00d8919866d9058e..e068ce7575c89de613d4bbbc743895a2da640628 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredReceiver.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredReceiver.java @@ -13,7 +13,7 @@ import java.util.List; * key过期事件接收 * * @author xxm - * @date 2022/5/7 + * @since 2022/5/7 */ @Slf4j @Component diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicListener.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicListener.java index 8c8a6fbff08f2027ae721b85100d09ffa58c69af..3ab36d72088b71636e31e95749b2da9ae3d8b771 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicListener.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicListener.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.redis.listener; * redis订阅消息 * * @author xxm - * @date 2022/5/7 + * @since 2022/5/7 */ public interface RedisTopicListener { diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicReceiver.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicReceiver.java index 3369732bdaeaaab3a5c0f7d2f6ebb634f4f30816..788d3a9a4df9a9ede939db7a06d54b570710f73a 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicReceiver.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicReceiver.java @@ -16,7 +16,7 @@ import java.util.List; * redis订阅消息接收 * * @author xxm - * @date 2022/5/7 + * @since 2022/5/7 */ @SuppressWarnings("rawtypes") @Slf4j diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonClientTemporary.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonClientTemporary.java index c3307f86f0d98602d67b19fecfff8792150edf38..dbf8354d53a9525ea897bbaa4bace653085d322b 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonClientTemporary.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonClientTemporary.java @@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit; * 只是在初始化时候使用一下,之后就会被替换 * * @author xxm - * @date 2022/11/30 + * @since 2022/11/30 */ public class RedissonClientTemporary implements RedissonClient { @@ -155,13 +155,13 @@ public class RedissonClientTemporary implements RedissonClient { /** * @param s * @param codec - * @param mapOptions + * @param mapCacheOptions * @param * @param * @return */ @Override - public RMapCache getMapCache(String s, Codec codec, MapOptions mapOptions) { + public RMapCache getMapCache(String s, Codec codec, MapCacheOptions mapCacheOptions) { return null; } @@ -178,13 +178,13 @@ public class RedissonClientTemporary implements RedissonClient { /** * @param s - * @param mapOptions + * @param mapCacheOptions * @param * @param * @return */ @Override - public RMapCache getMapCache(String s, MapOptions mapOptions) { + public RMapCache getMapCache(String s, MapCacheOptions mapCacheOptions) { return null; } diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonConfiguration.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonConfiguration.java index b7d2443b4a4fe655da281f51848a31fc27e2a02e..3703bf8ac2f6abf933d846a29373c112d8e14c7b 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonConfiguration.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonConfiguration.java @@ -19,7 +19,7 @@ import org.springframework.context.annotation.Configuration; * Redisson 自动配置 * * @author xxm - * @date 2022/12/19 + * @since 2022/12/19 */ @Configuration @ConditionalOnBean(name = "org.redisson.Redisson") diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonLoadListener.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonLoadListener.java index 300598872386b2dc11826a9f4b4b8c7b3cb533f7..60dac2213232a5a2edcecea23dcb0f90f1e4cda9 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonLoadListener.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonLoadListener.java @@ -21,7 +21,7 @@ import org.springframework.stereotype.Component; * 项目启动时Redisson替换RedissonClient的实现, Redisson连接失败是会导致项目无法启动, 选择改为项目启动成功后, 替换掉原有的Bean * * @author xxm - * @date 2022/11/30 + * @since 2022/11/30 */ @Component @ConditionalOnBean(name = "org.redisson.Redisson") diff --git a/bootx-commons/common-sequence/pom.xml b/bootx-commons/common-sequence/pom.xml index 6143484559f08e57f7d6cb38aa9b6dd3de650f55..085ba398f499ce7a3754d8b338125f1aa6450215 100644 --- a/bootx-commons/common-sequence/pom.xml +++ b/bootx-commons/common-sequence/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/SequenceAutoConfiguration.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/SequenceAutoConfiguration.java index 7a559f6db945ec47693538f2357617724298c17c..b6060afbbb3c6aa7e89799b0812e5a52600bb2d0 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/SequenceAutoConfiguration.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/SequenceAutoConfiguration.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.ComponentScan; * sequence序列生成器 * * @author xxm - * @date 2021/12/14 + * @since 2021/12/14 */ @ComponentScan @AutoConfiguration diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceConfiguration.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceConfiguration.java index 1cfa25071f15160d2153eab271d4a6fa3eb099cb..46707e4080802dedaaeb7b19f16544fee3b73951 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceConfiguration.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceConfiguration.java @@ -14,7 +14,7 @@ import org.springframework.context.annotation.Primary; * 序列化生成器 * * @author xxm - * @date 2021/8/6 + * @since 2021/8/6 */ @Configuration @RequiredArgsConstructor diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceProperties.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceProperties.java index cdf1423c776ff709a771d1c7dac257f41190ebc8..c1e945bb12630355ad5f396b8b0b8fc544a99db0 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceProperties.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceProperties.java @@ -8,7 +8,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * 序列生成器参数 * * @author xxm - * @date 2021/8/6 + * @since 2021/8/6 */ @Getter @Setter diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/impl/DefaultRangeSequence.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/impl/DefaultRangeSequence.java index af3fb4ed020d2b9cd38a3b89d956fbfb8b9eb01f..cc087eaaaeadc515513e87b9f4dbc009bb1af3ca 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/impl/DefaultRangeSequence.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/impl/DefaultRangeSequence.java @@ -16,7 +16,7 @@ import java.util.concurrent.locks.ReentrantLock; * 序列号区间生成器接口默认实现 * * @author xxm - * @date 2021/8/6 + * @since 2021/8/6 */ @Setter @Getter diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/SeqRangeConfig.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/SeqRangeConfig.java index 420d0682d0a493b2f2ddb93b1262b6ef22e5771d..7a0b78d94d10a51f58a4c1c0ac9094108c4593c9 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/SeqRangeConfig.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/SeqRangeConfig.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 序列号区间配置 * * @author xxm - * @date 2022/1/21 + * @since 2022/1/21 */ @Data @Accessors(chain = true) diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcRangeHandler.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcRangeHandler.java index 10690b254030230bb938fc7f5616c63c67d29b5d..b1e38c353ada0ac23e53aabd4a4d1e6d6aaf51dd 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcRangeHandler.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcRangeHandler.java @@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional; * jdbc区间管理 * * @author xxm - * @date 2021/12/14 + * @since 2021/12/14 */ @Slf4j @Service diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcSeqRangeManager.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcSeqRangeManager.java index 744053beb10beb7a638bab453b4602ea24b4a9f3..97e0716c6baedc843e91e1ac4a2497a1115fb9f5 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcSeqRangeManager.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcSeqRangeManager.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; * 区间管理器jdbc数据库方式实现 * * @author xxm - * @date 2021/12/14 + * @since 2021/12/14 */ @Slf4j @Component diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRange.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRange.java index c8504e6385c35e2cc3ee6971da117ab535e5fd67..534163385613476490ff4b807f0b5434396d1e56 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRange.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRange.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 队列区间 * * @author xxm - * @date 2021/12/14 + * @since 2021/12/14 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeManager.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeManager.java index 40c40a2d6707c3f8867ff92b0e6876b4d7cb7b25..38c969ae84a2d76b65ad250f049c4a0c39ca435f 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeManager.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeManager.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository; * 队列区间 * * @author xxm - * @date 2021/12/14 + * @since 2021/12/14 */ @Slf4j @Repository diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeMapper.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeMapper.java index 37c54fff01e8281c166e5ba5af601ce43b525eb6..30305b3581021b074336250536a06e4786ac4636 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeMapper.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeMapper.java @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper; * 队列区间 * * @author xxm - * @date 2021/12/14 + * @since 2021/12/14 */ @Mapper public interface SequenceRangeMapper extends BaseMapper { diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoRangeHandler.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoRangeHandler.java index 7bb50705860b3d5c436f275decc6f9ff3ec2d455..3f3ef1dfdb70025a31db4eb67bea81eeb7f7acb0 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoRangeHandler.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoRangeHandler.java @@ -15,7 +15,7 @@ import java.util.Optional; * Mongo区间处理器 * * @author xxm - * @date 2022/1/21 + * @since 2022/1/21 */ @ConditionalOnClass(name="org.springframework.data.mongodb.core.MongoTemplate") @Repository diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoSeqRangeManager.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoSeqRangeManager.java index 1088b673c015afbfa67aff7fa01e6237d3bf404f..69bdc34142c92dfbe0d0558d842d34569044ffe4 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoSeqRangeManager.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoSeqRangeManager.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; * 区间管理器MongoDB数据库方式实现 * * @author xxm - * @date 2022/1/21 + * @since 2022/1/21 */ @Slf4j @Component diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/SequenceRange.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/SequenceRange.java index 16875b97d557f4ae70632b263b558baf84d6aeb6..76b473c37ddd2c7dbc5e5a1ca1fe80d69c3ba223 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/SequenceRange.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/SequenceRange.java @@ -10,7 +10,7 @@ import org.springframework.data.mongodb.core.mapping.Document; * 队列区间 * * @author xxm - * @date 2021/12/14 + * @since 2021/12/14 */ @Data @FieldNameConstants diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/redis/RedisSeqRangeManager.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/redis/RedisSeqRangeManager.java index 2232b23f7def8531be53527f3c14d2ddcb0e2275..3957a8ee24fedbff14d5bf01befbcc8c9eded84a 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/redis/RedisSeqRangeManager.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/redis/RedisSeqRangeManager.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; * Redis区间管理器 * * @author xxm - * @date 2021/8/6 + * @since 2021/8/6 */ @Slf4j @Component diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/util/SequenceUtil.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/util/SequenceUtil.java index 9c1a08a088aa2e7daab8aa2737cef28d9964f275..c44d41086f5afef68144a84aad5f0d5cb84ffb90 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/util/SequenceUtil.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/util/SequenceUtil.java @@ -14,7 +14,7 @@ import java.util.Objects; * 序列号生成工具类 * * @author xxm - * @date 2022/12/27 + * @since 2022/12/27 */ @UtilityClass public class SequenceUtil { diff --git a/bootx-commons/common-spring/pom.xml b/bootx-commons/common-spring/pom.xml index 66ad0444038b7f63652531b11a471863f6817dc8..4432d11a899172c9f35f93595a64a8d3d93ca82c 100644 --- a/bootx-commons/common-spring/pom.xml +++ b/bootx-commons/common-spring/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/SpringConfigApplication.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/SpringConfigApplication.java index e4af5f1704eb1d8be246deff96aa791ed55cf6ed..853e99e515d91a91e3d73f8513f7b843c25e634e 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/SpringConfigApplication.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/SpringConfigApplication.java @@ -7,7 +7,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; /** * spring默认配置 * @author xxm - * @date 2023/3/29 + * @since 2023/3/29 */ @EnableScheduling @EnableRetry diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/aop/CountTimeAop.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/aop/CountTimeAop.java index f34c18b07ebedf1315ae9a534b27e5470547e6bf..b09ba620ea19bd4c8f325f68723bf1f4fa82f381 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/aop/CountTimeAop.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/aop/CountTimeAop.java @@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit; * 方法耗时工具类 * * @author xxm - * @date 2020/12/22 + * @since 2020/12/22 */ @Aspect @Slf4j diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/AsyncExecutorConfiguration.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/AsyncExecutorConfiguration.java index 71f04231c7137af70ec04eb27a5d85ba055ac630..e300da4e56bc31944c7ed59221ab0dba638675ec 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/AsyncExecutorConfiguration.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/AsyncExecutorConfiguration.java @@ -15,7 +15,7 @@ import java.util.concurrent.Executor; * 异步执行配置 * * @author xxm - * @date 2021/6/11 + * @since 2021/6/11 */ @Slf4j @EnableAsync diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringCorsConfiguration.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringCorsConfiguration.java index 4880ce6486b7d7365b62e470bb29660e2ef2bcea..e03cb5da28ef232840029f12bdd3d25bdd11c12f 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringCorsConfiguration.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringCorsConfiguration.java @@ -18,7 +18,7 @@ import java.time.Duration; * 跨域处理 * * @author xxm - * @date 2021/7/14 + * @since 2021/7/14 */ @Configuration @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringExecutorConfiguration.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringExecutorConfiguration.java index fd878e80f6e592a6e4b2d50139a2d0f34f992295..9954a55d0c7da79083f411e3d40af52711b23ab7 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringExecutorConfiguration.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringExecutorConfiguration.java @@ -18,7 +18,7 @@ import java.util.concurrent.ExecutorService; * spring 线程池 配置 * * @author xxm - * @date 2021/6/11 + * @since 2021/6/11 */ @Configuration @EnableConfigurationProperties({ SpringProperties.class }) diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringProperties.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringProperties.java index e4d8825b89da015545f54594b992f0e9ed60b1e1..0d14392a106ff5febeac111b34452e2345c02e6d 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringProperties.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringProperties.java @@ -6,7 +6,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; /** * @author xxm - * @date 2020/4/9 13:50 + * @since 2020/4/9 13:50 */ @ConfigurationProperties(prefix = "bootx.common.spring") @Data @@ -21,7 +21,7 @@ public class SpringProperties { /** * @author xxm - * @date 2021/6/11 + * @since 2021/6/11 */ @Data public static class Executor { diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/exception/RetryableException.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/exception/RetryableException.java index 1b495d61aeaab2999711140fd3624408ccecce76..2ece95f76815b781a5a094c0852bb44256b5ca83 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/exception/RetryableException.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/exception/RetryableException.java @@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.exception.BizException; * 可重试异常,抛出这个异常进行重试 * * @author xxm - * @date 2022/7/10 + * @since 2022/7/10 */ public class RetryableException extends BizException { diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/AopUtil.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/AopUtil.java index eef44db553b979508444d76f7cfa50206511cf30..1f9f3b2ba44cb03a646807f0e933e08b125e327d 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/AopUtil.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/AopUtil.java @@ -12,7 +12,7 @@ import java.lang.reflect.Method; * 切面工具类 * * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @UtilityClass public class AopUtil { diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/WebServletUtil.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/WebServletUtil.java index 8e40a2bea4b9a613f275c3719b3787254f16e797..c30f42924770724e4f72e9b4173db09d47ed5b02 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/WebServletUtil.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/WebServletUtil.java @@ -13,7 +13,7 @@ import java.util.Optional; * web服务器工具类 * * @author xxm - * @date 2021/8/13 + * @since 2021/8/13 */ @UtilityClass public class WebServletUtil { diff --git a/bootx-commons/common-super-query/pom.xml b/bootx-commons/common-super-query/pom.xml index 168c30a99f36e24fc61468fb0e10406d2f65de4a..581ed7b6a12591694a866dd7659b6d9387a07b18 100644 --- a/bootx-commons/common-super-query/pom.xml +++ b/bootx-commons/common-super-query/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/QueryApplication.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/QueryApplication.java index ab2a57d31ea95bb5a93e5c7d230b5830a2e1c90e..98a8ac206e1c4c625912767e44cb7e02b4c2f140 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/QueryApplication.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/QueryApplication.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * 高级查询器 * * @author xxm - * @date 2021/11/17 + * @since 2021/11/17 */ @ComponentScan @MapperScan(annotationClass = Mapper.class) diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/CompareTypeEnum.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/CompareTypeEnum.java index b622ea585162473d41d9cc27fedb218dbd9dad0e..331d4f2b4a19e773046b22fd91230f6241e30aaa 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/CompareTypeEnum.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/CompareTypeEnum.java @@ -8,7 +8,7 @@ import lombok.Getter; * 匹配条件类型 * * @author xxm - * @date 2021/11/17 + * @since 2021/11/17 */ @Getter @AllArgsConstructor diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/ParamTypeEnum.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/ParamTypeEnum.java index 9ef82b34c4a2b71a6e711a3d256ce2b37f3200df..0c739bccfec08b2cfc3a72f8b51469ba772da431 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/ParamTypeEnum.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/ParamTypeEnum.java @@ -8,7 +8,7 @@ import lombok.Getter; * 参数类型 * * @author xxm - * @date 2021/11/17 + * @since 2021/11/17 */ @Getter @AllArgsConstructor diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryBetweenParam.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryBetweenParam.java index 37d87c8efac5c5b86e8eec527ea244811bb38535..1378ee6a7a8bf0a4d4f1acb2771c9b69a051ddf6 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryBetweenParam.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryBetweenParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * Between 类型参数 * * @author xxm - * @date 2021/11/18 + * @since 2021/11/18 */ @Data @Accessors(chain = true) diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryOrder.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryOrder.java index 1152a5b0f2ce381df3b78e9ab7e9ad7e225e3455..bf0d6c46530602bf9c087a7b8587986c11aba04b 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryOrder.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryOrder.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2021/11/17 + * @since 2021/11/17 */ @Data @Accessors(chain = true) diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParam.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParam.java index f36fdfeaf571b7cdd66282a5d12420676f2dcbff..ee3f6af5a8ac4dff47691f4afd58aadb82e23876 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParam.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParam.java @@ -10,7 +10,7 @@ import java.util.List; /** * @author xxm - * @date 2021/11/17 + * @since 2021/11/17 */ @Data @Accessors(chain = true) diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParams.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParams.java index 1da487936eaa42be854bd6d5a4610ba3a18710f2..790a2349e562352dcd5e47b637fbce9729cc449a 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParams.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParams.java @@ -10,7 +10,7 @@ import java.util.List; * 查询参数 * * @author xxm - * @date 2021/11/17 + * @since 2021/11/17 */ @Data @Accessors(chain = true) diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/AnnotationQueryGenerator.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/AnnotationQueryGenerator.java index bfebee8e0c3123ec77a56cb7f38010f8f06095cd..cd0fd5305219bff571c2d12b9742fee8e6e14456 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/AnnotationQueryGenerator.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/AnnotationQueryGenerator.java @@ -3,12 +3,15 @@ package cn.bootx.platform.common.query.generator; import cn.bootx.platform.common.core.annotation.QueryParam; import cn.bootx.platform.common.core.function.CollectorsFunction; import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.common.query.entity.QueryOrder; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.text.NamingCase; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.google.common.collect.Lists; import lombok.experimental.UtilityClass; import lombok.val; @@ -22,7 +25,7 @@ import java.util.stream.Collectors; * 注解参数查询生成器 * * @author xxm - * @date 2022/12/14 + * @since 2022/12/14 */ @UtilityClass public class AnnotationQueryGenerator { @@ -80,7 +83,7 @@ public class AnnotationQueryGenerator { * @param 泛型 * @return 查询器 */ - QueryWrapper generator(Object queryParams) { + QueryWrapper generator(Object queryParams, QueryOrder...queryOrder) { QueryWrapper wrapper = new QueryWrapper<>(); if (Objects.isNull(queryParams)) { @@ -111,6 +114,9 @@ public class AnnotationQueryGenerator { } } + // 处理排序条件 + initQueryOrder(wrapper,Objects.isNull(queryOrder)?null: Lists.newArrayList(queryOrder)); + return wrapper; } @@ -193,7 +199,7 @@ public class AnnotationQueryGenerator { /** * 获取字段对应的数据库字段名 */ - public String getDatabaseFieldName(PropertyDescriptor paramDescriptor, Class paramClass, + private String getDatabaseFieldName(PropertyDescriptor paramDescriptor, Class paramClass, PropertyDescriptor entityDescriptor, Class entityClass, QueryParam.NamingCaseEnum namingCase) { // 读取注解, 判断有没有自定义字段名, 有自定义字段名直接返回 val queryParam = getQueryParamAnnotation(paramDescriptor, paramClass, entityDescriptor, entityClass); @@ -217,4 +223,24 @@ public class AnnotationQueryGenerator { return ""; } + /** + * 组装排序条件 + * @param queryWrapper 查询器 + * @param queryOrders 排序条件 + * @param 泛型 + */ + private void initQueryOrder(QueryWrapper queryWrapper, List queryOrders) { + if (CollUtil.isEmpty(queryOrders)) { + return; + } + for (QueryOrder queryOrder : queryOrders) { + if (queryOrder.isUnderLine()) { + queryWrapper.orderBy(true, queryOrder.isAsc(), StrUtil.toUnderlineCase(queryOrder.getSortField())); + } + else { + queryWrapper.orderBy(true, queryOrder.isAsc(), queryOrder.getSortField()); + } + } + } + } diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/ParamValueTypeConvert.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/ParamValueTypeConvert.java index f9fd67dd1de2735442127664b07363b330b01079..e99294e11b8dec271ccb1011010a7a762a7cbf0b 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/ParamValueTypeConvert.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/ParamValueTypeConvert.java @@ -16,7 +16,7 @@ import java.util.stream.Collectors; * 参数值转换 * * @author xxm - * @date 2021/11/18 + * @since 2021/11/18 */ public class ParamValueTypeConvert { diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/QueryGenerator.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/QueryGenerator.java index dd09b6f0de5b2e71fa9b96556093ea3a9fa3760c..555b13246d434c9d59b56fda8ad618c033e2471a 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/QueryGenerator.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/QueryGenerator.java @@ -1,5 +1,6 @@ package cn.bootx.platform.common.query.generator; +import cn.bootx.platform.common.query.entity.QueryOrder; import cn.bootx.platform.common.query.entity.QueryParams; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -7,7 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; * 查询条件生成器 * * @author xxm - * @date 2021/11/17 + * @since 2021/11/17 */ public class QueryGenerator { @@ -33,8 +34,8 @@ public class QueryGenerator { * @param 泛型 * @return 查询器 */ - public static QueryWrapper generator(Object queryParams) { - return AnnotationQueryGenerator.generator(queryParams); + public static QueryWrapper generator(Object queryParams, QueryOrder...queryOrder) { + return AnnotationQueryGenerator.generator(queryParams,queryOrder); } /** diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/SuperQueryGenerator.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/SuperQueryGenerator.java index c63374d47bb0f76ecd714a28dcf051ccfdd15453..1121ffbde3d5af2a3adbebeb0bb4b4dcba665c08 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/SuperQueryGenerator.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/SuperQueryGenerator.java @@ -17,7 +17,7 @@ import java.util.Optional; /** * @author xxm - * @date 2022/12/14 + * @since 2022/12/14 */ @UtilityClass public class SuperQueryGenerator { diff --git a/bootx-commons/common-swagger/pom.xml b/bootx-commons/common-swagger/pom.xml index 22529e79297ed36bcc1bcc1d5c49ecaf399d4a9f..c8ff6d93e935eb3a406ca22b0627d5af09ef645f 100644 --- a/bootx-commons/common-swagger/pom.xml +++ b/bootx-commons/common-swagger/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerAutoConfiguration.java b/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerAutoConfiguration.java index c5e8c616cbee17be0c9082f5065663f7f4bc76e4..62fa2fcc6265fb744e46db8022a8323bbdbe83db 100644 --- a/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerAutoConfiguration.java +++ b/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerAutoConfiguration.java @@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger; * swagger 自动配置 * * @author xxm - * @date 2020/4/9 13:33 + * @since 2020/4/9 13:33 */ @Slf4j @Configuration diff --git a/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerProperties.java b/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerProperties.java index dcaea363d5363f06180896e754b7969f2385a1d3..800b113e7ac599a040aa8ba65243107533612f3d 100644 --- a/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerProperties.java +++ b/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerProperties.java @@ -12,7 +12,7 @@ import java.util.Map; * swagger配置 * * @author xxm - * @date 2020/4/9 13:36 + * @since 2020/4/9 13:36 */ @Getter @Setter diff --git a/bootx-commons/common-websocket/pom.xml b/bootx-commons/common-websocket/pom.xml index 1aa01f6a2da305bb4192b03b5b6789250a9a2fd7..c44c110774c1bb398af9cee88ec9dfe1c2e82228 100644 --- a/bootx-commons/common-websocket/pom.xml +++ b/bootx-commons/common-websocket/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/WebsocketAutoConfiguration.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/WebsocketAutoConfiguration.java index 6b0d54ff81bc8ac4a690901fab04b15a1a227b91..68a4c087947347480fc039da34678a372b018398 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/WebsocketAutoConfiguration.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/WebsocketAutoConfiguration.java @@ -5,7 +5,7 @@ import org.springframework.context.annotation.ComponentScan; /** * @author xxm - * @date 2022/3/27 + * @since 2022/3/27 */ @ComponentScan @AutoConfiguration diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/code/WebsocketCode.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/code/WebsocketCode.java index c13ca9fedcd68b39d613e15cd5a28cc8f2bb49e8..c2fd21f892c4ef3c0e528de9d3899d79e17bb91e 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/code/WebsocketCode.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/code/WebsocketCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.websocket.code; * websocket常量码 * * @author xxm - * @date 2022/6/9 + * @since 2022/6/9 */ public interface WebsocketCode { diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/configuration/WebSocketConfig.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/configuration/WebSocketConfig.java index 46f36d2245a833dcd20b3275f90b49dfee0b06e1..62d23f98e69fb084831e9665a178302ceafa1360 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/configuration/WebSocketConfig.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/configuration/WebSocketConfig.java @@ -16,7 +16,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; * Websocket配置 * * @author xxm - * @date 2022/3/27 + * @since 2022/3/27 */ @EnableWebSocket @Configuration diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsRes.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsRes.java index 569806bedac55989acfbccb55a1228e457b7b420..de8ffe297311c7a7b2250653c4f47a02d2139987 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsRes.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsRes.java @@ -7,7 +7,7 @@ import lombok.experimental.UtilityClass; * websocket 响应工具类 * * @author xxm - * @date 2022/6/9 + * @since 2022/6/9 */ @UtilityClass public class WsRes { diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsResult.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsResult.java index fd54dcee8a0c4f60a09047ac70aa382a94a931b8..62b6d0e3ebb01805631dafffd5e95177e261ac95 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsResult.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsResult.java @@ -12,7 +12,7 @@ import java.io.Serializable; * websocket响应消息类 * * @author xxm - * @date 2022/6/9 + * @since 2022/6/9 */ @Getter @Setter diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/func/WsUserAuthService.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/func/WsUserAuthService.java index d04b5395715c0353f13f4bc02d314bf85a2fecdc..70907e50a24864f4b29b4eedfb0f3f05ec6d79dc 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/func/WsUserAuthService.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/func/WsUserAuthService.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.websocket.func; * websocket用户认证相关接口 * * @author xxm - * @date 2022/6/9 + * @since 2022/6/9 */ public interface WsUserAuthService { diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/SpringWebSocketSessionManager.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/SpringWebSocketSessionManager.java index 1eac21fc1543339bf7825cfa64551c0452cd7519..e3f7aff57d6fceba835d83cf4a3e1e123314d118 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/SpringWebSocketSessionManager.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/SpringWebSocketSessionManager.java @@ -13,7 +13,7 @@ import java.util.stream.Collectors; * websocket管理器 (Spring封装的socket) * * @author xxm - * @date 2022/5/27 + * @since 2022/5/27 */ public class SpringWebSocketSessionManager { diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/WebSocketSessionManager.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/WebSocketSessionManager.java index 9a92f04a09c4bb0d2b1f7c2d9a73a3df23144083..6bf60a1f7385568366f815627eae0d760a00e06f 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/WebSocketSessionManager.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/WebSocketSessionManager.java @@ -12,7 +12,7 @@ import java.util.stream.Collectors; * websocket管理器 (java原生) * * @author xxm - * @date 2022/5/27 + * @since 2022/5/27 */ public class WebSocketSessionManager { diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketHandler.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketHandler.java index 2110d3cb241cdeea26dd6ae6b240ec590f5d8b67..c1898d91d5aae261dde4c2fa53544da18acc49a4 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketHandler.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketHandler.java @@ -18,7 +18,7 @@ import static cn.bootx.platform.common.core.code.CommonCode.USER_ID; * 全局用户WS通知 * * @author xxm - * @date 2022/3/27 + * @since 2022/3/27 */ @Slf4j @Component diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketInterceptor.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketInterceptor.java index b18aef2ff9f184dca4e465ae1e8a9f5ce16fa1ba..7b30f7308735f10f69db67ed561331fe7872c5cd 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketInterceptor.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketInterceptor.java @@ -20,7 +20,7 @@ import static cn.bootx.platform.common.core.code.WebHeaderCode.ACCESS_TOKEN; * 全局用户WS通知拦截鉴权 * * @author xxm - * @date 2022/6/9 + * @since 2022/6/9 */ @Slf4j @Component diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/service/UserWsNoticeService.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/service/UserWsNoticeService.java index c5a898b97914a8a0aa718e91aa863da111250068..beab13ef83f24eb67278dd2007b37378662d6894 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/service/UserWsNoticeService.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/service/UserWsNoticeService.java @@ -13,7 +13,7 @@ import java.util.List; * 用户websocket方式发送通知消息 * * @author xxm - * @date 2022/6/9 + * @since 2022/6/9 */ @Slf4j @Service diff --git a/bootx-commons/common-xxl-job/pom.xml b/bootx-commons/common-xxl-job/pom.xml index 44d30301b6bf3a15b01f94ace795efc98edbda6e..b065daa26aa40b9d37768b610f3b09d81af1c40a 100644 --- a/bootx-commons/common-xxl-job/pom.xml +++ b/bootx-commons/common-xxl-job/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/JobAutoConfiguration.java b/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/JobAutoConfiguration.java index 97b73a4c09876850fd033484c061b7bf95429a8d..cf38cba62528c271c649f4b566e22915e61cf2cd 100644 --- a/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/JobAutoConfiguration.java +++ b/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/JobAutoConfiguration.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration; * xxl-job自动配置 * * @author xxm - * @date 2021/3/11 + * @since 2021/3/11 */ @Configuration @EnableConfigurationProperties(XxlJobProperties.class) diff --git a/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/XxlJobProperties.java b/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/XxlJobProperties.java index 89cd4906be6d34f3c9eaa869726e75c3d76986ca..414855fbdc4c93bc15c9ecf9ccd45adc4c011c93 100644 --- a/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/XxlJobProperties.java +++ b/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/XxlJobProperties.java @@ -7,7 +7,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * xxl-job配置 * * @author xxm - * @date 2021/3/11 + * @since 2021/3/11 */ @Data @ConfigurationProperties(prefix = "bootx.common.xxl-job") diff --git a/bootx-commons/pom.xml b/bootx-commons/pom.xml index 51bc3b2f366b88160a0ae862de7cc60785f592ca..669f4411df77a01c49ee77a2e39aac9d2cffa669 100644 --- a/bootx-commons/pom.xml +++ b/bootx-commons/pom.xml @@ -7,7 +7,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.1 + 1.3.3 bootx-commons @@ -31,6 +31,7 @@ common-websocket common-rabbitmq common-data-translate + common-eventer diff --git a/bootx-demo/pom.xml b/bootx-demo/pom.xml index 68720a2d55ae70240a194d8c35bbc9dd28b68523..b7ed06cf9b32a53e107eb9c2e3ecc829217a0b84 100644 --- a/bootx-demo/pom.xml +++ b/bootx-demo/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/DemoApplication.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/DemoApplication.java index 431979942fe2189e823a297bac560d0efc460f8b..2a10348f88492e4702d65be4aeeb43b9e6a33299 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/DemoApplication.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/DemoApplication.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * 演示 * * @author xxm - * @date 2021/8/6 + * @since 2021/8/6 */ // 以这个类为 basePackageClasses @MapperScan(annotationClass = Mapper.class) // 扫描Mybatis 的 mapper diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/bsp/DictConvertDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/bsp/DictConvertDemoController.java index 8d6a721fa4c0b09c89cc7e2818598016220cb0b6..3fa46a3993b6b77a4db68d24aaa5cb1412c37ca4 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/bsp/DictConvertDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/bsp/DictConvertDemoController.java @@ -23,7 +23,7 @@ import java.util.List; /** * @author xxm - * @date 2022/12/19 + * @since 2022/12/19 */ @Tag(name = "字典测试") @RestController diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataEncryptDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataEncryptDemoController.java index 378a276180b53f953c85682daa7a30c61185cc7e..0c79a6cf8f491c1af853c0e2e6dfe2f0b475c4bd 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataEncryptDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataEncryptDemoController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*; /** * @author xxm - * @date 2022/3/24 + * @since 2022/3/24 */ @Tag(name = "数据加密解密演示") @RestController diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataPermDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataPermDemoController.java index 69dca5038c87919f1e1866e14cb456f76da3fa55..447f0824da700f53be9b46379734319851ab16df 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataPermDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataPermDemoController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*; * 数据权限演示 * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @Tag(name = "数据权限演示") @RestController diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataSensitiveDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataSensitiveDemoController.java index 75c93b7e82225a5cd60a690d38cce9459dd2d727..cd1b7c9aec663c52e670dedac0670ead52490bee 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataSensitiveDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataSensitiveDemoController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*; * 数据脱敏演示 * * @author xxm - * @date 2022/3/24 + * @since 2022/3/24 */ @Tag(name = "数据脱敏演示") @RestController diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/lock/IdempotencyDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/lock/IdempotencyDemoController.java index 6de82c4c4777c4f8dbb9eaf4cf4766e50eb67a57..3530d881931fef7cc9181682109036ffbb4dc5e3 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/lock/IdempotencyDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/lock/IdempotencyDemoController.java @@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit; * 幂等控制演示 * * @author xxm - * @date 2022/3/31 + * @since 2022/3/31 */ @Slf4j @Tag(name = "幂等控制演示") diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/mq/MessageQueueDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/mq/MessageQueueDemoController.java index 983e6cc0c5a404d94808b9fa97228e8f5c2f1ed5..0589c59b8d6822cdd6ffa5b0ab330f3ceee36673 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/mq/MessageQueueDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/mq/MessageQueueDemoController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2022/5/27 + * @since 2022/5/27 */ @Tag(name = "测试消息队列") @RestController diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/notice/EmailSendDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/notice/EmailSendDemoController.java index 85b4cf858add568867ae0d48860e8136b7f0fb54..36020cd71ce14f20e22bafb6c7ab57c0e8e26664 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/notice/EmailSendDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/notice/EmailSendDemoController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2022/8/3 + * @since 2022/8/3 */ @Tag(name = "测试消息队列") @RestController diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/query/SuperQueryDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/query/SuperQueryDemoController.java index ac2a19ca083040b9cd8bd56ecfbc9a52fae07efb..09fff5580ab00683b1eeb68f32a8d965f482eb6a 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/query/SuperQueryDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/query/SuperQueryDemoController.java @@ -19,7 +19,7 @@ import java.time.LocalTime; /** * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @Tag(name = "超级查询演示") @RestController diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/ws/GlobalWebsocketDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/ws/GlobalWebsocketDemoController.java index 2afa138accbc9dd048a4d357534c6364248b4ae3..37e76843b34dfcc4f53d65af5962bf4477325e91 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/ws/GlobalWebsocketDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/ws/GlobalWebsocketDemoController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2022/6/10 + * @since 2022/6/10 */ @Tag(name = "全局websocket通知demo") @RestController diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoManager.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoManager.java index 5d0c1944f24e9ef350d41739d4ee69e450482643..6d31919f94537494f5b8549fae66f1d98c52e68e 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoManager.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoManager.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; /** * @author xxm - * @date 2022/3/24 + * @since 2022/3/24 */ @Slf4j @Repository diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoMapper.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoMapper.java index 91757000ece870f4e0a90f3f29044256cbd88c73..752178ba0e7405b51b439cea203fde89933667ee 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoMapper.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/3/24 + * @since 2022/3/24 */ @Mapper public interface DataEncryptDemoMapper extends BaseMapper { diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/entity/DataEncryptDemo.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/entity/DataEncryptDemo.java index 97ea1347ebe8cada86ddfde1c73b05fb9e4c58d9..47f0c2d1bd88898ab2ee35eb74dfeba4a1440896 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/entity/DataEncryptDemo.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/entity/DataEncryptDemo.java @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; * 权限显示demo * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/service/DataEncryptDemoService.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/service/DataEncryptDemoService.java index aa467c0da40673dd4009706e135f38a70c863190..b774140c728d03ec60700830dc5b8d1cb3b02292 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/service/DataEncryptDemoService.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/service/DataEncryptDemoService.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; /** * @author xxm - * @date 2022/3/24 + * @since 2022/3/24 */ @Slf4j @Service diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttConfiguration.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttConfiguration.java index 0e2288a71e142f475ab779b5486597cfe33d4ab7..b5042a133157829c3742cb1e330424df8235ce72 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttConfiguration.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttConfiguration.java @@ -11,7 +11,7 @@ /// ** // * // * @author xxm -// * @date 2022/5/30 +// * @since 2022/5/30 // */ // @Slf4j // @Configuration diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttMessageListener.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttMessageListener.java index 7785ca9baa35cdbf56799b0c945cdf81f72de1ff..d298210c2c0be17493d1c8bb5e89bfcf2a95fd39 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttMessageListener.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttMessageListener.java @@ -8,7 +8,7 @@ /// ** // * mqtt消息接收器 // * @author xxm -// * @date 2022/5/30 +// * @since 2022/5/30 // */ // @Component // @RequiredArgsConstructor diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqConfiguration.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqConfiguration.java index 5115fcf4279c195b94878b476abccc7292c60776..117f4b0c3c643750f5ec65a368996003b29cf872 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqConfiguration.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqConfiguration.java @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration; * 演示RabbitMQ消息队列配置 * * @author xxm - * @date 2022/5/30 + * @since 2022/5/30 */ @Configuration public class DemoRabbitMqConfiguration { diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqMessageListener.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqMessageListener.java index f1f2eda81cc68c6cdb8866459f477c9ae94abd36..aae4c17b832a56f561f4ad83f9e74969ab2ecf71 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqMessageListener.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqMessageListener.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; /** * @author xxm - * @date 2022/5/30 + * @since 2022/5/30 */ @Slf4j @ConditionalOnRabbit diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisExpiredListener.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisExpiredListener.java index b9d1eca0f903a6e2175415a686a75e5cd3eb8be7..5affc14d9601be99e9bda9efb7ea4dbe418ce723 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisExpiredListener.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisExpiredListener.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; * redis过期事件监听 * * @author xxm - * @date 2022/5/30 + * @since 2022/5/30 */ @Slf4j @Component diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisStreamListener.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisStreamListener.java index e79e26985df20a94b3d327a82169708d06ed2beb..9855116df1505486a4c7cd8bdf5d7056c4f02ae4 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisStreamListener.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisStreamListener.java @@ -8,7 +8,7 @@ import org.springframework.data.redis.stream.StreamListener; * RedisStream 消息队列 (未实现) * * @author xxm - * @date 2022/6/4 + * @since 2022/6/4 */ public class DemoRedisStreamListener implements StreamListener> { diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisTopicListener.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisTopicListener.java index 807329a8266945e80f9fd013f6893de5a449cb25..3ab837b7855da9a8ed4afd3b22e03c1f5e635d2a 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisTopicListener.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisTopicListener.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; * 测试Redis消息队列 * * @author xxm - * @date 2022/5/7 + * @since 2022/5/7 */ @Slf4j @Component diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mtm/entity/MtmTableEntity.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mtm/entity/MtmTableEntity.java index 63a4fcbdcc5bbaa3988f4aa5c1741d4b23f4003b..63c3df1e4a80f33f90967396b7195876fc1dd4df 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mtm/entity/MtmTableEntity.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mtm/entity/MtmTableEntity.java @@ -14,7 +14,7 @@ import java.util.Date; * actable测试 * * @author xxm - * @date 2023/1/11 + * @since 2023/1/11 */ @EqualsAndHashCode(callSuper = true) @DbTable(name = "mtm_table",comment = "actable测试") diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/entity/SendSimpleEmailDemoParam.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/entity/SendSimpleEmailDemoParam.java index 17a29627e71ec2363f464560ae1fb95e1681b3c6..e01cddac5fa681401188dd3e7c27f04b4453ee31 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/entity/SendSimpleEmailDemoParam.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/entity/SendSimpleEmailDemoParam.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull; * 简单邮件发送参数 * * @author xxm - * @date 2022/8/3 + * @since 2022/8/3 */ @Data @Accessors(chain = true) diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/service/EmailSendDemoService.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/service/EmailSendDemoService.java index 7c7caf455321518345aeda038643a34a4ef5a6b9..0463de451f65de0e69008ed3b4d5a80ecf67be01 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/service/EmailSendDemoService.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/service/EmailSendDemoService.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; * 邮件消息发送测试 * * @author xxm - * @date 2022/8/3 + * @since 2022/8/3 */ @Slf4j @Service diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoManager.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoManager.java index eddae2f43f6a0f38a8e96f07321a7037c28cb082..91652a3d8c32207ab0a994834709c112d668f53a 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoManager.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoManager.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Repository; * 数据权限演示 * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @Slf4j @Repository diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoMapper.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoMapper.java index 5e3f01d6c2ea8693026f1894523b719c70a20a81..4f0c7adae66d59f2c6da3186f778274a7d1fed5d 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoMapper.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 数据权限演示demo * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @Mapper public interface DataPermDemoMapper extends BaseMapper { diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/entity/DataPermDemo.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/entity/DataPermDemo.java index b392f0926698ad6803d7bdd4bcfcc6f71fbcbbfc..58a8a567a21feb3e48356f2559ae8d9846920f3d 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/entity/DataPermDemo.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/entity/DataPermDemo.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; * 权限显示demo * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @DataVersionLog(title = "数据权限演示") @EqualsAndHashCode(callSuper = true) diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/service/DataPermDemoService.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/service/DataPermDemoService.java index 5c71335cbb72d9abb3c67950d465ed42ef3eb5d8..bbc68b2f241d492192f9e893852bc990ade876b3 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/service/DataPermDemoService.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/service/DataPermDemoService.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Service; * 数据权限演示 * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @Slf4j @Service diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoManager.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoManager.java index 5fec740b538e97319d88b9e9c8db7a98fb11411a..886e74100d978704ace99ded4ca0bd50853054c6 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoManager.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoManager.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Repository; * 超级查询 * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @Slf4j @Repository diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoMapper.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoMapper.java index aeed0b2b32b32c06931a13ed95c90ee415efc595..70edb7040ae54207e3aea5a0309be8893ded768c 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoMapper.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 超级查询 * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @Mapper public interface SuperQueryDemoMapper extends BaseMapper { diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/entity/SuperQueryDemo.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/entity/SuperQueryDemo.java index 8baaa25e37f8b998c123b25cb028d62167fb92d7..94a15b6d747133e1a20c46d1115248dc3f62b61b 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/entity/SuperQueryDemo.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/entity/SuperQueryDemo.java @@ -15,7 +15,7 @@ import java.time.LocalTime; * 超级查询演示 * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/service/SuperQueryDemoService.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/service/SuperQueryDemoService.java index f6f3dd6169b22c4e415ebf06e40bbf83b3aa0d04..1c36a3f3f6c6219434fa7581dc91470abd5ad56c 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/service/SuperQueryDemoService.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/service/SuperQueryDemoService.java @@ -19,7 +19,7 @@ import java.time.LocalDateTime; * 超级查询 * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @Slf4j @Service diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoManager.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoManager.java index 3b17305f57669d52d06d7d3208dcf389b8e84a19..4ad228de9fe0d922fe7406966f2fa1969b78f807 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoManager.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoManager.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; /** * @author xxm - * @date 2022/3/24 + * @since 2022/3/24 */ @Slf4j @Repository diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoMapper.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoMapper.java index dc89d361645a3c504aa91a959bf0e98edfc31f29..c19df43324d3ad29d9f3a9bf438b411f74052b4b 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoMapper.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/3/24 + * @since 2022/3/24 */ @Mapper public interface DataSensitiveDemoMapper extends BaseMapper { diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/entity/DataSensitiveDemo.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/entity/DataSensitiveDemo.java index 0c19d62d8214555380ad45f2042e39d58bd44c4e..d70a7cb2ab3a90cf591655cb8e4b5455e9630945 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/entity/DataSensitiveDemo.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/entity/DataSensitiveDemo.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 数据脱敏 * * @author xxm - * @date 2022/3/24 + * @since 2022/3/24 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/service/DataSensitiveDemoService.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/service/DataSensitiveDemoService.java index 111eca4ec410843649e5dcf525fc4d458cd9e922..5f5dfb4d21712903d45907143127f30ea57ac2b4 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/service/DataSensitiveDemoService.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/service/DataSensitiveDemoService.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; /** * @author xxm - * @date 2022/3/24 + * @since 2022/3/24 */ @Slf4j @Service diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/ws/WebSocketDemo.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/ws/WebSocketDemo.java index 2ec6daba38bf200c869a51c5ca952c77e0c7ca7a..56ce57643043ac2ff68b2dfc4e1eb6abd355bf9d 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/ws/WebSocketDemo.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/ws/WebSocketDemo.java @@ -14,7 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger; * websocket demo * * @author xxm - * @date 2022/3/27 + * @since 2022/3/27 */ @Slf4j @Component diff --git a/bootx-services/pom.xml b/bootx-services/pom.xml index 3eff6ee256c9a6f211f8509e0dee9791007eca21..742c33a98ffbcda0b13d7f21163d46d3245feffb 100644 --- a/bootx-services/pom.xml +++ b/bootx-services/pom.xml @@ -5,8 +5,11 @@ cn.bootx.platform bootx-platform-parent - 1.3.1 + 1.3.3 + + service-miniapp + 4.0.0 diff --git a/bootx-services/service-baseapi/pom.xml b/bootx-services/service-baseapi/pom.xml index 248c2e1a1a21adb205ba7c137abc9976478f5bb5..1b354bdc021b9fa37b176964aead7ec05e1fbfe7 100644 --- a/bootx-services/service-baseapi/pom.xml +++ b/bootx-services/service-baseapi/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-services - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/BaseApiApplication.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/BaseApiApplication.java index 11756ff06d30d0d6169ad532f1b361200ae60226..8a833a03fc36538d06de541e76c11253d756a8a2 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/BaseApiApplication.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/BaseApiApplication.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * 基础功能 * * @author xxm - * @date 2021/8/4 + * @since 2021/8/4 */ @ComponentScan @MapperScan(annotationClass = Mapper.class) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/CachingCode.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/CachingCode.java index 0e9d2d0fb7490c0b32401330836338eb25268c70..d16cac23f31066335490fded8a432582b646770c 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/CachingCode.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/CachingCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.baseapi.code; * 缓存 * * @author xxm - * @date 2022/5/1 + * @since 2022/5/1 */ public interface CachingCode { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/ChinaRegionCode.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/ChinaRegionCode.java index 40aa3a091fb0132123941375947c26736574cb06..f7097a19d5b3e941721d102e092ec9fe7cd58592 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/ChinaRegionCode.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/ChinaRegionCode.java @@ -10,7 +10,7 @@ import java.util.Arrays; * 中国行政区划 * * @author xxm - * @date 2023/2/7 + * @since 2023/2/7 */ @Getter @AllArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/QuerySqlCode.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/QuerySqlCode.java index 3f2281425fb3b586ea6db5f3a5391e9115408997..09200c527199d2c6b9fdeb13a588a1603aaf0399 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/QuerySqlCode.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/QuerySqlCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.baseapi.code; * 查询SQL * * @author xxm - * @date 2023/3/12 + * @since 2023/3/12 */ public interface QuerySqlCode { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/AppVersionController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/AppVersionController.java deleted file mode 100644 index a5cf73377654f0c1e331a9830debd287c6670425..0000000000000000000000000000000000000000 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/AppVersionController.java +++ /dev/null @@ -1,58 +0,0 @@ -package cn.bootx.platform.baseapi.controller; - -import cn.bootx.platform.baseapi.core.app.service.AppVersionService; -import cn.bootx.platform.baseapi.dto.app.AppVersionDto; -import cn.bootx.platform.common.core.rest.PageResult; -import cn.bootx.platform.common.core.rest.Res; -import cn.bootx.platform.common.core.rest.ResResult; -import cn.bootx.platform.common.core.rest.param.PageParam; -import cn.bootx.platform.baseapi.param.app.AppVersionParam; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -/** - * @author xxm - * @date 2021/8/9 - */ -@Tag(name = "app版本管理") -@RestController -@RequestMapping("/app/version") -@RequiredArgsConstructor -public class AppVersionController { - - private final AppVersionService appVersionService; - - @Operation(summary = "添加") - @PostMapping("/add") - public ResResult add(@RequestBody AppVersionParam param) { - return Res.ok(appVersionService.add(param)); - } - - @Operation(summary = "删除") - @DeleteMapping("/delete") - public ResResult delete(Long id) { - appVersionService.delete(id); - return Res.ok(); - } - - @Operation(summary = "检查更新") - @PostMapping("/check") - public ResResult check() { - return Res.ok(appVersionService.check()); - } - - @Operation(summary = "分页") - @GetMapping("/page") - public ResResult> page(PageParam pageParam) { - return Res.ok(appVersionService.page(pageParam)); - } - - @Operation(summary = "查询详情") - @PostMapping("/findById") - public ResResult findById(Long id) { - return Res.ok(appVersionService.findById(id)); - } - -} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/CaptchaController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/CaptchaController.java index 6367424e3db6480a03c568d0a856775c2fcd31d0..d1e8920225c39a39e53a7ae6a6c09d4277db7bce 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/CaptchaController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/CaptchaController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; * 验证码服务 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Tag(name = "验证码服务") @RestController diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaRegionController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaRegionController.java index 4e7edd5a64c165d5925b7ec821d27e11e130a708..7e482e664854543198a8e9e20d910603065b98d2 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaRegionController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaRegionController.java @@ -17,7 +17,7 @@ import java.util.List; * 中国行政区划 * * @author xxm - * @date 2022/12/24 + * @since 2022/12/24 */ @Tag(name = "中国行政区划") @RestController diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryController.java index 49372c75f45cd8a6bff045b3ee50df58a487de25..b394edd38b6d5e7f8c28ab7f5311d28f19f64003 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryController.java @@ -20,7 +20,7 @@ import java.util.List; * 字典 * * @author xxm - * @date 2021/8/4 + * @since 2021/8/4 */ @Tag(name = "字典") @RestController diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryItemController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryItemController.java index a71625013a55a5236803e1f68d6c96eb4e378e62..8d4358f1041f09245cf286b19e56f1b8ad8e48ba 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryItemController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryItemController.java @@ -21,7 +21,7 @@ import java.util.List; /** * @author xxm - * @date 2020/4/18 19:03 + * @since 2020/4/18 19:03 */ @Tag(name = "字典项") @RestController diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicDataSourceController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicDataSourceController.java index f0b13d6ea054dca20ee107d933d91d636a194ba2..76212c5564f3edf2d992378d7fb1f537a15e0535 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicDataSourceController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicDataSourceController.java @@ -19,7 +19,7 @@ import java.util.List; * 动态数据源管理 * * @author xxm - * @date 2022-09-24 + * @since 2022-09-24 */ @Tag(name = "动态数据源管理") @RestController diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormController.java index c1841efe1f07f56b5fc4b03c06bd0c10e9cf88bc..a5e0306d6b9b38470a947580f8dc68bde8efdeb6 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormController.java @@ -18,7 +18,7 @@ import java.util.List; * 动态表单 * * @author xxm - * @date 2022-07-28 + * @since 2022-07-28 */ @Tag(name = "动态表单") @RestController diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormDataController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormDataController.java index 16e20e4a5537ec175b171a22cf56ee6433b6d4e0..cbeb9b663cd33d7a447a00047879f5a5645cbcfe 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormDataController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormDataController.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2022/8/13 + * @since 2022/8/13 */ @Tag(name = "动态表单数据") @RestController diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/QuerySqlController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/QuerySqlController.java index 94b4959a58afd75218b37ac0e94001b77f739008..768306c2408d559ecfb89ba9c4f9f937e902c293 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/QuerySqlController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/QuerySqlController.java @@ -1,16 +1,14 @@ package cn.bootx.platform.baseapi.controller; import cn.bootx.platform.baseapi.core.sql.service.QuerySqlService; +import cn.bootx.platform.baseapi.param.sql.QueryFieldParam; +import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.Res; import cn.bootx.platform.common.core.rest.ResResult; -import cn.bootx.platform.baseapi.param.sql.QueryFieldParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; @@ -19,7 +17,7 @@ import java.util.Map; * SQL查询 * * @author xxm - * @date 2023/3/9 + * @since 2023/3/9 */ @Tag(name = "SQL查询") @RestController @@ -29,6 +27,27 @@ public class QuerySqlController { private final QuerySqlService querySqlService; + + @Operation(summary = "分页查询") + @GetMapping("/page") + public ResResult> page(){ + return Res.ok(); + } + + @Operation(summary = "新建") + @PostMapping("/add") + public ResResult add(){ + querySqlService.add(); + return Res.ok(); + } + + @Operation(summary = "修改") + @PostMapping("/update") + public ResResult update(){ + querySqlService.update(); + return Res.ok(); + } + @Operation(summary = "测试SQL解析和执行") @PostMapping("/test") public ResResult test(@RequestBody Map map) { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/SystemParamController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/SystemParamController.java index fcf61835ba49c9d39f3370ecdcf33ed0e8c3ec3b..b19847233ba379e5909eb6378e5092ebc1b13ffc 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/SystemParamController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/SystemParamController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*; * 系统参数 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @Tag(name = "系统参数") @RestController diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/convert/AppVersionConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/convert/AppVersionConvert.java deleted file mode 100644 index bb39a7b27d2dce43709512405793555a2dc3f509..0000000000000000000000000000000000000000 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/convert/AppVersionConvert.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.bootx.platform.baseapi.core.app.convert; - -import cn.bootx.platform.baseapi.core.app.entity.AppVersion; -import cn.bootx.platform.baseapi.dto.app.AppVersionDto; -import cn.bootx.platform.baseapi.param.app.AppVersionParam; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * 转换 - * - * @author xxm - * @date 2021/8/9 - */ -@Mapper -public interface AppVersionConvert { - - AppVersionConvert CONVERT = Mappers.getMapper(AppVersionConvert.class); - - AppVersion convert(AppVersionParam in); - - AppVersion convert(AppVersionDto in); - - AppVersionDto convert(AppVersion in); - -} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/entity/AppVersion.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/entity/AppVersion.java deleted file mode 100644 index 96476354c57a8460aaae59fbb221249846f21599..0000000000000000000000000000000000000000 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/entity/AppVersion.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.bootx.platform.baseapi.core.app.entity; - -import cn.bootx.platform.baseapi.core.app.convert.AppVersionConvert; -import cn.bootx.platform.baseapi.dto.app.AppVersionDto; -import cn.bootx.platform.baseapi.param.app.AppVersionParam; -import cn.bootx.platform.common.core.function.EntityBaseFunction; -import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * App版本 - * - * @author xxm - * @date 2021/8/9 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName("App版本") -public class AppVersion extends MpBaseEntity implements EntityBaseFunction { - - /** app版本 */ - private String appVersion; - - /** 下载地址 */ - private String url; - - /** 密码 */ - private String password; - - /** 包名 */ - private String bundleId; - - /** 说明 */ - private String description; - - public static AppVersion init(AppVersionDto in) { - return AppVersionConvert.CONVERT.convert(in); - } - - public static AppVersion init(AppVersionParam in) { - return AppVersionConvert.CONVERT.convert(in); - } - - @Override - public AppVersionDto toDto() { - return AppVersionConvert.CONVERT.convert(this); - } - -} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/service/AppVersionService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/service/AppVersionService.java deleted file mode 100644 index f71a56b5133107f55e7755614ca1ac51153345bb..0000000000000000000000000000000000000000 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/service/AppVersionService.java +++ /dev/null @@ -1,67 +0,0 @@ -package cn.bootx.platform.baseapi.core.app.service; - -import cn.bootx.platform.baseapi.core.app.dao.AppVersionManager; -import cn.bootx.platform.baseapi.core.app.entity.AppVersion; -import cn.bootx.platform.baseapi.dto.app.AppVersionDto; -import cn.bootx.platform.baseapi.param.app.AppVersionParam; -import cn.bootx.platform.common.core.exception.DataNotExistException; -import cn.bootx.platform.common.core.rest.PageResult; -import cn.bootx.platform.common.core.rest.param.PageParam; -import cn.bootx.platform.common.mybatisplus.util.MpUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.Optional; - -/** - * 版本管理 - * - * @author xxm - * @date 2021/8/9 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class AppVersionService { - - private final AppVersionManager appVersionManager; - - /** - * 添加 - */ - public AppVersionDto add(AppVersionParam param) { - AppVersion appVersion = AppVersion.init(param); - return appVersionManager.save(appVersion).toDto(); - } - - /** - * 删除 - */ - public void delete(Long id) { - appVersionManager.deleteById(id); - } - - /** - * 检查更新 - */ - public AppVersionDto check() { - Optional appVersion = appVersionManager.findLatest(); - return appVersion.map(AppVersion::toDto).orElseThrow(DataNotExistException::new); - } - - /** - * 分页 - */ - public PageResult page(PageParam pageParam) { - return MpUtil.convert2DtoPageResult(appVersionManager.page(pageParam)); - } - - /** - * 获取详情 - */ - public AppVersionDto findById(Long id) { - return appVersionManager.findById(id).map(AppVersion::toDto).orElseThrow(DataNotExistException::new); - } - -} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/captcha/service/CaptchaService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/captcha/service/CaptchaService.java index 4eefbb062b36d2b94c3a8cbf6e4c8729c828544f..148826dd15823adcee0c1013a2b45985f302e334 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/captcha/service/CaptchaService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/captcha/service/CaptchaService.java @@ -15,7 +15,7 @@ import java.util.Objects; * 验证码服务 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Slf4j @Service diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/entity/ChinaWord.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/entity/ChinaWord.java new file mode 100644 index 0000000000000000000000000000000000000000..0d3049a879088f27ffbbe9731f993576fd60707c --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/entity/ChinaWord.java @@ -0,0 +1,39 @@ +package cn.bootx.platform.baseapi.core.chinaword.entity; + +import cn.bootx.mybatis.table.modify.annotation.DbTable; +import cn.bootx.platform.common.mybatisplus.base.MpDelEntity; +import cn.bootx.platform.common.mybatisplus.handler.StringListTypeHandler; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.List; + +/** + * 敏感词 + * @author xxm + * @since 2023/8/8 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@DbTable(comment = "敏感词") +@Accessors(chain = true) +@TableName(value = "base_china_word",autoResultMap = true) +public class ChinaWord extends MpDelEntity { + + /** 敏感词 */ + private String name; + /** 描述 */ + private String description; + /** + * 标签数组 + * 不同的业务场景下,需要启用不同标签的敏感词。 + * + */ + @TableField(typeHandler = StringListTypeHandler.class) + private List tags; + /** 是否启用 */ + private Boolean enable; +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/EndType.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/EndType.java new file mode 100644 index 0000000000000000000000000000000000000000..1e88c045e0acc89c8ac588cd297895817042cc8b --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/EndType.java @@ -0,0 +1,16 @@ +package cn.bootx.platform.baseapi.core.chinaword.wordfilter; + + +/** + * 结束类型定义 + * + * @author minghu.zhang + * @date 11:37 2020/11/11 + **/ +public enum EndType { + + /** + * 有下一个,结束 + */ + HAS_NEXT, IS_END +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/FlagIndex.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/FlagIndex.java new file mode 100644 index 0000000000000000000000000000000000000000..19d0450e0b71c9bf5af8755f11aa64338b9ce62f --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/FlagIndex.java @@ -0,0 +1,48 @@ +package cn.bootx.platform.baseapi.core.chinaword.wordfilter; + +import java.util.List; + +/** + * 敏感词标记 + * + * @author minghu.zhang + */ +public class FlagIndex { + + /** + * 标记结果 + */ + private boolean flag; + /** + * 是否黑名单词汇 + */ + private boolean isWhiteWord; + /** + * 标记索引 + */ + private List index; + + public boolean isFlag() { + return flag; + } + + public void setFlag(boolean flag) { + this.flag = flag; + } + + public List getIndex() { + return index; + } + + public void setIndex(List index) { + this.index = index; + } + + public boolean isWhiteWord() { + return isWhiteWord; + } + + public void setWhiteWord(boolean whiteWord) { + isWhiteWord = whiteWord; + } +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordContext.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordContext.java new file mode 100644 index 0000000000000000000000000000000000000000..fe4e49605f5a787b43240ec6f5589eae505d8ea5 --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordContext.java @@ -0,0 +1,194 @@ +package cn.bootx.platform.baseapi.core.chinaword.wordfilter; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.util.*; +/** + * 词库上下文环境 + *

+ * 初始化敏感词库,将敏感词加入到HashMap中,构建DFA算法模型 + * + * @author minghu.zhang + */ +@SuppressWarnings({"rawtypes", "unchecked"}) +public class WordContext { + + /** + * 敏感词字典 + */ + private final Map wordMap = new HashMap(1024); + + /** + * 是否已初始化 + */ + private boolean init; + /** + * 黑名单列表 + */ + private final String blackList; + /** + * 白名单列表 + */ + private final String whiteList; + + public WordContext() { + this.blackList = "/blacklist.txt"; + this.whiteList = "/whitelist.txt"; + initKeyWord(); + } + + public WordContext(String blackList, String whiteList) { + this.blackList = blackList; + this.whiteList = whiteList; + initKeyWord(); + } + + /** + * 获取初始化的敏感词列表 + * + * @return 敏感词列表 + */ + public Map getWordMap() { + return wordMap; + } + + /** + * 初始化 + */ + private synchronized void initKeyWord() { + try { + if (!init) { + // 将敏感词库加入到HashMap中 + addWord(readWordFile(blackList), WordType.BLACK); + // 将非敏感词库也加入到HashMap中 + addWord(readWordFile(whiteList), WordType.WHITE); + } + init = true; + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * 读取敏感词库,将敏感词放入HashSet中,构建一个DFA算法模型:
+ * 中 = { isEnd = 0 国 = {
+ * isEnd = 1 人 = {isEnd = 0 民 = {isEnd = 1} } 男 = { isEnd = 0 人 = { isEnd = 1 } + * } } } 五 = { isEnd = 0 星 = { isEnd = 0 红 = { isEnd = 0 旗 = { isEnd = 1 } } } } + */ + public void addWord(Iterable wordList, WordType wordType) { + Map nowMap; + Map newWorMap; + // 迭代keyWordSet + for (String key : wordList) { + nowMap = wordMap; + for (int i = 0; i < key.length(); i++) { + // 转换成char型 + char keyChar = key.charAt(i); + // 获取 + Object wordMap = nowMap.get(keyChar); + // 如果存在该key,直接赋值 + if (wordMap != null) { + nowMap = (Map) wordMap; + } else { + // 不存在则构建一个map,同时将isEnd设置为0,因为他不是最后一个 + newWorMap = new HashMap<>(4); + // 不是最后一个 + newWorMap.put("isEnd", String.valueOf(EndType.HAS_NEXT.ordinal())); + nowMap.put(keyChar, newWorMap); + nowMap = newWorMap; + } + + if (i == key.length() - 1) { + // 最后一个 + nowMap.put("isEnd", String.valueOf(EndType.IS_END.ordinal())); + nowMap.put("isWhiteWord", String.valueOf(wordType.ordinal())); + } + } + } + } + + /** + * 在线删除敏感词 + * + * @param wordList 敏感词列表 + * @param wordType 黑名单 BLACk,白名单WHITE + */ + public void removeWord(Iterable wordList, WordType wordType) { + Map nowMap; + for (String key : wordList) { + List cacheList = new ArrayList<>(); + nowMap = wordMap; + for (int i = 0; i < key.length(); i++) { + char keyChar = key.charAt(i); + + Object map = nowMap.get(keyChar); + if (map != null) { + nowMap = (Map) map; + cacheList.add(nowMap); + } else { + return; + } + + if (i == key.length() - 1) { + char[] keys = key.toCharArray(); + boolean cleanable = false; + char lastChar = 0; + for (int j = cacheList.size() - 1; j >= 0; j--) { + Map cacheMap = cacheList.get(j); + if (j == cacheList.size() - 1) { + if (String.valueOf(WordType.BLACK.ordinal()).equals(cacheMap.get("isWhiteWord"))) { + if (wordType == WordType.WHITE) { + return; + } + } + if (String.valueOf(WordType.WHITE.ordinal()).equals(cacheMap.get("isWhiteWord"))) { + if (wordType == WordType.BLACK) { + return; + } + } + cacheMap.remove("isWhiteWord"); + cacheMap.remove("isEnd"); + if (cacheMap.size() == 0) { + cleanable = true; + continue; + } + } + if (cleanable) { + Object isEnd = cacheMap.get("isEnd"); + if (String.valueOf(EndType.IS_END.ordinal()).equals(isEnd)) { + cleanable = false; + } + cacheMap.remove(lastChar); + } + lastChar = keys[j]; + } + + if (cleanable) { + wordMap.remove(lastChar); + } + } + } + } + } + + /** + * 读取敏感词库中的内容,将内容添加到set集合中 + */ + private Set readWordFile(String file) throws Exception { + Set set; + // 字符编码 + String encoding = "UTF-8"; + try (InputStreamReader read = new InputStreamReader( + this.getClass().getResourceAsStream(file), encoding)) { + set = new HashSet<>(); + BufferedReader bufferedReader = new BufferedReader(read); + String txt; + // 读取文件,将文件内容放入到set中 + while ((txt = bufferedReader.readLine()) != null) { + set.add(txt); + } + } + // 关闭文件流 + return set; + } +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordFilter.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordFilter.java new file mode 100644 index 0000000000000000000000000000000000000000..9f871574f73641c744a2a16d8a882d858e815940 --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordFilter.java @@ -0,0 +1,214 @@ +package cn.bootx.platform.baseapi.core.chinaword.wordfilter; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * 敏感词过滤器 + * + * @author minghu.zhang + */ +@SuppressWarnings("rawtypes") +public class WordFilter { + + /** + * 敏感词表 + */ + private final Map wordMap; + + /** + * 构造函数 + */ + public WordFilter(WordContext context) { + this.wordMap = context.getWordMap(); + } + + /** + * 替换敏感词 + * + * @param text 输入文本 + */ + public String replace(final String text) { + return replace(text, 0, '*'); + } + + /** + * 替换敏感词 + * + * @param text 输入文本 + * @param symbol 替换符号 + */ + public String replace(final String text, final char symbol) { + return replace(text, 0, symbol); + } + + /** + * 替换敏感词 + * + * @param text 输入文本 + * @param skip 文本距离 + * @param symbol 替换符号 + */ + public String replace(final String text, final int skip, final char symbol) { + char[] charset = text.toCharArray(); + for (int i = 0; i < charset.length; i++) { + FlagIndex fi = getFlagIndex(charset, i, skip); + if (fi.isFlag()) { + if (!fi.isWhiteWord()) { + for (int j : fi.getIndex()) { + charset[j] = symbol; + } + } else { + i += fi.getIndex().size() - 1; + } + } + } + return new String(charset); + } + + /** + * 是否包含敏感词 + * + * @param text 输入文本 + */ + public boolean include(final String text) { + return include(text, 0); + } + + /** + * 是否包含敏感词 + * + * @param text 输入文本 + * @param skip 文本距离 + */ + public boolean include(final String text, final int skip) { + boolean include = false; + char[] charset = text.toCharArray(); + for (int i = 0; i < charset.length; i++) { + FlagIndex fi = getFlagIndex(charset, i, skip); + if(fi.isFlag()) { + if (fi.isWhiteWord()) { + i += fi.getIndex().size() - 1; + } else { + include = true; + break; + } + } + } + return include; + } + + /** + * 获取敏感词数量 + * + * @param text 输入文本 + */ + public int wordCount(final String text) { + return wordCount(text, 0); + } + + /** + * 获取敏感词数量 + * + * @param text 输入文本 + * @param skip 文本距离 + */ + public int wordCount(final String text, final int skip) { + int count = 0; + char[] charset = text.toCharArray(); + for (int i = 0; i < charset.length; i++) { + FlagIndex fi = getFlagIndex(charset, i, skip); + if (fi.isFlag()) { + if(fi.isWhiteWord()) { + i += fi.getIndex().size() - 1; + } else { + count++; + } + } + } + return count; + } + + /** + * 获取敏感词列表 + * + * @param text 输入文本 + */ + public List wordList(final String text) { + return wordList(text, 0); + } + + /** + * 获取敏感词列表 + * + * @param text 输入文本 + * @param skip 文本距离 + */ + public List wordList(final String text, final int skip) { + List wordList = new ArrayList<>(); + char[] charset = text.toCharArray(); + for (int i = 0; i < charset.length; i++) { + FlagIndex fi = getFlagIndex(charset, i, skip); + if (fi.isFlag()) { + if(fi.isWhiteWord()) { + i += fi.getIndex().size() - 1; + } else { + StringBuilder builder = new StringBuilder(); + for (int j : fi.getIndex()) { + char word = text.charAt(j); + builder.append(word); + } + wordList.add(builder.toString()); + } + } + } + return wordList; + } + + /** + * 获取标记索引 + * + * @param charset 输入文本 + * @param begin 检测起始 + * @param skip 文本距离 + */ + private FlagIndex getFlagIndex(final char[] charset, final int begin, final int skip) { + FlagIndex fi = new FlagIndex(); + + Map current = wordMap; + boolean flag = false; + int count = 0; + List index = new ArrayList<>(); + for (int i = begin; i < charset.length; i++) { + char word = charset[i]; + Map mapTree = (Map) current.get(word); + if (count > skip || (i == begin && Objects.isNull(mapTree))) { + break; + } + if (Objects.nonNull(mapTree)) { + current = mapTree; + count = 0; + index.add(i); + } else { + count++; + if (flag && count > skip) { + break; + } + } + if ("1".equals(current.get("isEnd"))) { + flag = true; + } + if ("1".equals(current.get("isWhiteWord"))) { + fi.setWhiteWord(true); + break; + } + } + + fi.setFlag(flag); + fi.setIndex(index); + + return fi; + } +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordType.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordType.java new file mode 100644 index 0000000000000000000000000000000000000000..7284332c848c5b586c40f70ba02c8f0d9cc37d46 --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordType.java @@ -0,0 +1,15 @@ +package cn.bootx.platform.baseapi.core.chinaword.wordfilter; + +/** + * 词汇类型 + * + * @author minghu.zhang + * @date 11:37 2020/11/11 + **/ +public enum WordType { + + /** + * 黑名单/白名单 + */ + BLACK, WHITE +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/convert/DictionaryConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/convert/DictionaryConvert.java index 58ea966f76004732cb3ee42c14dbaecc4e22d045..187996595cd2cc10c68c6cef8f6be2245590e14d 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/convert/DictionaryConvert.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/convert/DictionaryConvert.java @@ -14,7 +14,7 @@ import org.mapstruct.factory.Mappers; * 渠道转换 * * @author xxm - * @date 2021/7/6 + * @since 2021/7/6 */ @Mapper public interface DictionaryConvert { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemManager.java index 61c8fa6ce5e315db0a9ed22006a0e9499d7ae67e..b8717be6eb83f3bc3f35d61d5fc9cd6a282dd8bc 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemManager.java @@ -16,7 +16,7 @@ import java.util.Optional; * 字典项 * * @author xxm - * @date 2020/4/21 14:08 + * @since 2020/4/21 14:08 */ @Repository @AllArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemMapper.java index 6626e8e020f459c639921a4d66baab8c659fac50..2a9070e2fb3b82af77a898074912731ff4ede110 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 字典项 * * @author xxm - * @date 2020/11/13 + * @since 2020/11/13 */ @Mapper public interface DictionaryItemMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryManager.java index b6a4e7fc9b61019b2162386b25cf9bde206123de..29677dea5cb604fa6e1f0da559ac3b804ca1c9db 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryManager.java @@ -17,7 +17,7 @@ import java.util.List; * 字典 * * @author xxm - * @date 2020/11/13 + * @since 2020/11/13 */ @Repository @AllArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryMapper.java index 99822895824cf7ca5119f2bd1cd8b67ed3ce2957..63f3f3d5504e9d6980a53d85c0e2e48d6082d8da 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 字典 * * @author xxm - * @date 2021/8/4 + * @since 2021/8/4 */ @Mapper public interface DictionaryMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/Dictionary.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/Dictionary.java index 7b5a9e81af8ee8ba6e96497c2562c4e19eed3d27..1fded29657cd9a42909079589067cf81ae3a35c4 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/Dictionary.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/Dictionary.java @@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode; * 字典 * * @author xxm - * @date 2020/11/13 + * @since 2020/11/13 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/DictionaryItem.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/DictionaryItem.java index 0a04a0f73dbff0c07b2d0efac0bcc21b4771117a..3f22374909010f30033415efb2dbca38ffc1b733 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/DictionaryItem.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/DictionaryItem.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; * 字典项 * * @author xxm - * @date 2020/4/15 17:45 + * @since 2020/4/15 17:45 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictTranslationServiceImpl.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictTranslationServiceImpl.java index 5dd953245bcf739359c47982583859be085a4995..991591bc827b0a44816b545e75c2d692983a908f 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictTranslationServiceImpl.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictTranslationServiceImpl.java @@ -21,7 +21,7 @@ import java.util.stream.Collectors; * 字典值转换工具类 * * @author xxm - * @date 2022/12/15 + * @since 2022/12/15 */ @Slf4j @Service diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryItemService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryItemService.java index d3047f86610a95f79e61c20fb0024948157408a5..0f39905eaaaa473f0ebdd4b7c03db93bb1a2e425 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryItemService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryItemService.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; /** * @author xxm - * @date 2020/4/16 21:16 + * @since 2020/4/16 21:16 */ @Service @AllArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryService.java index a29e2e153bb90837cb4b2666682af82359599a6d..9e4a8aafd1abf737c8170b33864a13d365b2e617 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryService.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; /** * @author xxm - * @date 2020/4/10 15:52 + * @since 2020/4/10 15:52 */ @Service @AllArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/convert/DynamicFormConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/convert/DynamicFormConvert.java index 57e799ab94126c7a22a5e58c14cb4f425f3248f4..37c0f81d08ebab31a2ad08a81440ff09da6f2b43 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/convert/DynamicFormConvert.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/convert/DynamicFormConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 动态表单 * * @author xxm - * @date 2022-07-28 + * @since 2022-07-28 */ @Mapper public interface DynamicFormConvert { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/dao/DynamicFormManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/dao/DynamicFormManager.java index 05b68eafe30810b69b99ca73087167ef14cd8fb9..8e5e18cd3591220e226d8d35f558f38082dbb1fc 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/dao/DynamicFormManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/dao/DynamicFormManager.java @@ -16,7 +16,7 @@ import java.util.Objects; * 动态表单 * * @author xxm - * @date 2022-07-28 + * @since 2022-07-28 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/dao/DynamicFormMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/dao/DynamicFormMapper.java index b8a68c69a8f76a9be1d67be99c4a72eb04c97fed..2569468b95f5ba48b4fa965fe77ac33e5ca6dc7e 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/dao/DynamicFormMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/dao/DynamicFormMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 动态表单 * * @author xxm - * @date 2022-07-28 + * @since 2022-07-28 */ @Mapper public interface DynamicFormMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicForm.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicForm.java index f40023cd38c4b279ee4ff2144dfdcc0f1a288329..bc1b0da21ce2fa930dcb8e043b93a4b7793d47cf 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicForm.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicForm.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; * 动态表单 * * @author xxm - * @date 2022-07-28 + * @since 2022-07-28 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicFormData.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicFormData.java index 216d0d2f930271ca22b10b607ca66c48ce615473..f130db13bbf8b8618e41d6cd1507f095d4b48a7f 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicFormData.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicFormData.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/7/30 + * @since 2022/7/30 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormDataService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormDataService.java index ac815f77f645abdfc8071c5dcda2c90e5ce13f8c..886636af709df43d8dd6b514c8c1e667346ce393 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormDataService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormDataService.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; * 动态表单数据收集 * * @author xxm - * @date 2022/8/13 + * @since 2022/8/13 */ @Slf4j @Service diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormService.java index eeb09bc53610808ae4a577fdc92fb7d6ada6993d..39c93a1ea5e767dd05fe5a25f9ec4e9235b6585e 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormService.java @@ -21,7 +21,7 @@ import java.util.List; * 动态表单 * * @author xxm - * @date 2022-07-28 + * @since 2022-07-28 */ @Slf4j @Service diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/convert/DynamicDataSourceConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/convert/DynamicDataSourceConvert.java index 02956b1bb23fcba1b8c1753802f528e2573c6334..d39fc09bbe6df95e5581922eea2db07e60da87bf 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/convert/DynamicDataSourceConvert.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/convert/DynamicDataSourceConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 动态数据源管理 * * @author xxm - * @date 2022-09-24 + * @since 2022-09-24 */ @Mapper public interface DynamicDataSourceConvert { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceManager.java index 841a924910d89bd1ed6074d85147106aa3976d21..4639c4608a1bf0cd76ae0b526f83f15347646834 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceManager.java @@ -18,7 +18,7 @@ import java.util.Optional; * 动态数据源管理 * * @author xxm - * @date 2022-09-24 + * @since 2022-09-24 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceMapper.java index 9085dbcdbd8c4354206b1223415c4f8f258f9037..f59b19d117e97b10005ad905f87497371a04e8cb 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 动态数据源管理 * * @author xxm - * @date 2022-09-24 + * @since 2022-09-24 */ @Mapper public interface DynamicDataSourceMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/entity/DynamicDataSource.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/entity/DynamicDataSource.java index e610a98cb1e22c4e24845b005209eb2efc2555f5..84de88d5c48daf5c796b686f72e8512d4be2a2d3 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/entity/DynamicDataSource.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/entity/DynamicDataSource.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; * 动态数据源管理 * * @author xxm - * @date 2022-09-24 + * @since 2022-09-24 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/service/DynamicDataSourceService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/service/DynamicDataSourceService.java index 0862e520f1a327ca2146665381025d0f40418bba..5a869aa175948594932fcfe7a123812da2b0974c 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/service/DynamicDataSourceService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/service/DynamicDataSourceService.java @@ -35,7 +35,7 @@ import java.util.stream.Collectors; * 动态数据源管理 * * @author xxm - * @date 2022/9/24 + * @since 2022/9/24 */ @Slf4j @Service diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueManager.java index 4912240d4cf6f088901dc14eb37ef945a658c3f6..52cee883762176e28b257317797a8b2642d3af70 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueManager.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; /** * @author xxm - * @date 2022/3/30 + * @since 2022/3/30 */ @Slf4j @Repository diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueMapper.java index 6830b32fbc8f53d591f796d038529040bffdae4f..367dbfea850bf85605ff0b3690f3b6ce2bbc9658 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/3/30 + * @since 2022/3/30 */ @Mapper public interface SysKeyValueMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/entity/SysKeyValue.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/entity/SysKeyValue.java index 8bc10663800dc5a583db4c1c040f8371a1af5d92..45e0258bff9f44a9fd7ed8e8cf45624f5625e44c 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/entity/SysKeyValue.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/entity/SysKeyValue.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; * kv存储 * * @author xxm - * @date 2022/3/30 + * @since 2022/3/30 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/service/SysKeyValueService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/service/SysKeyValueService.java index af2c90a84a550a7b985b7b58411e749f1781f1f1..c994548d6b0f0b3507c3fadacbad3d39839f8375 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/service/SysKeyValueService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/service/SysKeyValueService.java @@ -15,7 +15,7 @@ import java.util.stream.Collectors; * kv存储 * * @author xxm - * @date 2022/3/30 + * @since 2022/3/30 */ @Slf4j @Service diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/convert/SystemConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/convert/SystemConvert.java index 6dfecc4e8c7a46d1764b0d031ec2865599e1d603..2890c70ef70690898b344cd918e01eb2c3143b93 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/convert/SystemConvert.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/convert/SystemConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 系统参数和系统配置实体类转换 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @Mapper public interface SystemConvert { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamManager.java index db70e0eabdfd67ebe73561ebc50abd35036b6d1e..200bd344e7d8641cc5c0c515b630f9da8ad7cffd 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamManager.java @@ -22,7 +22,7 @@ import java.util.Optional; * 系统参数 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @Slf4j @Repository diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamMapper.java index 02b3be62f1d33a790e61daf1b008253d546d0c1b..04b29db1f790edeced573f121fb33ba32cb35e44 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @Mapper public interface SystemParamMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/entity/SystemParameter.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/entity/SystemParameter.java index bb75d4c9a68552a1bb0e2cd9ff9c73e5a1bb92a7..58676f5fa58eeb96cc42b65b2c228af88534921e 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/entity/SystemParameter.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/entity/SystemParameter.java @@ -16,7 +16,7 @@ import lombok.experimental.Accessors; * 系统参数 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/service/SystemParamService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/service/SystemParamService.java index e195a8d1bc1dc667dde091574ec6fa5ff5fef24e..fa75fe8c41b74ea3a36adfc81a63987580f20ba3 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/service/SystemParamService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/service/SystemParamService.java @@ -24,7 +24,7 @@ import java.util.Objects; * 系统参数 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @Slf4j @Service diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaManager.java index 2b1593875adf95254295f31acffcae0ca5ae6ca5..4b15232898746a661e20b3f031f8ebee860af5b4 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaManager.java @@ -11,7 +11,7 @@ import java.util.List; * 区域表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaMapper.java index 5cb4759c98601c8a3a98ec018fef00dc72c5216c..955fce5b4f4e0d80757c6cd9c42d18f7edd7b196 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 区域表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Mapper public interface AreaMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityManager.java index 34de04320c8bd2726d79d3711810e9bc9d3054c5..35844aa67d5ec46627d76e61e53f29bb2ef5eadd 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityManager.java @@ -11,7 +11,7 @@ import java.util.List; * 城市表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityMapper.java index 0f906aed1cf6733c2ec3d055fcf2df85673f7c78..527e5b0da3393f671f8a584f42dfa43b9b14db5f 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 城市表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Mapper public interface CityMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceManager.java index 07dc2d32ce7dad16d4c2e65f5355e9550b0b693d..ac27e072dca4d37050ee9766801a0021a8989153 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceManager.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository; * 省份表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceMapper.java index 536a801d8a364d223c55dffe448c5387e2f42aef..8ef0286f84b580d16b9c3054693cfa3bb1aa7c16 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 省份表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Mapper public interface ProvinceMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetManager.java index cab30559ed633bfa7b0989204c048f8071f52d07..62d517f76148666efd512fe07a0a74723d3d264f 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetManager.java @@ -11,7 +11,7 @@ import java.util.List; * 街道表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetMapper.java index 58114551c25467c745bd22bc2287a3b24129ab29..7a68223de7329b701a28bfdc04b2aa21b54710be 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 街道表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Mapper public interface StreetMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageManager.java index aeaf3a1370381a7640341d25cbfc642e9badf08f..8855d791415ff57d08f019498ea1970663d320db 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageManager.java @@ -11,7 +11,7 @@ import java.util.List; * 村庄/社区 * * @author xxm - * @date 2023/2/3 + * @since 2023/2/3 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageMapper.java index d13742a49eb50e705d400e4b2eab7b18c89398ef..dacf9cb6653f42791620ea467db4e80a5007661f 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 村庄/社区 * * @author xxm - * @date 2023/2/3 + * @since 2023/2/3 */ @Mapper public interface VillageMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Area.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Area.java index d7a96d48625cbd17ee0c00013810cf34cf175c55..70f44419c9f1ff13ef660daa39ddff8f32081a01 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Area.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Area.java @@ -9,7 +9,7 @@ import lombok.Data; * 区域表(县区) * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Data @TableName("base_area") diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/City.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/City.java index aea0abedc9ce18156c210b4160925ed350d6baa0..64cf37ebde8a77aea995dfb6f3eff1e5873ac6ef 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/City.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/City.java @@ -9,7 +9,7 @@ import lombok.Data; * 城市表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Data @TableName("base_city") diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Province.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Province.java index 23d40b86649b6dfa81f8e6704da975a09fa35da8..2f631cdcac71ee2d2bf557b9c7d3450102544d2d 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Province.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Province.java @@ -9,7 +9,7 @@ import lombok.Data; * 省份表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Data @TableName("base_province") diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Street.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Street.java index db0737000e431437ee7a0b21b464c4cff100f290..5091b13403f0dec4aad95cf631374140ef563bce 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Street.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Street.java @@ -9,7 +9,7 @@ import lombok.Data; * 街道/乡镇表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Data @TableName("base_street") diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Village.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Village.java index 3211ccdd2bf5c13ed58f92a9ed2ac15707b72842..67bf349853bffe7b69184133b9b5e07a24425898 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Village.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Village.java @@ -9,7 +9,7 @@ import lombok.Data; * 村庄/社区 * * @author xxm - * @date 2023/2/3 + * @since 2023/2/3 */ @Data @TableName("base_village") diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/service/ChinaRegionService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/service/ChinaRegionService.java index 3f54f6effa0f93f9ffe382941ce36649874962b9..4a643f170e0c8ee6ecbe34fffc1b9ff17804b99e 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/service/ChinaRegionService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/service/ChinaRegionService.java @@ -19,7 +19,7 @@ import java.util.stream.Collectors; * 中国行政区划 * * @author xxm - * @date 2022/12/24 + * @since 2022/12/24 */ @Slf4j @Service diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/convert/QuerySqlConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/convert/QuerySqlConvert.java index ffbeedde2f9bb9c176a2dc76adf9b6e763262d67..c29ab9c36c40939943dbcd2f4b8664c926e998dc 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/convert/QuerySqlConvert.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/convert/QuerySqlConvert.java @@ -8,7 +8,7 @@ import org.mapstruct.factory.Mappers; /** * @author xxm - * @date 2023/3/13 + * @since 2023/3/13 */ @Mapper public interface QuerySqlConvert { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlManager.java index 022dd6be5cf4c2f65ba0a33c9212642a8afb69f0..7b726ae3b130f6e816d766485fb961bf2fc9f358 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlManager.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository; /** * @author xxm - * @date 2023/3/9 + * @since 2023/3/9 */ @Slf4j @Repository diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlMapper.java index 714cff920135748a10f4b3285c62753ce6dfe083..6dc01155c83e6e7b4a7bf30ecb10152fd21bcf2c 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2023/3/9 + * @since 2023/3/9 */ @Mapper public interface QuerySqlMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/entity/QuerySql.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/entity/QuerySql.java index c002d399166ef4c92b40aff3a95fa972ea1ab9e6..55ca59300d806bf773a0d6dabda2da1616780be3 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/entity/QuerySql.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/entity/QuerySql.java @@ -18,7 +18,7 @@ import java.util.List; * SQL查询语句 * * @author xxm - * @date 2023/3/9 + * @since 2023/3/9 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/service/QuerySqlService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/service/QuerySqlService.java index 109cb840450b42b3695d0a3b9be1bcbf49ccfaf3..8766c897a7dfede1233fcf03f26c4305425255b4 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/service/QuerySqlService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/service/QuerySqlService.java @@ -13,6 +13,7 @@ import cn.bootx.platform.common.core.function.CollectorsFunction; import cn.bootx.platform.starter.auth.util.SecurityUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.db.Entity; +import cn.hutool.db.PageResult; import cn.hutool.db.handler.EntityHandler; import cn.hutool.db.handler.EntityListHandler; import cn.hutool.db.sql.SqlExecutor; @@ -33,7 +34,7 @@ import java.util.stream.Collectors; /** * @author xxm - * @date 2023/3/9 + * @since 2023/3/9 */ @Slf4j @Service @@ -58,10 +59,16 @@ public class QuerySqlService { /** * 修改 */ + public void update(){ + + } /** * 分页查询 */ + public PageResult page(){ + return new PageResult<>(); + } /** * 执行SQL查询 diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/app/AppVersionDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/app/AppVersionDto.java index daf3a20e1413b75cd21e5a3d9974964d7e8d70dd..cf511e756983eed5fb2a30a88f6b606050d21d0d 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/app/AppVersionDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/app/AppVersionDto.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2021/8/9 + * @since 2021/8/9 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/captcha/CaptchaDataResult.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/captcha/CaptchaDataResult.java index 9f8c052e747bd2ec5428fc63518058570b85f8e6..936dd5f60804853d8ade5db7f11782db725c0a4a 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/captcha/CaptchaDataResult.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/captcha/CaptchaDataResult.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; * 验证码数据 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryDto.java index 95c26c89d23d71003c52f072cb65511bcb168b73..d02e1ec8b51920511e5c998915f45292b3941d38 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryDto.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/4/10 14:46 + * @since 2020/4/10 14:46 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemDto.java index 5a2c60f63bc34ea04400d9cbaf228eff55ae3e57..795df4431abdde900a482b54ea618ad28e2790ec 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemDto.java @@ -12,7 +12,7 @@ import java.io.Serializable; * 数据字典项 * * @author xxm - * @date 2020/4/15 17:55 + * @since 2020/4/15 17:55 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemSimpleDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemSimpleDto.java index fcdc37f9825067951cea40389ca9bb823e250804..f783364fb5b4bddddd78dd1fa66289cccfea60e8 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemSimpleDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemSimpleDto.java @@ -10,7 +10,7 @@ import java.io.Serializable; * 数据字典项(简单) * * @author xxm - * @date 2020/4/15 17:55 + * @since 2020/4/15 17:55 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicform/DynamicFormDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicform/DynamicFormDto.java index 3556811c5c05b4454be0e7673d688d29b0e0d042..8e886ab83f848b10efd634fda105521cbdd0a88b 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicform/DynamicFormDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicform/DynamicFormDto.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 动态表单 * * @author xxm - * @date 2022-07-28 + * @since 2022-07-28 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicsource/DynamicDataSourceDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicsource/DynamicDataSourceDto.java index 559c1db5af2af8ba1b192d728f10ef4e933f94a3..13ce13a61763267e326d2351cd600a57455aa418 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicsource/DynamicDataSourceDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicsource/DynamicDataSourceDto.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; * 动态数据源管理 * * @author xxm - * @date 2022-09-24 + * @since 2022-09-24 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/parameter/SystemParameterDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/parameter/SystemParameterDto.java index ad78445183dd8c9821e9e3d98e4a092b1f5b0d1e..cf24d18cfc2ee594c2d9be78e0cd219e8fae9098 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/parameter/SystemParameterDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/parameter/SystemParameterDto.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 系统参数 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/region/RegionDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/region/RegionDto.java index 4191699e9151772c32d85c28bc6bd54e1a2d34d4..dae3b9b07bd67a3d2fccc698337f6cd83414b6dc 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/region/RegionDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/region/RegionDto.java @@ -13,7 +13,7 @@ import java.util.List; * 中国行政区域通用对象 * * @author xxm - * @date 2022/12/24 + * @since 2022/12/24 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/sql/QuerySqlDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/sql/QuerySqlDto.java index ef88e747da4bff70d357c33fa142d83bc9eb4722..97f2a164ff8fd228a5e04f41b8fefc1624b5c17a 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/sql/QuerySqlDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/sql/QuerySqlDto.java @@ -12,7 +12,7 @@ import java.util.List; /** * @author xxm - * @date 2023/3/13 + * @since 2023/3/13 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictAlreadyExistedException.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictAlreadyExistedException.java index af538821aa5d5cc33ba7b48457ce55f5098a7637..5b138b97dce2de7a6ff0a7ce3abb6c5383412868 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictAlreadyExistedException.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictAlreadyExistedException.java @@ -7,7 +7,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/4/10 15:14 + * @since 2020/4/10 15:14 */ public class DictAlreadyExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictChildItemExistedException.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictChildItemExistedException.java index f7e5bedc270ce81a51951c8e59ce9a41814e68ac..0bcdef395ed78ff33377457673a65bb2fe55157d 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictChildItemExistedException.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictChildItemExistedException.java @@ -7,7 +7,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/4/16 22:08 + * @since 2020/4/16 22:08 */ public class DictChildItemExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyExistedException.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyExistedException.java index be99f9e1c7b9d756649eeee2f59163488fa7c36e..60e67264e4198dadc4f47f7102e2bdaf5c04dae9 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyExistedException.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyExistedException.java @@ -7,7 +7,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/4/21 11:53 + * @since 2020/4/21 11:53 */ public class DictItemAlreadyExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyUsedException.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyUsedException.java index 18a3681090e1db98e6c6ef5854edf6fe6638225c..294af1e36b9eae98d407c3c3bcade5558b9bef86 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyUsedException.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyUsedException.java @@ -7,7 +7,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/4/21 11:54 + * @since 2020/4/21 11:54 */ public class DictItemAlreadyUsedException extends BizException implements Serializable { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemNotExistedException.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemNotExistedException.java index b3fe17f51b51dd0a7033e9728d987651d66df713..236367f70519e8ba834c82c024aefa61b1283190 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemNotExistedException.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemNotExistedException.java @@ -7,7 +7,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/4/21 11:54 + * @since 2020/4/21 11:54 */ public class DictItemNotExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictNotExistedException.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictNotExistedException.java index ab64a684f957d3c36502ea9944cf6e5890fa36c4..ce7e0be137fc31630289c51fe6bdf4ea69420a8b 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictNotExistedException.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictNotExistedException.java @@ -7,7 +7,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/4/21 11:53 + * @since 2020/4/21 11:53 */ public class DictNotExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/dynamicsource/DynamicDataSourceLoadHandler.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/dynamicsource/DynamicDataSourceLoadHandler.java index f2b5897dbc23f94e84ce94de1cf5e7dfcb30d8c3..28775ba54258d8cd2e4bdf98519ac572c5a64af9 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/dynamicsource/DynamicDataSourceLoadHandler.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/dynamicsource/DynamicDataSourceLoadHandler.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; /** * 初始化数据源函数 * @author xxm - * @date 2023/5/17 + * @since 2023/5/17 */ @Slf4j @Component diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/mp/MpMetaObjectHandler.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/mp/MpMetaObjectHandler.java index 1b67aff1093300a42754a6032a384891e7fb0e2b..06b5b98cb098b5d1a04d343f4a7703250752889e 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/mp/MpMetaObjectHandler.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/mp/MpMetaObjectHandler.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; * mp自动填充值 * * @author xxm - * @date 2021/7/27 + * @since 2021/7/27 */ @Component public class MpMetaObjectHandler implements MetaObjectHandler { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/region/ChinaRegionInitSqlHandler.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/region/ChinaRegionInitSqlHandler.java index 05ad3b0a5bd001cf4c2b95a6bf0d2929f8bb1d5c..df05b34d48db050666e9a7b7694b8257f4f51419 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/region/ChinaRegionInitSqlHandler.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/region/ChinaRegionInitSqlHandler.java @@ -10,7 +10,7 @@ import java.util.List; * 行政区域初始化 * * @author xxm - * @date 2023/2/7 + * @since 2023/2/7 */ @Component public class ChinaRegionInitSqlHandler extends SimpleDdl { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/app/AppVersionParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/app/AppVersionParam.java index d62cd06679af1b2c6ec95f60e4d4ca9780a1978d..8bca41b164c04fde66e0de5a2636f93cbb3b748f 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/app/AppVersionParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/app/AppVersionParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * app版本参数 * * @author xxm - * @date 2021/8/9 + * @since 2021/8/9 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryItemParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryItemParam.java index aba346a7284981d8bca0abed1dd0e605e1606b5f..e8be3376592a004e0efb45a95cc5c0a030b35227 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryItemParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryItemParam.java @@ -14,7 +14,7 @@ import java.io.Serializable; * 字典项参数 * * @author xxm - * @date 2021/8/4 + * @since 2021/8/4 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryParam.java index 6a6dc4e80c09a850db6c5ec01c6e3a90da3fc781..359f57abc119f71fe6495275d3924b89e7fb85bf 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryParam.java @@ -12,7 +12,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/4/10 14:46 + * @since 2020/4/10 14:46 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicform/DynamicFormParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicform/DynamicFormParam.java index ac1023476397040f53e536a62cf3ffada22ccb42..9a3874e698c9e270b5f620981f95e30a37a7d534 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicform/DynamicFormParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicform/DynamicFormParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 动态表单 * * @author xxm - * @date 2022-07-28 + * @since 2022-07-28 */ @Data @Schema(title = "动态表单") diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicsource/DynamicDataSourceParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicsource/DynamicDataSourceParam.java index fa7f375add56808f841bc51e9b8f04a629a256da..f79eb52bd17764a96d77602bc1b302ebb7df0fe8 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicsource/DynamicDataSourceParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicsource/DynamicDataSourceParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 动态数据源管理 * * @author xxm - * @date 2022-09-24 + * @since 2022-09-24 */ @Data @Schema(title = "动态数据源管理") diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QueryFieldParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QueryFieldParam.java index a11d89725e9fb333d6e05dc825aee75ee1dd592d..78150d81bdb5f7c6b48ae5891710be4a8a1d1006 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QueryFieldParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QueryFieldParam.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2023/3/9 + * @since 2023/3/9 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QuerySqlParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QuerySqlParam.java index 6a5d549e590f6a6a7861f4616c83b0df4089e521..b0d620d31395fa748751d4da39a2c7dea5003d74 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QuerySqlParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QuerySqlParam.java @@ -12,7 +12,7 @@ import java.util.List; * 查询语句参数类 * * @author xxm - * @date 2023/3/13 + * @since 2023/3/13 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/system/SystemParameterParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/system/SystemParameterParam.java index 0b2a1a993c99f56142430c949cf8fe85d64dae70..beea6f211af3bd6674fb4b20dc5f501aad994c10 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/system/SystemParameterParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/system/SystemParameterParam.java @@ -13,7 +13,7 @@ import javax.validation.constraints.Null; * 系统参数 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/pom.xml b/bootx-services/service-iam/pom.xml index 0c27af07f0617757da64960b5ff810f5171ac586..0a92ea4c9a8eef2be175ebda1121229798a5855f 100644 --- a/bootx-services/service-iam/pom.xml +++ b/bootx-services/service-iam/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-services - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/IamApplication.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/IamApplication.java index 33566bd6230d155d83b8ed42e8c3e781861e0442..fd5329e2bd66530ae8c44a77bcf366d619cc199a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/IamApplication.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/IamApplication.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * 身份识别与访问管理 * * @author xxm - * @date 2021/7/29 + * @since 2021/7/29 */ @ComponentScan @MapperScan(annotationClass = Mapper.class) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/CachingCode.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/CachingCode.java index 3a7db05ec6b0244501dcc3149446f1fb3321fac9..3c382a4b23f216fb4a23f04b63eaa05290b4d8d8 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/CachingCode.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/CachingCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.iam.code; * 缓存名称 * * @author xxm - * @date 2021/6/16 + * @since 2021/6/16 */ public interface CachingCode { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/IamErrorCode.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/IamErrorCode.java index 236f4566d0ec1f6a2879fe5ecfa14c95b64aa4ef..43cd6030d0bdbbb25310aca1dd733e9e3246c944 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/IamErrorCode.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/IamErrorCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.iam.code; * 用户中心错误码(21000-21999) * * @author xxm - * @date 2020/4/24 16:01 + * @since 2020/4/24 16:01 */ public interface IamErrorCode { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/OrgCategoryCode.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/OrgCategoryCode.java index 3f85fe41301491540621c87ceb4752e764112aa5..64070b64fd240ae9b80008636122901223bff577 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/OrgCategoryCode.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/OrgCategoryCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.iam.code; * 部门组织机构类型 * * @author xxm - * @date 2021/9/29 + * @since 2021/9/29 */ public interface OrgCategoryCode { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/PermissionCode.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/PermissionCode.java index 55be6a732d6b7c237fb177366e8418a67883a7df..bb64718114ac4fb138c030b2b26239e7b10c0847 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/PermissionCode.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/PermissionCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.iam.code; * 权限相关编码 * * @author xxm - * @date 2021/7/12 + * @since 2021/7/12 */ public interface PermissionCode { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/UserStatusCode.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/UserStatusCode.java index 25490690f2f3f204cc9bd4a34ca77fd1e0ab25cb..07f9d17d5e6c5ca032329ce4f72eebfccdfeb19d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/UserStatusCode.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/UserStatusCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.iam.code; * 用户状态码 * * @author xxm - * @date 2021/9/9 + * @since 2021/9/9 */ public interface UserStatusCode { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/AuthAssistController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/AuthAssistController.java index 3040af5a5b651c9d17767e73e84df4d82e1d4aa3..0a1acc23cc37a2e843702ade2e064c2673a8c36d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/AuthAssistController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/AuthAssistController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2021/9/9 + * @since 2021/9/9 */ @Tag(name = "认证支撑接口") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ClientController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ClientController.java index 46b778172b81c1853e25708aa9e12bb4e360b293..631ea44967a271880cf8262e9f923bf4076cda83 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ClientController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ClientController.java @@ -18,7 +18,7 @@ import java.util.List; * 认证终端 * * @author xxm - * @date 2022-06-27 + * @since 2022-06-27 */ @Tag(name = "认证终端") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DataScopeController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DataScopeController.java index ed1560a7e329dda13b844abce451c216e37072e0..6e0cb7b6e4bf7a83fe000d5107ce5caf1cf4fc6a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DataScopeController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DataScopeController.java @@ -21,7 +21,7 @@ import java.util.List; /** * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Tag(name = "数据范围权限配置") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DeptController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DeptController.java index 061d3613785dc33e20d8315afa391f6f01363254..215fba1f642b2b44537c7cdb61465068d4cf55f6 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DeptController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DeptController.java @@ -15,7 +15,7 @@ import java.util.List; /** * @author xxm - * @date 2020/5/10 + * @since 2020/5/10 */ @Tag(name = "部门管理") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/LoginTypeController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/LoginTypeController.java index 429eae8d44b18aef2ea53d049a36e2c6de0d1e43..aecb33de77c6d26823b81ec9dfc0474eaf174570 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/LoginTypeController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/LoginTypeController.java @@ -20,7 +20,7 @@ import java.util.List; * 登录方式 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ @Tag(name = "登录方式管理") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermMenuController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermMenuController.java index a695dfa642e8f90bc44c93ea724453dbe05748fa..f946dc38236ac278fcd86cd427a1f6f5a3c8c822 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermMenuController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermMenuController.java @@ -15,7 +15,7 @@ import java.util.List; /** * @author xxm - * @date 2020/5/11 9:36 + * @since 2020/5/11 9:36 */ @Tag(name = "菜单权限资源") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermPathController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermPathController.java index 5951759c296f0bb10163533b8037d51fcda92242..84392123a4e21417cba5a4a941bda84106758316 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermPathController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermPathController.java @@ -21,7 +21,7 @@ import java.util.List; /** * @author xxm - * @date 2020/5/11 9:36 + * @since 2020/5/11 9:36 */ @Validated @Tag(name = "请求权限资源") diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleController.java index 7f9e1d98815e4031b3627c1be5ca8910058a8824..b3b4cee2c8ccc4494e03e05a417b503c3c4e4140 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleController.java @@ -18,7 +18,7 @@ import java.util.List; /** * @author xxm - * @date 2021/6/9 + * @since 2021/6/9 */ @Tag(name = "角色管理") @RestController @@ -30,10 +30,10 @@ public class RoleController { @Operation(summary = "添加角色(返回角色对象)") @PostMapping(value = "/add") - public ResResult add(@RequestBody RoleParam roleParam) { + public ResResult add(@RequestBody RoleParam roleParam) { ValidationUtil.validateParam(roleParam); - RoleDto result = roleService.add(roleParam); - return Res.ok(result); + roleService.add(roleParam); + return Res.ok(); } @Operation(summary = "删除角色") @@ -47,8 +47,8 @@ public class RoleController { @PostMapping(value = "/update") public ResResult update(@RequestBody RoleParam roleParam) { ValidationUtil.validateParam(roleParam); - RoleDto result = roleService.update(roleParam); - return Res.ok(result); + roleService.update(roleParam); + return Res.ok(); } @Operation(summary = "通过ID查询角色") diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleMenuController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleMenuController.java index c80d60aa28f758626d71f9fce70081baa5588c81..3bb11af7ef6c69449ee21673429d82c8f43eb6d3 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleMenuController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleMenuController.java @@ -18,7 +18,7 @@ import java.util.List; * 角色权限(菜单)关联关系 * * @author xxm - * @date 2021/7/12 + * @since 2021/7/12 */ @Tag(name = "角色菜单权限关系") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RolePathController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RolePathController.java index 07cc8d299dc7cd50365ac7ae0112e705b4657e0a..f95eb3009761b488a73841b72e65a5404b350b5d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RolePathController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RolePathController.java @@ -15,7 +15,7 @@ import java.util.List; /** * @author xxm - * @date 2021/6/9 + * @since 2021/6/9 */ @Tag(name = "角色请求权限消息关系") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ThirdLoginController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ThirdLoginController.java index 2f78fe3eb03136b9ba474b3f545ff283644860b6..e047a6f2a7fb473a67b3708065ba53a3c47ae1b5 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ThirdLoginController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ThirdLoginController.java @@ -21,7 +21,7 @@ import java.io.IOException; * 三方登录 * * @author xxm - * @date 2022/6/29 + * @since 2022/6/29 */ @Slf4j @IgnoreAuth diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAdminController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAdminController.java index c4013a5e9345164aaff8bbfb7e6d440105695abd..227513d3224169e7c9fb89a763cc72666195f290 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAdminController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAdminController.java @@ -23,7 +23,7 @@ import java.util.List; /** * @author xxm - * @date 2021/9/6 + * @since 2021/9/6 */ @Validated @Tag(name = "管理用户(管理员级别)") diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAssistController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAssistController.java index d0666b27c010b3ea642d576d3d54531566f88b9a..92e3380a7451e6321f0db37e1716b7a339ec780a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAssistController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAssistController.java @@ -20,7 +20,7 @@ import javax.validation.constraints.NotBlank; * 用户操作支撑服务 * * @author xxm - * @date 2022/6/19 + * @since 2022/6/19 */ @Validated @IgnoreAuth(ignore = false, login = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDataScopeController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDataScopeController.java index 217eea3732c91d20fb9eb69df5e44d0fd8def110..1765bc87813466c74feda9f364d075cf43cf63e3 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDataScopeController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDataScopeController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*; /** * @author xxm - * @date 2022/1/2 + * @since 2022/1/2 */ @Tag(name = "用户数据权限配置") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDeptController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDeptController.java index fcc851840286aec6960d204e5e0d85ef8163bfab..fa08a459b53c12e0ea819131fbd477727513cb0f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDeptController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDeptController.java @@ -16,7 +16,7 @@ import java.util.List; /** * @author xxm - * @date 2021/9/29 + * @since 2021/9/29 */ @Tag(name = "用户部门关联关系") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserInfoController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserInfoController.java index 98d83c8dad5635bdf4cf91e0cee958e926d592ce..ca092e7b3cd353f20796e49b6d8c8c5df487771e 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserInfoController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserInfoController.java @@ -22,7 +22,7 @@ import javax.validation.constraints.NotBlank; /** * @author xxm - * @date 2020/4/25 20:02 + * @since 2020/4/25 20:02 */ @Validated @IgnoreAuth diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserRoleController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserRoleController.java index 147089fa17cf6c1d15196977b2baa3c7919f37f6..fe62e4d54578570e29da99a002b3dcbe782af84f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserRoleController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserRoleController.java @@ -16,7 +16,7 @@ import java.util.List; /** * @author xxm - * @date 2020/5/1 18:09 + * @since 2020/5/1 18:09 */ @Tag(name = "用户角色管理") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserThirdController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserThirdController.java index 8e1b580d457ddcd76e28696629875890b5ad2bf0..415182f6e89a8a600b09e7b8dba56aae7f737cad 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserThirdController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserThirdController.java @@ -23,7 +23,7 @@ import javax.validation.constraints.NotBlank; * 用户三方登录管理 * * @author xxm - * @date 2021/8/4 + * @since 2021/8/4 */ @Validated @Tag(name = "用户三方登录管理") diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthClientServiceImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthClientServiceImpl.java index 041d82d17614badb442d7b3961aa5ab5e2b43d16..0cb474d8e96c7550bf594a1d8d1c31820377d86d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthClientServiceImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthClientServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service; * 获取认证应用 * * @author xxm - * @date 2022/6/27 + * @since 2022/6/27 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthLoginTypeServiceImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthLoginTypeServiceImpl.java index b2e7875e731c7eb0b01bec75e9028778b4d523c3..a8f59643a1d1f20696c88bc476aafab5d824795c 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthLoginTypeServiceImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthLoginTypeServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service; * 获取认证终端 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginFailureHandlerImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginFailureHandlerImpl.java index c0304631769d8537ad69a0c32ea108ef50bf6621..7cd83ce0d24eee420089416e80cdc25ff69fb7e3 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginFailureHandlerImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginFailureHandlerImpl.java @@ -23,7 +23,7 @@ import java.util.Optional; * 登录失败 * * @author xxm - * @date 2021/8/13 + * @since 2021/8/13 */ @Component @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginSuccessHandlerImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginSuccessHandlerImpl.java index d7236e810cc3dbf6cffb15df8e94d9590de0bbf1..f16015325750143a61f8d2e2d198bf76b68618c6 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginSuccessHandlerImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginSuccessHandlerImpl.java @@ -23,7 +23,7 @@ import java.util.Optional; * 登录成功处理 * * @author xxm - * @date 2021/8/13 + * @since 2021/8/13 */ @Component @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/DingTalkLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/DingTalkLoginHandler.java index 193508766add3bcdb54a33155b825cb5129fdd8a..af48a97f5c62a4604dc4d4c5522ef39796ce511a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/DingTalkLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/DingTalkLoginHandler.java @@ -33,7 +33,7 @@ import java.util.Objects; * 钉钉登录 * * @author xxm - * @date 2022/4/2 + * @since 2022/4/2 */ @Slf4j @Component diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PasswordLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PasswordLoginHandler.java index 7b488c0d9ac7595d4520a782188978c9852ca29e..83cd5d891c41ba917f02f3c679a1c0b9a4e9d143 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PasswordLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PasswordLoginHandler.java @@ -29,7 +29,7 @@ import java.util.Objects; * 账号密码登陆方式实现 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Slf4j @Component diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PhoneLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PhoneLoginHandler.java index 326bf5a7fb28105f9bab95c928a3a7e1bb562968..268b61e44e1b8cdf90e3c123434871680b4b7b16 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PhoneLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PhoneLoginHandler.java @@ -18,7 +18,7 @@ import javax.servlet.http.HttpServletRequest; * 手机号登录 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Slf4j @Component diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatLoginHandler.java index 15a9116e42eaf661764d82924930ef350fe8e7ab..9c3be64e75e818c91249189f8a1e64e8a9a06667 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatLoginHandler.java @@ -21,7 +21,7 @@ import org.springframework.stereotype.Component; * 微信登录(公众号) * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Slf4j @Component diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatOpenLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatOpenLoginHandler.java index b851d1bcb23509fabee53ff7e3a940ab45bb2d59..477be3935b3eab3178f7a7a1d757d2a857383a8c 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatOpenLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatOpenLoginHandler.java @@ -30,7 +30,7 @@ import java.util.Objects; * 微信开放平台登录 * * @author xxm - * @date 2022/8/4 + * @since 2022/8/4 */ @Slf4j @Component diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeComLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeComLoginHandler.java index bf99f0d39ad43705023b15811beae88d28c03d11..fa9a0e082ee188942c0aa84a32231aa8d24058a6 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeComLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeComLoginHandler.java @@ -30,7 +30,7 @@ import java.util.Objects; * 企业微信登录 * * @author xxm - * @date 2022/6/30 + * @since 2022/6/30 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/AuthAssistService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/AuthAssistService.java index e901edacfb1b16700848995cbbff2415a7398752..abbbc9518821d2dc461350a4e8352a5f0c53e839 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/AuthAssistService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/AuthAssistService.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service; * 认证支撑服务 * * @author xxm - * @date 2021/9/9 + * @since 2021/9/9 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/ThirdLoginService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/ThirdLoginService.java index 416336195bb569e02bfa4f7218a0ecd8e5f1406c..11599b6a6367c4acb969fb5c04398016ca4d4444 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/ThirdLoginService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/ThirdLoginService.java @@ -14,7 +14,7 @@ import java.util.List; * 三方登录 * * @author xxm - * @date 2022/6/29 + * @since 2022/6/29 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/ClientConvert.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/ClientConvert.java index 571a7fe2ab49a31ebdf3afd39feee677880f31b5..5c422a13b30938961dd86d59673a64d702f6844b 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/ClientConvert.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/ClientConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 认证应用 * * @author xxm - * @date 2022-06-27 + * @since 2022-06-27 */ @Mapper public interface ClientConvert { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/LoginTypeConvert.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/LoginTypeConvert.java index 0c3af1ac80ac08c490b6f4cd363852781cb5fe22..b6c680883d396b48b8131d200e52559ca36d7996 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/LoginTypeConvert.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/LoginTypeConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 认证终端 * * @author bootx - * @date 2022-02-20 + * @since 2022-02-20 */ @Mapper public interface LoginTypeConvert { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientManager.java index af97690aa182aa0874e41861c86c6502f0435809..3bab7e79585de2d395566ee013b8462ef3fb7b86 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientManager.java @@ -11,13 +11,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.List; import java.util.Optional; /** * 认证应用 * * @author xxm - * @date 2022-06-27 + * @since 2022-06-27 */ @Repository @RequiredArgsConstructor @@ -34,6 +35,13 @@ public class ClientManager extends BaseManager { .page(mpPage); } + /** + * 查询 + */ + public List findAllByDefaultEndow(Boolean defaultEndow){ + return findAllByField(Client::getDefaultEndow,defaultEndow); + } + public Optional findByCode(String code) { return findByField(Client::getCode, code); } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientMapper.java index 089967f9b1e16b9c3929731cd6a60441c4a8ed09..c097acbb43eec6b21f505faaa491ecd3537b09db 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 认证应用 * * @author xxm - * @date 2022-06-27 + * @since 2022-06-27 */ @Mapper public interface ClientMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeManager.java index 7d517633aa70a07fa68f9886d7950e8035fca73f..eff57bdc2dc092b002d810f7841d2ed00dfe1c12 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeManager.java @@ -19,7 +19,7 @@ import java.util.Optional; * 终端 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeMapper.java index d281c48da5391f2fdebb9e0a530fbd59022d11a0..3fb7861d542c017a5f94ad579cb1e5c081895cde 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 终端 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ @Mapper public interface LoginTypeMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/Client.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/Client.java index 3f56b6241b9d0955d384f5310bf019144b09d670..69d2d316d685fbce92e980da7f46c8b01582e28e 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/Client.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/Client.java @@ -1,5 +1,7 @@ package cn.bootx.platform.iam.core.client.entity; +import cn.bootx.mybatis.table.modify.annotation.DbColumn; +import cn.bootx.mybatis.table.modify.annotation.DbTable; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.iam.core.client.convert.ClientConvert; import cn.bootx.platform.iam.param.client.ClientParam; @@ -21,10 +23,11 @@ import java.util.stream.Collectors; * 认证终端 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ @EqualsAndHashCode(callSuper = true) @Data +@DbTable(comment = "认证终端",isAppend = true) @TableName("iam_client") @Accessors(chain = true) public class Client extends MpBaseEntity implements EntityBaseFunction { @@ -45,6 +48,10 @@ public class Client extends MpBaseEntity implements EntityBaseFunction { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/dao/DeptMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/dao/DeptMapper.java index b8235f20cc55ac63765d887ae5c6f18222c78248..c604f979b77505387c5692c75a9eed4f765aa336 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/dao/DeptMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/dao/DeptMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 部门 * * @author xxm - * @date 2020/5/7 17:40 + * @since 2020/5/7 17:40 */ @Mapper public interface DeptMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/entity/Dept.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/entity/Dept.java index 221d8c007403eb56926834a72269c76fcbf34f40..ef38741a0c8a0a397c0a220f9f26afb2a645389a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/entity/Dept.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/entity/Dept.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; * 部门表 * * @author xxm - * @date 2020/5/7 17:38 + * @since 2020/5/7 17:38 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/event/DeptDeleteEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/event/DeptDeleteEvent.java index ea5a7be0bdcf66a5dd75cc0da1f19d44a176f4e3..37ac99e3bf392353b595d2bcffd6a138a581bb00 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/event/DeptDeleteEvent.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/event/DeptDeleteEvent.java @@ -9,7 +9,7 @@ import java.util.List; * 部门删除事件 * * @author xxm - * @date 2022/1/3 + * @since 2022/1/3 */ @Getter public class DeptDeleteEvent extends ApplicationEvent { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptRuleService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptRuleService.java index 0340babf6b9c7b22def3c9c10e2c6e4d2efdac9a..925fc7e783e01f9d1054b9df5ad0aed2ff4fbeab 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptRuleService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptRuleService.java @@ -17,7 +17,7 @@ import java.util.*; * 部门规则工具类 * * @author xxm - * @date 2020/5/10 15:01 + * @since 2020/5/10 15:01 */ @Service @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptService.java index c7bf4f0633d9d295dff8d43a2f6ff400647c932c..ece77efdb90dbe6159ed1d00b6e413e7e510401d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptService.java @@ -25,7 +25,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_DATA_SCOPE; /** * @author xxm - * @date 2020/5/7 17:42 + * @since 2020/5/7 17:42 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/convert/PermConvert.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/convert/PermConvert.java index 78e3a3ab870f3378cf1348497aa605fd9039015b..16683976d6cc23a9e89e76e2b0c0bb9e68e454b5 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/convert/PermConvert.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/convert/PermConvert.java @@ -14,7 +14,7 @@ import org.mapstruct.factory.Mappers; * 权限转换 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Mapper public interface PermConvert { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuManager.java index eb468c859b73f88d02d3b11ecd56b23aa2c45426..633ce77a306c9541b3062094e667ffc5269dca10 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuManager.java @@ -13,7 +13,7 @@ import java.util.List; * 权限配置 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuMapper.java index c33cb1a92042d9ca88f5552a500cef799d49ec45..c00ee599316caabb31be0eae573dc38f349c3c2b 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 权限配置 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Mapper public interface PermMenuMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathManager.java index f9614f674cc84dd95b970f60a4ab7335c6044935..ec611c331e8411b39af010998cb42349051820dc 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathManager.java @@ -18,7 +18,7 @@ import java.util.List; * 权限 * * @author xxm - * @date 2020/5/10 23:27 + * @since 2020/5/10 23:27 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathMapper.java index d3f7942037a9ba361ec6273e12cd624573a765e7..4ce661035d6e54a231ef3234b2304bc88a58718b 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathMapper.java @@ -11,7 +11,7 @@ import java.util.List; * 权限 * * @author xxm - * @date 2020/5/10 23:26 + * @since 2020/5/10 23:26 */ @Mapper public interface PermPathMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/PermMenu.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/PermMenu.java index c587757a3ad6523d6e2c0b5b6d75fdb2f9f8a3ce..0486b8a6a6072fd92d95a76494e8de39e85306ea 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/PermMenu.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/PermMenu.java @@ -18,7 +18,7 @@ import static com.baomidou.mybatisplus.annotation.FieldStrategy.IGNORED; * 权限配置 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/PermPath.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/PermPath.java index df26849597405d80d629957c69cec05a3ce40621..5058e4ef799b6c3cac2c328b8baa3fcf0763cef3 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/PermPath.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/PermPath.java @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; * 权限资源(url请求) * * @author xxm - * @date 2020/5/10 23:09 + * @since 2020/5/10 23:09 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/RequestPath.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/RequestPath.java index 3db10b0d502d07251f1e7dd3b846acae343099d1..bf164f63a056966d3af978f8e55090459112488c 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/RequestPath.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/RequestPath.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 请求权限 * * @author xxm - * @date 2021/12/19 + * @since 2021/12/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermCodeService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermCodeService.java index 3f7826ec1feaf15d86752be5c251261010325d42..5c33cacf6dc4b5ccbad587a6adc729801db5b987 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermCodeService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermCodeService.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; * 权限码管理 * * @author xxm - * @date 2023/1/23 + * @since 2023/1/23 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermMenuService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermMenuService.java index 346178ecf856f7ea583037402bd8dadfd94593af..c933bfd449e85dcc5b6b5a9c5062aab532d8ae2d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermMenuService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermMenuService.java @@ -32,7 +32,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_PERM_CODE; * 权限 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermPathService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermPathService.java index 8c6cdd440899917a497d24614ed9a7982a01d060..13ca3341e46f21997326454705502ac3085ae100 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermPathService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermPathService.java @@ -42,7 +42,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_PATH; * 请求权限 * * @author xxm - * @date 2020/5/10 23:20 + * @since 2020/5/10 23:20 */ @Service @AllArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/RequestPathService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/RequestPathService.java index c11b296aaed397d31336a11ca482ea75a670e5b1..bd3a4ad4d65fb068e940f5d08b189440a5398463 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/RequestPathService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/RequestPathService.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; * 请求权限处理 * * @author xxm - * @date 2021/12/19 + * @since 2021/12/19 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/dao/RoleManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/dao/RoleManager.java index a830c57a1507f7719c10d2ed345e68cb92df01a8..ad89763a1cc44d6b7100da45ca27cab255580da7 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/dao/RoleManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/dao/RoleManager.java @@ -20,7 +20,7 @@ import java.util.stream.Collectors; * 角色 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/dao/RoleMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/dao/RoleMapper.java index f51a7346be2a9d32968ebe5cebad1cd6612aec10..3302a24c92b7b7e80d5ff62ef28e243d9e12b1c1 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/dao/RoleMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/dao/RoleMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 角色 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Mapper public interface RoleMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/entity/Role.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/entity/Role.java index e194b1cd80d7b28a8c0506c8068a9c4d5ebdb4dd..7ef021db28fea1e628064b57a03eb474fc2e5e52 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/entity/Role.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/entity/Role.java @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; * 角色 * * @author xxm - * @date 2020/5/1 17:31 + * @since 2020/5/1 17:31 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/service/RoleService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/service/RoleService.java index 3503a482f1e838b344840f7f7365d495a69682f3..afbc43b15fb4d7a98707aa5ff07172ddbd9c5656 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/service/RoleService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/service/RoleService.java @@ -8,6 +8,9 @@ import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.bootx.platform.iam.core.upms.dao.RoleMenuManager; import cn.bootx.platform.iam.core.upms.dao.RolePathManager; import cn.bootx.platform.iam.core.upms.dao.UserRoleManager; +import cn.bootx.platform.iam.event.role.RoleCreateEvent; +import cn.bootx.platform.iam.event.role.RoleDeleteEvent; +import cn.bootx.platform.iam.event.role.RoleUpdateEvent; import cn.bootx.platform.iam.exception.role.RoleAlreadyExistedException; import cn.bootx.platform.iam.exception.role.RoleAlreadyUsedException; import cn.bootx.platform.iam.exception.role.RoleNotExistedException; @@ -20,6 +23,7 @@ import cn.hutool.core.bean.copier.CopyOptions; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.cache.annotation.CacheEvict; +import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,7 +36,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_PATH; * 角色 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Slf4j @Service @@ -47,11 +51,13 @@ public class RoleService { private final RoleMenuManager roleMenuManager; + private final ApplicationEventPublisher eventPublisher; + /** * 添加 */ @Transactional(rollbackFor = Exception.class) - public RoleDto add(RoleParam roleParam) { + public void add(RoleParam roleParam) { // Name唯一性校验(名称code不能相同) if (roleManager.existsByCode(roleParam.getCode())) { throw new RoleAlreadyExistedException(); @@ -60,14 +66,15 @@ public class RoleService { throw new RoleAlreadyExistedException(); } Role role = Role.init(roleParam); - return roleManager.save(role).toDto(); + RoleDto roleDto = roleManager.save(role).toDto(); + eventPublisher.publishEvent(new RoleCreateEvent(this,roleDto)); } /** * 修改 */ @Transactional(rollbackFor = Exception.class) - public RoleDto update(RoleParam roleParam) { + public void update(RoleParam roleParam) { Long id = roleParam.getId(); // name和code唯一性校验 @@ -80,8 +87,9 @@ public class RoleService { Role role = roleManager.findById(id).orElseThrow(RoleNotExistedException::new); BeanUtil.copyProperties(roleParam, role, CopyOptions.create().ignoreNullValue()); - - return roleManager.updateById(role).toDto(); + RoleDto roleDto = roleManager.updateById(role) + .toDto(); + eventPublisher.publishEvent(new RoleUpdateEvent(this,roleDto)); } /** @@ -102,6 +110,7 @@ public class RoleService { // 删除关联的请求和菜单权限 rolePathManager.deleteByRole(roleId); roleMenuManager.deleteByRole(roleId); + eventPublisher.publishEvent(new RoleDeleteEvent(this,roleId)); } /** diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/convert/DataScopeConvert.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/convert/DataScopeConvert.java index 46aca4c4a05b21600484be7d451d2d6a4cfdc495..fe9ed00b7184f372c6def5bd664067fec5803a67 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/convert/DataScopeConvert.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/convert/DataScopeConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 数据范围转换类 * * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Mapper public interface DataScopeConvert { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeDeptManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeDeptManager.java index fce45e677ee5026fdd08bc014690e0d6ec2cf036..2bb40fb98fbac2d06f505613f0167566775f4367 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeDeptManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeDeptManager.java @@ -10,7 +10,7 @@ import java.util.List; /** * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeDeptMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeDeptMapper.java index 2ec32af450820a2301f526e6995b74da536ab186..b5cec7f8bf7ff882e119af9bd3a20915088f760c 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeDeptMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeDeptMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Mapper public interface DataScopeDeptMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeManager.java index c6b2e37e453e2ea003e353ddbc7b4a8cfdac07a2..3b8e416587e74412de3ef3ffd54a6c8c53f27870 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeManager.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; /** * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeMapper.java index 71874fc9ec08f72e98eee6e5148c9b9ceae50881..ab11b70db14a1a3db97d75cd7c5ddb7a9b17ca52 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Mapper public interface DataScopeMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeUserManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeUserManager.java index cd2cb650abc8afd3d8b744f6c29f38c7e83f0580..5547226afb501ac450f2224d54236cc8a7287eb1 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeUserManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeUserManager.java @@ -10,7 +10,7 @@ import java.util.List; /** * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeUserMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeUserMapper.java index d082f37a99a393cdc313fb9240f5c3248a4ffea5..d0b4b0b29f051626d32ca2a044abef13b53f466e 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeUserMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeUserMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Mapper public interface DataScopeUserMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScope.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScope.java index 835afad36172931fe380c6533c027786b53b54af..caa5314a9857866671a1588fe3450121e55f025c 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScope.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScope.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; * 数据范围配置 * * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScopeDept.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScopeDept.java index b315e677e9ebdce6c857f7ccfc6649aa879c9053..88c614dffa55091989420cbb2b1f145a5c494506 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScopeDept.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScopeDept.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 数据范围部门关联配置 * * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScopeUser.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScopeUser.java index 0ba35651db5a6a69979cdddc44e0dec8e1d0f0f3..bfad82534f60f0d087a9dcd770812cf381669e54 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScopeUser.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScopeUser.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 数据范围用户关联配置 * * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/service/DataScopeService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/service/DataScopeService.java index a1ace83f1992453ad052137b2bd3924878fa9aa5..4ef76cfa3b7d8eff83f3af367802355af505fe9a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/service/DataScopeService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/service/DataScopeService.java @@ -38,7 +38,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_DATA_SCOPE; * 数据范围权限 * * @author xxm - * @date 2021/12/24 + * @since 2021/12/24 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/service/DataScopeUserService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/service/DataScopeUserService.java index 6473c868d39e1d9d2834fa87791a7c774298946f..97f1954e77245990c0d2895c5db9959c3201d2ae 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/service/DataScopeUserService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/service/DataScopeUserService.java @@ -28,7 +28,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_DATA_SCOPE; * 数据范围权限限定用户级别 * * @author xxm - * @date 2022/1/4 + * @since 2022/1/4 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/convert/UserThirdInfoConvert.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/convert/UserThirdInfoConvert.java index c09aaa19e3e1dec281fe6dcfbeb7d86336c78b4a..573eaf0ddc1bb718b9b3c5dd7a3bd62a4b210d61 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/convert/UserThirdInfoConvert.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/convert/UserThirdInfoConvert.java @@ -9,7 +9,7 @@ import org.mapstruct.factory.Mappers; * 用户三方登录绑定详情 * * @author xxm - * @date 2022-07-02 + * @since 2022-07-02 */ @Mapper public interface UserThirdInfoConvert { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdInfoManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdInfoManager.java index 7a1384d61c41a4f01fa45127ccd41d090b16790c..4230a992e54a02c98a2e99eb4003a7621347b3b5 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdInfoManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdInfoManager.java @@ -17,7 +17,7 @@ import java.util.Optional; * 用户三方登录绑定详情 * * @author xxm - * @date 2022-07-02 + * @since 2022-07-02 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdInfoMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdInfoMapper.java index a60adef84557f4791d195d84fed04e0f2bd8c056..6cd44570c87c5c1c0cd1c2fd0490755f20de6065 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdInfoMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdInfoMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 用户三方登录绑定详情 * * @author xxm - * @date 2022-07-02 + * @since 2022-07-02 */ @Mapper public interface UserThirdInfoMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdManager.java index 1b72142863ada71139506280a1c6d1c52632f62b..9debeb1d224e87ea8a0afd7bd35d567d63640c7a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdManager.java @@ -17,7 +17,7 @@ import java.util.Optional; * 三方登录 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdMapper.java index c6750b01622c75615499d5117ce6e21528e9edfe..030bd1816c91764bef93c87c608f849ea2e6e1f8 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 三方登录 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Mapper public interface UserThirdMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThird.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThird.java index 7af2611e98c1ba205b027a10bc741fc15931a9ac..b7b4480436e22d997ee3ec254c0504c75d9f61d1 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThird.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThird.java @@ -12,7 +12,7 @@ import lombok.EqualsAndHashCode; * 用户三方登录 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThirdInfo.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThirdInfo.java index 9e06dff528c63bccca25606097cff5aaa16bb98b..147c7179a7dfbe9b5f4a7c76807620e525a190dc 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThirdInfo.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThirdInfo.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; * 用户三方登录绑定详情 * * @author xxm - * @date 2022-07-02 + * @since 2022-07-02 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdBindService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdBindService.java index 4e17591baa447b3b978b8292df4d512e349d2e08..fa10f8244ac08dcb2f1d1f5a04516fc5b9442f06 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdBindService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdBindService.java @@ -20,7 +20,7 @@ import java.util.List; * 三方账号绑定 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdQueryService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdQueryService.java index c7af1983936c239c73e8d009dc8f37cd15117baa..4fb19099eb5089e6fd310efc8124c4e4cbbe9bb6 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdQueryService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdQueryService.java @@ -26,7 +26,7 @@ import java.util.stream.Collectors; * 用户三方账号查询 * * @author xxm - * @date 2022/4/2 + * @since 2022/4/2 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserTiredOperateService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserTiredOperateService.java index 95822a937d4aa89216543a7d9f7e1c41c731dea4..f0474293243367b1a1d8b69d10de9b14e6ffbf66 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserTiredOperateService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserTiredOperateService.java @@ -22,7 +22,7 @@ import java.util.function.BiConsumer; * 用户绑定操作类 * * @author xxm - * @date 2022/7/22 + * @since 2022/7/22 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuManager.java index 8a5d6d03a1af2552659c00b7d27841efeb3d4395..89bd27686d01700c24bd0b749b8e7b94fe1b8563 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuManager.java @@ -14,7 +14,7 @@ import java.util.List; * 角色权限关系 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuMapper.java index ab7d31ff1a7c635f10f3ac58575117d9b0d2d10e..c9d298c6384c2ba38669e41cb9add45c49fd903e 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuMapper.java @@ -11,7 +11,7 @@ import java.util.List; * 角色权限关系 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Mapper public interface RoleMenuMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathManager.java index 0d6da544989002d12aaeec621ed530d25c69461f..11745f41d99d7a33d64391ce0100ca9eb01b4c38 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathManager.java @@ -13,7 +13,7 @@ import java.util.List; * 角色权限 * * @author xxm - * @date 2020/5/27 16:02 + * @since 2020/5/27 16:02 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathMapper.java index 6b4cb485af681d9d976dd34d94d465bef10b0032..61efa044f24f13470d355a601ab3c75e291078e7 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathMapper.java @@ -11,7 +11,7 @@ import java.util.List; * 角色权限 * * @author xxm - * @date 2020/11/14 + * @since 2020/11/14 */ @Mapper public interface RolePathMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeManager.java index 27f9e7f38ff3d4cc20a7a374fd7b117227c602c5..3e397a0b16247310aa6084b97b11763769f2b40f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeManager.java @@ -13,7 +13,7 @@ import java.util.Optional; /** * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeMapper.java index 702ee2ff2538752fe91cf232df6cb4160cb4f081..9627e8de8a8e1c07020067c9db6cc3c2569ded5a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeMapper.java @@ -9,7 +9,7 @@ import java.util.List; /** * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Mapper public interface UserDataScopeMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleManager.java index 712c6dc588399ace6842aa9011cb07a0a2247f63..3e50c1de8e3f9cfd39284c977bfde44ae6a5e800 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleManager.java @@ -14,7 +14,7 @@ import java.util.List; * 用户角色关系 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleMapper.java index 73ec012e41b3b51611263abe212e18c0fc958b7c..4155234a8047df26b8c5a833c95e967865bb666f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleMapper.java @@ -11,7 +11,7 @@ import java.util.List; * 用户角色关系 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Mapper public interface UserRoleMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RoleMenu.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RoleMenu.java index e2cd3165ac2ebe7843c24e84307018bf184a6b13..90eba2873b292597d979522f35f4797ec1cc505f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RoleMenu.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RoleMenu.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; * 角色权限关联关系 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RolePath.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RolePath.java index d479e472e40f315f66c9af380dae207aae6a7633..35b7edb270ac923267799ce749d6f1dee581d3e7 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RolePath.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RolePath.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; * 角色路径权限表 * * @author xxm - * @date 2020/5/11 22:25 + * @since 2020/5/11 22:25 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserDataScope.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserDataScope.java index f50f7af108761d111e14ddcad41c138b4d27a15b..065169a06e4648008ef11693d6662520c9d02a6c 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserDataScope.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserDataScope.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 用户数据范围关联关系 * * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserRole.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserRole.java index 19fe395d3067717ee0aea5288e1df8cfd4bfd599..f4853525af110d0dee16e190cccad8a52e4ce12a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserRole.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserRole.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; * 用户角色关系 * * @author xxm - * @date 2020/5/1 11:18 + * @since 2020/5/1 11:18 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePathService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePathService.java index 12b23fcf8d97f2b0ec7b611f8cdc6cacb5c9757e..920ed563c976a96d9bec42561456b66d1452ca39 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePathService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePathService.java @@ -30,7 +30,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_PATH; * 角色请求权限关系 * * @author xxm - * @date 2021/6/9 + * @since 2021/6/9 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePermService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePermService.java index cebada4c54f81c4406ea031d9bd4ad29ae1e24b7..b1df9935fd89c6257ded2be2c352ee83f80e9ce1 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePermService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePermService.java @@ -33,7 +33,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_PERM_CODE; * 角色权限菜单关系 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserDataScopeService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserDataScopeService.java index 375c48d6e5c81e16ae8c936849b8f04fd08dcf71..8a057d40de234539e6a30829a533fc2d21febfaf 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserDataScopeService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserDataScopeService.java @@ -42,7 +42,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_DATA_SCOPE; * 用户数据权限关联关系 * * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Slf4j @Service @@ -186,17 +186,17 @@ public class UserDataScopeService { .collect(Collectors.toMap(MpIdEntity::getId, Function.identity())); Set deptOrgCodes = deptIds.stream().map(deptMap::get).map(Dept::getOrgCode).collect(Collectors.toSet()); return deptMap.values() - .stream() - .filter(dept -> this.judgeSubDept(dept.getOrgCode(), deptOrgCodes)) - .map(MpIdEntity::getId) - .collect(Collectors.toSet()); + .stream() + .filter(dept -> this.judgeSubDept(dept.getOrgCode(), deptOrgCodes)) + .map(MpIdEntity::getId) + .collect(Collectors.toSet()); } /** * 判断是否是子部门 */ private boolean judgeSubDept(String orgCode, Set orgCodes) { - return orgCodes.stream().anyMatch(s -> StrUtil.startWith(s, orgCode)); + return orgCodes.stream().anyMatch(s -> StrUtil.startWith(orgCode,s) && orgCode.length()>=s.length()); } } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserRoleService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserRoleService.java index 606e784563aa86768632c0a63868b3767ae61d21..7da9152280e66156171ec2db0d1ca03f29bebfaa 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserRoleService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserRoleService.java @@ -2,19 +2,22 @@ package cn.bootx.platform.iam.core.upms.service; import cn.bootx.platform.common.core.exception.BizException; import cn.bootx.platform.common.core.util.ResultConvertUtil; -import cn.bootx.platform.iam.core.user.dao.UserInfoManager; -import cn.bootx.platform.iam.core.user.entity.UserInfo; import cn.bootx.platform.iam.core.role.dao.RoleManager; import cn.bootx.platform.iam.core.upms.dao.UserRoleManager; import cn.bootx.platform.iam.core.upms.entity.UserRole; +import cn.bootx.platform.iam.core.user.dao.UserInfoManager; +import cn.bootx.platform.iam.core.user.entity.UserInfo; import cn.bootx.platform.iam.dto.role.RoleDto; +import cn.bootx.platform.iam.event.user.UserAssignRoleEvent; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.cache.annotation.CacheEvict; +import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -25,7 +28,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_PERM_CODE; * 用户角色关系 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Slf4j @Service @@ -38,6 +41,9 @@ public class UserRoleService { private final UserRoleManager userRoleManager; + private final ApplicationEventPublisher eventPublisher; + + /** * 给用户分配角色 */ @@ -49,6 +55,7 @@ public class UserRoleService { // 然后给用户添加角色 List userRoles = this.createUserRoles(userId, roleIds); userRoleManager.saveAll(userRoles); + eventPublisher.publishEvent(new UserAssignRoleEvent(this, Collections.singletonList(userId),roleIds)); } /** @@ -67,6 +74,7 @@ public class UserRoleService { .flatMap(Collection::stream) .collect(Collectors.toList()); userRoleManager.saveAll(userRoles); + eventPublisher.publishEvent(new UserAssignRoleEvent(this, userIds,roleIds)); } /** diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptManager.java index a0a7c013cf81be32e6c358250fb55698063afa0b..952a2b8447d88ff9e63dc1d2a83c973098ea6af3 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptManager.java @@ -14,7 +14,7 @@ import java.util.List; * 用户部门关系 * * @author xxm - * @date 2021/9/29 + * @since 2021/9/29 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptMapper.java index d8e03d01b764471bcda95bb6c21a47400f2e3c53..86bdcbdc4d5f2aa8b8c045686b0648a160c5a41a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptMapper.java @@ -11,7 +11,7 @@ import java.util.List; * 用户部门关系 * * @author xxm - * @date 2021/9/29 + * @since 2021/9/29 */ @Mapper public interface UserDeptMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoManager.java index ef7749e81ccec099717e5acb6a0c08c3c060c2b7..20cb287ef5ab64806d07b153dc66e6cd5d7696fa 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoManager.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; * 用户扩展信息 * * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoMapper.java index 51316d9937e053d1d36c68776d55a0c6b334f1c4..3c98f3540ce331eea90140c435e30691e590b189 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @Mapper public interface UserExpandInfoMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoManager.java index 644cfa0b0cc0ac1500c53ba28a07422bf2fc25b3..f49ddaa1e024d6b8c4b39178670ed818fd10f236 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoManager.java @@ -1,16 +1,19 @@ package cn.bootx.platform.iam.core.user.dao; import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpDelEntity; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.bootx.platform.iam.core.user.entity.UserInfo; import cn.bootx.platform.iam.param.user.UserInfoParam; import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.starter.auth.util.SecurityUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.time.LocalDateTime; import java.util.List; import java.util.Optional; @@ -18,7 +21,7 @@ import java.util.Optional; * 用户信息 * * @author xxm - * @date 2020/4/24 15:32 + * @since 2020/4/24 15:32 */ @Repository @RequiredArgsConstructor @@ -77,7 +80,24 @@ public class UserInfoManager extends BaseManager { * 批量更新用户状态 */ public void setUpStatusBatch(List userIds, int status) { - lambdaUpdate().in(MpIdEntity::getId, userIds).set(UserInfo::getStatus, status).update(); + lambdaUpdate() + .in(MpIdEntity::getId, userIds) + .set(UserInfo::getStatus, status) + .set(MpDelEntity::getLastModifiedTime, LocalDateTime.now()) + .set(MpDelEntity::getLastModifier, SecurityUtil.getUserIdOrDefaultId()) + .update(); + } + + /** + * 批量重置用户密码 + */ + public void restartPasswordBatch(List userIds,String password){ + lambdaUpdate() + .in(MpIdEntity::getId, userIds) + .set(UserInfo::getPassword, password) + .set(MpDelEntity::getLastModifiedTime, LocalDateTime.now()) + .set(MpDelEntity::getLastModifier, SecurityUtil.getUserIdOrDefaultId()) + .update(); } } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoMapper.java index 089f906c98d4bb27967bb74c80549c7f5a62bf50..c264c513d8e1816b1c6bdf73252eb2a7a1039cf6 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 用户信息 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ @Mapper public interface UserInfoMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserDept.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserDept.java index d555f2e62b226178dc08dfa1169de4833ef1e931..937182e192267f6cdcd4763397ef1ef726a29c8b 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserDept.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserDept.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 用户部门关联关系 * * @author xxm - * @date 2021/9/29 + * @since 2021/9/29 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserExpandInfo.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserExpandInfo.java index 737ac56309435881e66e01faeb9cf4caef15278d..d567b08376968515d1fc0cea1780dd18acd7d62e 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserExpandInfo.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserExpandInfo.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; * 用户扩展信息 * * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserInfo.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserInfo.java index 2d42ee66160e22c17d6d05cf95587cd30c815407..efff964fa93bd138fedb467af5b29e534dda5093 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserInfo.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserInfo.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; * 用户的核心信息 * * @author xxm - * @date 2020/4/24 15:21 + * @since 2020/4/24 15:21 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAdminService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAdminService.java index 9b691ad6bf2285695e4b1fb972575afbe74d8089..9ee82d1767742ada6ee139448a204d00a3fb0bb6 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAdminService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAdminService.java @@ -1,27 +1,27 @@ package cn.bootx.platform.iam.core.user.service; +import cn.bootx.platform.baseapi.core.captcha.service.CaptchaService; import cn.bootx.platform.common.core.exception.BizException; import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.param.PageParam; -import cn.bootx.platform.common.mybatisplus.util.MpUtil; -import cn.bootx.platform.iam.core.client.dao.ClientManager; -import cn.bootx.platform.iam.exception.user.UserInfoNotExistsException; -import cn.bootx.platform.iam.param.user.UserInfoParam; -import cn.bootx.platform.iam.param.user.UserRegisterParam; -import cn.bootx.platform.starter.auth.util.PasswordEncoder; -import cn.bootx.platform.baseapi.core.captcha.service.CaptchaService; import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.bootx.platform.iam.code.UserStatusCode; +import cn.bootx.platform.iam.core.client.dao.ClientManager; import cn.bootx.platform.iam.core.upms.service.UserRoleService; import cn.bootx.platform.iam.core.user.dao.UserExpandInfoManager; import cn.bootx.platform.iam.core.user.dao.UserInfoManager; import cn.bootx.platform.iam.core.user.entity.UserExpandInfo; import cn.bootx.platform.iam.core.user.entity.UserInfo; -import cn.bootx.platform.iam.core.user.event.UserCreateEvent; import cn.bootx.platform.iam.dto.dept.DeptDto; import cn.bootx.platform.iam.dto.role.RoleDto; import cn.bootx.platform.iam.dto.user.UserInfoDto; import cn.bootx.platform.iam.dto.user.UserInfoWhole; +import cn.bootx.platform.iam.event.user.*; +import cn.bootx.platform.iam.exception.user.UserInfoNotExistsException; +import cn.bootx.platform.iam.param.user.UserInfoParam; +import cn.bootx.platform.iam.param.user.UserRegisterParam; +import cn.bootx.platform.starter.auth.util.PasswordEncoder; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollUtil; @@ -31,7 +31,6 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.validation.constraints.NotBlank; import java.time.LocalDateTime; import java.util.List; import java.util.stream.Collectors; @@ -40,7 +39,7 @@ import java.util.stream.Collectors; * 超级管理员操作类 * * @author xxm - * @date 2021/9/6 + * @since 2021/9/6 */ @Slf4j @Service @@ -77,6 +76,7 @@ public class UserAdminService { */ public void lock(Long userId) { userInfoManager.setUpStatus(userId, UserStatusCode.BAN); + eventPublisher.publishEvent(new UserLockEvent(this, userId)); } /** @@ -84,6 +84,7 @@ public class UserAdminService { */ public void lockBatch(List userIds) { userInfoManager.setUpStatusBatch(userIds, UserStatusCode.BAN); + eventPublisher.publishEvent(new UserLockEvent(this, userIds)); } /** @@ -91,6 +92,7 @@ public class UserAdminService { */ public void unlock(Long userId) { userInfoManager.setUpStatus(userId, UserStatusCode.NORMAL); + eventPublisher.publishEvent(new UserUnlockEvent(this, userId)); } /** @@ -98,6 +100,7 @@ public class UserAdminService { */ public void unlockBatch(List userIds) { userInfoManager.setUpStatusBatch(userIds, UserStatusCode.NORMAL); + eventPublisher.publishEvent(new UserUnlockEvent(this, userIds)); } /** @@ -112,13 +115,13 @@ public class UserAdminService { UserInfoParam userInfoParam = new UserInfoParam(); BeanUtil.copyProperties(param, userInfoParam); userInfoParam.setName(param.getUsername()); - // TODO 默认注册就有所有终端的权限, 后期优化 - List ids = clientManager.findAll() + // 添加默认注册就有权限的终端 + List clientIds = clientManager.findAllByDefaultEndow(true) .stream() .map(MpIdEntity::getId) .map(String::valueOf) .collect(Collectors.toList()); - userInfoParam.setClientIdList(ids); + userInfoParam.setClientIdList(clientIds); this.add(userInfoParam); } @@ -147,27 +150,37 @@ public class UserAdminService { UserExpandInfo userExpandInfo = new UserExpandInfo(); userExpandInfo.setInitialPassword(true).setId(userInfo.getId()); userExpandInfoManager.save(userExpandInfo); - // 发送用户注册事件 eventPublisher.publishEvent(new UserCreateEvent(this, userInfo.toDto())); - } /** * 重置密码 */ - public void restartPassword(Long userId, @NotBlank(message = "新密码不能为空") String newPassword) { + public void restartPassword(Long userId, String newPassword) { UserInfo userInfo = userInfoManager.findById(userId).orElseThrow(UserInfoNotExistsException::new); // 新密码进行加密 newPassword = passwordEncoder.encode(newPassword); userInfo.setPassword(newPassword); userInfoManager.updateById(userInfo); + eventPublisher.publishEvent(new UserRestartPasswordEvent(this, userInfo.getId())); + } + + /** + * 批量重置密码 + */ + public void restartPasswordBatch(List userIds, String newPassword){ + // 新密码进行加密 + String password = passwordEncoder.encode(newPassword); + // 批量重置密码 + userInfoManager.restartPasswordBatch(userIds,password); + eventPublisher.publishEvent(new UserRestartPasswordEvent(this, userIds)); } /** * 编辑用户信息 */ - public UserInfoDto update(UserInfoParam userInfoParam) { + public void update(UserInfoParam userInfoParam) { UserInfo userInfo = userInfoManager.findById(userInfoParam.getId()) .orElseThrow(UserInfoNotExistsException::new); userInfoParam.setPassword(null); @@ -178,7 +191,8 @@ public class UserAdminService { else { userInfo.setClientIds(""); } - return userInfoManager.updateById(userInfo).toDto(); + UserInfoDto userInfoDto = userInfoManager.updateById(userInfo).toDto(); + eventPublisher.publishEvent(new UserUpdateEvent(this, userInfoDto)); } /** diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAssistService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAssistService.java index 74e4860d3fc0f5dbdb4b976184fc95aa8eb1ccd4..bc2cff48f9bc5b240c4d8ccd20993eafa41c2402 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAssistService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAssistService.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; * 用户操作支撑服务 * * @author xxm - * @date 2022/6/19 + * @since 2022/6/19 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserDeptService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserDeptService.java index b3cfbd6cf86355f1117af611eebb8133547e50fa..cf092c7e02a66644fd164476f876ef71bc3d48a6 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserDeptService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserDeptService.java @@ -20,7 +20,7 @@ import java.util.stream.Collectors; * 用户部门关联关系 * * @author xxm - * @date 2021/9/29 + * @since 2021/9/29 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserExpandInfoService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserExpandInfoService.java index c74db26cf9d2408bfe6cfb38fc004c0baad0bc96..02b45069e30f9b0c7e1758d5b00c6f890a869553 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserExpandInfoService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserExpandInfoService.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; * 用户扩展信息服务 * * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserInfoService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserInfoService.java index e0988a07ad5283cc12cec1d97be511cbdbb52418..7e6b51b69d3517c0f5f9bdbca772970fe20b86f0 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserInfoService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserInfoService.java @@ -1,10 +1,6 @@ package cn.bootx.platform.iam.core.user.service; import cn.bootx.platform.common.core.exception.BizException; -import cn.bootx.platform.iam.exception.user.UserInfoNotExistsException; -import cn.bootx.platform.iam.param.user.UserBaseInfoParam; -import cn.bootx.platform.starter.auth.util.PasswordEncoder; -import cn.bootx.platform.starter.auth.util.SecurityUtil; import cn.bootx.platform.iam.core.user.dao.UserExpandInfoManager; import cn.bootx.platform.iam.core.user.dao.UserInfoManager; import cn.bootx.platform.iam.core.user.entity.UserExpandInfo; @@ -12,9 +8,16 @@ import cn.bootx.platform.iam.core.user.entity.UserInfo; import cn.bootx.platform.iam.dto.user.LoginAfterUserInfo; import cn.bootx.platform.iam.dto.user.UserBaseInfoDto; import cn.bootx.platform.iam.dto.user.UserInfoDto; +import cn.bootx.platform.iam.event.user.UserChangePasswordEvent; +import cn.bootx.platform.iam.event.user.UserUpdateEvent; +import cn.bootx.platform.iam.exception.user.UserInfoNotExistsException; +import cn.bootx.platform.iam.param.user.UserBaseInfoParam; +import cn.bootx.platform.starter.auth.util.PasswordEncoder; +import cn.bootx.platform.starter.auth.util.SecurityUtil; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.RequiredArgsConstructor; +import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -24,7 +27,7 @@ import java.time.LocalDateTime; * 用户 * * @author xxm - * @date 2020/4/27 21:11 + * @since 2020/4/27 21:11 */ @Service @RequiredArgsConstructor @@ -40,6 +43,8 @@ public class UserInfoService { private final PasswordEncoder passwordEncoder; + private final ApplicationEventPublisher eventPublisher; + /** * 登录后获取用户信息 */ @@ -92,6 +97,7 @@ public class UserInfoService { BeanUtil.copyProperties(param, userInfo, CopyOptions.create().ignoreNullValue()); userExpandInfoManager.updateById(userExpandInfo); userInfoManager.updateById(userInfo); + eventPublisher.publishEvent(new UserUpdateEvent(this, userInfo.toDto())); } /** @@ -116,6 +122,7 @@ public class UserInfoService { userInfoManager.updateById(userInfo); userExpandInfo.setLastChangePasswordTime(LocalDateTime.now()); userExpandInfoManager.updateById(userExpandInfo); + eventPublisher.publishEvent(new UserChangePasswordEvent(this,userInfo.getId())); } /** @@ -144,6 +151,7 @@ public class UserInfoService { userInfo.setPhone(phone); userInfoManager.updateById(userInfo); userAssistService.deletePhoneChangeCaptcha(phone); + eventPublisher.publishEvent(new UserUpdateEvent(this,userInfo.toDto())); } /** @@ -169,6 +177,7 @@ public class UserInfoService { userInfo.setEmail(email); userInfoManager.updateById(userInfo); userAssistService.deleteEmailChangeCaptcha(email); + eventPublisher.publishEvent(new UserUpdateEvent(this,userInfo.toDto())); } /** @@ -187,6 +196,7 @@ public class UserInfoService { userInfoManager.updateById(userInfo); userExpandInfoManager.updateById(userExpandInfo); userAssistService.deletePhoneForgetCaptcha(phone); + eventPublisher.publishEvent(new UserUpdateEvent(this, userInfo.toDto())); } /** @@ -204,6 +214,7 @@ public class UserInfoService { userInfoManager.updateById(userInfo); userExpandInfoManager.updateById(userExpandInfo); userAssistService.deleteEmailForgetCaptcha(email); + eventPublisher.publishEvent(new UserUpdateEvent(this, userInfo.toDto())); } /** @@ -223,6 +234,7 @@ public class UserInfoService { userInfo.setPhone(phone); userInfoManager.updateById(userInfo); userAssistService.deletePhoneChangeCaptcha(phone); + eventPublisher.publishEvent(new UserUpdateEvent(this, userInfo.toDto())); } /** @@ -242,6 +254,7 @@ public class UserInfoService { userInfo.setEmail(email); userInfoManager.updateById(userInfo); userAssistService.deleteEmailChangeCaptcha(userInfo.getEmail()); + eventPublisher.publishEvent(new UserUpdateEvent(this, userInfo.toDto())); } } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserQueryService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserQueryService.java index 169a3261e7793570ed304435c4486cdbd19d467b..55a1a119c62159901fb7dccd80dee7d5f04e76ce 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserQueryService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserQueryService.java @@ -18,7 +18,7 @@ import java.util.Optional; * 用户信息查询服务 * * @author xxm - * @date 2022/6/19 + * @since 2022/6/19 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/auth/AuthInfoResult.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/auth/AuthInfoResult.java index 1b01317df1b2ad6b3030ad6a837edb2d9300708e..56b5a0b3c2a136d21fa71e486b3ed4ccf02adb90 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/auth/AuthInfoResult.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/auth/AuthInfoResult.java @@ -8,7 +8,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2021/6/3 + * @since 2021/6/3 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/auth/AuthPasswordDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/auth/AuthPasswordDto.java index 0751d726c62d8349026146760392720065b8a72a..80496eac76af3618c8b9358cb3d23ba5b84c0c32 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/auth/AuthPasswordDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/auth/AuthPasswordDto.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2020/4/25 17:27 + * @since 2020/4/25 17:27 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/ClientDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/ClientDto.java index 85b9b6905b143fdb900013311b4f90efa82369cd..b5e7c4006991c5e4621a947c471cf83f563393f3 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/ClientDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/ClientDto.java @@ -13,7 +13,7 @@ import java.util.List; * 认证应用 * * @author xxm - * @date 2022-06-27 + * @since 2022-06-27 */ @EqualsAndHashCode(callSuper = true) @Data @@ -33,6 +33,9 @@ public class ClientDto extends BaseDto { @Schema(description = "是否可用") private Boolean enable; + @Schema(description = "新注册的用户是否默认赋予该终端") + private Boolean defaultEndow; + @Schema(description = "关联登录方式id") private List loginTypeIdList = new ArrayList<>(); diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/LoginTypeDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/LoginTypeDto.java index ead9139ff094db4c3f72160a53966eb3d3296150..f5932880308f710241c3577098f88efe29b51d12 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/LoginTypeDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/LoginTypeDto.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 登录方式 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/dept/DeptDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/dept/DeptDto.java index 88150241821004962d914c9bf4fba62be42d60aa..37e153f269416536a5b06149778c80193772ee00 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/dept/DeptDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/dept/DeptDto.java @@ -11,7 +11,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/5/7 18:29 + * @since 2020/5/7 18:29 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/dept/DeptTreeResult.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/dept/DeptTreeResult.java index 497fd10b700f16fa0ba5a2351ceb73d30c16a36c..a1d5f0ba227ee4521275963bc66aff516f9a0519 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/dept/DeptTreeResult.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/dept/DeptTreeResult.java @@ -10,7 +10,7 @@ import java.util.List; /** * @author xxm - * @date 2020/5/10 15:25 + * @since 2020/5/10 15:25 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/permission/PermMenuDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/permission/PermMenuDto.java index 308305866cc4003700982a4df71a6b11e59f3f76..c151e7bc64ba31dacbc4e7d6aa8dc9f82880c41f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/permission/PermMenuDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/permission/PermMenuDto.java @@ -11,7 +11,7 @@ import java.util.List; /** * @author xxm - * @date 2021/7/12 + * @since 2021/7/12 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/scope/DataScopeDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/scope/DataScopeDto.java index 5e979e52fa156506dd75a7275324615340cb6e29..90f6d01f706956c061d157952307b40b6ddf9959 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/scope/DataScopeDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/scope/DataScopeDto.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2021/12/24 + * @since 2021/12/24 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/scope/DataScopeUserInfoDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/scope/DataScopeUserInfoDto.java index da8755a6ae47bd4778d59ef0c1b00706b70c79ac..d16322a2b273fbc64380147bd54a026d5c2c65dc 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/scope/DataScopeUserInfoDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/scope/DataScopeUserInfoDto.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 用户数据范围权限详细信息 * * @author xxm - * @date 2022/1/5 + * @since 2022/1/5 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/upms/MenuAndResourceDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/upms/MenuAndResourceDto.java index 37da80c9585257427f9742e94ea2170cc671029e..5edb74db502ffaa024bf5cff94c58977d6ba0fc4 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/upms/MenuAndResourceDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/upms/MenuAndResourceDto.java @@ -11,7 +11,7 @@ import java.util.List; * 用户菜单及资源权限返回类 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/LoginAfterUserInfo.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/LoginAfterUserInfo.java index 5cbc645063d457191f07d6a5da1339c9fcf1f35d..0c3e32ec4a8aaeaee01a36a6665fa08f43667b06 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/LoginAfterUserInfo.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/LoginAfterUserInfo.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 用户登录后所需的基础信息信息 * * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserBaseInfoDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserBaseInfoDto.java index 42094afb3d4dbcef791b150b4fb8002ea1d622bb..dfeca86fb86e24a659b471c6bbb987a289bf2cd5 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserBaseInfoDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserBaseInfoDto.java @@ -8,7 +8,7 @@ import java.time.LocalDate; /** * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserExpandInfoDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserExpandInfoDto.java index 754cd366b822967d0a5129d5b3e0d771ce1eb416..4c72d4025d0e702fc66e24552cb29f179f7bb21d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserExpandInfoDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserExpandInfoDto.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserInfoDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserInfoDto.java index 25cdf2ac938c9d5ca632036a915fc42e42993e0c..68dba601e2a4e4626d400679cb8ed2be825a35d1 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserInfoDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserInfoDto.java @@ -18,7 +18,7 @@ import java.util.stream.Collectors; /** * @author xxm - * @date 2020/4/24 + * @since 2020/4/24 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserInfoWhole.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserInfoWhole.java index 168a95aabd55e0cf95629649175f6014fc2a4d98..df07aafd4d555b21a9498bcfd6a1cbe28f6ac43f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserInfoWhole.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserInfoWhole.java @@ -10,7 +10,7 @@ import java.util.List; /** * @author xxm - * @date 2021/9/29 + * @since 2021/9/29 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdBindInfo.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdBindInfo.java index 2d40be3fbda74bfae4519fc49031c813be8fc980..86174d2631961aa800ef5a84f50ceba2cd501931 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdBindInfo.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdBindInfo.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 用户三方绑定信息 * * @author xxm - * @date 2022/7/2 + * @since 2022/7/2 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdDto.java index 73844b33849340e1ae8275e41e23c38e592a6a7a..575d8c6bb826abc0aa19398764a973579b007533 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdDto.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2021/8/4 + * @since 2021/8/4 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdInfoDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdInfoDto.java index 02415273a42f08ac251a16071db1833903159ec6..564ad05459d8b3bbf638d9b29a82007572b952ea 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdInfoDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdInfoDto.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 用户三方登录绑定详情 * * @author xxm - * @date 2022-07-02 + * @since 2022-07-02 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleCreateEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleCreateEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..a224af4e5387a1e581f91a29176b9a73e55c5818 --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleCreateEvent.java @@ -0,0 +1,19 @@ +package cn.bootx.platform.iam.event.role; + +import cn.bootx.platform.iam.dto.role.RoleDto; +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +/** + * 角色创建时间 + * @author xxm + * @since 2023/7/31 + */ +@Getter +public class RoleCreateEvent extends ApplicationEvent { + private final RoleDto role; + public RoleCreateEvent(Object source, RoleDto role) { + super(source); + this.role = role; + } +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleDeleteEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleDeleteEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..93d08c66812243fea3f986da8267618324575b91 --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleDeleteEvent.java @@ -0,0 +1,32 @@ +package cn.bootx.platform.iam.event.role; + +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +/** + * 角色删除事件 + * @author xxm + * @since 2023/8/2 + */ +@Getter +public class RoleDeleteEvent extends ApplicationEvent { + private final List roleIds; + + + public RoleDeleteEvent(Object source, Long ...roleIds) { + super(source); + if (Objects.nonNull(roleIds)){ + this.roleIds = Arrays.asList(roleIds); + } else { + this.roleIds = null; + } + } + public RoleDeleteEvent(Object source, List roleIds) { + super(source); + this.roleIds = roleIds; + } +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleUpdateEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleUpdateEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..5c0fa1c8db26f7872ee82ad84f39f702f18c91de --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleUpdateEvent.java @@ -0,0 +1,19 @@ +package cn.bootx.platform.iam.event.role; + +import cn.bootx.platform.iam.dto.role.RoleDto; +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +/** + * 角色更新事件 + * @author xxm + * @since 2023/7/31 + */ +@Getter +public class RoleUpdateEvent extends ApplicationEvent { + private final RoleDto role; + public RoleUpdateEvent(Object source, RoleDto role) { + super(source); + this.role = role; + } +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserAssignRoleEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserAssignRoleEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..e3aec38e3f8187d65facf1391046a52134b8b60d --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserAssignRoleEvent.java @@ -0,0 +1,23 @@ +package cn.bootx.platform.iam.event.user; + +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +import java.util.List; + +/** + * 用户分配角色事件 + * @author xxm + * @since 2023/8/3 + */ +@Getter +public class UserAssignRoleEvent extends ApplicationEvent { + private final List userIds; + private final List roleIds; + + public UserAssignRoleEvent(Object source, List userIds, List roleIds) { + super(source); + this.userIds = userIds; + this.roleIds = roleIds; + } +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserChangePasswordEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserChangePasswordEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..6e2e4971d745cb58ea6df7d39f77c03105e28f31 --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserChangePasswordEvent.java @@ -0,0 +1,32 @@ +package cn.bootx.platform.iam.event.user; + +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +/** + * 更改用户密码操作 + * @author xxm + * @since 2023/8/2 + */ +@Getter +public class UserChangePasswordEvent extends ApplicationEvent { + private final List userIds; + + public UserChangePasswordEvent(Object source, Long ...userIds) { + super(source); + if (Objects.nonNull(userIds)){ + this.userIds = Arrays.asList(userIds); + } else { + this.userIds = null; + } + } + + public UserChangePasswordEvent(Object source, List userIds) { + super(source); + this.userIds = userIds; + } +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/event/UserCreateEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserCreateEvent.java similarity index 86% rename from bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/event/UserCreateEvent.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserCreateEvent.java index 2d07440001d21928055f4d14501abcd0fe386692..983fb7605b24e2320484c3b50634c9695e4a7aa1 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/event/UserCreateEvent.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserCreateEvent.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.iam.core.user.event; +package cn.bootx.platform.iam.event.user; import cn.bootx.platform.iam.dto.user.UserInfoDto; import lombok.Getter; @@ -8,11 +8,10 @@ import org.springframework.context.ApplicationEvent; * 用户创建事件 * * @author xxm - * @date 2022/7/2 + * @since 2022/7/2 */ @Getter public class UserCreateEvent extends ApplicationEvent { - private final UserInfoDto userInfo; public UserCreateEvent(Object source, UserInfoDto userInfo) { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserDeleteEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserDeleteEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..df430a3e877a10daad8c31d88f94766b8295d751 --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserDeleteEvent.java @@ -0,0 +1,32 @@ +package cn.bootx.platform.iam.event.user; + +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +/** + * 用户删除事件 + * @author xxm + * @since 2023/7/31 + */ +@Getter +public class UserDeleteEvent extends ApplicationEvent { + private final List userIds; + + public UserDeleteEvent(Object source, Long ...userIds) { + super(source); + if (Objects.nonNull(userIds)){ + this.userIds = Arrays.asList(userIds); + } else { + this.userIds = null; + } + } + + public UserDeleteEvent(Object source, List userIds) { + super(source); + this.userIds = userIds; + } +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserLockEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserLockEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..98107d5d5eb7e8d89a9fa76f9308dd07309516d5 --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserLockEvent.java @@ -0,0 +1,32 @@ +package cn.bootx.platform.iam.event.user; + +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +/** + * 锁定用户 + * @author xxm + * @since 2023/7/29 + */ +@Getter +public class UserLockEvent extends ApplicationEvent { + + private final List userIds; + + public UserLockEvent(Object source, Long ...userIds) { + super(source); + if (Objects.nonNull(userIds)){ + this.userIds = Arrays.asList(userIds); + } else { + this.userIds = null; + } + } + public UserLockEvent(Object source, List userIds) { + super(source); + this.userIds = userIds; + } +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserRestartPasswordEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserRestartPasswordEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..9a23a18ba310405a49e4041c3a962b72d55cfba6 --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserRestartPasswordEvent.java @@ -0,0 +1,31 @@ +package cn.bootx.platform.iam.event.user; + +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +/** + * 重置用户密码操作 + * @author xxm + * @since 2023/7/31 + */ +@Getter +public class UserRestartPasswordEvent extends ApplicationEvent { + private final List userIds; + + public UserRestartPasswordEvent(Object source, Long ...userIds) { + super(source); + if (Objects.nonNull(userIds)){ + this.userIds = Arrays.asList(userIds); + } else { + this.userIds = null; + } + } + public UserRestartPasswordEvent(Object source, List userIds) { + super(source); + this.userIds = userIds; + } +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserUnlockEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserUnlockEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..62ce405a5aa8543332d530604cd3865c1d2c7239 --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserUnlockEvent.java @@ -0,0 +1,32 @@ +package cn.bootx.platform.iam.event.user; + +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +/** + * 解锁用户 + * @author xxm + * @since 2023/7/29 + */ +@Getter +public class UserUnlockEvent extends ApplicationEvent { + + private final List userIds; + + public UserUnlockEvent(Object source, Long ...userIds) { + super(source); + if (Objects.nonNull(userIds)){ + this.userIds = Arrays.asList(userIds); + } else { + this.userIds = null; + } + } + public UserUnlockEvent(Object source, List userIds) { + super(source); + this.userIds = userIds; + } +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserUpdateEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserUpdateEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..47364327e90964091e90c5c61697b314ef13c961 --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserUpdateEvent.java @@ -0,0 +1,21 @@ +package cn.bootx.platform.iam.event.user; + +import cn.bootx.platform.iam.dto.user.UserInfoDto; +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +/** + * 用户信息更新事件 + * @author xxm + * @since 2023/7/31 + */ +@Getter +public class UserUpdateEvent extends ApplicationEvent { + private final UserInfoDto userInfo; + + public UserUpdateEvent(Object source, UserInfoDto userInfo) { + super(source); + this.userInfo = userInfo; + } + +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/login/UserPasswordInvalidException.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/login/UserPasswordInvalidException.java index 0a912ebad2d5dc4fde95e9605df8cb30908ea50c..891bb6d63f81656cdea429135209f9b20d0c23c7 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/login/UserPasswordInvalidException.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/login/UserPasswordInvalidException.java @@ -10,7 +10,7 @@ import static cn.bootx.platform.iam.code.IamErrorCode.USER_PASSWORD_INVALID; * 用户密码不正确异常 * * @author xxm - * @date 2020/5/7 18:16 + * @since 2020/5/7 18:16 */ public class UserPasswordInvalidException extends BizException implements Serializable { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/permission/PermissionDBErrorException.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/permission/PermissionDBErrorException.java index 13d2022defa9d614ed5179cd9e608b827aab3879..1b8d4dd169a9af9be0acc6c1c5051dc3fb4337f5 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/permission/PermissionDBErrorException.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/permission/PermissionDBErrorException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.iam.code.IamErrorCode.PERMISSION_DB_ERROR; /** * @author xxm - * @date 2020/5/7 18:01 + * @since 2020/5/7 18:01 */ public class PermissionDBErrorException extends BizException implements Serializable { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleAlreadyExistedException.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleAlreadyExistedException.java index 2201a47e25a634e1efd4c970388156a8384c49e7..38205f929fcf9bde576d4d7ec82c3503ad29a2f2 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleAlreadyExistedException.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleAlreadyExistedException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.iam.code.IamErrorCode.ROLE_ALREADY_EXISTED; /** * @author xxm - * @date 2020/4/29 14:37 + * @since 2020/4/29 14:37 */ public class RoleAlreadyExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleAlreadyUsedException.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleAlreadyUsedException.java index ee86a7286ad1a00c3bece10a1b27443a28b8ade4..bc7fd89c6cb8fb3e1d606c1cb61d74b46ad2e16d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleAlreadyUsedException.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleAlreadyUsedException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.iam.code.IamErrorCode.ROLE_ALREADY_USED; /** * @author xxm - * @date 2020/4/29 14:42 + * @since 2020/4/29 14:42 */ public class RoleAlreadyUsedException extends BizException implements Serializable { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleNotExistedException.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleNotExistedException.java index 267620a1397a316703a509fcea3fe917b059af0e..3a4a3122385217fa5a03119344d094de87ff6131 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleNotExistedException.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleNotExistedException.java @@ -10,7 +10,7 @@ import static cn.bootx.platform.iam.code.IamErrorCode.ROLE_NOT_EXISTED; * 角色不存在 * * @author xxm - * @date 2020/5/7 18:04 + * @since 2020/5/7 18:04 */ public class RoleNotExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserInfoNotExistsException.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserInfoNotExistsException.java index 3c42079a91c2968aeaa9b5e9ab7a2bacfcef6354..dbc23d34028e02c880f9fe4c79cd77926f5eaab4 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserInfoNotExistsException.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserInfoNotExistsException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.iam.code.IamErrorCode.USER_INFO_NOT_EXISTS; * 用户信息不存在异常 * * @author xxm - * @date 2020/5/7 18:29 + * @since 2020/5/7 18:29 */ public class UserInfoNotExistsException extends FatalException { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserNonePhoneAndEmailException.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserNonePhoneAndEmailException.java index f93f0389214d9aa12d2dd7cb99f882cdbf80db50..069a7af8f31b694ab9b50648805989faa22c64c4 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserNonePhoneAndEmailException.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserNonePhoneAndEmailException.java @@ -10,7 +10,7 @@ import static cn.bootx.platform.iam.code.IamErrorCode.NONE_PHONE_AND_EMAIL; * 用户手机号和邮箱不可都为空的异常 * * @author xxm - * @date 2020/5/7 18:30 + * @since 2020/5/7 18:30 */ public class UserNonePhoneAndEmailException extends BizException implements Serializable { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserPhoneAlreadyExistedException.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserPhoneAlreadyExistedException.java index 508056fc49002368858ad532edcf0a232c154486..640193aa8402b935e5261b43e75dd0db28acfec8 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserPhoneAlreadyExistedException.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserPhoneAlreadyExistedException.java @@ -10,7 +10,7 @@ import static cn.bootx.platform.iam.code.IamErrorCode.USER_PHONE_ALREADY_EXISTED * 用户手机已存在异常 * * @author xxm - * @date 2020/5/7 18:25 + * @since 2020/5/7 18:25 */ public class UserPhoneAlreadyExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/DataPermScopeHandlerImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/DataPermScopeHandlerImpl.java index 913c175dde98145a6833b2de425d7e60c26afd75..b76bcb6e203c5f395b2105b2327c282d6532d983 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/DataPermScopeHandlerImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/DataPermScopeHandlerImpl.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; * 数据权限业务实现 * * @author xxm - * @date 2021/12/22 + * @since 2021/12/22 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/IgnorePathRouterCheck.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/IgnorePathRouterCheck.java index 97b8ce5283ed037e6d2d9306d32c7d066c64d25d..3cdd3bc7c81a76d9e8ce311aa560ed713956c80b 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/IgnorePathRouterCheck.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/IgnorePathRouterCheck.java @@ -13,7 +13,7 @@ import java.util.List; * 跳过不启用权限控制的路径 * * @author xxm - * @date 2022/5/27 + * @since 2022/5/27 */ @Component @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/PermCodeRouterCheck.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/PermCodeRouterCheck.java index 4f3a8118ac2eb9a41644de65240c959075202ebb..2b5f7b7d07d6f71c7f3eef7aa298eb40d3d91362 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/PermCodeRouterCheck.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/PermCodeRouterCheck.java @@ -19,7 +19,7 @@ import java.util.Optional; * 权限码方式请求路径拦截 * * @author xxm - * @date 2023/1/22 + * @since 2023/1/22 */ @Slf4j @Component diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/SelectFieldPermHandlerImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/SelectFieldPermHandlerImpl.java index 8ee746c477414080e4f7341b7e09a3f49145b929..c6675cbb6de70fa6c105e2ee7335ecca1fe7ae54 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/SelectFieldPermHandlerImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/SelectFieldPermHandlerImpl.java @@ -21,7 +21,7 @@ import java.util.stream.Collectors; * 数据字段权限业务逻辑实现 * * @author xxm - * @date 2023/1/22 + * @since 2023/1/22 */ @Slf4j @Component diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/UserPathRouterCheck.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/UserPathRouterCheck.java index 66b3625144861e07063877a0b4272143ee436b64..a371e427abbf7b9032ae90dea172cae5accd1943 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/UserPathRouterCheck.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/UserPathRouterCheck.java @@ -16,7 +16,7 @@ import java.util.Optional; * 用户路径路由拦截 * * @author xxm - * @date 2021/12/21 + * @since 2021/12/21 */ @Component @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/WsUserAuthServiceImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/WsUserAuthServiceImpl.java index d3dd5d0ba2fd3bafbb58d5ca4b45175bdc46eb46..30e83067e6d69b340788ca7be459a9d65f5f38ce 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/WsUserAuthServiceImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/WsUserAuthServiceImpl.java @@ -12,7 +12,7 @@ import java.util.Optional; * websocket 用户认证接口实现 * * @author xxm - * @date 2022/6/9 + * @since 2022/6/9 */ @Slf4j @Component diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/ClientParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/ClientParam.java index 123b68c636eca541f1d87cf7f61d239c76f9a1a3..7bc90013a13c6c1ac4993db6601a47242d3f5d85 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/ClientParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/ClientParam.java @@ -10,7 +10,7 @@ import java.util.List; * 认证应用 * * @author xxm - * @date 2022-06-27 + * @since 2022-06-27 */ @Data @Schema(title = "认证应用") @@ -32,6 +32,9 @@ public class ClientParam { @Schema(description = "是否可用") private Boolean enable; + @Schema(description = "新注册的用户是否默认赋予该终端") + private Boolean defaultEndow; + @Schema(description = "关联终端") private List loginTypeIdList; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/LoginTypeParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/LoginTypeParam.java index 83108b224c9627dabcb41472a1cf772c0663ed42..63bf49041d0c719a6fb434d9011ef5b6d87dcdd3 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/LoginTypeParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/LoginTypeParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 认证终端 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/dept/DeptParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/dept/DeptParam.java index e5d574f08dab6e5e2128038b034b88625265258c..f87f3d2a81ccba2ecf3ad94ba1d5119955575646 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/dept/DeptParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/dept/DeptParam.java @@ -9,7 +9,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/5/7 18:29 + * @since 2020/5/7 18:29 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermMenuParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermMenuParam.java index 772590e9316f48f2819626ddf7cbb953ab72e379..00666d65ceada131e16f5073c7542215826ec815 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermMenuParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermMenuParam.java @@ -12,7 +12,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2021/7/12 + * @since 2021/7/12 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermPathBatchEnableParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermPathBatchEnableParam.java index 2f9104fc06200da75c049b7aca268fb652c7d263..a7124555e8aeb2b3825651b86dc3d8451f7688c8 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermPathBatchEnableParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermPathBatchEnableParam.java @@ -11,7 +11,7 @@ import java.util.List; * 请求权限批量启停用 * * @author xxm - * @date 2022/6/6 + * @since 2022/6/6 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermPathParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermPathParam.java index 98cee0178b16bb6967c32a4bce3c46206a693718..0cbe67388a6d3e44076a13502e65dce47032c2c0 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermPathParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermPathParam.java @@ -8,7 +8,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2021/6/16 + * @since 2021/6/16 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/role/RoleParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/role/RoleParam.java index fa45b0682cd20bc9a0cef9d794f13d37493185a5..f3343d8f30d109a65442c2caa2bc19c9ab603023 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/role/RoleParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/role/RoleParam.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2021/6/17 + * @since 2021/6/17 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeDeptParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeDeptParam.java index 17ccf28af635bbc5aa46f262aef88c3496022d53..6479128cffeed18630b50d32b68ba16a3207f350 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeDeptParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeDeptParam.java @@ -8,7 +8,7 @@ import java.util.List; /** * @author xxm - * @date 2021/12/24 + * @since 2021/12/24 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeParam.java index c9db3337a29f6f3cb339c50f5f4dd1f79f2ea830..22117080d7cb42151fea66a475d58ddcddad5fb6 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeParam.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2021/12/24 + * @since 2021/12/24 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeUserParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeUserParam.java index 3174acce86a7dff9e14016d515a12aea175688c0..86dbce98c65c98fd427a8ef83d64267d70b4adcf 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeUserParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeUserParam.java @@ -8,7 +8,7 @@ import java.util.List; /** * @author xxm - * @date 2021/12/24 + * @since 2021/12/24 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/RolePermissionParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/RolePermissionParam.java index 68319f87c8bc073c7e4120f4eba0b9a847b83cd0..cb24437bdc1403924e67b2bbf79579981d399d4f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/RolePermissionParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/RolePermissionParam.java @@ -11,7 +11,7 @@ import java.util.List; /** * @author xxm - * @date 2021/6/9 + * @since 2021/6/9 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserDataScopeBatchParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserDataScopeBatchParam.java index ef0aeaf9a791787fe0c7f57f257f218e8ef31cc8..e533c1b293573274b795f1041adc3e3584b8cb8f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserDataScopeBatchParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserDataScopeBatchParam.java @@ -8,7 +8,7 @@ import java.util.List; /** * @author xxm - * @date 2022/6/7 + * @since 2022/6/7 */ @Data @Schema(title = "用户数据权限批量设置参数") diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserDataScopeParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserDataScopeParam.java index bebe2cd284922c2ac2593f34656a546a1a28e257..644b0318802392328d3ac64ca043230809253055 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserDataScopeParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserDataScopeParam.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; /** * @author xxm - * @date 2022/1/2 + * @since 2022/1/2 */ @Data @Schema(title = "用户数据权限参数") diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserRoleBatchParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserRoleBatchParam.java index a02d4e894b170889e20f4d337ec74f89ddfec8e8..00f8b3b3d4cdf94fbc34f88200098a994ff147e5 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserRoleBatchParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserRoleBatchParam.java @@ -8,7 +8,7 @@ import java.util.List; /** * @author xxm - * @date 2020/5/1 18:10 + * @since 2020/5/1 18:10 */ @Data @Schema(title = "用户角色参数") diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserRoleParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserRoleParam.java index a4e0ba0c561130b747e39aa298f54c2740cf734d..c6c838d9435e984702919856a0eaeee0c919631d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserRoleParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserRoleParam.java @@ -8,7 +8,7 @@ import java.util.List; /** * @author xxm - * @date 2020/5/1 18:10 + * @since 2020/5/1 18:10 */ @Data @Schema(title = "用户角色参数") diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserBaseInfoParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserBaseInfoParam.java index 4f622fd54fb19432573b157b6c21df6b87a376cd..90a1f00dd5cf239813b012a6015d8174e1c53d5f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserBaseInfoParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserBaseInfoParam.java @@ -8,7 +8,7 @@ import java.time.LocalDate; /** * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserBindThirdParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserBindThirdParam.java index bd4cf15e621490cc17f366362a052205a38abb2a..caac0efe06dafd4130797abed58e3d0f8a5d2693 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserBindThirdParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserBindThirdParam.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotBlank; * 用户绑定第三方开放平台参数 * * @author xxm - * @date 2022/7/2 + * @since 2022/7/2 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserChangeEmailParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserChangeEmailParam.java index 96d3bd1a31723cb5d3299a86890fb4a186822deb..e9dc676e261d86112c04666f99d24cf7f936ab20 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserChangeEmailParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserChangeEmailParam.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotBlank; * 用户修改邮箱参数 * * @author xxm - * @date 2022/6/19 + * @since 2022/6/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserChangePhoneParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserChangePhoneParam.java index eb0068438669231e6f20aa3754ec196179530036..0479d318914d2e1f8693cbd9ed506a590d6a0084 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserChangePhoneParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserChangePhoneParam.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotBlank; * 用户修改手机号参数 * * @author xxm - * @date 2022/6/19 + * @since 2022/6/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserDeptBatchParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserDeptBatchParam.java index c23dea5de9067aec17165dcfd1db64df87bc10c6..4c38a032ebb1dac62fd9744ac2bd8a162c42ac58 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserDeptBatchParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserDeptBatchParam.java @@ -9,7 +9,7 @@ import java.util.List; /** * @author xxm - * @date 2021/9/29 + * @since 2021/9/29 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserDeptParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserDeptParam.java index cdedba846306533559bb7134850d17a042f51354..f5272b2c4071f5ac0b386193a635cd2b0016e79f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserDeptParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserDeptParam.java @@ -9,7 +9,7 @@ import java.util.List; /** * @author xxm - * @date 2021/9/29 + * @since 2021/9/29 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserExpandInfoParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserExpandInfoParam.java index 84c6d4deb59efaac3a4ba612fec57e7eab691a8c..c666b4ce499cb27491d000dd8c310a9a213d84b1 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserExpandInfoParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserExpandInfoParam.java @@ -8,7 +8,7 @@ import java.time.LocalDate; /** * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserForgetEmailParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserForgetEmailParam.java index 03fb6ce46a76757c4beb00666636a9ccfd4406c8..ae28f4e8481de884282d383b40cabc1d8346b2b1 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserForgetEmailParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserForgetEmailParam.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotBlank; * 通过邮件验证码忘记密码参数 * * @author xxm - * @date 2022/6/26 + * @since 2022/6/26 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserForgetPhoneParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserForgetPhoneParam.java index 1dd3d0b1a6655be68083474df57e98daf1d0b883..2e56662d70504861cd79ad238a472d8508de8d35 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserForgetPhoneParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserForgetPhoneParam.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotBlank; * 通过手机验证码忘记密码参数 * * @author xxm - * @date 2022/6/26 + * @since 2022/6/26 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserInfoParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserInfoParam.java index a2acdfe4b5a5698593756a5fcecf73808a539a97..e0dda2892fd3c4629cb74192eb2528ddfb487a64 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserInfoParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserInfoParam.java @@ -9,7 +9,7 @@ import java.util.List; /** * @author xxm - * @date 2021/6/2 + * @since 2021/6/2 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserRegisterParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserRegisterParam.java index 14fa8716e6aa6747212ef1fd0cdffe11a147ffd1..e94833f10235bcf966f167637e4601e8fde1153d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserRegisterParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserRegisterParam.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotBlank; * 注册用户参数 * * @author xxm - * @date 2022/6/26 + * @since 2022/6/26 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserThirdInfoParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserThirdInfoParam.java index ae83b4df5d1fd271fb2f6917467949c17ef99498..20940d040fdbe7115a5acb2fd0093d660c29ad51 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserThirdInfoParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserThirdInfoParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 用户三方登录绑定详情 * * @author xxm - * @date 2022-07-02 + * @since 2022-07-02 */ @Data @Schema(title = "用户三方登录绑定详情") diff --git a/bootx-services/service-miniapp/pom.xml b/bootx-services/service-miniapp/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..d93bb8f1714ffa2edcf17c714666f99f472a3f46 --- /dev/null +++ b/bootx-services/service-miniapp/pom.xml @@ -0,0 +1,53 @@ + + + 4.0.0 + + cn.bootx.platform + bootx-services + 1.3.3 + + + service-miniapp + + + + + com.mysql + mysql-connector-j + runtime + + + + + com.baomidou + mybatis-plus-boot-starter + + + + + cn.bootx.platform + common-starter-auth + + + + + cn.bootx.platform + common-starter-audit-log + + + + cn.bootx.platform + common-super-query + + + + + cn.bootx.platform + service-baseapi + ${bootx-platform.version} + + + + diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/MiniAppApplication.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/MiniAppApplication.java new file mode 100644 index 0000000000000000000000000000000000000000..16fe14e9b8db202e4b58c0be47f589d6d2d5c6f7 --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/MiniAppApplication.java @@ -0,0 +1,15 @@ +package cn.bootx.platform.miniapp; + +import org.apache.ibatis.annotations.Mapper; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.context.annotation.ComponentScan; + +/** + * 微信小程序 + * @author xxm + * @since 2023/8/2 + */ +@ComponentScan +@MapperScan(annotationClass = Mapper.class) +public class MiniAppApplication { +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/controller/UserProtocolController.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/controller/UserProtocolController.java new file mode 100644 index 0000000000000000000000000000000000000000..cc45f6ca1401ace83698cb4fb53f2dfa4ef903a4 --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/controller/UserProtocolController.java @@ -0,0 +1,67 @@ +package cn.bootx.platform.miniapp.controller; + +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.miniapp.core.protocol.service.UserProtocolService; +import cn.bootx.platform.miniapp.dto.protocol.UserProtocolDto; +import cn.bootx.platform.miniapp.param.protocol.UserProtocolParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 用户协议 + * @author xxm + * @since 2023-08-02 + */ +@Tag(name ="用户协议") +@RestController +@RequestMapping("/user/protocol") +@RequiredArgsConstructor +public class UserProtocolController { + private final UserProtocolService userProtocolService; + + @Operation( summary = "添加") + @PostMapping(value = "/add") + public ResResult add(@RequestBody UserProtocolParam param){ + userProtocolService.add(param); + return Res.ok(); + } + + @Operation( summary = "修改") + @PostMapping(value = "/update") + public ResResult update(@RequestBody UserProtocolParam param){ + userProtocolService.update(param); + return Res.ok(); + } + + @Operation( summary = "删除") + @DeleteMapping(value = "/delete") + public ResResult delete(Long id){ + userProtocolService.delete(id); + return Res.ok(); + } + + @Operation( summary = "通过ID查询") + @GetMapping(value = "/findById") + public ResResult findById(Long id){ + return Res.ok(userProtocolService.findById(id)); + } + + @Operation( summary = "查询所有") + @GetMapping(value = "/findAll") + public ResResult> findAll(){ + return Res.ok(userProtocolService.findAll()); + } + + @Operation( summary = "分页查询") + @GetMapping(value = "/page") + public ResResult> page(PageParam pageParam, UserProtocolParam userProtocolParam){ + return Res.ok(userProtocolService.page(pageParam,userProtocolParam)); + } +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/convert/UserProtocolConvert.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/convert/UserProtocolConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..00670e76493a665c0bab009e53a0d257d9d0c376 --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/convert/UserProtocolConvert.java @@ -0,0 +1,22 @@ +package cn.bootx.platform.miniapp.core.protocol.convert; + +import cn.bootx.platform.miniapp.core.protocol.entity.UserProtocol; +import cn.bootx.platform.miniapp.dto.protocol.UserProtocolDto; +import cn.bootx.platform.miniapp.param.protocol.UserProtocolParam; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * 用户协议 + * @author xxm + * @since 2023-08-02 + */ +@Mapper +public interface UserProtocolConvert { + UserProtocolConvert CONVERT = Mappers.getMapper(UserProtocolConvert.class); + + UserProtocol convert(UserProtocolParam in); + + UserProtocolDto convert(UserProtocol in); + +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/dao/UserProtocolManager.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/dao/UserProtocolManager.java new file mode 100644 index 0000000000000000000000000000000000000000..b5f0928eaaeb90a23cc6b5078b65a9f9b0b81650 --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/dao/UserProtocolManager.java @@ -0,0 +1,35 @@ +package cn.bootx.platform.miniapp.core.protocol.dao; + +import cn.bootx.platform.miniapp.param.protocol.UserProtocolParam; +import cn.bootx.platform.miniapp.core.protocol.entity.UserProtocol; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.common.query.generator.QueryGenerator; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +/** + * 用户协议 + * @author xxm + * @since 2023-08-02 + */ +@Repository +@RequiredArgsConstructor +public class UserProtocolManager extends BaseManager { + + /** + * 分页 + */ + public Page page(PageParam pageParam, UserProtocolParam param) { + Page mpPage = MpUtil.getMpPage(pageParam, UserProtocol.class); + QueryWrapper wrapper = QueryGenerator.generator(param, this.getEntityClass()); + wrapper.select(this.getEntityClass(),MpUtil::excludeBigField) + .orderByDesc(MpUtil.getColumnName(UserProtocol::getId)); + return this.page(mpPage,wrapper); + } +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/dao/UserProtocolMapper.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/dao/UserProtocolMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..23fe1e652bd36a238a51d337c3d39d1e46f064d1 --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/dao/UserProtocolMapper.java @@ -0,0 +1,14 @@ +package cn.bootx.platform.miniapp.core.protocol.dao; + +import cn.bootx.platform.miniapp.core.protocol.entity.UserProtocol; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 用户协议 + * @author xxm + * @since 2023-08-02 + */ +@Mapper +public interface UserProtocolMapper extends BaseMapper { +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/entity/UserProtocol.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/entity/UserProtocol.java new file mode 100644 index 0000000000000000000000000000000000000000..1c502eba76735a6ad8cb973d45f60828b75a8d90 --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/entity/UserProtocol.java @@ -0,0 +1,48 @@ +package cn.bootx.platform.miniapp.core.protocol.entity; + +import cn.bootx.mybatis.table.modify.annotation.DbColumn; +import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlFieldType; +import cn.bootx.mybatis.table.modify.mybatis.mysq.constants.MySqlFieldTypeEnum; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.miniapp.core.protocol.convert.UserProtocolConvert; +import cn.bootx.platform.miniapp.dto.protocol.UserProtocolDto; +import cn.bootx.platform.miniapp.param.protocol.UserProtocolParam; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** +* 用户协议 +* @author xxm +* @since 2023-08-02 +*/ +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +@TableName("miniapp_user_protocol") +public class UserProtocol extends MpBaseEntity implements EntityBaseFunction{ + + /** 编码 */ + @DbColumn(comment = "编码") + private String code; + /** 内容 */ + @DbColumn(comment = "内容") + @DbMySqlFieldType(MySqlFieldTypeEnum.LONGTEXT) + private String content; + /** 备注 */ + @DbColumn(comment = "备注") + private String remark; + + /** 创建对象 */ + public static UserProtocol init(UserProtocolParam in) { + return UserProtocolConvert.CONVERT.convert(in); + } + + /** 转换成dto */ + @Override + public UserProtocolDto toDto() { + return UserProtocolConvert.CONVERT.convert(this); + } +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/service/UserProtocolService.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/service/UserProtocolService.java new file mode 100644 index 0000000000000000000000000000000000000000..1d43b0a031257af3cd6eb197ed136483f8cf997c --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/service/UserProtocolService.java @@ -0,0 +1,76 @@ +package cn.bootx.platform.miniapp.core.protocol.service; + +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.miniapp.core.protocol.dao.UserProtocolManager; +import cn.bootx.platform.miniapp.core.protocol.entity.UserProtocol; +import cn.bootx.platform.miniapp.dto.protocol.UserProtocolDto; +import cn.bootx.platform.miniapp.param.protocol.UserProtocolParam; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 用户协议 + * @author xxm + * @since 2023-08-02 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class UserProtocolService { + private final UserProtocolManager userProtocolManager; + + /** + * 添加 + */ + public void add(UserProtocolParam param){ + UserProtocol userProtocol = UserProtocol.init(param); + userProtocolManager.save(userProtocol); + } + + /** + * 修改 + */ + public void update(UserProtocolParam param){ + UserProtocol userProtocol = userProtocolManager.findById(param.getId()).orElseThrow(DataNotExistException::new); + + BeanUtil.copyProperties(param,userProtocol, CopyOptions.create().ignoreNullValue()); + userProtocolManager.updateById(userProtocol); + } + + /** + * 分页 + */ + public PageResult page(PageParam pageParam,UserProtocolParam userProtocolParam){ + return MpUtil.convert2DtoPageResult(userProtocolManager.page(pageParam,userProtocolParam)); + } + + /** + * 获取单条 + */ + public UserProtocolDto findById(Long id){ + return userProtocolManager.findById(id).map(UserProtocol::toDto).orElseThrow(DataNotExistException::new); + } + + /** + * 获取全部 + */ + public List findAll(){ + return ResultConvertUtil.dtoListConvert(userProtocolManager.findAll()); + } + + /** + * 删除 + */ + public void delete(Long id){ + userProtocolManager.deleteById(id); + } +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/dto/protocol/UserProtocolDto.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/dto/protocol/UserProtocolDto.java new file mode 100644 index 0000000000000000000000000000000000000000..05a098ffecbfa71e02b46ff0edb6c9fc319710d0 --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/dto/protocol/UserProtocolDto.java @@ -0,0 +1,27 @@ +package cn.bootx.platform.miniapp.dto.protocol; + +import cn.bootx.platform.common.core.rest.dto.BaseDto; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * 用户协议 + * @author xxm + * @since 2023-08-02 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Schema(title = "用户协议") +@Accessors(chain = true) +public class UserProtocolDto extends BaseDto { + + @Schema(description = "编码") + private String code; + @Schema(description = "内容") + private String content; + @Schema(description = "备注") + private String remark; + +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/param/protocol/UserProtocolParam.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/param/protocol/UserProtocolParam.java new file mode 100644 index 0000000000000000000000000000000000000000..a4f2b5343eb31a225e9aae955be175e92b3eeba3 --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/param/protocol/UserProtocolParam.java @@ -0,0 +1,26 @@ +package cn.bootx.platform.miniapp.param.protocol; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 用户协议 + * @author xxm + * @since 2023-08-02 + */ +@Data +@Schema(title = "用户协议") +@Accessors(chain = true) +public class UserProtocolParam { + + @Schema(description= "主键") + private Long id; + + @Schema(description = "编码") + private String code; + @Schema(description = "内容") + private String content; + @Schema(description = "备注") + private String remark; +} diff --git a/bootx-services/service-miniapp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-services/service-miniapp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000000000000000000000000000000000000..96eb62d2b1506e0c7d20ff3ec903f334098d3816 --- /dev/null +++ b/bootx-services/service-miniapp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.bootx.platform.miniapp.MiniAppApplication diff --git a/bootx-services/service-notice/pom.xml b/bootx-services/service-notice/pom.xml index 2d48973ca0435f5385765f5798e5f4694faf3d9c..6fe77931f839f7bb48f532b5cc6ff650652772f6 100644 --- a/bootx-services/service-notice/pom.xml +++ b/bootx-services/service-notice/pom.xml @@ -5,7 +5,7 @@ bootx-services cn.bootx.platform - 1.3.1 + 1.3.3 4.0.0 @@ -73,5 +73,11 @@ cn.bootx.platform common-starter-wecom + + + + org.dromara.sms4j + sms4j-spring-boot-starter + diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/NoticeApplication.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/NoticeApplication.java index abb5d9bfdbfce62b8c450087b2b6718ae42bf55e..89ee0ab17b964245c4a2b9803f599fbf44c6279f 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/NoticeApplication.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/NoticeApplication.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * 通知中心 * * @author xxm - * @date 2021/8/5 + * @since 2021/8/5 */ @ComponentScan @MapperScan(annotationClass = Mapper.class) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MailCode.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MailCode.java index b42df65d5bb4215131db2c2cee3189dac489bfbc..365467142107cd4ea277dd5deab3fb2b83bc5f73 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MailCode.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MailCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.notice.code; * 邮箱常量 * * @author xxm - * @date 2021/8/5 + * @since 2021/8/5 */ public interface MailCode { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MessageTemplateCode.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MessageTemplateCode.java index cf14766151383b07631ba2978566c4bbd422f61f..a8e24118f2cf3da6068b4da7bf17e05894cb039b 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MessageTemplateCode.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MessageTemplateCode.java @@ -4,26 +4,20 @@ package cn.bootx.platform.notice.code; * 消息模板类型 * * @author xxm - * @date 2021/8/10 + * @since 2021/8/10 */ public interface MessageTemplateCode { /** 站内信 */ - int SITE = 0; + String SITE = "site"; /** 钉钉 */ - int DING_TALK = 1; + String DING_TALK = "ding_talk"; /** 钉钉机器人 */ - int DING_TALK_ROBOT = 2; - - /** 短信 */ - int SMS = 3; + String DING_TALK_ROBOT = "ding_talk_robot"; /** Email */ - int EMAIL = 4; - - /** 微信 */ - int WECHAT = 5; + String EMAIL = "email"; } diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/NoticeCenterErrorCode.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/NoticeCenterErrorCode.java index 1c19838a55c7a4381ee0e6ab524776dc261e90aa..7cabadf0bbec8b66bfba217cf66bccda529ae29b 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/NoticeCenterErrorCode.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/NoticeCenterErrorCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.notice.code; * 通知中心错误码 * * @author xxm - * @date 2021/8/5 + * @since 2021/8/5 */ public interface NoticeCenterErrorCode { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/SiteMessageCode.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/SiteMessageCode.java index 0c68ceb86c671a7fb8f5136c438c722d04bca1d2..44887d5540af4b779ccfbe0f4dbf3ccb79fa5764 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/SiteMessageCode.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/SiteMessageCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.notice.code; * 站内信编码 * * @author xxm - * @date 2022/8/14 + * @since 2022/8/14 */ public interface SiteMessageCode { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/SmsChannelStatusCode.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/SmsChannelStatusCode.java new file mode 100644 index 0000000000000000000000000000000000000000..ae6a7b9d5b66dd2eedede867283b34256ec331af --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/SmsChannelStatusCode.java @@ -0,0 +1,14 @@ +package cn.bootx.platform.notice.code; + +/** + * 短信渠道商配置状态 + * @author xxm + * @since 2023/8/3 + */ +public interface SmsChannelStatusCode { + /** 正常 */ + String NORMAL = "normal"; + + /** 停用 */ + String FORBIDDEN = "forbidden"; +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MailConfigController.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MailConfigController.java index f3247086d8d5172fc0a7f5289cf28ff8a260c094..8160bd4afa53652d34322ae4fe3cab5c2491c4a0 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MailConfigController.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MailConfigController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*; /** * @author xxm - * @date 2020/5/2 14:38 + * @since 2020/5/2 14:38 */ @Tag(name = "邮箱配置") @RestController diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MessageTemplateController.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MessageTemplateController.java index cfe43bdcfff385368826de95a43a70ef0b9c0bb8..91351250616e1e5a768f67ae9117db4dea7c3877 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MessageTemplateController.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MessageTemplateController.java @@ -18,7 +18,7 @@ import java.util.Map; * 消息模板 * * @author xxm - * @date 2021/8/10 + * @since 2021/8/10 */ @Tag(name = "消息模板") @RestController diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SiteMessageController.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SiteMessageController.java index 5e16e6bdb69320b2ebc8a986c72cf837344d5037..3106d874ceed0eec48cfd0c76a1e023a51b04e99 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SiteMessageController.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SiteMessageController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*; /** * @author xxm - * @date 2021/8/8 + * @since 2021/8/8 */ @Tag(name = "站内信") @RestController diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsChannelConfigController.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsChannelConfigController.java new file mode 100644 index 0000000000000000000000000000000000000000..5ed30259e2b01d8525a944eb1a49201bcfa48c50 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsChannelConfigController.java @@ -0,0 +1,60 @@ +package cn.bootx.platform.notice.controller; + +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.notice.core.sms.service.SmsChannelConfigService; +import cn.bootx.platform.notice.dto.sms.SmsChannelConfigDto; +import cn.bootx.platform.notice.param.sms.SmsChannelConfigParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * + * @author xxm + * @since 2023/8/5 + */ +@Tag(name = "短信渠道配置") +@RestController +@RequestMapping("/sms/config") +@RequiredArgsConstructor +public class SmsChannelConfigController { + private final SmsChannelConfigService configService; + + @Operation(summary = "添加") + @PostMapping(value = "/add") + public ResResult add(@RequestBody Map map) { + configService.add(map); + return Res.ok(); + } + + @Operation(summary = "修改") + @PostMapping(value = "/update") + public ResResult update(@RequestBody Map map) { + configService.update(map); + return Res.ok(); + } + + @Operation(summary = "通过ID查询") + @GetMapping(value = "/findById") + public ResResult findById(Long id) { + return Res.ok(configService.findById(id)); + } + + @Operation(summary = "通过Code查询") + @GetMapping(value = "/findByCode") + public ResResult findByCode(String code) { + return Res.ok(configService.findByCode(code)); + } + + @Operation(summary = "查询所有") + @GetMapping(value = "/findAll") + public ResResult> findAll() { + return Res.ok(configService.findAll()); + } + +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsTemplateController.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsTemplateController.java new file mode 100644 index 0000000000000000000000000000000000000000..3f6075305103b48ec2a1e38f0038c9eb4a42ce75 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsTemplateController.java @@ -0,0 +1,67 @@ +package cn.bootx.platform.notice.controller; + +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.notice.core.sms.service.SmsTemplateService; +import cn.bootx.platform.notice.dto.sms.SmsTemplateDto; +import cn.bootx.platform.notice.param.sms.SmsTemplateParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 短信模板配置 + * @author xxm + * @since 2023-08-03 + */ +@Tag(name ="短信模板配置") +@RestController +@RequestMapping("/sms/template") +@RequiredArgsConstructor +public class SmsTemplateController { + private final SmsTemplateService smsTemplateService; + + @Operation( summary = "添加") + @PostMapping(value = "/add") + public ResResult add(@RequestBody SmsTemplateParam param){ + smsTemplateService.add(param); + return Res.ok(); + } + + @Operation( summary = "修改") + @PostMapping(value = "/update") + public ResResult update(@RequestBody SmsTemplateParam param){ + smsTemplateService.update(param); + return Res.ok(); + } + + @Operation( summary = "删除") + @DeleteMapping(value = "/delete") + public ResResult delete(Long id){ + smsTemplateService.delete(id); + return Res.ok(); + } + + @Operation( summary = "通过ID查询") + @GetMapping(value = "/findById") + public ResResult findById(Long id){ + return Res.ok(smsTemplateService.findById(id)); + } + + @Operation( summary = "查询所有") + @GetMapping(value = "/findAll") + public ResResult> findAll(){ + return Res.ok(smsTemplateService.findAll()); + } + + @Operation( summary = "分页查询") + @GetMapping(value = "/page") + public ResResult> page(PageParam pageParam, SmsTemplateParam smsTemplateParam){ + return Res.ok(smsTemplateService.page(pageParam,smsTemplateParam)); + } +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/chat/DingChatNoticeParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/chat/DingChatNoticeParam.java index d13db094f764eb982643982c7c6f5a836be3aa3f..e900fc2e5e4b4b36096ffb844081eef28ab438b2 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/chat/DingChatNoticeParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/chat/DingChatNoticeParam.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 企业群消息参数 * * @author xxm - * @date 2022/7/20 + * @since 2022/7/20 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeParam.java index 32dc74c9b4b59a2e7219aaec0e18359fc135c3d2..ad83dc652119ebf332d7f7a1a72640141e6a3764 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeParam.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 钉钉企业通知消息父类 * * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeReceive.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeReceive.java index 40fa72c1a3e4d0be146b80f12784324bcb04c7b5..b2f5b33ad4c25afe370f484d3a9d82b445112186 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeReceive.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeReceive.java @@ -10,7 +10,7 @@ import java.util.List; * 企业通知接收人配置 * * @author xxm - * @date 2022/7/20 + * @since 2022/7/20 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeUpdate.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeUpdate.java index 290498bc0ad6ae9f491969a4d8c8e48c40647633..78e51a4ba66f1afe2af8eb549ef5129319ab35a3 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeUpdate.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeUpdate.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; * 企业通知(OA消息)更新 * * @author xxm - * @date 2022/7/20 + * @since 2022/7/20 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingActionCardMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingActionCardMsg.java index bf60c14c1ebf4ddcbcdac7a3c3b1d16ac26b7059..c5638a13834229db0e6a98d10befb93cc0d68946 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingActionCardMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingActionCardMsg.java @@ -15,7 +15,7 @@ import java.util.stream.Collectors; * 钉钉卡片工作通知消息 * * @author xxm - * @date 2022/7/20 + * @since 2022/7/20 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingFileMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingFileMsg.java index 76d58c4907a6ea1366757eb275e8b5fd4cbd4c2c..50dca7a730ff0bb3c6af9f9c18df94c11e810e13 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingFileMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingFileMsg.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 钉钉文件工作通知消息 * * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingImageMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingImageMsg.java index fa935b6310918401138e67ba843683706527e11f..9d88fcdc1ec89efa93797c5624876e3dcdf88aa6 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingImageMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingImageMsg.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 钉钉图片工作通知消息 * * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingLinkMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingLinkMsg.java index 837a9c1b00628a0f9f9f2a6b7ae409f4d45326d1..3bcb6bac33c29796b5f7b4b5dd36b5357b5de0b0 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingLinkMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingLinkMsg.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 钉钉链接信息 * * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMarkDownMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMarkDownMsg.java index 7096f616bbabbbaa024c0c846df485b65b968385..36bc79ec1ac0c9157bbe9a9b53663ae807d30450 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMarkDownMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMarkDownMsg.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/7/20 + * @since 2022/7/20 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMsg.java index a77d85ac28ad97e4d6dc13dd7b749285be1586c7..2c85da3994323e39aa8695742d8e281f13ec52ee 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMsg.java @@ -6,7 +6,7 @@ import cn.bootx.platform.starter.dingtalk.param.notice.msg.Msg; * 钉钉消息接口 * * @author xxm - * @date 2022/7/20 + * @since 2022/7/20 */ public interface DingMsg { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingOaMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingOaMsg.java index 873f3bbcd07b5bdf9c3a1e295f68b7132289708b..24e582f1ddd0905113872377787f48a6f083e28b 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingOaMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingOaMsg.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingTextMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingTextMsg.java index 5f5f525040211384d70fdcaec96b482463b6c6d7..c0956a14dbc65e30ff747bff48978e0a01977447 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingTextMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingTextMsg.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 钉钉工作通知消息 * * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingVoiceMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingVoiceMsg.java index 2aaa68322d85f810832b32d45ae6bd89aaf3d835..860b8df6b5c70782b75cb0da0911ac537a4e60ac 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingVoiceMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingVoiceMsg.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 声音消息 * * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingRobotNoticeSenderImpl.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingRobotNoticeSenderImpl.java index fcdb76fd41fd4d022da3d923fa926c24291cd980..f5adfe92936d91803487240ee421776554e2fdc3 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingRobotNoticeSenderImpl.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingRobotNoticeSenderImpl.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; * 钉钉机器人消息 * * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @Slf4j @Service diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingTalkNoticeSenderImpl.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingTalkNoticeSenderImpl.java index 1b000ba9953a18a6f82082170a529e5c34fa441e..692a424639f4427cf8575dffb4e137cffca40e21 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingTalkNoticeSenderImpl.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingTalkNoticeSenderImpl.java @@ -28,7 +28,7 @@ import java.util.Objects; * 钉钉消息通知 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ @Slf4j @Service diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/convert/MailConvert.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/convert/MailConvert.java index b971bc1e4acf3329f5a1dcf50d0e7d3ab7a30b4c..6cb7e1e0b40c2255088681a4dd6df499807cb3ef 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/convert/MailConvert.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/convert/MailConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 钉钉相关类转换 * * @author xxm - * @date 2021/8/5 + * @since 2021/8/5 */ @Mapper public interface MailConvert { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigManager.java index 054bfe587d5d322ea45a8c3ea18c5ab7a640b84a..8fa429669210b44ede5989eca3331b9e2b39f5e1 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigManager.java @@ -16,7 +16,7 @@ import java.util.Optional; /** * @author xxm - * @date 2020/4/8 13:27 + * @since 2020/4/8 13:27 */ @Slf4j @Repository diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigMapper.java index 432f2c42732cb00e6c80649c57c23469fa0580e2..614327ef6a261deaee42930d7658f4d43f8bfd72 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 邮件[配置 * * @author xxm - * @date 2020/4/8 13:22 + * @since 2020/4/8 13:22 */ @Mapper public interface MailConfigMapper extends BaseMapper { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/entity/MailConfig.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/entity/MailConfig.java index 0d5e2681de590e89f07bfe01c45f88a155e26c0e..8f71bc3ee1ca6e9ca8a3c2ba3f8089c3bae0c149 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/entity/MailConfig.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/entity/MailConfig.java @@ -16,7 +16,7 @@ import lombok.experimental.Accessors; * 邮件配置 * * @author xxm - * @date 2020/4/8 11:14 + * @since 2020/4/8 11:14 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/EmailNoticeSenderImpl.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/EmailNoticeSenderImpl.java index dc3566a32d20b5d50c3ed74e40a648e334f9368b..9d49534a8da2ff369a250d4e711778d901c97b64 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/EmailNoticeSenderImpl.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/EmailNoticeSenderImpl.java @@ -36,7 +36,7 @@ import java.util.*; * 邮件发送服务 * * @author xxm - * @date 2020/5/2 16:06 + * @since 2020/5/2 16:06 */ @Slf4j @Service diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/MailConfigService.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/MailConfigService.java index e31394e322497d1ac86ba472b96357deeaca1413..ca7bf74dcb484e83ff8fa0953dab4daad8930fc8 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/MailConfigService.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/MailConfigService.java @@ -20,7 +20,7 @@ import org.springframework.transaction.annotation.Transactional; * 邮件配置 * * @author xxm - * @date 2020/4/8 13:29 + * @since 2020/4/8 13:29 */ @Service @AllArgsConstructor diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/convert/SiteMessageConvert.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/convert/SiteMessageConvert.java index 89184dd5fe8cea962a097aa250839e3216b07cbd..6b27d1cfc064ab71ed02966b46429109fbf5b2d5 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/convert/SiteMessageConvert.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/convert/SiteMessageConvert.java @@ -9,7 +9,7 @@ import org.mapstruct.factory.Mappers; * 站内信转换 * * @author xxm - * @date 2021/8/7 + * @since 2021/8/7 */ @Mapper public interface SiteMessageConvert { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageManager.java index 84fa6108592d12c5733d76b8ab69ddebeda4718f..e2749ce503db35606dd81f5b0a61d36ce48b9ad2 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageManager.java @@ -23,7 +23,7 @@ import static cn.bootx.platform.notice.code.SiteMessageCode.STATE_SENT; * 站内信 * * @author xxm - * @date 2021/8/7 + * @since 2021/8/7 */ @Slf4j @Repository diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageMapper.java index 41605d215051082de8b4796f2973cdd95f7e1d15..2ce415b49e8b46d87a73161c71aacfd16d5d90c8 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageMapper.java @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param; * 站内信 * * @author xxm - * @date 2021/8/7 + * @since 2021/8/7 */ @Mapper public interface SiteMessageMapper extends BaseMapper { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserManager.java index ad0d30f689e53c40e64fa141ff607e8ec3d49625..3620ed892f52a6b5f161c0dbef47da80c99fe16b 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserManager.java @@ -12,7 +12,7 @@ import java.util.Optional; /** * @author xxm - * @date 2022/8/14 + * @since 2022/8/14 */ @Slf4j @Repository diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserMapper.java index 7d42e33b863292addeb9ba224edb30a1966f58b8..b8917594db67efefd8f89fcf9433e42a39e730f5 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/8/14 + * @since 2022/8/14 */ @Mapper public interface SiteMessageUserMapper extends BaseMapper { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfo.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfo.java index c79362c32c9ba74598ba544f51d41aa7b6cff692..5e41cdf14481fd0dd8656fa8b0bbcb2304dbc49c 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfo.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfo.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 站内信信息详情 * * @author xxm - * @date 2022/8/14 + * @since 2022/8/14 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfoMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfoMapper.java index 806cb66c6cc8d5e8df0d378526e84e5d26c1fe6a..26e909a109e399fdb9b7fccc847e185e2d24d259 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfoMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfoMapper.java @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper; * 只用来生成字段缓存 * * @author xxm - * @date 2022/8/14 + * @since 2022/8/14 */ @Mapper public interface SiteMessageInfoMapper extends BaseMapper { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessage.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessage.java index feb247dbe9987c92e6cf69398337ec96104bf6f8..7102e54128cb0fea1036cde91d7275a1b1962595 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessage.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessage.java @@ -18,7 +18,7 @@ import java.time.LocalDateTime; * 站内信 * * @author xxm - * @date 2021/8/7 + * @since 2021/8/7 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessageUser.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessageUser.java index 1573cef2ec39051d60dafa5dc601427dac4ae75f..7539feb030d2ced63c4a7d062f53fdd41298b3c4 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessageUser.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessageUser.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 消息用户关联信息 * * @author xxm - * @date 2022/8/13 + * @since 2022/8/13 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/service/SiteMessageService.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/service/SiteMessageService.java index c3483d214b06d58e2e6b23aabd2ae719b24e0771..cc2bea1709acbc561a250b44b75d646e85b65668 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/service/SiteMessageService.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/service/SiteMessageService.java @@ -39,7 +39,7 @@ import static cn.bootx.platform.notice.code.SiteMessageCode.*; * 站内信 * * @author xxm - * @date 2021/8/7 + * @since 2021/8/7 */ @Slf4j @Service diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/convert/SmsChannelConfigConvert.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/convert/SmsChannelConfigConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..ccfdf66da4deb7b2e0c09599643584cd367ba424 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/convert/SmsChannelConfigConvert.java @@ -0,0 +1,22 @@ +package cn.bootx.platform.notice.core.sms.convert; + +import cn.bootx.platform.notice.core.sms.entity.SmsChannelConfig; +import cn.bootx.platform.notice.dto.sms.SmsChannelConfigDto; +import cn.bootx.platform.notice.param.sms.SmsChannelConfigParam; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * 短信渠道配置 + * @author xxm + * @since 2023-08-03 + */ +@Mapper +public interface SmsChannelConfigConvert { + SmsChannelConfigConvert CONVERT = Mappers.getMapper(SmsChannelConfigConvert.class); + + SmsChannelConfig convert(SmsChannelConfigParam in); + + SmsChannelConfigDto convert(SmsChannelConfig in); + +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/convert/SmsTemplateConvert.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/convert/SmsTemplateConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..e65f82fd6558435d963e340354419140bda302ea --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/convert/SmsTemplateConvert.java @@ -0,0 +1,22 @@ +package cn.bootx.platform.notice.core.sms.convert; + +import cn.bootx.platform.notice.core.sms.entity.SmsTemplate; +import cn.bootx.platform.notice.dto.sms.SmsTemplateDto; +import cn.bootx.platform.notice.param.sms.SmsTemplateParam; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * 短信模板配置 + * @author xxm + * @since 2023-08-03 + */ +@Mapper +public interface SmsTemplateConvert { + SmsTemplateConvert CONVERT = Mappers.getMapper(SmsTemplateConvert.class); + + SmsTemplate convert(SmsTemplateParam in); + + SmsTemplateDto convert(SmsTemplate in); + +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigManager.java index cfe4b8507a0e13689024f358afe60c39b1e8f81e..918a328d6133c0f3222c50eeba2ad7ddd771d386 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigManager.java @@ -6,8 +6,22 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.Optional; + @Slf4j @Service @RequiredArgsConstructor public class SmsChannelConfigManager extends BaseManager { + + + public boolean existsByCode(String code){ + return existedByField(SmsChannelConfig::getCode,code); + } + public boolean existsByCode(String code,Long id){ + return existedByField(SmsChannelConfig::getCode,code,id); + } + + public Optional findByCode(String code){ + return findByField(SmsChannelConfig::getCode,code); + } } diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigMapper.java index aacead01e4bfb7373e3f8124250416cd6e76bf32..63cde28882212d22566b6766deb76e8acb5a47ff 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2023/3/28 + * @since 2023/3/28 */ @Mapper public interface SmsChannelConfigMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsTemplateManager.java similarity index 34% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionManager.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsTemplateManager.java index 789c55654240254c8e22149f0252cca9e3f33461..81212869263033e16adf2fcaf5c1f6fcb2ac1c81 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsTemplateManager.java @@ -1,35 +1,35 @@ -package cn.bootx.platform.baseapi.core.app.dao; +package cn.bootx.platform.notice.core.sms.dao; -import cn.bootx.platform.baseapi.core.app.entity.AppVersion; +import cn.bootx.platform.notice.param.sms.SmsTemplateParam; +import cn.bootx.platform.notice.core.sms.entity.SmsTemplate; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; -import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.common.query.generator.QueryGenerator; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; -import java.util.Optional; - /** - * app版本管理 - * + * 短信模板配置 * @author xxm - * @date 2021/8/9 + * @since 2023-08-03 */ -@Slf4j @Repository @RequiredArgsConstructor -public class AppVersionManager extends BaseManager { +public class SmsTemplateManager extends BaseManager { - public Page page(PageParam pageParam) { - Page mpPage = MpUtil.getMpPage(pageParam, AppVersion.class); - return lambdaQuery().orderByDesc(MpIdEntity::getId).page(mpPage); + /** + * 分页 + */ + public Page page(PageParam pageParam, SmsTemplateParam param) { + Page mpPage = MpUtil.getMpPage(pageParam, SmsTemplate.class); + QueryWrapper wrapper = QueryGenerator.generator(param, this.getEntityClass()); + wrapper.select(this.getEntityClass(),MpUtil::excludeBigField) + .orderByDesc(MpUtil.getColumnName(SmsTemplate::getId)); + return this.page(mpPage,wrapper); } - - public Optional findLatest() { - return MpUtil.findOne(lambdaQuery().orderByDesc(AppVersion::getAppVersion)); - } - } diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsTemplateMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsTemplateMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..09ee2fbe31d57a3b1168a2051962fcc8b7e2a617 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsTemplateMapper.java @@ -0,0 +1,14 @@ +package cn.bootx.platform.notice.core.sms.dao; + +import cn.bootx.platform.notice.core.sms.entity.SmsTemplate; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 短信模板配置 + * @author xxm + * @since 2023-08-03 + */ +@Mapper +public interface SmsTemplateMapper extends BaseMapper { +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java index 62469e77fe8f8df2543da2011d09db7e247f7093..aeb73cf73012400006e2a38a0081f9e55f2712d5 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java @@ -1,31 +1,93 @@ package cn.bootx.platform.notice.core.sms.entity; +import cn.bootx.mybatis.table.modify.annotation.DbColumn; +import cn.bootx.mybatis.table.modify.annotation.DbTable; +import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlFieldType; +import cn.bootx.mybatis.table.modify.mybatis.mysq.constants.MySqlFieldTypeEnum; +import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.notice.core.sms.convert.SmsChannelConfigConvert; +import cn.bootx.platform.notice.dto.sms.SmsChannelConfigDto; +import cn.bootx.platform.notice.param.sms.SmsChannelConfigParam; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.dromara.sms4j.provider.enumerate.SupplierType; + +import static com.baomidou.mybatisplus.annotation.FieldStrategy.IGNORED; /** * 短信渠道配置 * @author xxm - * @date 2023/3/28 + * @since 2023/3/28 */ @EqualsAndHashCode(callSuper = true) @Data +@DbTable(comment = "短信渠道配置") @Accessors(chain = true) @TableName("notice_sms_channel_config") -public class SmsChannelConfig extends MpBaseEntity { +public class SmsChannelConfig extends MpBaseEntity implements EntityBaseFunction { - /** 渠道编码 */ + /** + * 渠道类型编码 + * @see SupplierType#name() + */ + @DbColumn(comment = "渠道类型编码") + @TableField(updateStrategy = FieldStrategy.NEVER) private String code; - /** 短信签名 */ - private String signature; - /** 短信ApiKey */ - private String apiKey; - /** 短信Api秘钥 */ - private String apiSecret; - /** 回调地址 */ - private String url; + /** + * 渠道类型名称 + * @see SupplierType#getName() + */ + @DbColumn(comment = "渠道类型名称") + private String name; + + /** + * 状态 + * @see cn.bootx.platform.notice.code.SmsChannelStatusCode + */ + @DbColumn(comment = "状态") + private String state; + + /** AccessKey */ + @DbColumn(comment = "AccessKey") + private String accessKey; + + /** AccessSecret */ + @DbColumn(comment = "AccessSecret") + private String accessSecret; + + /** 配置字符串 */ + @DbMySqlFieldType(MySqlFieldTypeEnum.TEXT) + @DbColumn(comment = "配置字符串") + @TableField(updateStrategy = IGNORED) + private String config; + + /** 图片 */ + @TableField(updateStrategy = IGNORED) + @DbColumn(comment = "图片") + private Long image; + + /** 排序 */ + @DbColumn(comment = "排序") + private Double sortNo; + + /** 备注 */ + @DbColumn(comment = "备注") + private String remark; + + /** 创建对象 */ + public static SmsChannelConfig init(SmsChannelConfigParam in) { + return SmsChannelConfigConvert.CONVERT.convert(in); + } + + /** 转换成dto */ + @Override + public SmsChannelConfigDto toDto() { + return SmsChannelConfigConvert.CONVERT.convert(this); + } } diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsTemplate.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsTemplate.java new file mode 100644 index 0000000000000000000000000000000000000000..38b6fcfc69dabd0227d59610d76697c39497c0b9 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsTemplate.java @@ -0,0 +1,43 @@ +package cn.bootx.platform.notice.core.sms.entity; + +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.notice.core.sms.convert.SmsTemplateConvert; +import cn.bootx.platform.notice.dto.sms.SmsTemplateDto; +import cn.bootx.platform.notice.param.sms.SmsTemplateParam; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** +* 短信模板配置 +* @author xxm +* @since 2023-08-03 +*/ +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +@TableName("notice_sms_template") +public class SmsTemplate extends MpBaseEntity implements EntityBaseFunction{ + + /** 短信渠道商类型 */ + private String supplierType; + /** 短信模板id */ + private String templateId; + /** 短信模板名称 */ + private String name; + /** 短信模板内容 */ + private String content; + + /** 创建对象 */ + public static SmsTemplate init(SmsTemplateParam in) { + return SmsTemplateConvert.CONVERT.convert(in); + } + + /** 转换成dto */ + @Override + public SmsTemplateDto toDto() { + return SmsTemplateConvert.CONVERT.convert(this); + } +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsChannelConfigService.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsChannelConfigService.java new file mode 100644 index 0000000000000000000000000000000000000000..8720228d9b088d3742d8f8009aa661cee6260ae4 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsChannelConfigService.java @@ -0,0 +1,246 @@ +package cn.bootx.platform.notice.core.sms.service; + +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.function.CollectorsFunction; +import cn.bootx.platform.common.core.util.CollUtil; +import cn.bootx.platform.common.jackson.util.JacksonUtil; +import cn.bootx.platform.notice.core.sms.dao.SmsChannelConfigManager; +import cn.bootx.platform.notice.core.sms.entity.SmsChannelConfig; +import cn.bootx.platform.notice.dto.sms.SmsChannelConfigDto; +import cn.bootx.platform.notice.event.sms.SmsChannelAddEvent; +import cn.bootx.platform.notice.event.sms.SmsChannelUpdateEvent; +import cn.bootx.platform.notice.param.sms.SmsChannelConfigParam; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import cn.hutool.core.util.StrUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import lombok.val; +import org.dromara.sms4j.aliyun.config.AlibabaConfig; +import org.dromara.sms4j.api.universal.SupplierConfig; +import org.dromara.sms4j.cloopen.config.CloopenConfig; +import org.dromara.sms4j.comm.exception.SmsBlendException; +import org.dromara.sms4j.core.config.SupplierFactory; +import org.dromara.sms4j.ctyun.config.CtyunConfig; +import org.dromara.sms4j.emay.config.EmayConfig; +import org.dromara.sms4j.huawei.config.HuaweiConfig; +import org.dromara.sms4j.jdcloud.config.JdCloudConfig; +import org.dromara.sms4j.netease.config.NeteaseConfig; +import org.dromara.sms4j.provider.enumerate.SupplierType; +import org.dromara.sms4j.tencent.config.TencentConfig; +import org.dromara.sms4j.unisms.config.UniConfig; +import org.dromara.sms4j.yunpian.config.YunpianConfig; +import org.springframework.boot.web.context.WebServerInitializedEvent; +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; + +@Slf4j +@Service +@RequiredArgsConstructor +public class SmsChannelConfigService { + + private final SmsChannelConfigManager configManager; + + private final ApplicationEventPublisher eventPublisher; + + /** + * 添加 + */ + @Transactional(rollbackFor = Exception.class) + public void add(Map map){ + SmsChannelConfigParam param = BeanUtil.toBean(map, SmsChannelConfigParam.class); + SmsChannelConfig channelConfig = SmsChannelConfig.init(param); + // 编码不能重复 + if (configManager.existsByCode(param.getCode())) { + throw new BizException("编码已存在"); + } + String supplierConfig = getSupplierConfig(channelConfig, map); + channelConfig.setConfig(supplierConfig); + configManager.save(channelConfig); + this.initChannelConfig(channelConfig); + eventPublisher.publishEvent(new SmsChannelAddEvent(this,channelConfig.toDto())); + } + + /** + * 更新 + */ + @Transactional(rollbackFor = Exception.class) + public void update(Map map){ + SmsChannelConfigParam param = BeanUtil.toBean(map, SmsChannelConfigParam.class); + SmsChannelConfig channelConfig = configManager.findById(param.getId()) + .orElseThrow(DataNotExistException::new); + // 编码不能重复 + if (configManager.existsByCode(param.getCode(), param.getId())) { + throw new BizException("编码已存在"); + } + BeanUtil.copyProperties(param, channelConfig, CopyOptions.create().ignoreNullValue()); + String supplierConfig = getSupplierConfig(channelConfig, map); + channelConfig.setConfig(supplierConfig); + configManager.updateById(channelConfig); + this.initChannelConfig(channelConfig); + eventPublisher.publishEvent(new SmsChannelUpdateEvent(this,channelConfig.toDto())); + } + + + /** + * 查询全部配置 + */ + public List findAll(){ + // 遍历数据库 + Map map = configManager.findAll() + .stream() + .collect(Collectors.toMap(SmsChannelConfig::getCode, Function.identity(), CollectorsFunction::retainLatest)); + return Arrays.stream(SupplierType.values()) + .map(type-> Optional.ofNullable(map.get(type.name().toLowerCase())) + .orElse(new SmsChannelConfig() + .setCode(type.name().toLowerCase()) + .setSortNo(0.0) + .setName(type.getName()))) + .sorted(Comparator.comparing(SmsChannelConfig::getSortNo)) + .map(SmsChannelConfig::toDto) + .collect(Collectors.toList()); + } + + /** + * 根据ID查询 + */ + public SmsChannelConfigDto findById(Long id) { + return configManager.findById(id).map(SmsChannelConfig::toDto) + .orElseThrow(DataNotExistException::new); + } + + /** + * 根据code查询 + */ + public SmsChannelConfigDto findByCode(String code) { + return configManager.findByCode(code).map(SmsChannelConfig::toDto) + .orElseThrow(DataNotExistException::new); + } + + /** + * 启动成功后初始化所有的短信通道配置 + */ + @EventListener(WebServerInitializedEvent.class) + public void initChannelConfig(){ + List smsChannelConfigs = configManager.findAll(); + smsChannelConfigs.forEach(this::initChannelConfig); + } + + /** + * 启动成功后初始化所有的短信通道配置 + */ + public void initChannelConfig(SmsChannelConfig channelConfig){ + SupplierType supplierType = getSupplierType(channelConfig.getCode()); + String config = channelConfig.getConfig(); + if (StrUtil.isBlank(config)){ + return; + } + SupplierConfig bean; + if (supplierType == SupplierType.ALIBABA) { + bean = JacksonUtil.toBean(config, AlibabaConfig.class); + } else if (supplierType == SupplierType.HUAWEI) { + bean = JacksonUtil.toBean(config, HuaweiConfig.class); + } else if (supplierType == SupplierType.UNI_SMS) { + bean = JacksonUtil.toBean(config, UniConfig.class); + } else if (supplierType == SupplierType.TENCENT) { + bean = JacksonUtil.toBean(config, TencentConfig.class); + } else if (supplierType == SupplierType.YUNPIAN) { + bean = JacksonUtil.toBean(config, YunpianConfig.class); + } else if (supplierType == SupplierType.JD_CLOUD) { + bean = JacksonUtil.toBean(config, JdCloudConfig.class); + } else if (supplierType == SupplierType.CLOOPEN) { + bean = JacksonUtil.toBean(config, CloopenConfig.class); + } else if (supplierType == SupplierType.EMAY) { + bean = JacksonUtil.toBean(config, EmayConfig.class); + } else if (supplierType == SupplierType.CTYUN) { + bean = JacksonUtil.toBean(config, CtyunConfig.class); + } else if (supplierType == SupplierType.NETEASE) { + bean = JacksonUtil.toBean(config, NeteaseConfig.class); + } else { + throw new SmsBlendException("短信加载失败!请检查配置类型."); + } + SupplierFactory.setSupplierConfig(bean); + } + + /** + * 获取供应商配置的序列化 + */ + private String getSupplierConfig(SmsChannelConfig channelConfig, Map map){ + SupplierType supplierType = getSupplierType(channelConfig.getCode()); + if (CollUtil.isEmpty(map)){ + return null; + } + if (supplierType == SupplierType.ALIBABA) { + val bean = BeanUtil.toBean(map, AlibabaConfig.class); + bean.setAccessKeyId(channelConfig.getAccessKey()); + bean.setAccessKeySecret(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); + } else if (supplierType == SupplierType.HUAWEI) { + val bean = BeanUtil.toBean(map, HuaweiConfig.class); + bean.setAppKey(channelConfig.getAccessKey()); + bean.setAppSecret(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); + } else if (supplierType == SupplierType.UNI_SMS) { + val bean = BeanUtil.toBean(map, UniConfig.class); + bean.setAccessKeyId(channelConfig.getAccessKey()); + bean.setAccessKeySecret(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); + } else if (supplierType == SupplierType.TENCENT) { + val bean = BeanUtil.toBean(map, TencentConfig.class); + bean.setAccessKeyId(channelConfig.getAccessKey()); + bean.setAccessKeySecret(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); + } else if (supplierType == SupplierType.YUNPIAN) { + val bean = BeanUtil.toBean(map, YunpianConfig.class); + bean.setAccessKeyId(channelConfig.getAccessKey()); + bean.setAccessKeySecret(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); + } else if (supplierType == SupplierType.JD_CLOUD) { + val bean = BeanUtil.toBean(map, JdCloudConfig.class); + bean.setAccessKeyId(channelConfig.getAccessKey()); + bean.setAccessKeySecret(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); + } else if (supplierType == SupplierType.CLOOPEN) { + val bean = BeanUtil.toBean(map, CloopenConfig.class); + bean.setAccessKeyId(channelConfig.getAccessKey()); + bean.setAccessKeySecret(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); + } else if (supplierType == SupplierType.EMAY) { + val bean = BeanUtil.toBean(map, EmayConfig.class); + bean.setAppId(channelConfig.getAccessKey()); + bean.setSecretKey(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); + } else if (supplierType == SupplierType.CTYUN) { + val bean = BeanUtil.toBean(map, CtyunConfig.class); + bean.setAccessKeyId(channelConfig.getAccessKey()); + bean.setAccessKeySecret(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); + } else if (supplierType == SupplierType.NETEASE) { + val bean = BeanUtil.toBean(map, NeteaseConfig.class); + bean.setAccessKeyId(channelConfig.getAccessKey()); + bean.setAccessKeySecret(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); + } else { + throw new SmsBlendException("短信加载失败!请检查配置类型."); + } + + } + + /** + * 获取 短信供应商 枚举 + */ + public SupplierType getSupplierType(String code){ + return Arrays.stream(SupplierType.values()) + .filter(supplierType -> supplierType.name().equalsIgnoreCase(code)) + .findFirst() + .orElseThrow(() -> new BizException("短信供应商未找到")); + } + +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsTemplateService.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsTemplateService.java new file mode 100644 index 0000000000000000000000000000000000000000..22c1c354d822daa59e251f57aedc68b75afc7d56 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsTemplateService.java @@ -0,0 +1,75 @@ +package cn.bootx.platform.notice.core.sms.service; + +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.notice.core.sms.dao.SmsTemplateManager; +import cn.bootx.platform.notice.core.sms.entity.SmsTemplate; +import cn.bootx.platform.notice.dto.sms.SmsTemplateDto; +import cn.bootx.platform.notice.param.sms.SmsTemplateParam; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 短信模板配置 + * @author xxm + * @since 2023-08-03 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class SmsTemplateService { + private final SmsTemplateManager smsTemplateManager; + + /** + * 添加 + */ + public void add(SmsTemplateParam param){ + SmsTemplate smsTemplate = SmsTemplate.init(param); + smsTemplateManager.save(smsTemplate); + } + + /** + * 修改 + */ + public void update(SmsTemplateParam param){ + SmsTemplate smsTemplate = smsTemplateManager.findById(param.getId()).orElseThrow(DataNotExistException::new); + BeanUtil.copyProperties(param,smsTemplate, CopyOptions.create().ignoreNullValue()); + smsTemplateManager.updateById(smsTemplate); + } + + /** + * 分页 + */ + public PageResult page(PageParam pageParam,SmsTemplateParam smsTemplateParam){ + return MpUtil.convert2DtoPageResult(smsTemplateManager.page(pageParam,smsTemplateParam)); + } + + /** + * 获取单条 + */ + public SmsTemplateDto findById(Long id){ + return smsTemplateManager.findById(id).map(SmsTemplate::toDto).orElseThrow(DataNotExistException::new); + } + + /** + * 获取全部 + */ + public List findAll(){ + return ResultConvertUtil.dtoListConvert(smsTemplateManager.findAll()); + } + + /** + * 删除 + */ + public void delete(Long id){ + smsTemplateManager.deleteById(id); + } +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/convert/MessageTemplateConvert.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/convert/MessageTemplateConvert.java index 75bd7afbf9944a2b3fd175481a4a911eba76778c..cdaf3044b71f07e5cc94384e79cec10ba0715572 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/convert/MessageTemplateConvert.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/convert/MessageTemplateConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 消息模板转换 * * @author xxm - * @date 2021/8/10 + * @since 2021/8/10 */ @Mapper public interface MessageTemplateConvert { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateManager.java index f879acab73c761d113a3002c0b4f83531e4c5420..0fb1fb91417dbd5be1a118e1e99901c6597fcefa 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateManager.java @@ -18,7 +18,7 @@ import java.util.Optional; * 消息模板 * * @author xxm - * @date 2021/8/9 + * @since 2021/8/9 */ @Slf4j @Repository diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateMapper.java index 1bd5c72507573ceca29db52b7a7d9f2a8bae3664..038c07bec8a673f61eb2c0b1c21f53a41da1b094 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2021/8/9 + * @since 2021/8/9 */ @Mapper public interface MessageTemplateMapper extends BaseMapper { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/entity/MessageTemplate.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/entity/MessageTemplate.java index a0cd526b64d743391dfd83a6273c1cdaef7b47da..931748f4aae846f27674f31bc98f15062c365764 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/entity/MessageTemplate.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/entity/MessageTemplate.java @@ -33,7 +33,7 @@ public class MessageTemplate extends MpBaseEntity implements EntityBaseFunction< * 模板类型 * @see MessageTemplateCode */ - private Integer type; + private String type; public static MessageTemplate init(MessageTemplateParam in) { return MessageTemplateConvert.CONVERT.convert(in); diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/service/MessageTemplateService.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/service/MessageTemplateService.java index cfbc66db520a7ab2fc688109934843cf631f70fb..609f040c0bc82bf64f0fde5f437dbe54e44b41d2 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/service/MessageTemplateService.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/service/MessageTemplateService.java @@ -24,7 +24,7 @@ import java.util.Map; * 消息模板 * * @author xxm - * @date 2021/8/9 + * @since 2021/8/9 */ @Slf4j @Service diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigManager.java index 426492ced6bd09107b2739d3f995340eebffe51e..1a87485e4a939159c5cfec153f44b59300357a8a 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigManager.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; * 微信消息配置 * * @author xxm - * @date 2021/8/10 + * @since 2021/8/10 */ @Slf4j @Repository diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigMapper.java index 88103ba3ce37f74498325d911f48ba39bdae48d1..57010736a5a4133f6d8bca06af5824bb8b3bd0a3 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2021/8/10 + * @since 2021/8/10 */ @Mapper public interface WeChatNoticeConfigMapper extends BaseMapper { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/entity/WeChatNoticeConfig.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/entity/WeChatNoticeConfig.java index 3ec399f227244402b6e7c720eed4363fcc57dae8..972c7cf4f636a3946026ca3542ab9fac809b62e1 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/entity/WeChatNoticeConfig.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/entity/WeChatNoticeConfig.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 微信消息配置 * * @author xxm - * @date 2021/8/10 + * @since 2021/8/10 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeParam.java index 9dc077fc0b3a50afeb6aefe644bc3345e2f36503..4466a9a8667f314839125c72fb3701a50f709b6c 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeParam.java @@ -12,7 +12,7 @@ import me.chanjar.weixin.cp.bean.message.WxCpMessage; * 企业微信发送消息参数 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeReceive.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeReceive.java index abfcff26690806f3fdacdeba33aab6476a25e160..2dcff4128df4b30b79f3eb3cdfc7fa47d2c48c31 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeReceive.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeReceive.java @@ -10,7 +10,7 @@ import java.util.List; /** * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComFileMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComFileMsg.java index 20b0ed7b40cf266e22e6333fe8541dee1a7523b3..41b16ca2eafc75ad283dcd828248eff4cab6f9bb 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComFileMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComFileMsg.java @@ -7,7 +7,7 @@ import me.chanjar.weixin.cp.bean.message.WxCpMessage; /** * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComImageMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComImageMsg.java index e431a829acfe2e359a1977fbf381807f71f04b0b..7dbc5189e4c917abe0a1ad6850629463380728eb 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComImageMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComImageMsg.java @@ -9,7 +9,7 @@ import me.chanjar.weixin.cp.bean.message.WxCpMessage; /** * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @NoArgsConstructor diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMarkdownMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMarkdownMsg.java index 731dfee96d34f22c88a30710451d40d37ca45b99..cfd8f6d44f1c90d975a82596a8e9578300647475 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMarkdownMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMarkdownMsg.java @@ -9,7 +9,7 @@ import me.chanjar.weixin.cp.bean.message.WxCpMessage; /** * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @AllArgsConstructor diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMpNewsMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMpNewsMsg.java index fd3f9b35c54032e19163d53c2b80736229b2b836..27663e7c3b587f62b3ae354db5635bffa07a891a 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMpNewsMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMpNewsMsg.java @@ -15,7 +15,7 @@ import java.util.List; * mpnews类型的图文消息,跟普通的图文消息一致,唯一的差异是图文内容存储在企业微信。 多次发送mpnews,会被认为是不同的图文,阅读、点赞的统计会被分开计算。 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMsg.java index 29652ffab8344d73c6b99c62f0c4b49a54358162..7f4a58251b8f53a237bd370205c1221104ac353e 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMsg.java @@ -6,7 +6,7 @@ import me.chanjar.weixin.cp.bean.message.WxCpMessage; * 企业微信通知消息 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ public interface WeComMsg { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComNewsMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComNewsMsg.java index e29daa1f093c1bd24c34308828e21651e51e58c7..b74b443dcd0e881dfc1457f889580e139c601f5f 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComNewsMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComNewsMsg.java @@ -15,7 +15,7 @@ import java.util.List; * 暂未支持 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComRobotReceive.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComRobotReceive.java index a9bbe438d578e7fb36cd47f18cd924290e59c558..ddad5674abed17a5cbca7d63a71444c6235ac10e 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComRobotReceive.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComRobotReceive.java @@ -10,7 +10,7 @@ import java.util.List; * 企微机器人接收人配置 * * @author xxm - * @date 2022/7/24 + * @since 2022/7/24 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextCardMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextCardMsg.java index 9e94ed3b975d6dfa74d9cc8b0843c81e0f5ad5ea..cf5e7295481a7fbea1a1b7af4f06efd789e71c9f 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextCardMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextCardMsg.java @@ -7,7 +7,7 @@ import me.chanjar.weixin.cp.bean.message.WxCpMessage; /** * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextMsg.java index 54d4789ae06493c0dbc863cc680951a2c2f627e6..0bf517c0b397adae800673dfbe79027f66266f83 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextMsg.java @@ -9,7 +9,7 @@ import me.chanjar.weixin.cp.bean.message.WxCpMessage; /** * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @AllArgsConstructor diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVideoMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVideoMsg.java index a03ec2c8eb04d6303c259068723a704bd64e804d..662a419d6952c5a8d216635474e8b6090078b1be 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVideoMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVideoMsg.java @@ -9,7 +9,7 @@ import me.chanjar.weixin.cp.bean.message.WxCpMessage; /** * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @NoArgsConstructor diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVoiceMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVoiceMsg.java index a3ead5f71e8d84de257b9926e09df6383ae5163e..04d7def47e0c37442d0480de3319006647d2ef9e 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVoiceMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVoiceMsg.java @@ -9,7 +9,7 @@ import me.chanjar.weixin.cp.bean.message.WxCpMessage; /** * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @AllArgsConstructor diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComNoticeSenderImpl.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComNoticeSenderImpl.java index 9b4e952cffb2edd6960d53158acace407590000f..0454ec561eb4b1d0a284b3beda5aee485cac57fe 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComNoticeSenderImpl.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComNoticeSenderImpl.java @@ -16,7 +16,7 @@ import java.io.InputStream; * 实现类 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Slf4j @Service diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComRobotNoticeSenderImpl.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComRobotNoticeSenderImpl.java index f116388994e74e54851c9312cacdad8188da55c0..ae141917bd5ed63f474ef8cbb637033d779320a8 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComRobotNoticeSenderImpl.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComRobotNoticeSenderImpl.java @@ -18,7 +18,7 @@ import java.util.List; * 微信机器人消息发送 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Slf4j @Service diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/BaseMailParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/BaseMailParam.java index bd0c6f1d81fb43576d41767c3915a267a99697a4..acd5b20ba598cc14e7185eca4aaa4618bc626e19 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/BaseMailParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/BaseMailParam.java @@ -9,7 +9,7 @@ import java.io.Serializable; * 基础通知参数 * * @author xxm - * @date 2020/5/2 20:32 + * @since 2020/5/2 20:32 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailConfigDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailConfigDto.java index c77ead5939ac2f4d2ad27445f08a6fd500ac6a7d..61a088ba858de09237af9c8ccd3e05f68b700700 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailConfigDto.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailConfigDto.java @@ -12,7 +12,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/5/2 14:42 + * @since 2020/5/2 14:42 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailFileParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailFileParam.java index 544a008abd78ba73c31e3c4df67e1d6a4e136353..92c715905e08ffd41cc85f164a9c67fa48153e5c 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailFileParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailFileParam.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 邮件附件参数 * * @author xxm - * @date 2020/5/2 20:33 + * @since 2020/5/2 20:33 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/NoticeReceiverDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/NoticeReceiverDto.java index aed897a547b63839c3269e531ca5144ec7733231..9ae7938466a6d6c926575961687b9d7cd2235ca7 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/NoticeReceiverDto.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/NoticeReceiverDto.java @@ -13,7 +13,7 @@ import javax.validation.constraints.Size; * 测试通知接收者管理 * * @author xxm - * @date 2020/5/3 10:56 + * @since 2020/5/3 10:56 */ @EqualsAndHashCode(callSuper = true) @Schema(title = "通知接收者配置dto") diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/SendMailParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/SendMailParam.java index 5abb3f75177f0d1d0677005806a3e6ed4bbed445..b4a163191fc3e508821f40cbfb688ef7b9fdf3a3 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/SendMailParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/SendMailParam.java @@ -12,7 +12,7 @@ import java.util.List; * 发邮件的参数 * * @author xxm - * @date 2020/5/2 20:31 + * @since 2020/5/2 20:31 */ @Schema(title = "发邮件的参数") @Data diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/ToUserRequiredMailParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/ToUserRequiredMailParam.java index 367c98ad41fe4a106430c08b9f0c31e12ba63d4d..0b3a85d289f320e099ce53e288eddca338d2efd3 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/ToUserRequiredMailParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/ToUserRequiredMailParam.java @@ -9,7 +9,7 @@ import java.io.Serializable; * touser 必需时使用的参数 * * @author xxm - * @date 2020/5/2 20:32 + * @since 2020/5/2 20:32 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/site/SiteMessageDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/site/SiteMessageDto.java index 0beb5f831d077ba98283b304f50927ebdb33fbad..46b3cdf9cf206d7220754b3788e06cc06dc2b779 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/site/SiteMessageDto.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/site/SiteMessageDto.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; * 站内信 * * @author xxm - * @date 2021/8/7 + * @since 2021/8/7 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsChannelConfigDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsChannelConfigDto.java new file mode 100644 index 0000000000000000000000000000000000000000..495b06594b825c609f101e062a234feedc22a27b --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsChannelConfigDto.java @@ -0,0 +1,39 @@ +package cn.bootx.platform.notice.dto.sms; + +import cn.bootx.platform.common.core.rest.dto.BaseDto; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * 短信渠道配置 + * @author xxm + * @since 2023-08-04 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Schema(title = "短信渠道配置") +@Accessors(chain = true) +public class SmsChannelConfigDto extends BaseDto { + + @Schema(description = "渠道类型编码") + private String code; + @Schema(description = "渠道类型名称") + private String name; + @Schema(description = "状态") + private String state; + @Schema(description = "AccessKey") + private String accessKey; + @Schema(description = "AccessSecret") + private String accessSecret; + @Schema(description = "配置") + private String config; + @Schema(description = "排序") + private Double sortNo; + @Schema(description = "图片") + private Long image; + @Schema(description = "备注") + private String remark; + +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsTemplateDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsTemplateDto.java new file mode 100644 index 0000000000000000000000000000000000000000..5dd0d135a152accbcd8a26f4c37161621194c631 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsTemplateDto.java @@ -0,0 +1,29 @@ +package cn.bootx.platform.notice.dto.sms; + +import cn.bootx.platform.common.core.rest.dto.BaseDto; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * 短信模板配置 + * @author xxm + * @since 2023-08-03 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Schema(title = "短信模板配置") +@Accessors(chain = true) +public class SmsTemplateDto extends BaseDto { + + @Schema(description = "短信渠道商类型") + private String supplierType; + @Schema(description = "短信模板id") + private String templateId; + @Schema(description = "短信模板名称") + private String name; + @Schema(description = "短信模板内容") + private String content; + +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/template/MessageTemplateDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/template/MessageTemplateDto.java index 1847818cadbe0cbd59eda420e069bf001d688bad..e330b29232cc234fa397f577de6aa6d748156828 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/template/MessageTemplateDto.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/template/MessageTemplateDto.java @@ -13,7 +13,7 @@ import java.io.Serializable; * 消息模板 * * @author xxm - * @date 2021/8/10 + * @since 2021/8/10 */ @EqualsAndHashCode(callSuper = true) @Data @@ -39,6 +39,6 @@ public class MessageTemplateDto extends BaseDto implements Serializable { * 模板类型 * @see MessageTemplateCode */ - private Integer type; + private String type; } diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/wechat/WeChatNoticeConfigDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/wechat/WeChatNoticeConfigDto.java index eadfae0069220454661e306e88187271c328fbb7..d60fcd4993be25434f1135c319655e020944f45e 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/wechat/WeChatNoticeConfigDto.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/wechat/WeChatNoticeConfigDto.java @@ -12,7 +12,7 @@ import java.io.Serializable; * 微信通知配置 * * @author xxm - * @date 2021/8/10 + * @since 2021/8/10 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelAddEvent.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelAddEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..dcbedc55e24f003b1283e03f2157d4ff79c45dcb --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelAddEvent.java @@ -0,0 +1,20 @@ +package cn.bootx.platform.notice.event.sms; + +import cn.bootx.platform.notice.dto.sms.SmsChannelConfigDto; +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +/** + * 短信渠道添加事件 + * @author xxm + * @since 2023/8/5 + */ +@Getter +public class SmsChannelAddEvent extends ApplicationEvent { + private final SmsChannelConfigDto channelConfig; + + public SmsChannelAddEvent(Object source, SmsChannelConfigDto channelConfig) { + super(source); + this.channelConfig = channelConfig; + } +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelDisableEnableEvent.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelDisableEnableEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..81261da416ffaaeb72c8250191687d3f93eca972 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelDisableEnableEvent.java @@ -0,0 +1,19 @@ +package cn.bootx.platform.notice.event.sms; + +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +/** + * 短信通道停用事件 + * @author xxm + * @since 2023/8/5 + */ +@Getter +public class SmsChannelDisableEnableEvent extends ApplicationEvent { + private final String code; + + public SmsChannelDisableEnableEvent(Object source, String code) { + super(source); + this.code = code; + } +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelEnableEvent.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelEnableEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..21fd75b8e670dd45571147dcf6141b5e55e2aac5 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelEnableEvent.java @@ -0,0 +1,19 @@ +package cn.bootx.platform.notice.event.sms; + +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +/** + * 短信通道启用事件 + * @author xxm + * @since 2023/8/5 + */ +@Getter +public class SmsChannelEnableEvent extends ApplicationEvent { + private final String code; + + public SmsChannelEnableEvent(Object source, String code) { + super(source); + this.code = code; + } +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelUpdateEvent.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelUpdateEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..44b2102c529a8693f7fff65b810c78083ec86c36 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelUpdateEvent.java @@ -0,0 +1,20 @@ +package cn.bootx.platform.notice.event.sms; + +import cn.bootx.platform.notice.dto.sms.SmsChannelConfigDto; +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +/** + * 短信渠道更新事件 + * @author xxm + * @since 2023/8/5 + */ +@Getter +public class SmsChannelUpdateEvent extends ApplicationEvent { + private final SmsChannelConfigDto channelConfig; + + public SmsChannelUpdateEvent(Object source, SmsChannelConfigDto channelConfig) { + super(source); + this.channelConfig = channelConfig; + } +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/CodeTemplateExistedException.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/CodeTemplateExistedException.java index 05bd2a96c1e2f92e1dda68352280b916fe12e687..df47db0752213ee696ad9d70fdd5b95b9f532ed4 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/CodeTemplateExistedException.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/CodeTemplateExistedException.java @@ -10,7 +10,7 @@ import static cn.bootx.platform.notice.code.NoticeCenterErrorCode.MAIL_CONFIG_CO * 邮箱代码已经存在 * * @author xxm - * @date 2020/6/10 16:21 + * @since 2020/6/10 16:21 */ public class CodeTemplateExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/DefaultMailConfigAlreadyExistedException.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/DefaultMailConfigAlreadyExistedException.java index 0d67bf4a317830976b112ff9bd7ebdaa81f84a3f..4aac9e62b5e8f16c68c0d74c674bf55b368b88e1 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/DefaultMailConfigAlreadyExistedException.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/DefaultMailConfigAlreadyExistedException.java @@ -10,7 +10,7 @@ import static cn.bootx.platform.notice.code.NoticeCenterErrorCode.DEFAULT_MAIL_C * 默认邮箱配置 已存在异常 * * @author xxm - * @date 2020/5/2 14:43 + * @since 2020/5/2 14:43 */ public class DefaultMailConfigAlreadyExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailConfigCodeAlreadyExistedException.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailConfigCodeAlreadyExistedException.java index 02f83f0302f24fccc71cbddb75260a10828f13ad..100424133775f660981e45fcc65a89525cfd3e12 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailConfigCodeAlreadyExistedException.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailConfigCodeAlreadyExistedException.java @@ -10,7 +10,7 @@ import static cn.bootx.platform.notice.code.NoticeCenterErrorCode.MAIL_CONFIG_CO * 邮箱配置编号 已存在异常 * * @author xxm - * @date 2020/5/2 14:12 + * @since 2020/5/2 14:12 */ public class MailConfigCodeAlreadyExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailTemplateNotExistException.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailTemplateNotExistException.java index 9f5433945e3d39c86fd269d07b723117f752905c..1e58621b04a16d83366e843276523b5089f96432 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailTemplateNotExistException.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailTemplateNotExistException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.notice.code.NoticeCenterErrorCode.MAIL_TEMPLATE_ * 模板不存在 * * @author xxm - * @date 2020/11/18 + * @since 2020/11/18 */ public class MailTemplateNotExistException extends FatalException { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailConfigParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailConfigParam.java index 144b222c2d2b80d64da591a0db48739731c86eb3..594e8e8bf1b35edba016d457ab6ca226e8b8b002 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailConfigParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailConfigParam.java @@ -8,7 +8,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/5/2 14:42 + * @since 2020/5/2 14:42 */ @Data @Schema(title = "邮箱配置 DTO") diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailTemplateParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailTemplateParam.java index 81b2deb17592130653058db80e0ae79b5fd7fac6..e213359609319bbb79b7ed3cbf9aa76f9f16936a 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailTemplateParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailTemplateParam.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; * 邮件模板 * * @author xxm - * @date 2021/8/5 + * @since 2021/8/5 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/site/SendSiteMessageParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/site/SendSiteMessageParam.java index 1975c4d7b0e6b984c2b16d1ea39365fdedd07c4d..152df426851f553a0134af3490a9d2f0caa3bdc1 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/site/SendSiteMessageParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/site/SendSiteMessageParam.java @@ -12,7 +12,7 @@ import java.util.List; * 站内信发送参数 * * @author xxm - * @date 2021/8/8 + * @since 2021/8/8 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/sms/SmsChannelConfigParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/sms/SmsChannelConfigParam.java new file mode 100644 index 0000000000000000000000000000000000000000..960b701993ceea40fe6e157989964b2a3cc7c671 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/sms/SmsChannelConfigParam.java @@ -0,0 +1,39 @@ +package cn.bootx.platform.notice.param.sms; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 短信渠道配置 + * @author xxm + * @since 2023-08-04 + */ +@Data +@Schema(title = "短信渠道配置") +@Accessors(chain = true) +public class SmsChannelConfigParam { + + @Schema(description= "主键") + private Long id; + + @Schema(description = "渠道类型编码") + private String code; + @Schema(description = "渠道类型名称") + private String name; + @Schema(description = "状态") + private String state; + @Schema(description = "AccessKey") + private String accessKey; + @Schema(description = "AccessSecret") + private String accessSecret; + @Schema(description = "图片") + private Long image; + @Schema(description = "排序") + private Double sortNo; + @Schema(description = "配置") + private String config; + @Schema(description = "备注") + private String remark; + +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/sms/SmsTemplateParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/sms/SmsTemplateParam.java new file mode 100644 index 0000000000000000000000000000000000000000..2b88b36ed5cc9b7d616afce6509ca994678791a6 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/sms/SmsTemplateParam.java @@ -0,0 +1,29 @@ +package cn.bootx.platform.notice.param.sms; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 短信模板配置 + * @author xxm + * @since 2023-08-03 + */ +@Data +@Schema(title = "短信模板配置") +@Accessors(chain = true) +public class SmsTemplateParam { + + @Schema(description= "主键") + private Long id; + + @Schema(description = "短信渠道商类型") + private String supplierType; + @Schema(description = "短信模板id") + private String templateId; + @Schema(description = "短信模板名称") + private String name; + @Schema(description = "短信模板内容") + private String content; + +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/template/MessageTemplateParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/template/MessageTemplateParam.java index 3722b779ca1b8f39643ce1a8289543070ea1c1bc..3002ff1f17cd592382c1e9307549ab17697728e5 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/template/MessageTemplateParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/template/MessageTemplateParam.java @@ -9,7 +9,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2021/8/10 + * @since 2021/8/10 */ @Data @Accessors(chain = true) @@ -45,6 +45,5 @@ public class MessageTemplateParam implements Serializable { * 模板类型 * @see MessageTemplateCode */ - private Integer type; - + private String type; } diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingRobotNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingRobotNoticeSender.java index 50f8ba3a70f8478cbdc6d09b22e519b878e1459e..c8efdb2e7665372b07601f2aad05ceea71c8d638 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingRobotNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingRobotNoticeSender.java @@ -8,7 +8,7 @@ import cn.bootx.platform.starter.dingtalk.param.notice.msg.TextMsg; * 钉钉机器人消息通知 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ public interface DingRobotNoticeSender { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingTalkNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingTalkNoticeSender.java index 22f09aaa77a4a4fa52970573b6879d2793fda59f..5041b6b9c1fc0789e02aa96c083cf66b3e4cc487 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingTalkNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingTalkNoticeSender.java @@ -10,7 +10,7 @@ import java.io.InputStream; * 钉钉消息通知服务 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ public interface DingTalkNoticeSender { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/EmailNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/EmailNoticeSender.java index 8f34bbf5a483dbcf2a722702f8dbf314088429b7..49d50ffdba8be9d2a5a326ad7a2b34050f140e10 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/EmailNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/EmailNoticeSender.java @@ -6,7 +6,7 @@ import cn.bootx.platform.notice.dto.mail.SendMailParam; * 邮件发送服务 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ public interface EmailNoticeSender { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/SmsNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/SmsNoticeSender.java index 498d111d12d28fa9b691c6632e311acacd2edc3b..bddc1765c050f4d49dc09eb8e392a020bb45c5f2 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/SmsNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/SmsNoticeSender.java @@ -4,7 +4,7 @@ package cn.bootx.platform.notice.service; * 短信通知服务 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ public interface SmsNoticeSender { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeChatNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeChatNoticeSender.java index 164543a3e9cf11b45e9f3ea9090ebd2b0d80be97..ccdf917c48bdb20f968cd858f694a7abe1074bd0 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeChatNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeChatNoticeSender.java @@ -4,7 +4,7 @@ package cn.bootx.platform.notice.service; * 微信消息服务 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ public interface WeChatNoticeSender { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComNoticeSender.java index f9e1ffc0dc014439041e13b9a58aa690750baa41..ff028d87d88151b4e7c53b21f9cac6cdbb93c783 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComNoticeSender.java @@ -9,7 +9,7 @@ import java.io.InputStream; * 企业微信通知服务 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ public interface WeComNoticeSender { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComRobotNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComRobotNoticeSender.java index b95307dab4cf8ebceb022950a82be474b3dfd693..acde17ea59c165619520138736b547dd255a64a1 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComRobotNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComRobotNoticeSender.java @@ -9,7 +9,7 @@ import java.util.List; * 企业微信机器人配置 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ public interface WeComRobotNoticeSender { diff --git a/bootx-services/service-visualization/pom.xml b/bootx-services/service-visualization/pom.xml index 0483d8330074c360424da65775f9528ce31097da..da1f19463a26b3a87658120bdc23fefacfef4dc7 100644 --- a/bootx-services/service-visualization/pom.xml +++ b/bootx-services/service-visualization/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-services - 1.3.1 + 1.3.3 4.0.0 diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/VisualizationApplication.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/VisualizationApplication.java index bc7269565eec02579bc235621a3dcbde64336d62..50908aede5415d7b594fa53937f5e7aa56515ece 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/VisualizationApplication.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/VisualizationApplication.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.ComponentScan; * 可视化模块 * * @author xxm - * @date 2023/2/16 + * @since 2023/2/16 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/code/GoVIewCode.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/code/GoVIewCode.java index 88d1a6ded293f2cbacf91ca237020e40e534d982..e8f99aa9294a5318a078886b079a5921eb95de4c 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/code/GoVIewCode.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/code/GoVIewCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.visualization.code; * GoVIew大屏相关常量 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ public interface GoVIewCode { diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/configuration/VisualizationProperties.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/configuration/VisualizationProperties.java index b7d98cb685836e19c00e19709ea1844f4288bae5..2669b84931d4e81c06e13d40c83464e8b1c99977 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/configuration/VisualizationProperties.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/configuration/VisualizationProperties.java @@ -6,7 +6,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; /** * @author xxm - * @date 2023/3/2 + * @since 2023/3/2 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewAdminController.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewAdminController.java index 7af40cdd4b8b3db05363dc2553da590a462289c9..5ead437bffcee78a5548b13a46b8509bdb8c97a2 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewAdminController.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewAdminController.java @@ -22,7 +22,7 @@ import javax.validation.Valid; * GoView可视化大屏管理接口 * * @author xxm - * @date 2023/2/24 + * @since 2023/2/24 */ @Validated @Tag(name = "GoView可视化大屏管理接口") diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewController.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewController.java index 666ab8d1d79c3391ea4099cfa4143f0f3fbe9387..5970b51242b836d177953a4a5f1a13583d367322 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewController.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewController.java @@ -20,7 +20,7 @@ import java.util.List; * GoView可视化大屏对接接口 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Validated @Tag(name = "GoView可视化大屏对接接口") diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/convert/GoViewConvert.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/convert/GoViewConvert.java index 7e37f267f1707d80565b94995ae1f125d50bdb91..10439a2b4f4abba3d8432f58784a5fd2434f070f 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/convert/GoViewConvert.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/convert/GoViewConvert.java @@ -9,7 +9,7 @@ import org.mapstruct.factory.Mappers; * 转换 * * @author xxm - * @date 2023/3/2 + * @since 2023/3/2 */ @Mapper public interface GoViewConvert { diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoManager.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoManager.java index b1da2a8bc491bb3d0e877d4758c056b36702cc37..f213fc15fcb028f11b918ffb5efe7e1a65714fd4 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoManager.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoManager.java @@ -14,7 +14,7 @@ import java.util.Objects; /** * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Repository public class ProjectInfoManager extends BaseManager { diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoMapper.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoMapper.java index 2a7eab05063abd4f3a4587c9447f9f4bfaad06d2..b9d96cff5c89e9cb982b26b0466fad3be1e2298f 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoMapper.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Mapper public interface ProjectInfoMapper extends BaseMapper { diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishManager.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishManager.java index bd83240f605dc3e502156d881d5f86c7e5e44dc8..66d2a911aa97f8167a132ad8e947e031cc08a080 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishManager.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishManager.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Repository; /** * @author xxm - * @date 2023/2/24 + * @since 2023/2/24 */ @Repository public class ProjectInfoPublishManager extends BaseManager { diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishMapper.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishMapper.java index 81f0f371c110f85d88f9132e2f4c2149733eb4e2..8c8188c36951385905b796f6736073351db6d6b8 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishMapper.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2023/2/24 + * @since 2023/2/24 */ @Mapper public interface ProjectInfoPublishMapper extends BaseMapper { diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/entity/ProjectInfo.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/entity/ProjectInfo.java index 862c4283aa1a511bd9a352f5b9b07bd0ae82c79e..1ead7718391d878fa2f29f890468dc02eef72b3b 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/entity/ProjectInfo.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/entity/ProjectInfo.java @@ -18,7 +18,7 @@ import lombok.experimental.Accessors; * 自定义大屏信息 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/entity/ProjectInfoPublish.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/entity/ProjectInfoPublish.java index 14eb6d30ba8d06cd0bfa32c98eb76435c7558659..616c9c12b2b8398bd55804c498f1fe964cf672c9 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/entity/ProjectInfoPublish.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/entity/ProjectInfoPublish.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 自定义大屏编辑时缓存信息 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/service/ProjectInfoService.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/service/ProjectInfoService.java index b2dfe7d55cc17437935f6edb9965ea90cc0efcb9..b4483ecf98d52d6ebf359434a4980935f6b234c7 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/service/ProjectInfoService.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/service/ProjectInfoService.java @@ -36,7 +36,7 @@ import java.util.stream.Collectors; * 自定义大屏数据接口 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Slf4j @Service diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/GoVIewPageResult.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/GoVIewPageResult.java index 198d287451e6c0f5981e5b7c2e8694fb83a00659..76149afc6eb4fe22d616243c266a0c64acc9af2c 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/GoVIewPageResult.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/GoVIewPageResult.java @@ -9,7 +9,7 @@ import lombok.ToString; * GoView分页 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Getter @Setter diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/OssInfo.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/OssInfo.java index c31f7a3e3584ba28320b6f516561b1d26373e768..02bfcc026fcf266f049049ac170f0d1202e42cd7 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/OssInfo.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/OssInfo.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 文件上传oss信息 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/ProjectInfoDto.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/ProjectInfoDto.java index bedd1d04a86c55f49ac97461e542f4f917728d4a..cf9225489372f43f41313f599cb41884f8be815a 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/ProjectInfoDto.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/ProjectInfoDto.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; * 项目大屏信息 * * @author xxm - * @date 2023/2/24 + * @since 2023/2/24 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/ProjectInfoResult.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/ProjectInfoResult.java index 981a45f6a56d160b921338ba207c7476aab9b8e5..2e5a825b669c1afce2237e986c5b5db3f6137fe1 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/ProjectInfoResult.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/ProjectInfoResult.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 项目大屏信息 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/login/GoViewLoginAuthentication.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/login/GoViewLoginAuthentication.java index 9ba292fa6705d4cd8876f6b5b13a0b0aa9a8aa7c..1a53e7e2e200b880a719291d7244c0e6133dbe91 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/login/GoViewLoginAuthentication.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/login/GoViewLoginAuthentication.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; /** * @author xxm - * @date 2023/2/16 + * @since 2023/2/16 */ @Slf4j @Component diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/CreateParam.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/CreateParam.java index d046488a2da5df60740c97ead43f9ff142f8aa29..c8b986dd493d60d78c8d36b4a724fa07a798ac4b 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/CreateParam.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/CreateParam.java @@ -7,7 +7,7 @@ import lombok.Data; * GoView项目创建参数 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Data @Schema(description = "GoView项目创建参数") diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/ProjectInfoParam.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/ProjectInfoParam.java index ac4bd49f30740c89dd390df7e7c8202c5d85cce2..229d2a621ad9a80459bca70c81e613763f5e0cb6 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/ProjectInfoParam.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/ProjectInfoParam.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2023/3/3 + * @since 2023/3/3 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/ProjectInfoSave.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/ProjectInfoSave.java index c3e7209d797c367a1ba3071cab7a3c2ef8e393e0..2fc46f8aa505d5f5841e781fcdc3a3510d58244b 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/ProjectInfoSave.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/ProjectInfoSave.java @@ -10,7 +10,7 @@ import java.util.Map; * 大屏更新参数 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/PublishParam.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/PublishParam.java index d650e4e32cbe8e705fb63655a02554a6f415b359..8378e507440aef4546541646dc58b3f313389aaf 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/PublishParam.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/PublishParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 发布/取消发布参数 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Data @Accessors(chain = true) diff --git a/bootx-start/pom.xml b/bootx-start/pom.xml index 99efe9958631d97a01816a79b189c1acbc81da40..b451e350d8b9d9144000613d68d4b8dc173c5022 100644 --- a/bootx-start/pom.xml +++ b/bootx-start/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.1 + 1.3.3 4.0.0 bootx-start @@ -41,7 +41,6 @@ spring-boot-starter-undertow - org.flywaydb @@ -56,6 +55,13 @@ ${bootx-platform.version} + + + cn.bootx.platform + service-miniapp + ${bootx-platform.version} + + @@ -69,6 +75,13 @@ common-starter-monitor + + + io.minio + minio + ${minio.version} + + diff --git a/bootx-start/src/main/java/cn/bootx/platform/start/BootxApplication.java b/bootx-start/src/main/java/cn/bootx/platform/start/BootxApplication.java index 356ce117a52694f527a5a3d4d7d805b4baeb3ddf..fba1f97fb2c965f08974188cabee3c7fe712097d 100644 --- a/bootx-start/src/main/java/cn/bootx/platform/start/BootxApplication.java +++ b/bootx-start/src/main/java/cn/bootx/platform/start/BootxApplication.java @@ -14,7 +14,7 @@ import java.net.UnknownHostException; * 启动类 * * @author xxm - * @date 2021/7/27 + * @since 2021/7/27 */ @Slf4j @SpringBootApplication diff --git a/bootx-start/src/main/resources/application-dev.yml b/bootx-start/src/main/resources/application-dev.yml index ddd19a190184c35a7c92c29e55561e0f976837fe..b1a4b6ecd2ebab3c82f37b83dae5043dc6db6c61 100644 --- a/bootx-start/src/main/resources/application-dev.yml +++ b/bootx-start/src/main/resources/application-dev.yml @@ -1,6 +1,9 @@ server: port: 9999 spring: +# profiles: +# include: +# - bootx-dev datasource: dynamic: primary: master @@ -82,8 +85,7 @@ logging: # 自动建表配置 mybatis-table: update-type: update - database-type: mysql - scan-package: cn.bootx + scan-package: cn.bootx.platform # 项目配置 bootx: common: @@ -91,7 +93,7 @@ bootx: swagger: enabled: true author: bootx - version: 1.3.1 + version: 1.3.3 title: bootx开发平台单体版 description: bootx-platform开发平台单体版 # basic认证 @@ -104,6 +106,7 @@ bootx: "[消息服务]": cn.bootx.platform.notice "[演示模块]": cn.bootx.demo "[可视化大屏]": cn.bootx.platform.visualization + "[微信小程序]": cn.bootx.platform.miniapp "[第三方对接]": - cn.bootx.platform.starter.dingtalk - cn.bootx.platform.starter.wecom @@ -201,7 +204,7 @@ bootx: search-type: cache # 文件上传 file-upload: - upload-type: local + upload-type: jdbc server-url: http://127.0.0.1:8080 local: local-path: /data/file diff --git a/bootx-start/src/main/resources/application.yml b/bootx-start/src/main/resources/application.yml index 0725766789094d7af8bdfdf3e704ac15a6db2e16..10ca25dfdd68162943506f41bd6004e008708641 100644 --- a/bootx-start/src/main/resources/application.yml +++ b/bootx-start/src/main/resources/application.yml @@ -32,8 +32,9 @@ mybatis-plus: sa-token: is-print: false token-name: AccessToken -# 工作流 -flowable: - activityFontName: "宋体" - annotation-font-name: "宋体" - label-font-name: "宋体" +# 短信配置 +sms: + # 是否使用redis进行缓存 默认false + redis-cache: true + # 打印banner + is-print: false diff --git a/bootx-start/src/main/resources/db/migration/V1.3.1_230607__release.sql b/bootx-start/src/main/resources/db/migration/V1.3.3_230808__release.sql similarity index 92% rename from bootx-start/src/main/resources/db/migration/V1.3.1_230607__release.sql rename to bootx-start/src/main/resources/db/migration/V1.3.3_230808__release.sql index 0fb97592923089be8c0c3a9133671c642b4f4360..73508a3a144b2f1dec6bc2b891b99798b0afa980 100644 --- a/bootx-start/src/main/resources/db/migration/V1.3.1_230607__release.sql +++ b/bootx-start/src/main/resources/db/migration/V1.3.3_230808__release.sql @@ -2,13 +2,11 @@ Navicat Premium Data Transfer Source Server Type : MySQL - Source Server Version : 50735 Target Server Type : MySQL - Target Server Version : 50735 File Encoding : 65001 - Date: 07/06/2023 15:15:39 + Date: 08/08/2023 15:09:13 */ SET NAMES utf8mb4; @@ -3383,9 +3381,9 @@ CREATE TABLE `base_dict` ( `group_tag` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '分类标签', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NULL DEFAULT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -3396,7 +3394,7 @@ CREATE TABLE `base_dict` ( -- ---------------------------- INSERT INTO `base_dict` VALUES (1422929378374828033, 'Sex', '性别', b'1', '基础属性', '性别', 0, '2021-08-04 22:36:15', 1399985191002447872, '2022-05-11 19:48:40', 0, 6); INSERT INTO `base_dict` VALUES (1425744045414772737, 'MenuType', '菜单类型', b'1', '系统属性', '菜单类型', 0, '2021-08-12 17:00:44', 1399985191002447872, '2022-05-11 19:48:44', 0, 4); -INSERT INTO `base_dict` VALUES (1430063572491411456, 'loginType', '字典类型', b'1', NULL, '字典类型', 1399985191002447872, '2021-08-24 15:05:00', 1399985191002447872, '2021-08-24 15:05:00', 1, 2); +INSERT INTO `base_dict` VALUES (1430063572491411456, 'loginType', '字典类型', b'1', '基础属性', '字典类型', 1399985191002447872, '2021-08-24 15:05:00', 1399985191002447872, '2021-08-24 15:05:00', 1, 2); INSERT INTO `base_dict` VALUES (1435829999592759296, 'UserStatusCode', '用户状态码', b'1', '系统属性', '用户状态码', 1399985191002447872, '2021-09-09 12:58:43', 1399985191002447872, '2022-05-11 19:48:56', 0, 2); INSERT INTO `base_dict` VALUES (1435838066191458304, 'LogBusinessType', '业务操作类型', b'1', '系统属性', '操作日志记录的业务操作类型', 1399985191002447872, '2021-09-09 13:30:46', 1399985191002447872, '2022-05-11 19:49:00', 0, 2); INSERT INTO `base_dict` VALUES (1438078864509317120, 'MailSecurityCode', '邮箱安全方式编码', b'1', '消息服务', '邮箱安全方式编码', 1399985191002447872, '2021-09-15 17:54:54', 1399985191002447872, '2022-05-11 19:49:06', 0, 2); @@ -3404,28 +3402,12 @@ INSERT INTO `base_dict` VALUES (1439961232651034624, 'MessageTemplateCode', '消 INSERT INTO `base_dict` VALUES (1452836604783845376, 'SocialType', '三方系统类型', b'1', '系统属性', '三方系统类型', 1399985191002447872, '2021-10-26 11:16:54', 1399985191002447872, '2022-05-11 19:48:28', 0, 3); INSERT INTO `base_dict` VALUES (1452843488735621120, 'ParamType', '参数类型', b'1', '系统属性', '参数类型', 1399985191002447872, '2021-10-26 11:44:15', 1399985191002447872, '2022-05-11 19:48:21', 0, 2); INSERT INTO `base_dict` VALUES (1496024933900169216, 'Political', '政治面貌', b'1', '基础数据', '政治面貌', 1399985191002447872, '2022-02-22 15:31:54', 1399985191002447872, '2022-05-11 19:48:04', 0, 1); -INSERT INTO `base_dict` VALUES (1496722894707728384, 'PayChannel', '支付通道', b'1', '支付服务', '支付宝, 微信, 云闪付等', 1399985191002447872, '2022-02-24 13:45:21', 1399985191002447872, '2022-05-11 19:47:51', 0, 1); -INSERT INTO `base_dict` VALUES (1496723207565058048, 'PayWay', '支付方式', b'1', '支付服务', '扫码支付、Wap、App支付等', 1399985191002447872, '2022-02-24 13:46:35', 1399985191002447872, '2022-05-11 19:47:46', 0, 1); -INSERT INTO `base_dict` VALUES (1497140849954185216, 'PayStatus', '支付状态', b'1', '支付服务', '支付中,成功,失败等', 1399985191002447872, '2022-02-25 17:26:09', 1399985191002447872, '2022-05-11 19:47:40', 0, 2); -INSERT INTO `base_dict` VALUES (1501031423232937984, 'AsyncPayChannel', '异步支付通道', b'1', '支付服务', '如微信支付宝云闪付等第三方支付', 1399985191002447872, '2022-03-08 11:05:54', 1399985191002447872, '2022-05-11 19:47:37', 0, 1); -INSERT INTO `base_dict` VALUES (1502276739978473472, 'WalletStatus', '钱包状态', b'1', '支付服务', '钱包状态', 1399985191002447872, '2022-03-11 21:34:20', 1399985191002447872, '2022-05-11 19:47:33', 0, 2); -INSERT INTO `base_dict` VALUES (1502624342339448832, 'WalletOperation', '钱包日志操作类型', b'1', NULL, '', 1399985191002447872, '2022-03-12 20:35:35', 1399985191002447872, '2022-03-12 20:35:35', 1, 0); -INSERT INTO `base_dict` VALUES (1502624515799085056, 'WalletLogType', '钱包日志类型', b'1', '支付服务', '钱包日志类型', 1399985191002447872, '2022-03-12 20:36:17', 1399985191002447872, '2022-05-11 19:47:29', 0, 1); -INSERT INTO `base_dict` VALUES (1502624632392347648, 'WalletLogOperation', '钱包日志操作类型', b'1', '支付服务', '钱包日志操作类型', 1399985191002447872, '2022-03-12 20:36:44', 1399985191002447872, '2022-05-11 19:47:21', 0, 1); -INSERT INTO `base_dict` VALUES (1503340128037212160, 'VoucherStatus', '储值卡状态', b'1', '支付服务', '储值卡状态', 1399985191002447872, '2022-03-14 19:59:52', 1399985191002447872, '2022-05-11 19:47:12', 0, 1); -INSERT INTO `base_dict` VALUES (1524356168611188736, 'input', '手工输入', b'1', '商品服务', '', 1399985191002447872, '2022-05-11 19:50:06', 1399985191002447872, '2022-05-11 19:50:06', 1, 0); -INSERT INTO `base_dict` VALUES (1524356376518643712, 'GoodsParamType', '参数类型', b'1', '商品服务', '列表/手动输入', 1399985191002447872, '2022-05-11 19:50:56', 1399985191002447872, '2022-05-14 23:05:41', 0, 1); -INSERT INTO `base_dict` VALUES (1546757092010078208, 'PayNotifyProcess', '支付回调处理状态', b'1', '支付服务', '成功/忽略/失败', 1399985191002447872, '2022-07-12 15:23:23', 1399985191002447872, '2022-07-12 15:23:53', 0, 1); INSERT INTO `base_dict` VALUES (1556996322223968256, 'WeChatMediaType', '微信媒体类型', b'1', '微信', '微信媒体类型', 1399985191002447872, '2022-08-09 21:30:25', 1399985191002447872, '2022-08-09 21:30:26', 0, 0); INSERT INTO `base_dict` VALUES (1561003021674987520, 'SiteMessageReceive', '消息接收类型', b'1', '站内信', '站内信接收类型', 1399985191002447872, '2022-08-20 22:51:37', 1399985191002447872, '2022-08-20 22:51:37', 0, 0); INSERT INTO `base_dict` VALUES (1561003189111603200, 'SiteMessageState', '消息发布状态', b'1', '站内信', '站内信消息发布状态', 1399985191002447872, '2022-08-20 22:52:17', 1399985191002447872, '2022-08-20 22:52:17', 0, 0); -INSERT INTO `base_dict` VALUES (1562696107020230656, 'BpmModelPublish', '工作流模型发布状态', b'1', '工作流', '工作流模型发布状态', 1399985191002447872, '2022-08-25 14:59:20', 1399985191002447872, '2022-08-25 15:27:55', 0, 1); -INSERT INTO `base_dict` VALUES (1563083969989423104, 'BpmTaskAssignType', '工作流处理人分配类型', b'1', '工作流', '流程任务处理人分配类型', 1399985191002447872, '2022-08-26 16:40:34', 1399985191002447872, '2022-08-26 16:40:53', 0, 1); -INSERT INTO `base_dict` VALUES (1567091641298386944, 'BpmTaskState', '流程任务状态', b'1', '工作流', '流程任务状态', 1399985191002447872, '2022-09-06 18:05:37', 1399985191002447872, '2022-09-06 18:05:47', 0, 1); -INSERT INTO `base_dict` VALUES (1570343684024705024, 'BpmTaskResult', '流程任务处理结果', b'1', '工作流', '流程任务处理结果', 1399985191002447872, '2022-09-15 17:28:05', 1414143554414059520, '2022-10-19 23:13:40', 0, 1); -INSERT INTO `base_dict` VALUES (1570764395519111168, 'BpmInstanceState', '流程实例状态', b'1', '工作流', '流程实例状态', 1399985191002447872, '2022-09-16 21:19:50', 1414143554414059520, '2022-10-19 23:13:33', 0, 1); INSERT INTO `base_dict` VALUES (1589527951317389312, 'DataScopePerm', '数据范围权限', b'1', '系统属性', '数据范围权限', 1414143554414059520, '2022-11-07 15:59:30', 1399985191002447872, '2022-12-09 22:09:25', 0, 3); INSERT INTO `base_dict` VALUES (1633393287952257024, 'DatabaseType', '数据库类型', b'1', '开发', '数据库类型', 1414143554414059520, '2023-03-08 17:04:41', 1414143554414059520, '2023-03-08 17:04:41', 0, 0); +INSERT INTO `base_dict` VALUES (1688742690398617600, 'smsChannel', '短信渠道商', b'1', '消息服务', '短信渠道商', 1414143554414059520, '2023-08-08 10:43:27', 1414143554414059520, '2023-08-08 10:43:27', 0, 0); -- ---------------------------- -- Table structure for base_dict_item @@ -3441,9 +3423,9 @@ CREATE TABLE `base_dict_item` ( `sort_no` double(8, 2) NOT NULL COMMENT '排序', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE, @@ -3497,85 +3479,11 @@ INSERT INTO `base_dict_item` VALUES (1496027369796743168, 1496024933900169216, ' INSERT INTO `base_dict_item` VALUES (1496027408141070336, 1496024933900169216, 'Political', '11', '台盟盟员', b'1', 11.00, '', 1399985191002447872, '2022-02-22 15:41:44', 1399985191002447872, '2022-02-22 15:41:44', 0, 0); INSERT INTO `base_dict_item` VALUES (1496027456849522688, 1496024933900169216, 'Political', '12', '无党派人士', b'1', 12.00, '', 1399985191002447872, '2022-02-22 15:41:55', 1399985191002447872, '2022-02-22 15:41:55', 0, 0); INSERT INTO `base_dict_item` VALUES (1496027516639326208, 1496024933900169216, 'Political', '13', '群众', b'1', 13.00, '', 1399985191002447872, '2022-02-22 15:42:09', 1399985191002447872, '2022-02-22 15:42:10', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780500696539136, 1496722894707728384, 'PayChannel', '1', '支付宝', b'1', 1.00, '', 1399985191002447872, '2022-02-24 17:34:15', 1399985191002447872, '2022-03-08 11:02:59', 0, 3); -INSERT INTO `base_dict_item` VALUES (1496780576818962432, 1496722894707728384, 'PayChannel', '2', '微信', b'1', 2.00, '', 1399985191002447872, '2022-02-24 17:34:33', 1399985191002447872, '2022-03-08 11:04:00', 0, 2); -INSERT INTO `base_dict_item` VALUES (1496780712492113920, 1496723207565058048, 'PayWay', '1', 'wap支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:05', 1399985191002447872, '2022-02-24 17:35:05', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780757647990784, 1496723207565058048, 'PayWay', '2', '应用支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:16', 1399985191002447872, '2022-02-24 17:35:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780799691694080, 1496723207565058048, 'PayWay', '3', 'web支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:26', 1399985191002447872, '2022-02-24 17:35:26', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780838451257344, 1496723207565058048, 'PayWay', '4', '二维码扫码支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:35', 1399985191002447872, '2022-02-24 17:35:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780876388737024, 1496723207565058048, 'PayWay', '5', '付款码支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:44', 1399985191002447872, '2022-02-24 17:35:44', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141630803566592, 1497140849954185216, 'PayStatus', '3', '支付取消', b'1', 0.00, '', 1399985191002447872, '2022-02-25 17:29:15', 1399985191002447872, '2022-02-25 17:29:15', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141652379066368, 1497140849954185216, 'PayStatus', '2', '失败', b'1', 0.00, '', 1399985191002447872, '2022-02-25 17:29:20', 1399985191002447872, '2022-02-25 17:29:20', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141681915355136, 1497140849954185216, 'PayStatus', '1', '成功', b'1', 0.00, '', 1399985191002447872, '2022-02-25 17:29:27', 1399985191002447872, '2022-02-25 17:29:27', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141712743489536, 1497140849954185216, 'PayStatus', '0', '支付中', b'1', 0.00, '', 1399985191002447872, '2022-02-25 17:29:35', 1399985191002447872, '2022-02-25 17:29:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497506810439892992, 1497140849954185216, 'PayStatus', '4', '部分退款', b'1', 1.00, '部分退款', 1399985191002447872, '2022-02-26 17:40:21', 1399985191002447872, '2022-03-04 21:22:46', 0, 7); -INSERT INTO `base_dict_item` VALUES (1499367587857694720, 1497140849954185216, 'PayStatus', '5', '已退款', b'1', 2.00, '完全退款', 1399985191002447872, '2022-03-03 20:54:25', 1399985191002447872, '2022-03-04 21:22:49', 0, 3); -INSERT INTO `base_dict_item` VALUES (1501030031432847360, 1496722894707728384, 'PayChannel', '3', '云闪付', b'1', 3.00, '', 1399985191002447872, '2022-03-08 11:00:22', 1399985191002447872, '2022-03-08 11:04:07', 0, 2); -INSERT INTO `base_dict_item` VALUES (1501030073489133568, 1496722894707728384, 'PayChannel', '4', '现金', b'1', 4.00, '', 1399985191002447872, '2022-03-08 11:00:32', 1399985191002447872, '2022-03-08 11:04:10', 0, 2); -INSERT INTO `base_dict_item` VALUES (1501030108314439680, 1496722894707728384, 'PayChannel', '5', '钱包', b'1', 5.00, '', 1399985191002447872, '2022-03-08 11:00:40', 1399985191002447872, '2022-03-08 11:04:14', 0, 2); -INSERT INTO `base_dict_item` VALUES (1501031490513768448, 1501031423232937984, 'AsyncPayChannel', '3', '云闪付', b'1', 0.00, '', 1399985191002447872, '2022-03-08 11:06:10', 1399985191002447872, '2022-03-08 11:06:10', 0, 0); -INSERT INTO `base_dict_item` VALUES (1501031518208757760, 1501031423232937984, 'AsyncPayChannel', '2', '微信', b'1', 0.00, '', 1399985191002447872, '2022-03-08 11:06:16', 1399985191002447872, '2022-03-08 11:06:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1501031544360243200, 1501031423232937984, 'AsyncPayChannel', '1', '支付宝', b'1', 0.00, '', 1399985191002447872, '2022-03-08 11:06:23', 1399985191002447872, '2022-03-08 11:06:23', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502276841057005568, 1502276739978473472, 'WalletStatus', '2', '禁用', b'1', 0.00, '', 1399985191002447872, '2022-03-11 21:34:45', 1399985191002447872, '2022-03-11 21:34:45', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502276862108217344, 1502276739978473472, 'WalletStatus', '1', '正常', b'1', 0.00, '', 1399985191002447872, '2022-03-11 21:34:50', 1399985191002447872, '2022-03-11 21:34:50', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502624716257456128, 1502624515799085056, 'WalletLogType', '1', '开通', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:37:04', 1399985191002447872, '2022-03-12 20:37:04', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502624931978899456, 1502624515799085056, 'WalletLogType', '2', '主动充值', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:37:56', 1399985191002447872, '2022-03-12 20:37:56', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502624956209393664, 1502624515799085056, 'WalletLogType', '3', '自动充值', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:02', 1399985191002447872, '2022-03-12 20:38:02', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625014719934464, 1502624515799085056, 'WalletLogType', '4', '余额变动', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:16', 1399985191002447872, '2022-03-12 20:38:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625053097816064, 1502624515799085056, 'WalletLogType', '5', '支付', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:25', 1399985191002447872, '2022-03-12 20:38:25', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625091639275520, 1502624515799085056, 'WalletLogType', '6', '系统扣除余额', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:34', 1399985191002447872, '2022-03-12 20:38:34', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625123725701120, 1502624515799085056, 'WalletLogType', '7', '退款', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:42', 1399985191002447872, '2022-03-12 20:38:42', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625783145787392, 1502624632392347648, 'WalletLogOperation', '1', '系统操作', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:41:19', 1399985191002447872, '2022-03-12 20:41:19', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625814837948416, 1502624632392347648, 'WalletLogOperation', '2', '管理员操作', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:41:26', 1399985191002447872, '2022-03-12 20:41:26', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625850355314688, 1502624632392347648, 'WalletLogOperation', '3', '用户操作', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:41:35', 1399985191002447872, '2022-03-12 20:41:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1503340241493135360, 1503340128037212160, 'VoucherStatus', '1', '启用', b'1', 0.00, '', 1399985191002447872, '2022-03-14 20:00:19', 1399985191002447872, '2022-03-14 20:00:19', 0, 0); -INSERT INTO `base_dict_item` VALUES (1503340326645895168, 1503340128037212160, 'VoucherStatus', '2', '停用', b'1', 0.00, '', 1399985191002447872, '2022-03-14 20:00:39', 1399985191002447872, '2022-03-14 20:00:39', 0, 0); -INSERT INTO `base_dict_item` VALUES (1505112357976612864, 1496722894707728384, 'PayChannel', '6', '储值卡', b'1', 0.00, '', 1399985191002447872, '2022-03-19 17:22:04', 1399985191002447872, '2022-03-19 17:22:04', 0, 0); -INSERT INTO `base_dict_item` VALUES (1524356452720758784, 1524356376518643712, 'GoodsParamType', 'input', '手工录入', b'1', 0.00, '', 1399985191002447872, '2022-05-11 19:51:14', 1399985191002447872, '2022-05-11 19:51:14', 0, 0); -INSERT INTO `base_dict_item` VALUES (1524356510157557760, 1524356376518643712, 'GoodsParamType', 'select', '列表选择', b'1', 0.00, '', 1399985191002447872, '2022-05-11 19:51:28', 1399985191002447872, '2022-05-11 19:51:28', 0, 0); -INSERT INTO `base_dict_item` VALUES (1546757293592522752, 1546757092010078208, 'PayNotifyProcess', '0', '失败', b'1', 0.00, '', 1399985191002447872, '2022-07-12 15:24:11', 1399985191002447872, '2022-07-12 15:24:11', 0, 0); -INSERT INTO `base_dict_item` VALUES (1546757327901929472, 1546757092010078208, 'PayNotifyProcess', '1', '成功', b'1', -1.00, '', 1399985191002447872, '2022-07-12 15:24:19', 1399985191002447872, '2022-07-12 15:31:38', 0, 2); -INSERT INTO `base_dict_item` VALUES (1546757375637303296, 1546757092010078208, 'PayNotifyProcess', '2', '忽略', b'1', 0.00, '', 1399985191002447872, '2022-07-12 15:24:30', 1399985191002447872, '2022-07-12 15:24:30', 0, 0); -INSERT INTO `base_dict_item` VALUES (1556996422006460416, 1556996322223968256, 'WeChatMediaType', 'news', '新闻', b'1', 0.00, '', 1399985191002447872, '2022-08-09 21:30:49', 1399985191002447872, '2022-08-09 21:30:49', 1, 0); -INSERT INTO `base_dict_item` VALUES (1556996472661069824, 1556996322223968256, 'WeChatMediaType', 'voice', '语音', b'1', 0.00, '', 1399985191002447872, '2022-08-09 21:31:01', 1399985191002447872, '2022-08-09 21:31:01', 0, 0); -INSERT INTO `base_dict_item` VALUES (1556996501417218048, 1556996322223968256, 'WeChatMediaType', 'image', '图片', b'1', 0.00, '', 1399985191002447872, '2022-08-09 21:31:08', 1399985191002447872, '2022-08-09 21:31:08', 0, 0); -INSERT INTO `base_dict_item` VALUES (1556996529565192192, 1556996322223968256, 'WeChatMediaType', 'video', '视频', b'1', 0.00, '', 1399985191002447872, '2022-08-09 21:31:15', 1399985191002447872, '2022-08-09 21:31:15', 0, 0); -INSERT INTO `base_dict_item` VALUES (1561003235710320640, 1561003189111603200, 'SiteMessageState', 'user', '指定用户', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:52:28', 1399985191002447872, '2022-08-20 22:52:28', 1, 0); -INSERT INTO `base_dict_item` VALUES (1561003279322693632, 1561003189111603200, 'SiteMessageState', 'all', '全部用户', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:52:38', 1399985191002447872, '2022-08-20 22:52:39', 1, 0); INSERT INTO `base_dict_item` VALUES (1561003368762032128, 1561003021674987520, 'SiteMessageReceive', 'user', '指定用户', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:53:00', 1399985191002447872, '2022-08-20 22:53:00', 0, 0); INSERT INTO `base_dict_item` VALUES (1561003399778910208, 1561003021674987520, 'SiteMessageReceive', 'all', '全部用户', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:53:07', 1399985191002447872, '2022-08-20 22:53:24', 0, 1); INSERT INTO `base_dict_item` VALUES (1561003539772194816, 1561003189111603200, 'SiteMessageState', 'sent', '已发送', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:53:41', 1399985191002447872, '2022-08-20 22:53:41', 0, 0); INSERT INTO `base_dict_item` VALUES (1561003575608328192, 1561003189111603200, 'SiteMessageState', 'cancel', '撤销', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:53:49', 1399985191002447872, '2022-08-20 22:53:49', 0, 0); INSERT INTO `base_dict_item` VALUES (1561245469535080448, 1561003189111603200, 'SiteMessageState', 'draft', '草稿', b'1', 0.00, '', 1399985191002447872, '2022-08-21 14:55:01', 1399985191002447872, '2022-08-21 14:55:01', 0, 0); -INSERT INTO `base_dict_item` VALUES (1562696390043475968, 1562696107020230656, 'BpmModelPublish', 'published', '已发布', b'1', 0.00, '', 1399985191002447872, '2022-08-25 15:00:28', 1399985191002447872, '2022-08-25 15:00:28', 0, 0); -INSERT INTO `base_dict_item` VALUES (1562696420561231872, 1562696107020230656, 'BpmModelPublish', 'unpublished', '未发布', b'1', 0.00, '未上传xml文档', 1399985191002447872, '2022-08-25 15:00:35', 1399985191002447872, '2022-08-25 15:28:09', 0, 1); -INSERT INTO `base_dict_item` VALUES (1562703450588028928, 1562696107020230656, 'BpmModelPublish', 'unpublishedXml', '未发布(已上传BPMN)', b'1', 0.00, '有xml文档', 1399985191002447872, '2022-08-25 15:28:31', 1399985191002447872, '2022-08-25 15:34:45', 0, 1); -INSERT INTO `base_dict_item` VALUES (1563087300157747200, 1563083969989423104, 'BpmTaskAssignType', 'user', '用户', b'1', 0.00, '', 1399985191002447872, '2022-08-26 16:53:48', 1399985191002447872, '2022-09-06 22:50:15', 0, 1); -INSERT INTO `base_dict_item` VALUES (1567091825981980672, 1567091641298386944, 'BpmTaskState', 'running', '处理中', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:06:21', 1399985191002447872, '2022-09-06 18:06:21', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567091863017684992, 1567091641298386944, 'BpmTaskState', 'pass', '通过', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:06:30', 1399985191002447872, '2022-09-06 18:06:30', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567091902414782464, 1567091641298386944, 'BpmTaskState', 'reject', '驳回', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:06:39', 1399985191002447872, '2022-09-06 18:06:51', 0, 1); -INSERT INTO `base_dict_item` VALUES (1567091993569591296, 1567091641298386944, 'BpmTaskState', 'back', '退回', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:07:01', 1399985191002447872, '2022-09-06 18:07:01', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567092037261656064, 1567091641298386944, 'BpmTaskState', 'retrieve', '取回', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:07:12', 1399985191002447872, '2022-09-06 18:07:22', 0, 1); -INSERT INTO `base_dict_item` VALUES (1567092124226355200, 1567091641298386944, 'BpmTaskState', 'skip', '跳过', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:07:32', 1399985191002447872, '2022-09-06 18:07:32', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567163310103564288, 1563083969989423104, 'BpmTaskAssignType', 'userGroup', '用户组', b'1', 0.00, '', 1399985191002447872, '2022-09-06 22:50:24', 1399985191002447872, '2022-09-06 22:50:24', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567163343288897536, 1563083969989423104, 'BpmTaskAssignType', 'role', '角色', b'1', 0.00, '', 1399985191002447872, '2022-09-06 22:50:32', 1399985191002447872, '2022-09-06 22:50:32', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567163380693700608, 1563083969989423104, 'BpmTaskAssignType', 'deptMember', '部门成员', b'1', 0.00, '', 1399985191002447872, '2022-09-06 22:50:41', 1399985191002447872, '2022-09-06 22:50:41', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567163412960481280, 1563083969989423104, 'BpmTaskAssignType', 'deptLeader', '部门的负责人', b'1', 0.00, '', 1399985191002447872, '2022-09-06 22:50:49', 1399985191002447872, '2022-09-06 22:50:49', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567175558888923136, 1563083969989423104, 'BpmTaskAssignType', 'roleGroup', '角色组', b'1', 0.00, '', 1399985191002447872, '2022-09-06 23:39:05', 1399985191002447872, '2022-09-06 23:39:05', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567178994242002944, 1563083969989423104, 'BpmTaskAssignType', 'sponsor', '发起人', b'1', 0.00, '', 1399985191002447872, '2022-09-06 23:52:44', 1399985191002447872, '2022-09-06 23:52:44', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567179143576002560, 1563083969989423104, 'BpmTaskAssignType', 'select', '用户手动选择', b'1', 0.00, '', 1399985191002447872, '2022-09-06 23:53:19', 1399985191002447872, '2022-09-07 00:01:22', 0, 1); -INSERT INTO `base_dict_item` VALUES (1570343731634249728, 1570343684024705024, 'BpmTaskResult', 'pass', '通过', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:16', 1399985191002447872, '2022-09-15 17:28:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343761636106240, 1570343684024705024, 'BpmTaskResult', 'notPass', '不通过', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:23', 1399985191002447872, '2022-09-15 17:28:23', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343788056027136, 1570343684024705024, 'BpmTaskResult', 'abstain', '弃权', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:29', 1399985191002447872, '2022-09-15 17:28:29', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343826018672640, 1570343684024705024, 'BpmTaskResult', 'reject', '驳回', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:38', 1399985191002447872, '2022-09-15 17:28:38', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343873737269248, 1570343684024705024, 'BpmTaskResult', 'back', '退回', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:50', 1399985191002447872, '2022-09-15 17:28:50', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343913918701568, 1570343684024705024, 'BpmTaskResult', 'retrieve', '取回', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:59', 1399985191002447872, '2022-09-15 17:28:59', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570685888076120064, 1570343684024705024, 'BpmTaskResult', 'autoFinish', '自动完成', b'1', 0.00, '', 1399985191002447872, '2022-09-16 16:07:52', 1399985191002447872, '2022-09-16 16:08:02', 0, 1); -INSERT INTO `base_dict_item` VALUES (1570764765255397376, 1570764395519111168, 'BpmInstanceState', 'running', '运行中', b'1', 0.00, '', 1399985191002447872, '2022-09-16 21:21:18', 1399985191002447872, '2022-12-09 22:15:46', 0, 2); -INSERT INTO `base_dict_item` VALUES (1570764802047832064, 1570764395519111168, 'BpmInstanceState', 'finish', '已完成', b'1', 0.00, '', 1399985191002447872, '2022-09-16 21:21:27', 1399985191002447872, '2022-09-16 21:21:27', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570764836319490048, 1570764395519111168, 'BpmInstanceState', 'cancel', '取消', b'1', 0.00, '', 1399985191002447872, '2022-09-16 21:21:35', 1399985191002447872, '2022-09-16 21:21:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570784215744585728, 1570343684024705024, 'BpmTaskResult', 'cancel', '取消', b'1', 0.00, '', 1399985191002447872, '2022-09-16 22:38:35', 1399985191002447872, '2022-09-16 22:38:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570784331511570432, 1567091641298386944, 'BpmTaskState', 'cancel', '取消', b'1', 0.00, '', 1399985191002447872, '2022-09-16 22:39:03', 1399985191002447872, '2022-09-16 22:39:03', 0, 0); INSERT INTO `base_dict_item` VALUES (1573665422392098816, 1439961232651034624, 'MessageTemplateCode', '0', '站内信', b'1', -11.00, 'SITE', 1399985191002447872, '2022-09-24 21:27:29', 1399985191002447872, '2022-09-24 21:27:39', 0, 1); INSERT INTO `base_dict_item` VALUES (1589528254477488128, 1589527951317389312, 'DataScopePerm', '7', '所在及下级部门', b'1', 0.00, '', 1414143554414059520, '2022-11-07 16:00:43', 1414143554414059520, '2022-11-07 16:00:43', 0, 0); INSERT INTO `base_dict_item` VALUES (1589528283539820544, 1589527951317389312, 'DataScopePerm', '6', '所在部门', b'1', 0.00, '', 1414143554414059520, '2022-11-07 16:00:49', 1414143554414059520, '2022-11-07 16:00:49', 0, 0); @@ -3587,6 +3495,16 @@ INSERT INTO `base_dict_item` VALUES (1589528423956729856, 1589527951317389312, ' INSERT INTO `base_dict_item` VALUES (1633403429028536320, 1633393287952257024, 'DatabaseType', 'mysql', 'MySQL', b'1', 1.00, '', 1414143554414059520, '2023-03-08 17:44:59', 1414143554414059520, '2023-03-08 17:44:59', 0, 0); INSERT INTO `base_dict_item` VALUES (1633403459470794752, 1633393287952257024, 'DatabaseType', 'oracle', 'Oracle', b'1', 2.00, '', 1414143554414059520, '2023-03-08 17:45:07', 1414143554414059520, '2023-03-08 17:45:07', 0, 0); INSERT INTO `base_dict_item` VALUES (1633403498695925760, 1633393287952257024, 'DatabaseType', 'mssql', 'SQLServer', b'1', 3.00, '', 1414143554414059520, '2023-03-08 17:45:16', 1414143554414059520, '2023-03-08 17:45:16', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742732891111424, 1688742690398617600, 'smsChannel', 'alibaba', '阿里云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:43:38', 1414143554414059520, '2023-08-08 10:43:38', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742768479780864, 1688742690398617600, 'smsChannel', 'huawei', '华为云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:43:46', 1414143554414059520, '2023-08-08 10:43:46', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742808027873280, 1688742690398617600, 'smsChannel', 'yunpian', '云片', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:43:55', 1414143554414059520, '2023-08-08 10:43:56', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742840626003968, 1688742690398617600, 'smsChannel', 'tencent', '腾讯云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:03', 1414143554414059520, '2023-08-08 10:44:03', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742872506908672, 1688742690398617600, 'smsChannel', 'uni_sms', '合一短信', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:11', 1414143554414059520, '2023-08-08 10:44:11', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742905553829888, 1688742690398617600, 'smsChannel', 'jd_cloud', '京东云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:19', 1414143554414059520, '2023-08-08 10:44:19', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742954715267072, 1688742690398617600, 'smsChannel', 'cloopen', '容联云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:30', 1414143554414059520, '2023-08-08 10:44:30', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742990446542848, 1688742690398617600, 'smsChannel', 'emay', '亿美软通', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:39', 1414143554414059520, '2023-08-08 10:44:39', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688743032297308160, 1688742690398617600, 'smsChannel', 'ctyun', '天翼云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:49', 1414143554414059520, '2023-08-08 10:44:49', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688743065205817344, 1688742690398617600, 'smsChannel', 'netease', '网易云信', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:57', 1414143554414059520, '2023-08-08 10:44:57', 0, 0); -- ---------------------------- -- Table structure for base_dynamic_data_source @@ -3605,9 +3523,9 @@ CREATE TABLE `base_dynamic_data_source` ( `db_password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '密码', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3628,9 +3546,9 @@ CREATE TABLE `base_dynamic_form` ( `value` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '表单内容', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -3651,9 +3569,9 @@ CREATE TABLE `base_key_value` ( `key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数键名', `value` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数值', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -3677,9 +3595,9 @@ CREATE TABLE `base_param` ( `internal` bit(1) NOT NULL COMMENT '内置参数', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -3692,7 +3610,7 @@ INSERT INTO `base_param` VALUES (1452842684284891136, '测试', 'test.v1', '123' INSERT INTO `base_param` VALUES (1500338438182789120, '结算台聚合支付请求地址', 'CashierAggregateUrl', 'http://127.0.0.1/api/', 1, b'1', b'1', '', 1399985191002447872, '2022-03-06 13:12:13', 1399985191002447872, '2022-05-01 15:03:03', 0, 3); INSERT INTO `base_param` VALUES (1520668030248361984, '文件服务器地址', 'FileServerUrl', 'http://127.0.0.1:9999', 1, b'1', b'1', '', 1399985191002447872, '2022-05-01 15:34:46', 1399985191002447872, '2022-05-19 12:53:21', 0, 5); INSERT INTO `base_param` VALUES (1529281530059161600, 'websocket服务器地址', 'WebsocketServerUrl', 'ws://127.0.0.1:9999', 1, b'1', b'1', '', 1399985191002447872, '2022-05-25 10:01:44', 1399985191002447872, '2022-05-25 10:01:44', 0, 0); -INSERT INTO `base_param` VALUES (1545765299880448000, '服务器地址', 'ServerUrl', 'http://127.0.0.1:9999', 1, b'1', b'1', '', 1399985191002447872, '2022-07-09 21:42:21', 1399985191002447872, '2022-07-09 21:42:21', 0, 0); +INSERT INTO `base_param` VALUES (1545765299880448000, '服务器地址', 'ServerUrl', 'http://127.0.0.1:9999', 1, b'1', b'1', '优先级高于配置文件内进行的配置', 1399985191002447872, '2022-07-09 21:42:21', 1414143554414059520, '2023-08-05 16:40:05', 0, 1); INSERT INTO `base_param` VALUES (1547511252795912192, '微信jsapi支付回调服务地址', 'JsapiRedirectUrl', 'http://127.0.0.1/api/', 1, b'1', b'1', '', 1414143554414059520, '2022-07-14 17:20:09', 1414143554414059520, '2022-07-14 17:20:09', 0, 0); -- ---------------------------- @@ -3753,9 +3671,9 @@ CREATE TABLE `base_query_sql` ( `params` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'SQL查询参数', `fields` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'SQL查询结果字段', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '乐观锁', `deleted` bit(1) NOT NULL COMMENT '删除标志', PRIMARY KEY (`id`) USING BTREE @@ -3806,9 +3724,9 @@ CREATE TABLE `common_sequence_range` ( `range_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '区间key', `range_value` bigint(20) NOT NULL COMMENT '区间开始值', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3829,9 +3747,9 @@ CREATE TABLE `demo_data_encrypt` ( `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '内容', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3853,9 +3771,9 @@ CREATE TABLE `demo_data_perm` ( `creator_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者名称', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '说明', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3882,9 +3800,9 @@ CREATE TABLE `demo_data_sensitive` ( `email` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '电子邮件', `other` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '其他', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3906,14 +3824,14 @@ CREATE TABLE `demo_super_query` ( `age` int(5) NULL DEFAULT NULL COMMENT '年龄', `vip` bit(1) NULL DEFAULT NULL COMMENT '是否vip', `birthday` date NULL DEFAULT NULL COMMENT '生日', - `work_time` time(0) NULL DEFAULT NULL COMMENT '上班时间', - `registration_time` datetime(0) NULL DEFAULT NULL COMMENT '注册时间', + `work_time` time NULL DEFAULT NULL COMMENT '上班时间', + `registration_time` datetime NULL DEFAULT NULL COMMENT '注册时间', `political` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '政治面貌', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3933,29 +3851,30 @@ INSERT INTO `demo_super_query` VALUES (1496373512871284736, '刘备', 108, b'0', -- ---------------------------- DROP TABLE IF EXISTS `iam_client`; CREATE TABLE `iam_client` ( - `id` bigint(20) NOT NULL, + `id` bigint(20) NOT NULL COMMENT '主键', `code` varchar(21) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编码', `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', `system` bit(1) NOT NULL COMMENT '是否系统内置', `enable` bit(1) NOT NULL COMMENT '是否可用', `login_type_ids` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '关联登录方式\r\n', `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', + `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', + `version` int(11) NOT NULL COMMENT '乐观锁', + `deleted` bit(1) NOT NULL DEFAULT 0 COMMENT '删除标志', + `default_endow` bit(1) NULL DEFAULT NULL COMMENT '新注册的用户是否默认赋予该终端', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '认证终端' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of iam_client -- ---------------------------- -INSERT INTO `iam_client` VALUES (1430430071299207168, 'admin', 'pc管理端', b'1', b'1', '1430430071299207168,1435138582839009280,1430478946919653376,1542091599907115008,1542804450312122368,1543126042909016064', 'pc浏览器', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-07-02 14:55:11', 4, 0); -INSERT INTO `iam_client` VALUES (1430430071299207169, 'h5', 'h5端', b'1', b'1', '1430430071299207168,1435138582839009280', '手机wap', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-06-29 18:31:45', 1, 0); -INSERT INTO `iam_client` VALUES (1580487061605175296, 'adminv3', 'pc管理端(vue3版)', b'0', b'1', '1430430071299207168,1430478946919653376,1435138582839009280,1542091599907115008,1542804450312122368,1543126042909016064', 'vue3版本', 1399985191002447872, '2022-10-13 17:14:14', 1399985191002447872, '2022-10-13 17:14:25', 1, 0); -INSERT INTO `iam_client` VALUES (1626840094767714304, 'GoView', '可视化平台', b'0', b'1', '1430430071299207168', '', 1414143554414059520, '2023-02-18 15:04:38', 1414143554414059520, '2023-02-18 15:04:38', 0, 0); +INSERT INTO `iam_client` VALUES (1430430071299207168, 'admin', 'pc管理端', b'1', b'1', '1430430071299207168,1435138582839009280,1430478946919653376,1542091599907115008,1542804450312122368,1543126042909016064', 'pc浏览器', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-07-02 14:55:11', 4, b'0', NULL); +INSERT INTO `iam_client` VALUES (1430430071299207169, 'h5', 'h5端', b'1', b'1', '1430430071299207168,1435138582839009280', '手机wap', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-06-29 18:31:45', 1, b'0', NULL); +INSERT INTO `iam_client` VALUES (1580487061605175296, 'adminv3', 'pc管理端(vue3版)', b'0', b'1', '1430430071299207168,1430478946919653376,1435138582839009280,1542091599907115008,1542804450312122368,1543126042909016064', 'vue3版本', 1399985191002447872, '2022-10-13 17:14:14', 1414143554414059520, '2023-08-02 14:28:37', 2, b'0', b'1'); +INSERT INTO `iam_client` VALUES (1626840094767714304, 'GoView', '可视化平台', b'0', b'1', '1430430071299207168', '', 1414143554414059520, '2023-02-18 15:04:38', 1414143554414059520, '2023-02-18 15:04:38', 0, b'0', NULL); -- ---------------------------- -- Table structure for iam_data_scope @@ -3968,9 +3887,9 @@ CREATE TABLE `iam_data_scope` ( `type` int(4) NOT NULL COMMENT '类型', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '说明', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4041,9 +3960,9 @@ CREATE TABLE `iam_dept` ( `address` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '地址', `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4083,9 +4002,9 @@ CREATE TABLE `iam_login_type` ( `enable` bit(1) NOT NULL COMMENT '是否可用', `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4130,9 +4049,9 @@ CREATE TABLE `iam_perm_menu` ( `admin` bit(1) NOT NULL COMMENT '系统菜单', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4271,6 +4190,9 @@ INSERT INTO `iam_perm_menu` VALUES (1623494586215579648, 'admin', 15522079825107 INSERT INTO `iam_perm_menu` VALUES (1629039360928075776, 'adminv3', 1582276341792985088, '可视化大屏', 'ProjectInfoList', NULL, b'0', '', b'0', b'0', '/modules/develop/report/ProjectInfoList', NULL, '/develop/report', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-02-24 16:43:44', 1414143554414059520, '2023-02-24 16:44:17', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1631946120891707392, 'admin', 1552207982510706688, '可视化大屏', 'ProjectInfoList', NULL, b'0', '', b'0', b'0', 'develop/report/ProjectInfoList', NULL, '/develop/report', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2023-03-04 17:14:10', 1399985191002447872, '2023-03-04 17:14:10', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1635274568758435840, 'adminv3', 1582276341792985088, 'SQL查询语句', 'QuerySqlList', NULL, b'0', '', b'0', b'0', '/modules/develop/query/QuerySqlList', NULL, '/develop/querySql', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-03-13 21:40:14', 1414143554414059520, '2023-03-13 21:43:05', 2, 0); +INSERT INTO `iam_perm_menu` VALUES (1687369862646558720, 'adminv3', 1582275984849326080, '短信管理', 'Sms', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/notice/sms', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-08-04 15:48:20', 1414143554414059520, '2023-08-04 15:48:32', 1, 0); +INSERT INTO `iam_perm_menu` VALUES (1687370142234669056, 'adminv3', 1687369862646558720, '短信配置', 'SmsChannelConfigList', NULL, b'0', '', b'0', b'0', '/modules/notice/sms/config/SmsChannelConfigList', NULL, '/notice/sms/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-08-04 15:49:26', 1414143554414059520, '2023-08-04 15:49:26', 0, 0); +INSERT INTO `iam_perm_menu` VALUES (1687370277496778752, 'adminv3', 1687369862646558720, '短信模板', 'SmsTemplateList', NULL, b'0', '', b'0', b'0', '/modules/notice/sms/template/SmsTemplateList', NULL, '/notice/sms/template', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-08-04 15:49:59', 1414143554414059520, '2023-08-04 15:50:38', 1, 0); -- ---------------------------- -- Table structure for iam_perm_path @@ -4310,9 +4232,9 @@ CREATE TABLE `iam_role` ( `internal` bit(1) NOT NULL COMMENT '是否系统内置', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '说明', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4407,14 +4329,14 @@ CREATE TABLE `iam_user_expand_info` ( `sex` int(4) NULL DEFAULT NULL COMMENT '性别', `birthday` date NULL DEFAULT NULL COMMENT '生日', `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '头像', - `last_login_time` datetime(0) NULL DEFAULT NULL COMMENT '上次登录时间', - `current_login_time` datetime(0) NULL DEFAULT NULL COMMENT '本次登录时间', + `last_login_time` datetime NULL DEFAULT NULL COMMENT '上次登录时间', + `current_login_time` datetime NULL DEFAULT NULL COMMENT '本次登录时间', `initial_password` bit(1) NOT NULL COMMENT '是否初始密码', - `last_change_password_time` datetime(0) NULL DEFAULT NULL COMMENT '上次修改密码时间', + `last_change_password_time` datetime NULL DEFAULT NULL COMMENT '上次修改密码时间', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4446,12 +4368,12 @@ CREATE TABLE `iam_user_info` ( `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '头像', `source` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '注册来源', `admin` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否超级管理员', - `register_time` datetime(0) NULL DEFAULT NULL COMMENT '注册时间', + `register_time` datetime NULL DEFAULT NULL COMMENT '注册时间', `status` tinyint(4) NOT NULL COMMENT '账号状态', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4499,9 +4421,9 @@ CREATE TABLE `iam_user_third` ( `ding_talk_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '钉钉唯一标识', `we_com_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企业微信唯一标识', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE, @@ -4525,9 +4447,9 @@ CREATE TABLE `iam_user_third_info` ( `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '用户头像', `third_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '关联第三方平台的用户id', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE, INDEX `pk_user_client`(`user_id`, `client_code`) USING BTREE COMMENT '用户id和终端code' @@ -4554,9 +4476,9 @@ CREATE TABLE `notice_mail_config` ( `activity` tinyint(1) NULL DEFAULT 0 COMMENT '是否默认配置,0:否。1:是', `security_type` int(2) NULL DEFAULT NULL COMMENT '安全传输方式 1:plain 2:tls 3:ssl', `creator` bigint(18) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(18) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NULL DEFAULT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -4575,12 +4497,12 @@ CREATE TABLE `notice_message_template` ( `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编码', `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', `data` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '模板数据', - `type` int(11) NULL DEFAULT NULL COMMENT '模板类型', + `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板类型', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4589,15 +4511,15 @@ CREATE TABLE `notice_message_template` ( -- ---------------------------- -- Records of notice_message_template -- ---------------------------- -INSERT INTO `notice_message_template` VALUES (1424936204932169730, 'cs', '测试', 'hello ${msg}6666666666666666666666666666', 1, '测试模板', 0, '2021-08-10 11:30:40', 0, '2021-08-10 11:30:40', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573951326893510656, 'BpmTaskCreated', '流程任务创建事件', '流程任务创建事件', 0, '', 1399985191002447872, '2022-09-25 16:23:34', 1399985191002447872, '2022-09-25 16:23:34', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573951515616219136, 'BpmTaskAssignCreated', '流程任务更改处理人事件(新处理人)', '流程任务更改处理人事件(新处理人)', 0, '', 1399985191002447872, '2022-09-25 16:24:19', 1399985191002447872, '2022-09-25 16:27:09', 1, 0); -INSERT INTO `notice_message_template` VALUES (1573952505056727040, 'BpmTaskAssignCancel', '流程任务更改处理人事件(原处理人)', '流程任务更改处理人事件(原处理人)', 0, '', 1399985191002447872, '2022-09-25 16:28:14', 1399985191002447872, '2022-09-25 16:28:14', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573952568654958592, 'BpmTaskCancel', '流程任务取消事件', '流程任务取消事件', 0, '', 1399985191002447872, '2022-09-25 16:28:30', 1399985191002447872, '2022-09-25 16:28:30', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573952621826150400, 'BpmTaskReject', '流程任务驳回事件', '流程任务驳回事件', 0, '', 1399985191002447872, '2022-09-25 16:28:42', 1399985191002447872, '2022-09-25 16:28:42', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573952709432578048, 'BpmInstanceCompleted', '流程完成时通知发起人', '流程完成时通知发起人', 0, '', 1399985191002447872, '2022-09-25 16:29:03', 1399985191002447872, '2022-09-25 16:29:03', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573952762507300864, 'BpmInstanceCancel', '流程取消时通知发起人', '流程取消时通知发起人', 0, '', 1399985191002447872, '2022-09-25 16:29:16', 1399985191002447872, '2022-09-25 16:29:16', 0, 0); -INSERT INTO `notice_message_template` VALUES (1580083314274070528, 'BpmTaskBack', '流程任务回退事件', '流程任务驳回事件', 0, '', 1399985191002447872, '2022-10-12 14:29:53', 1399985191002447872, '2022-10-12 14:30:11', 1, 0); +INSERT INTO `notice_message_template` VALUES (1424936204932169730, 'cs', '测试', 'hello ${msg}6666666666666666666666666666', '1', '测试模板', 0, '2021-08-10 11:30:40', 0, '2021-08-10 11:30:40', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573951326893510656, 'BpmTaskCreated', '流程任务创建事件', '流程任务创建事件', '0', '', 1399985191002447872, '2022-09-25 16:23:34', 1399985191002447872, '2022-09-25 16:23:34', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573951515616219136, 'BpmTaskAssignCreated', '流程任务更改处理人事件(新处理人)', '流程任务更改处理人事件(新处理人)', '0', '', 1399985191002447872, '2022-09-25 16:24:19', 1399985191002447872, '2022-09-25 16:27:09', 1, 0); +INSERT INTO `notice_message_template` VALUES (1573952505056727040, 'BpmTaskAssignCancel', '流程任务更改处理人事件(原处理人)', '流程任务更改处理人事件(原处理人)', '0', '', 1399985191002447872, '2022-09-25 16:28:14', 1399985191002447872, '2022-09-25 16:28:14', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573952568654958592, 'BpmTaskCancel', '流程任务取消事件', '流程任务取消事件', '0', '', 1399985191002447872, '2022-09-25 16:28:30', 1399985191002447872, '2022-09-25 16:28:30', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573952621826150400, 'BpmTaskReject', '流程任务驳回事件', '流程任务驳回事件', '0', '', 1399985191002447872, '2022-09-25 16:28:42', 1399985191002447872, '2022-09-25 16:28:42', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573952709432578048, 'BpmInstanceCompleted', '流程完成时通知发起人', '流程完成时通知发起人', '0', '', 1399985191002447872, '2022-09-25 16:29:03', 1399985191002447872, '2022-09-25 16:29:03', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573952762507300864, 'BpmInstanceCancel', '流程取消时通知发起人', '流程取消时通知发起人', '0', '', 1399985191002447872, '2022-09-25 16:29:16', 1399985191002447872, '2022-09-25 16:29:16', 0, 0); +INSERT INTO `notice_message_template` VALUES (1580083314274070528, 'BpmTaskBack', '流程任务回退事件', '流程任务驳回事件', '0', '', 1399985191002447872, '2022-10-12 14:29:53', 1399985191002447872, '2022-10-12 14:30:11', 1, 0); -- ---------------------------- -- Table structure for notice_site_message @@ -4609,15 +4531,15 @@ CREATE TABLE `notice_site_message` ( `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '消息内容', `sender_id` bigint(20) NULL DEFAULT NULL COMMENT '发送者id', `sender_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发送者姓名', - `sender_time` datetime(0) NULL DEFAULT NULL COMMENT '发送时间', + `sender_time` datetime NULL DEFAULT NULL COMMENT '发送时间', `receive_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '消息类型', `send_state` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布状态', - `efficient_time` datetime(0) NULL DEFAULT NULL COMMENT '截至有效期', - `cancel_time` datetime(0) NULL DEFAULT NULL COMMENT '撤回时间', + `efficient_time` datetime NULL DEFAULT NULL COMMENT '截至有效期', + `cancel_time` datetime NULL DEFAULT NULL COMMENT '撤回时间', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4636,9 +4558,9 @@ CREATE TABLE `notice_site_message_user` ( `message_id` bigint(20) NOT NULL COMMENT '消息id', `receive_id` bigint(20) NOT NULL COMMENT '接收者id', `have_read` bit(1) NOT NULL COMMENT '已读/未读', - `read_time` datetime(0) NULL DEFAULT NULL COMMENT '已读时间', + `read_time` datetime NULL DEFAULT NULL COMMENT '已读时间', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `uni_receive_message`(`receive_id`, `message_id`) USING BTREE COMMENT '接收人和消息联合索引', @@ -4659,17 +4581,21 @@ INSERT INTO `notice_site_message_user` VALUES (1561379841968648192, 156136589480 DROP TABLE IF EXISTS `notice_sms_channel_config`; CREATE TABLE `notice_sms_channel_config` ( `id` bigint(20) NOT NULL COMMENT '主键', - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '渠道编码', - `signature` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '短信签名', - `api_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '短信ApiKey', - `api_secret` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '短信Api秘钥', - `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '回调地址', + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '渠道类型编码', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '乐观锁', `deleted` bit(1) NOT NULL COMMENT '删除标志', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '渠道类型名称', + `state` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态', + `access_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'AccessKey', + `config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '配置字符串', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `access_secret` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'AccessSecret', + `image` bigint(20) NULL DEFAULT NULL COMMENT '图片', + `sort_no` double(10, 0) NULL DEFAULT NULL COMMENT '排序', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '短信渠道配置' ROW_FORMAT = DYNAMIC; @@ -4692,9 +4618,9 @@ CREATE TABLE `notice_sms_config` ( `from_num` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, `is_default` tinyint(1) NULL DEFAULT 0 COMMENT '是否默认配置,0:否。1:是', `creator` bigint(18) NULL DEFAULT NULL, - `create_time` datetime(0) NULL DEFAULT NULL, + `create_time` datetime NULL DEFAULT NULL, `last_modifier` bigint(18) NULL DEFAULT NULL, - `last_modified_time` datetime(0) NULL DEFAULT NULL, + `last_modified_time` datetime NULL DEFAULT NULL, `version` int(10) NULL DEFAULT NULL, `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `secret` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, @@ -4707,6 +4633,29 @@ CREATE TABLE `notice_sms_config` ( -- Records of notice_sms_config -- ---------------------------- +-- ---------------------------- +-- Table structure for notice_sms_template +-- ---------------------------- +DROP TABLE IF EXISTS `notice_sms_template`; +CREATE TABLE `notice_sms_template` ( + `id` bigint(20) NOT NULL COMMENT '主键', + `supplier_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '短信渠道商类型', + `template_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '短信渠道商类型', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '短信模板名称', + `content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '短信模板内容', + `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', + `version` int(11) NOT NULL COMMENT '乐观锁', + `deleted` bit(1) NOT NULL COMMENT '删除标志', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '短信模板配置' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of notice_sms_template +-- ---------------------------- + -- ---------------------------- -- Table structure for notice_wechat_config -- ---------------------------- @@ -4720,9 +4669,9 @@ CREATE TABLE `notice_wechat_config` ( `corp_secret` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, `is_default` tinyint(1) NULL DEFAULT 0 COMMENT '是否默认配置,0:否。1:是', `creator` bigint(18) NULL DEFAULT NULL, - `create_time` datetime(0) NULL DEFAULT NULL, + `create_time` datetime NULL DEFAULT NULL, `last_modifier` bigint(18) NULL DEFAULT NULL, - `last_modified_time` datetime(0) NULL DEFAULT NULL, + `last_modified_time` datetime NULL DEFAULT NULL, `version` int(10) NULL DEFAULT NULL, `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4980,9 +4929,9 @@ CREATE TABLE `report_project_info` ( `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '报表内容', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '乐观锁', `deleted` bit(1) NOT NULL COMMENT '删除标志', `index_image` bigint(20) NULL DEFAULT NULL COMMENT '预览图片id', @@ -5002,9 +4951,9 @@ CREATE TABLE `report_project_info_publish` ( `id` bigint(20) NOT NULL COMMENT '主键', `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '报表内容', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '乐观锁', `deleted` bit(1) NOT NULL COMMENT '删除标志', PRIMARY KEY (`id`) USING BTREE @@ -5027,7 +4976,7 @@ CREATE TABLE `starter_audit_data_version` ( `change_content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '数据更新内容', `version` int(10) NOT NULL COMMENT '版本', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据版本日志' ROW_FORMAT = DYNAMIC; @@ -5053,7 +5002,7 @@ CREATE TABLE `starter_audit_login_log` ( `os` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作系统', `browser` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '浏览器类型', `msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提示消息', - `login_time` datetime(0) NULL DEFAULT NULL COMMENT '访问时间', + `login_time` datetime NULL DEFAULT NULL COMMENT '访问时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '登陆日志' ROW_FORMAT = DYNAMIC; @@ -5080,7 +5029,7 @@ CREATE TABLE `starter_audit_operate_log` ( `operate_return` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '返回参数', `success` bit(1) NULL DEFAULT NULL COMMENT '是否成功', `error_msg` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '错误提示', - `operate_time` datetime(0) NULL DEFAULT NULL COMMENT '操作时间', + `operate_time` datetime NULL DEFAULT NULL COMMENT '操作时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志' ROW_FORMAT = DYNAMIC; @@ -5130,6 +5079,21 @@ CREATE TABLE `starter_ding_robot_config` ( -- Records of starter_ding_robot_config -- ---------------------------- +-- ---------------------------- +-- Table structure for starter_file_data +-- ---------------------------- +DROP TABLE IF EXISTS `starter_file_data`; +CREATE TABLE `starter_file_data` ( + `id` bigint(20) NOT NULL COMMENT '主键', + `base64` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT 'base64方式存储', + `data` longblob NULL COMMENT 'base64方式存储', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '上传文件数据' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of starter_file_data +-- ---------------------------- + -- ---------------------------- -- Table structure for starter_file_upload_info -- ---------------------------- @@ -5143,7 +5107,7 @@ CREATE TABLE `starter_file_upload_info` ( `file_size` bigint(20) NULL DEFAULT NULL COMMENT '文件大小', `external_storage_id` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '外部关联id', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '上传文件信息' ROW_FORMAT = DYNAMIC; @@ -5164,9 +5128,9 @@ CREATE TABLE `starter_quartz_job` ( `state` int(4) NULL DEFAULT NULL COMMENT '状态', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -5188,10 +5152,10 @@ CREATE TABLE `starter_quartz_job_log` ( `class_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理器全限定名', `success` bit(1) NOT NULL COMMENT '是否执行成功', `error_message` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误信息', - `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间', - `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间', + `start_time` datetime NULL DEFAULT NULL COMMENT '开始时间', + `end_time` datetime NULL DEFAULT NULL COMMENT '结束时间', `duration` bigint(255) NULL DEFAULT NULL COMMENT '执行时长', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '任务执行日志' ROW_FORMAT = DYNAMIC; @@ -5230,7 +5194,7 @@ CREATE TABLE `starter_wx_fans` ( `id` bigint(20) NOT NULL, `openid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '关联OpenId', `subscribe_status` bit(1) NULL DEFAULT NULL COMMENT '订阅状态', - `subscribe_time` datetime(0) NULL DEFAULT NULL COMMENT '订阅时间', + `subscribe_time` datetime NULL DEFAULT NULL COMMENT '订阅时间', `nickname` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '昵称', `sex` varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '性别', `language` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '语言', @@ -5257,9 +5221,9 @@ CREATE TABLE `starter_wx_menu` ( `remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注', `publish` bit(1) NOT NULL COMMENT '是否发布', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(11) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -5285,9 +5249,9 @@ CREATE TABLE `starter_wx_template` ( `content` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板内容', `example` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '示例', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `inx_`(`template_id`) USING BTREE COMMENT '模板id' diff --git a/bootx-start/src/main/resources/logback-spring.xml b/bootx-start/src/main/resources/logback-spring.xml index c1a67868630ea7168e1d4a373a0bc1afadc62cef..a7b2caa03298ac6341de5c61a65ed6ca43742f04 100644 --- a/bootx-start/src/main/resources/logback-spring.xml +++ b/bootx-start/src/main/resources/logback-spring.xml @@ -1,5 +1,10 @@ + + @@ -12,6 +17,13 @@ + + + ${appname} + 127.0.0.1 + + + diff --git a/docker-compose.yml b/docker-compose.yml index 917015df4132dcad5114208dcd12aa958a9849fd..41e894c3621f2280773a1847b2916f4342b41b49 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,8 +6,7 @@ services: ports: - "8080:8080" volumes: - # 宿主机目录:容器目录 日志映射 - - /data/logs/bootx-platform:/logs - # 外部化配置文件 - - ./application.yml:/application.yml - - ./logback-spring.xml:/logback-spring.xml + # 读取外部化配置文件(根据实际服务器环境做修改), 宿主机目录:容器目录 + - /data/logs/dax-start:/logs # 日志 + - /root/dax-pay/application-dev.yml:/application-dev.yml # 配置 + - /root/dax-pay/logback-spring.xml:/logback-spring.xml # 日志框架 diff --git a/pom.xml b/pom.xml index c68017739320887c452582789ca6e304e078cbb4..2707c6acf8cc6b8af18ce4330a230c3dc9333268 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.11 + 2.7.13 @@ -15,7 +15,7 @@ cn.bootx.platform bootx-platform-parent pom - 1.3.1 + 1.3.3 bootx-platform @@ -83,49 +83,50 @@ 1.8 - 1.3.1 + 1.3.3 - 5.8.18 - 6.4.0 + 5.8.20 + 6.4.4 2.12.3 3.11 4.4 1.10.0 2.11.0 - 31.1-jre + 32.1.1-jre 4.0.1 0.0.38 1.7.30 - 2.14.2 + 2.14.3 7.15.0 1.4.01 1.2.12 3.5.3 - 3.2.1 + 3.3.2 2.4.0 2.9.7 1.34.0 1.16.5 - 8.5.2 - 3.5.3.1 + 8.5.4 + 3.5.3.2 3.6.1 1.6.15 - 3.21.1 - 4.0.0 - 1.5.3.Final + 3.23.0 + 4.2.0 + 1.5.5.Final 0.2.0 1.6.2 - 7.3 + 7.4 1.2.83_noneautotype 0.41 V1.4-SNAPSHOT 2.3 - 4.4.9.B + 4.5.2.B 1.3.81 - 2.2.4 + 2.2.5 2.7.0 + 2.2.0 1.5.3 @@ -365,6 +366,12 @@ common-starter-wecom ${bootx-platform.version} + + + org.dromara.sms4j + sms4j-spring-boot-starter + ${sms4j.version} +