修复修改及run问题

This commit is contained in:
junleea 2024-07-05 16:55:57 +08:00
parent 77b76caf39
commit 69a25507e8
2 changed files with 12 additions and 2 deletions

View File

@ -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
}

View File

@ -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"})
}