From 2ed82019f630dd8762d51c38fa18fc624a6d9858 Mon Sep 17 00:00:00 2001
From: zcy <290198252@qq.com>
Date: Mon, 22 Mar 2021 12:10:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E8=A1=A8=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E8=BD=AF=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/plan.go |  4 ++--
 main.go            | 20 ++++++++++----------
 model/model.go     | 18 ++++++++++++------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/controller/plan.go b/controller/plan.go
index 809018d..89e8fd1 100644
--- a/controller/plan.go
+++ b/controller/plan.go
@@ -192,7 +192,7 @@ func (this *PlanController) GetUndo(c *gin.Context) {
 	}()
 	undos := []model.Undo{}
 	e := db.GetOrm().Model(&model.Undo{}).Find(&undos).Error
-	if nil != e{
+	if nil != e {
 		log.Print(e.Error())
 		return
 	}
@@ -236,7 +236,7 @@ func (this *PlanController) DeleteUndo(c *gin.Context) {
 	sid := c.Param("id")
 	id := db.Atoi(sid)
 	e := db.GetOrm().Model(&model.Undo{}).Delete(&model.Undo{ID: int32(id)}).Error
-	if nil != e{
+	if nil != e {
 		log.Print(e.Error())
 		return
 	}
diff --git a/main.go b/main.go
index ffee060..dacb0cf 100644
--- a/main.go
+++ b/main.go
@@ -24,10 +24,10 @@ import (
 // @BasePath /api/v1
 
 var (
-	userController = controller.UserController{}
-	mailContoller  = controller.MailController{}
-	fileController = controller.FileController{}
-	planController = controller.PlanController{}
+	userController    = controller.UserController{}
+	mailContoller     = controller.MailController{}
+	fileController    = controller.FileController{}
+	planController    = controller.PlanController{}
 	openapiController = controller.OpenApiController{}
 )
 
@@ -182,17 +182,17 @@ func main() {
 		api.POST("/plan_days", planController.PlanDay)      // 获取本月有计划天数
 		api.GET("/plan_types", planController.Types)
 
-		api.PUT("/undo",planController.CreateUndo)
-		api.POST("/undo",planController.UpdateUndo)
-		api.GET("/undo",planController.GetUndo)
-		api.DELETE("/undo/:id",planController.DeleteUndo)
+		api.PUT("/undo", planController.CreateUndo)
+		api.POST("/undo", planController.UpdateUndo)
+		api.GET("/undo", planController.GetUndo)
+		api.DELETE("/undo/:id", planController.DeleteUndo)
 	}
 
 	openapi := r.Group("openapi")
 	{
 		openapi.POST("/diff")
-		openapi.POST("/ddl2orm",openapiController.DDL2ORM)
-		openapi.POST("/ddl2markdown",openapiController.DDL2Markdown)
+		openapi.POST("/ddl2orm", openapiController.DDL2ORM)
+		openapi.POST("/ddl2markdown", openapiController.DDL2Markdown)
 
 	}
 	e := r.Run(":" + strconv.Itoa(config.GetPort()))
diff --git a/model/model.go b/model/model.go
index 5cfa211..36454b7 100644
--- a/model/model.go
+++ b/model/model.go
@@ -7,6 +7,9 @@ import (
 	"crypto/md5"
 	"fmt"
 	"log"
+	"time"
+
+	"github.com/jinzhu/gorm"
 )
 
 type Plan struct {
@@ -19,12 +22,15 @@ type Plan struct {
 }
 
 type Undo struct {
-	ID        int32  `json:"id" gorm:"column:id" sql:"id"`
-	Content   string `json:"content" gorm:"column:content" sql:"content"`
-	SpendTime int32  `json:"spend_time" gorm:"column:spend_time" sql:"spend_time"`
-	Parent     int32  `json:"parent" gorm:"column:parent" sql:"parent"`
-	Level     int32  `json:"level" gorm:"column:level" sql:"level"`
-	Type      int32  `json:"type" gorm:"column:type" sql:"type"`
+	model     gorm.Model
+	ID        int32      `json:"id" gorm:"column:id" sql:"id"`
+	Content   string     `json:"content" gorm:"column:content" sql:"content"`
+	SpendTime int32      `json:"spend_time" gorm:"column:spend_time" sql:"spend_time"`
+	Parent    int32      `json:"parent" gorm:"column:parent" sql:"parent"`
+	Level     int32      `json:"level" gorm:"column:level" sql:"level"`
+	Type      int32      `json:"type" gorm:"column:type" sql:"type"`
+	Done      int        `json:"done" gorm:"done" sql:"done"`
+	DeletedAt *time.Time `json:"deleted_at"`
 }
 
 type PlanType struct {