From 69a25507e805c6664865e49b182608733e22533b Mon Sep 17 00:00:00 2001 From: junleea <354425203@qq.com> Date: Fri, 5 Jul 2024 16:55:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9=E5=8F=8Aru?= =?UTF-8?q?n=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/db.go | 8 ++++++++ handler/cid.go | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dao/db.go b/dao/db.go index 344e21e..5bf9c7f 100644 --- a/dao/db.go +++ b/dao/db.go @@ -32,6 +32,14 @@ func Init() { if err != nil { fmt.Println("logger table:", err) } // 自动迁移,创建表,如果表已经存在,会自动更新表结构,不会删除表,只会创建不存在的表 + err = db.AutoMigrate(&CID{}) + if err != nil { + fmt.Println("cid table:", err) + } // 自动迁移,创建表,如果表已经存在,会自动更新表结构,不会删除表,只会创建不存在的表 + err = db.AutoMigrate(&CIDRunLog{}) + if err != nil { + fmt.Println("cidrunlog table:", err) + } // 自动迁移,创建表,如果表已经存在,会自动更新表结构,不会删除表,只会创建不存在的表 DB = db } diff --git a/handler/cid.go b/handler/cid.go index f701622..f3421de 100644 --- a/handler/cid.go +++ b/handler/cid.go @@ -2,6 +2,7 @@ package handler import ( "bytes" + "fmt" "github.com/gin-gonic/gin" "os/exec" "regexp" @@ -29,7 +30,7 @@ type CIDUpdateReq struct { Name string `json:"name" form:"name"` Url string `json:"url" form:"url"` Script string `json:"script" form:"script"` - Token string `json:"token" form:"token"` + Token string `json:"cidtoken" form:"cidtoken"` } func SetUpCIDGroup(router *gin.Engine) { @@ -70,6 +71,7 @@ func RunCID(c *gin.Context) { //执行脚本 cmd := exec.Command("/bin/bash", "-c", scriptContent) err3 := cmd.Run() + fmt.Println("bash content:", scriptContent) // 使用bytes.Buffer捕获输出 var out bytes.Buffer cmd.Stdout = &out @@ -92,7 +94,7 @@ func CreateCID(c *gin.Context) { res := dao.CreateCID(req.Name, req.Url, req.Script, token, authID) if res != 0 { - c.JSON(200, gin.H{}) + c.JSON(200, gin.H{"code": proto.SuccessCode, "message": "success", "data": res}) } else { c.JSON(200, gin.H{"error": "CreateCID failed", "code": proto.OperationFailed, "message": "failed"}) }