Merge branch 'refs/heads/feat-cmd' into release
This commit is contained in:
commit
757062b65f
|
|
@ -45,7 +45,7 @@ func (s *ShellHandler) CreateShell(c *gin.Context) {
|
||||||
user_id, _ := c.Get("id")
|
user_id, _ := c.Get("id")
|
||||||
uid := int(user_id.(float64))
|
uid := int(user_id.(float64))
|
||||||
var req CreateShellReq
|
var req CreateShellReq
|
||||||
if err := c.ShouldBindJSON(&req); err != nil {
|
if err := c.ShouldBind(&req); err != nil {
|
||||||
c.JSON(200, gin.H{"code": proto.ShellCreateFailed, "message": "参数错误", "data": err.Error()})
|
c.JSON(200, gin.H{"code": proto.ShellCreateFailed, "message": "参数错误", "data": err.Error()})
|
||||||
} else {
|
} else {
|
||||||
id := service.CreateShell(req.ShellName, req.ShellContent, req.Server, uid)
|
id := service.CreateShell(req.ShellName, req.ShellContent, req.Server, uid)
|
||||||
|
|
@ -68,7 +68,7 @@ func (s *ShellHandler) UpdateShell(c *gin.Context) {
|
||||||
var req UpdateShellReqV2
|
var req UpdateShellReqV2
|
||||||
userId, _ := c.Get("id")
|
userId, _ := c.Get("id")
|
||||||
id := int(userId.(float64))
|
id := int(userId.(float64))
|
||||||
if err := c.ShouldBindJSON(&req); err != nil {
|
if err := c.ShouldBind(&req); err != nil {
|
||||||
c.JSON(200, gin.H{"code": proto.ShellUpdateFailed, "message": "参数错误", "data": err.Error()})
|
c.JSON(200, gin.H{"code": proto.ShellUpdateFailed, "message": "参数错误", "data": err.Error()})
|
||||||
} else {
|
} else {
|
||||||
var resp []UpdateShellResp
|
var resp []UpdateShellResp
|
||||||
|
|
@ -91,7 +91,7 @@ func (s *ShellHandler) ServerWillRun(c *gin.Context) {
|
||||||
userId, _ := c.Get("id")
|
userId, _ := c.Get("id")
|
||||||
id := int(userId.(float64))
|
id := int(userId.(float64))
|
||||||
var req ServerWillRunReq
|
var req ServerWillRunReq
|
||||||
if err := c.ShouldBindJSON(&req); err != nil {
|
if err := c.ShouldBind(&req); err != nil {
|
||||||
c.JSON(200, gin.H{"code": proto.ShellUpdateFailed, "message": "参数错误", "data": err.Error()})
|
c.JSON(200, gin.H{"code": proto.ShellUpdateFailed, "message": "参数错误", "data": err.Error()})
|
||||||
} else {
|
} else {
|
||||||
willRunShells, err2 := service.FindShellWillRunByServer(req.Server, id)
|
willRunShells, err2 := service.FindShellWillRunByServer(req.Server, id)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue