From 9509653e553975aaf5ea81d4eebb8800c1612514 Mon Sep 17 00:00:00 2001 From: "DESKTOP-4RNDQIC\\29019" <290198252@qq.com> Date: Fri, 26 Jun 2020 18:20:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller/blog.go | 7 +++-- main.go | 2 +- model/memo.go | 20 ++++++++----- model/template.go | 73 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 12 deletions(-) create mode 100644 model/template.go diff --git a/controller/blog.go b/controller/blog.go index 4161673..48260f4 100644 --- a/controller/blog.go +++ b/controller/blog.go @@ -359,6 +359,7 @@ func CreateMemo(c *gin.Context) { var req model.Memo e := c.BindJSON(&req) if nil != e{ + logs.Error(e.Error()) resp.Msg = "wrong input" return } @@ -400,7 +401,7 @@ func GetMemos(c *gin.Context) { c.JSON(200,rsp) }() type ReqMemos struct { - title string `json:"title"` + Title string `json:"title"` } req := ReqMemos{} e := c.BindJSON(&req) @@ -410,7 +411,7 @@ func GetMemos(c *gin.Context) { } limit,offset := GetPageParaFromQuery(c) if limit != 0 && offset != 0{ - dat, e := model.GetMemos(req.title,10,0) + dat, e := model.GetMemos(req.Title,10,0) if nil != e{ return } @@ -418,7 +419,7 @@ func GetMemos(c *gin.Context) { rsp.Status = 0 rsp.Msg = "OK" }else { - dat, e := model.GetMemos(req.title,10,0) + dat, e := model.GetMemos(req.Title,10,0) if nil != e{ return } diff --git a/main.go b/main.go index 519c7dd..d1624f6 100644 --- a/main.go +++ b/main.go @@ -109,7 +109,7 @@ func main() { r := gin.New() // use ginSwagger middleware to serve the API docs r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler)) - r.Run() + r.Run(":9992") }() api := r.Group("/api") { diff --git a/model/memo.go b/model/memo.go index 773a606..fa745d9 100644 --- a/model/memo.go +++ b/model/memo.go @@ -4,19 +4,22 @@ import ( "background/db" "background/logs" "fmt" + "qiniupkg.com/x/log.v7" "strings" ) type Memo struct { ID int64 `sql:"id" json:"id"` Title string `sql:"title" json:"title"` - CreateTime int64 `sql:"create_time" json:"create_time"` + CreateTime string `sql:"create_time" json:"create_time"` Content string `sql:"content" json:"content"` } func CreateMemo(memo Memo) error{ - sql := fmt.Sprintf(`insert into memo(title,create_time,content) values (%s,%s,%s) `, - memo.Title,memo.CreateTime,strings.Replace(memo.Content, "'", "\\'", -1)) + sql := fmt.Sprintf(`insert into memo(title,create_time,content) select '%s','%s','%s' + from dual where not exists (select * from memo where memo.title='%s') `, + memo.Title,memo.CreateTime,strings.Replace(memo.Content, "'", "\\'", -1),memo.Title) + log.Print(sql) _, e := db.GetMysqlClient().Query(sql) if nil != e { logs.Error(e.Error()) @@ -26,9 +29,9 @@ func CreateMemo(memo Memo) error{ } func UpdateMemo(memo Memo) error{ - sql := fmt.Sprintf(`update memo set title = %s, - create_time = %s, - content = %s where memo.id = '%d'`, + sql := fmt.Sprintf(`update memo set title = '%s', + create_time = '%s', + content = '%s' where memo.id = %d`, memo.Title,memo.CreateTime,strings.Replace(memo.Content, "'", "\\'", -1),memo.ID) _, e := db.GetMysqlClient().Query(sql) if nil != e { @@ -61,8 +64,9 @@ func ReadMemo(id int32) ([]Memo,error){ func GetMemos(title string,limit int,offset int) ([]Memo,error) { memo := []Memo{} - sql := fmt.Sprintf(`select * from memo where memo.title like '%d' offset %d limit %d`, - title,offset,limit) + sql := fmt.Sprintf(`select * from memo where memo.title like '%s%%' limit %d offset %d`, + title,limit,offset) + log.Print(sql) e := db.GetMysqlClient().Query2(sql,&memo) if nil != e { logs.Error(e.Error()) diff --git a/model/template.go b/model/template.go new file mode 100644 index 0000000..f618c48 --- /dev/null +++ b/model/template.go @@ -0,0 +1,73 @@ +package model + +import ( + "background/db" + "background/logs" + "fmt" + "log" +) + +type DocTemplate struct { + Id int32 `sql:"id" json:"id"` + Content string `sql:"content" json:"content"` + Name string `sql:"content" json:"name"` +} + + +func CreateDocTemplate(templ DocTemplate) error{ + sql := fmt.Sprintf(`insert into doc_template(content,name) select '%s','%s + from dual where not exists (select * from doc_template where doc_template.name='%s') `, + templ.Content,templ.Name,templ.Name) + log.Print(sql) + _, e := db.GetMysqlClient().Query(sql) + if nil != e { + log.Print(sql) + return e + } + return nil +} + +func UpdateDocTemplate(templ DocTemplate) error{ + sql := fmt.Sprintf(`update doc_template set content = %s, + name = %s, where memo.id = '%d'`,templ.Content,templ.Name,templ.Id) + _, e := db.GetMysqlClient().Query(sql) + if nil != e { + log.Print(e.Error()) + return e + } + return nil +} + +func DeleteDocTemplate(id int32) error{ + sql := fmt.Sprintf(`delete from doc_template doc_template memo.id = '%d'`,id) + _, e := db.GetMysqlClient().Query(sql) + if nil != e { + logs.Error(e.Error()) + return e + } + return nil +} + +func ReadDocTemplate(id int32) ([]DocTemplate,error){ + memo := []DocTemplate{} + sql := fmt.Sprintf(`select * from doc_template where doc_template.id = '%d'`,id) + e := db.GetMysqlClient().Query2(sql,&memo) + if nil != e { + logs.Error(e.Error()) + return nil,e + } + return memo,nil +} + +func GetDocTemplate(title string,limit int,offset int) ([]DocTemplate,error) { + memo := []DocTemplate{} + sql := fmt.Sprintf(`select * from doc_template where doc_template.name like '%s%%' limit %d offset %d`, + title,limit,offset) + log.Print(sql) + e := db.GetMysqlClient().Query2(sql,&memo) + if nil != e { + logs.Error(e.Error()) + return nil,e + } + return memo,nil +} \ No newline at end of file