Merge branch 'refs/heads/feat-cmd' into release
This commit is contained in:
commit
269e8d70f1
|
|
@ -2,6 +2,7 @@ package handler
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"log"
|
||||||
"videoplayer/proto"
|
"videoplayer/proto"
|
||||||
"videoplayer/service"
|
"videoplayer/service"
|
||||||
)
|
)
|
||||||
|
|
@ -94,6 +95,7 @@ func (s *ShellHandler) ServerWillRun(c *gin.Context) {
|
||||||
if err := c.ShouldBind(&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 {
|
||||||
|
log.Printf("ServerWillRunReq:%s,id:%d", req.Server, id)
|
||||||
willRunShells, err2 := service.FindShellWillRunByServer(req.Server, id)
|
willRunShells, err2 := service.FindShellWillRunByServer(req.Server, id)
|
||||||
if err2 != nil {
|
if err2 != nil {
|
||||||
c.JSON(200, gin.H{"code": proto.ShellUpdateFailed, "message": "获取失败", "data": err2.Error()})
|
c.JSON(200, gin.H{"code": proto.ShellUpdateFailed, "message": "获取失败", "data": err2.Error()})
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue