diff --git a/business/jxstore/cms/temp.go b/business/jxstore/cms/temp.go index d79389ee6..5d2ac294f 100644 --- a/business/jxstore/cms/temp.go +++ b/business/jxstore/cms/temp.go @@ -1,20 +1 @@ package cms - -import ( - "fmt" - "net" -) - -func TestTemp() { - conn, err := net.Dial("tcp", "print.jxcs.net:8000") - if err != nil { - fmt.Println("client err=", err) - return - } - defer conn.Close() // 关闭连接 - //将line发送给服务器 - _, err = conn.Write([]byte("aaaa")) - if err != nil { - fmt.Println("conn.write err=", err) - } -} diff --git a/controllers/job_controller.go b/controllers/job_controller.go index 8e4dc2dfe..b2643cced 100644 --- a/controllers/job_controller.go +++ b/controllers/job_controller.go @@ -547,7 +547,7 @@ func (c *JobController) RefreshJdDelivery() { func (c *JobController) TempJob() { c.callTempJob(func(params *tJobTempJobParams) (retVal interface{}, errCode string, err error) { //cms.TempJob() - cms.TestTemp() + //cms.TestTemp() return retVal, "", err }) } diff --git a/controllers/print_controller.go b/controllers/print_controller.go index 80c1b6613..23976c00b 100644 --- a/controllers/print_controller.go +++ b/controllers/print_controller.go @@ -1,9 +1,13 @@ package controllers import ( + "bufio" + "fmt" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/globals" beego "github.com/astaxie/beego/server/web" + "io" + "net" ) type PrintController struct { @@ -17,6 +21,20 @@ type CallBackPrint struct { func (c *PrintController) Msg() { //if c.Ctx.Input.Method() == http.MethodPost { + l, err := net.Listen("tcp", "print.jxcs.net:8000") + if err != nil { + fmt.Println("listen error:", err) + return + } + for { + c, err := l.Accept() + if err != nil { + fmt.Println("accept error:", err) + break + } + globals.SugarLogger.Debugf("tcp socket:", utils.Format4Output(c, true)) + go handleConn(c) + } callBackPrint := &CallBackPrint{} globals.SugarLogger.Debugf("print callback callbackResponse:%s", utils.Format4Output(c.Ctx.Request, true)) c.Data["json"] = callBackPrint @@ -25,3 +43,27 @@ func (c *PrintController) Msg() { // c.Abort("404") //} } + +func handleConn(c net.Conn) { + if c == nil { + fmt.Println("conn is nil") + return + } + defer c.Close() + reader := bufio.NewReader(c) + for { + //ReadString阻塞,直到读到\n + msg, err := reader.ReadString('\n') + if err != nil { + if err == io.EOF { + fmt.Println("connection close") + } else { + fmt.Println("ReadString err", err) + } + return + } + fmt.Println("read data:", msg) + b := []byte("ok") + c.Write(b) + } +} diff --git a/main.go b/main.go index d512bb22a..b4158a98c 100644 --- a/main.go +++ b/main.go @@ -1,11 +1,8 @@ package main import ( - "bufio" "flag" "fmt" - "io" - "net" "net/http" _ "net/http/pprof" "os" @@ -146,44 +143,6 @@ func main() { http.ListenAndServe("0.0.0.0:6060", nil) } }() - l, err := net.Listen("tcp", "print.jxcs.net:8000") - if err != nil { - fmt.Println("listen error:", err) - return - } - for { - c, err := l.Accept() - if err != nil { - fmt.Println("accept error:", err) - break - } - globals.SugarLogger.Debugf("tcp socket:", utils.Format4Output(c, true)) - go handleConn(c) - } beego.Run() } } - -func handleConn(c net.Conn) { - if c == nil { - fmt.Println("conn is nil") - return - } - defer c.Close() - reader := bufio.NewReader(c) - for { - //ReadString阻塞,直到读到\n - msg, err := reader.ReadString('\n') - if err != nil { - if err == io.EOF { - fmt.Println("connection close") - } else { - fmt.Println("ReadString err", err) - } - return - } - fmt.Println("read data:", msg) - b := []byte("ok") - c.Write(b) - } -}