Browse Source

style(server): fmt print to log

lejianwen 1 year ago
parent
commit
63f2fd2f07
2 changed files with 4 additions and 5 deletions
  1. 1 1
      http/controller/admin/rustdesk.go
  2. 3 4
      service/serverCmd.go

+ 1 - 1
http/controller/admin/rustdesk.go

@@ -103,7 +103,7 @@ func (r *Rustdesk) SendCmd(c *gin.Context) {
103
 	rc := &RustdeskCmd{}
103
 	rc := &RustdeskCmd{}
104
 	c.ShouldBindJSON(rc)
104
 	c.ShouldBindJSON(rc)
105
 	if rc.Cmd == "" {
105
 	if rc.Cmd == "" {
106
-		response.Fail(c, 101, "cmd is required")
106
+		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError"))
107
 		return
107
 		return
108
 	}
108
 	}
109
 	res, err := service.AllService.ServerCmdService.SendCmd(rc.Cmd, rc.Option)
109
 	res, err := service.AllService.ServerCmdService.SendCmd(rc.Cmd, rc.Option)

+ 3 - 4
service/serverCmd.go

@@ -3,7 +3,6 @@ package service
3
 import (
3
 import (
4
 	"Gwen/global"
4
 	"Gwen/global"
5
 	"Gwen/model"
5
 	"Gwen/model"
6
-	"fmt"
7
 	"net"
6
 	"net"
8
 	"time"
7
 	"time"
9
 )
8
 )
@@ -66,14 +65,14 @@ func (is *ServerCmdService) SendSocketCmd(ty string, cmd string) (string, error)
66
 	}
65
 	}
67
 	conn, err := net.Dial(tcp, addr+":21115")
66
 	conn, err := net.Dial(tcp, addr+":21115")
68
 	if err != nil {
67
 	if err != nil {
69
-		fmt.Printf("connect to id %s server failed: %v\n", ty, err)
68
+		global.Logger.Debugf("%s connect to id server failed: %v", ty, err)
70
 		return "", err
69
 		return "", err
71
 	}
70
 	}
72
 	defer conn.Close()
71
 	defer conn.Close()
73
 	//发送命令
72
 	//发送命令
74
 	_, err = conn.Write([]byte(cmd))
73
 	_, err = conn.Write([]byte(cmd))
75
 	if err != nil {
74
 	if err != nil {
76
-		fmt.Printf("send cmd failed: %v\n", err)
75
+		global.Logger.Debugf("%s send cmd failed: %v", ty, err)
77
 		return "", err
76
 		return "", err
78
 	}
77
 	}
79
 	time.Sleep(100 * time.Millisecond)
78
 	time.Sleep(100 * time.Millisecond)
@@ -81,7 +80,7 @@ func (is *ServerCmdService) SendSocketCmd(ty string, cmd string) (string, error)
81
 	buf := make([]byte, 1024)
80
 	buf := make([]byte, 1024)
82
 	n, err := conn.Read(buf)
81
 	n, err := conn.Read(buf)
83
 	if err != nil && err.Error() != "EOF" {
82
 	if err != nil && err.Error() != "EOF" {
84
-		fmt.Printf("read response failed: %v\n", err)
83
+		global.Logger.Debugf("%s read response failed: %v", ty, err)
85
 		return "", err
84
 		return "", err
86
 	}
85
 	}
87
 	return string(buf[:n]), nil
86
 	return string(buf[:n]), nil