From 1b352d072d0044fd76fbb2413e82347d08a40b40 Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@chandao.com>
Date: Mon, 24 Mar 2025 02:06:18 +0000
Subject: [PATCH]  * [misc] modify sql.

---
 db/update22.0.sql |  4 ++--
 db/zentao.sql     | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/db/update22.0.sql b/db/update22.0.sql
index 9fabf6e3de..d9d53d33f6 100644
--- a/db/update22.0.sql
+++ b/db/update22.0.sql
@@ -17,7 +17,7 @@ CREATE TABLE `zt_rule` (
   `lastRunTime` datetime DEFAULT NULL,
   `lastRunResult` varchar(30) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 CREATE INDEX `objectType`  ON `zt_rule` (`objectType`);
 CREATE INDEX `action`  ON `zt_rule` (`action`);
 
@@ -32,7 +32,7 @@ CREATE TABLE `zt_rulequeue` (
   `triggeredDate` date DEFAULT NULL,
   `executedTime` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`) VALUES
 ('*/1', '*', '*', '*', '*', ' moduleName=rulequeue&methodName=run', '异步执行规则引擎', 'zentao', 1, 'normal');
diff --git a/db/zentao.sql b/db/zentao.sql
index 1f07949171..7e444a92a7 100755
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -1812,8 +1812,8 @@ CREATE INDEX `repo`     ON `zt_repohistory` (`repo`);
 CREATE INDEX `revision` ON `zt_repohistory` (`revision`);
 
 -- DROP TABLE IF EXISTS `zt_rule`;
-CREATE TABLE `zt_rule` (
-  `id` int(8) NOT NULL AUTO_INCREMENT,
+CREATE TABLE IF NOT EXISTS `zt_rule` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(255) NOT NULL,
   `type` enum('global','group') NOT NULL DEFAULT 'global',
   `workflowGroup` varchar(255) DEFAULT NULL,
@@ -1831,12 +1831,12 @@ CREATE TABLE `zt_rule` (
   `lastRunTime` datetime DEFAULT NULL,
   `lastRunResult` varchar(30) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 CREATE INDEX `objectType`  ON `zt_rule` (`objectType`);
 CREATE INDEX `action`  ON `zt_rule` (`action`);
 
 -- DROP TABLE IF EXISTS `zt_rulequeue`;
-CREATE TABLE `zt_rulequeue` (
+CREATE TABLE IF NOT EXISTS `zt_rulequeue` (
   `id` int(8) NOT NULL AUTO_INCREMENT,
   `rule` int(8) NOT NULL,
   `fromObject` text DEFAULT NULL,
@@ -1847,7 +1847,7 @@ CREATE TABLE `zt_rulequeue` (
   `triggeredDate` date DEFAULT NULL,
   `executedTime` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- DROP TABLE IF EXISTS `zt_score`;
 CREATE TABLE IF NOT EXISTS `zt_score` (