diff --git a/server/like-common/src/main/java/com/mdd/common/entity/Crontab.java b/server/like-common/src/main/java/com/mdd/common/entity/Crontab.java index 6b111bf06a4d4a8d16ed1d68b9b73377808c2908..1780a867b4b97a02099ee144478e492bdaac950d 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/Crontab.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/Crontab.java @@ -1,6 +1,7 @@ package com.mdd.common.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; @@ -17,6 +18,7 @@ public class Crontab implements Serializable { @TableId(value="id", type= IdType.AUTO) private Integer id; // 主键 private String name; // 任务名称 + @TableField("`groups`") private String groups; // 任务分组 private String command; // 执行命令 private String rules; // 执行规则 diff --git a/server/pom.xml b/server/pom.xml index 3f6b82bf163b42631a251afae65b67b0b6581e6a..84f27b2e6bf7616401b3f31f5b62930346085f28 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -33,7 +33,7 @@ 1.4.5 1.18.24 - 2.0.16 + 2.0.22 3.12.0 2.11.0 2.11.1 @@ -258,4 +258,4 @@ - \ No newline at end of file + diff --git a/sql/install.sql b/sql/install.sql index 24dc103d2b1ba45847426c63d6a73ca1e3a60bce..254b207e82583df8cd2d6049923994584313f013 100644 --- a/sql/install.sql +++ b/sql/install.sql @@ -528,8 +528,8 @@ SET FOREIGN_KEY_CHECKS = 1; -- ---------------------------- BEGIN; INSERT INTO `la_system_auth_dept` VALUES (1, 0, '默认部门', 'LikeAdmin', '18327647788', 10, 0, 0, 1649841995, 1660190949, 0); -INSERT INTO `la_system_auth_role` VALUES (1, '审核员', '审核数据', 0, 0, 1668679451, 1668679468); -INSERT INTO `la_system_auth_admin` VALUES (1, '0', '1', '', 'admin', 'admin', '4919832b10f1d2133c0f24a7dbe8330e', '/api/static/backend_avatar.png', 'Huku0', 0, 1, 0, 0, '127.0.0.1', 1670314940, 1642321599, 1670376604, 0); +INSERT INTO `la_system_auth_role` VALUES (1, '系统管理员', '系统管理', 0, 0, 1668679451, 1668679468); +INSERT INTO `la_system_auth_admin` VALUES (1, '1', '1', '', 'admin', 'admin', '4919832b10f1d2133c0f24a7dbe8330e', '/api/static/backend_avatar.png', 'Huku0', 0, 1, 0, 0, '127.0.0.1', 1670314940, 1642321599, 1670376604, 0); INSERT INTO `la_crontab` VALUES (1, '有参数任务', 'default', 'myJob.handle(\"参数\")', '* * * * * ?', '', '', 2, 1, 0, 0, 1670377612, 1670377612, 0, 1669970830, 1670289651, 0); COMMIT;