From b83dec8fc7381d95e34da25d3f1ea30d7b456ce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=9F=E5=8D=97=E4=B8=80=E7=82=B9=E9=9B=A8?=
 <wangsong0210@gmail.com>
Date: Sun, 26 Apr 2020 17:03:05 +0800
Subject: [PATCH] m

---
 vhr/vhrserver/vhr-mapper/vhr-mapper.iml                |  1 -
 .../src/main/resources/db/migration/V1__vhr.sql        | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/vhr/vhrserver/vhr-mapper/vhr-mapper.iml b/vhr/vhrserver/vhr-mapper/vhr-mapper.iml
index b9adf88..ede1c22 100644
--- a/vhr/vhrserver/vhr-mapper/vhr-mapper.iml
+++ b/vhr/vhrserver/vhr-mapper/vhr-mapper.iml
@@ -25,7 +25,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.flywaydb:flyway-core:5.2.4" level="project" />
     <orderEntry type="module" module-name="vhr-model" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.8.RELEASE" level="project" />
diff --git a/vhr/vhrserver/vhr-web/src/main/resources/db/migration/V1__vhr.sql b/vhr/vhrserver/vhr-web/src/main/resources/db/migration/V1__vhr.sql
index b055ded..e237b3d 100644
--- a/vhr/vhrserver/vhr-web/src/main/resources/db/migration/V1__vhr.sql
+++ b/vhr/vhrserver/vhr-web/src/main/resources/db/migration/V1__vhr.sql
@@ -51,16 +51,16 @@ CREATE TABLE `appraise` (
 DROP TABLE IF EXISTS `mail_send_log`;
 
 CREATE TABLE `mail_send_log` (
-  `msgId` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `msgId` varchar(255) DEFAULT NULL,
   `empId` int(11) DEFAULT NULL,
   `status` int(11) DEFAULT '0' COMMENT '0发送中，1发送成功，2发送失败',
-  `routeKey` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `exchange` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
-  `count` int(11) DEFAULT NULL COMMENT '重试次数',
+  `routeKey` varchar(255) DEFAULT NULL,
+  `exchange` varchar(255) DEFAULT NULL,
+  `count` int(11) DEFAULT '0' COMMENT '重试次数',
   `tryTime` date DEFAULT NULL COMMENT '第一次重试时间',
   `createTime` date DEFAULT NULL,
   `updateTime` date DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 /*Data for the table `appraise` */
 
 /*Table structure for table `department` */
-- 
GitLab