From fdb8b5f24ce399e036a270781ce171a9394fae18 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Wed, 24 Apr 2024 03:21:04 +0000
Subject: [PATCH 1/2] =?UTF-8?q?java8=E7=89=88=E6=9C=AC=E5=8D=95=E4=BD=93?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=EF=BC=8C=E8=84=9A=E6=9C=AC=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E5=AF=BC=E8=87=B4=E5=90=AF=E5=8A=A8=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lbw <wangiegie@163.com>
---
 db/pig.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/pig.sql b/db/pig.sql
index 2f459f2e..bd16063a 100644
--- a/db/pig.sql
+++ b/db/pig.sql
@@ -695,6 +695,7 @@ CREATE TABLE `sys_job` (
                            `start_time` timestamp NULL DEFAULT NULL COMMENT '初次执行时间',
                            `previous_time` timestamp NULL DEFAULT NULL COMMENT '上次执行时间',
                            `next_time` timestamp NULL DEFAULT NULL COMMENT '下次执行时间',
+                           `remark` varchar(255) CHARACTER SET utf8mb4 DEFAULT '' COMMENT '备注信息',
                             PRIMARY KEY (`job_id`) USING BTREE,
                            UNIQUE KEY `job_name_group_idx` (`job_name`,`job_group`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='定时任务调度表';
-- 
Gitee


From f383a3977954cc9ffbe315cde4c64f48ae3f2a1c Mon Sep 17 00:00:00 2001
From: ccl <1020308280@qq.com>
Date: Wed, 29 May 2024 17:59:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E8=BD=BB=E9=87=8F=E7=BA=A7=20PR?=
 =?UTF-8?q?=E3=80=91=EF=BC=9A=E9=92=88=E5=AF=B9=E5=8D=95=E4=BD=93=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AEboot=E5=B7=A5=E7=A8=8B=E7=A7=BB=E9=99=A4=E5=9B=A0?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5=E5=85=B6=E4=BB=96=E6=A8=A1=E5=9D=97=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E5=A4=9A=E4=BD=99=E7=9A=84cloud=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pig-boot/pom.xml | 84 ++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 67 insertions(+), 17 deletions(-)

diff --git a/pig-boot/pom.xml b/pig-boot/pom.xml
index 6ffd8e33..b6a28c5d 100755
--- a/pig-boot/pom.xml
+++ b/pig-boot/pom.xml
@@ -30,35 +30,85 @@
     <description>pig 单体版本启动</description>
 
     <dependencies>
-        <!--必备：认证中心模块-->
-        <dependency>
-            <groupId>com.pig4cloud</groupId>
-            <artifactId>pig-auth</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <!--必备：用户管理模块-->
-        <dependency>
-            <groupId>com.pig4cloud</groupId>
-            <artifactId>pig-upms-biz</artifactId>
-            <version>${revision}</version>
-        </dependency>
+		<!--必备：认证中心模块-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pig-auth</artifactId>
+			<version>${revision}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.alibaba.cloud</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework.cloud</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<!--必备：用户管理模块-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pig-upms-biz</artifactId>
+			<version>${revision}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.alibaba.cloud</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework.cloud</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
         <!--可选：代码生成模块-->
         <dependency>
             <groupId>com.pig4cloud</groupId>
             <artifactId>pig-codegen</artifactId>
             <version>${revision}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.alibaba.cloud</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework.cloud</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
         </dependency>
         <!--可选：定时任务模块-->
         <dependency>
             <groupId>com.pig4cloud</groupId>
             <artifactId>pig-quartz</artifactId>
             <version>${revision}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.alibaba.cloud</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework.cloud</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
         </dependency>
-        <!--安全模块-->
-        <dependency>
-            <groupId>com.pig4cloud</groupId>
-            <artifactId>pig-common-security</artifactId>
-        </dependency>
+		<!--安全模块-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pig-common-security</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>com.alibaba.cloud</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework.cloud</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
         <!--接口文档-->
         <dependency>
             <groupId>com.pig4cloud</groupId>
-- 
Gitee