From be73fbf9a865b6a54189523d2dc5da806ab722ee Mon Sep 17 00:00:00 2001
From: intellijboy <1099501218@qq.com>
Date: Thu, 5 Jan 2023 01:04:35 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20fastjson2=20=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=EF=BC=8C=E4=BF=AE=E5=A4=8D=20maven=20=E4=BE=9D?=
=?UTF-8?q?=E8=B5=96=E8=A7=A3=E6=9E=90=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
server/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/pom.xml b/server/pom.xml
index 3f6b82bf..84f27b2e 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
+
--
Gitee
From 5ded7ea69a2cf529c51b40e5ac40641f5bad7d79 Mon Sep 17 00:00:00 2001
From: intellijboy <1099501218@qq.com>
Date: Thu, 5 Jan 2023 01:08:17 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=AB=98=E4=BA=8E=20mysq?=
=?UTF-8?q?l8.0=20=E7=89=88=E6=9C=AC=20groups=20=E4=B8=BA=E5=85=B3?=
=?UTF-8?q?=E9=94=AE=E8=AF=8D=E5=AF=BC=E8=87=B4=E5=AE=9A=E6=97=B6=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=EF=BC=8C=E5=85=B3?=
=?UTF-8?q?=E8=81=94issue:=20https://gitee.com/likeadmin/likeadmin=5Fjava/?=
=?UTF-8?q?issues/I67C1K?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/mdd/common/entity/Crontab.java | 2 ++
1 file changed, 2 insertions(+)
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 6b111bf0..1780a867 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; // 执行规则
--
Gitee
From 72435abddb23265936b7f2f977420b2b96974ea1 Mon Sep 17 00:00:00 2001
From: intellijboy <1099501218@qq.com>
Date: Sun, 8 Jan 2023 14:14:59 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E5=91=98=E7=BC=96=E8=BE=91=E8=A7=92=E8=89=B2=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E6=95=B0=E5=AD=97=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sql/install.sql | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sql/install.sql b/sql/install.sql
index 24dc103d..254b207e 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;
--
Gitee