From 704fb336e658fe9cd3fd2e7af99bac45a3a5247c Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Tue, 15 Jun 2021 15:00:00 +0800
Subject: [PATCH] aa

---
 controllers/print_controller.go | 18 ------------------
 main.go                         | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/controllers/print_controller.go b/controllers/print_controller.go
index 937bbf81d..80c1b6613 100644
--- a/controllers/print_controller.go
+++ b/controllers/print_controller.go
@@ -4,8 +4,6 @@ import (
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/globals"
 	beego "github.com/astaxie/beego/server/web"
-	"github.com/gorilla/websocket"
-	"net/http"
 )
 
 type PrintController struct {
@@ -17,26 +15,10 @@ type CallBackPrint struct {
 	Code string `json:"code"`
 }
 
-// 配置升级程序(升级为websocket)
-var upgrader2 = websocket.Upgrader{}
-
 func (c *PrintController) Msg() {
-	// 解决跨域问题(微信小程序)
-	upgrader2.CheckOrigin = func(r *http.Request) bool {
-		return true
-	}
-	//升级将HTTP服务器连接升级到WebSocket协议。
-	//responseHeader包含在对客户端升级的响应中
-	//请求。使用responseHeader指定Cookie（设置Cookie）和
-	//应用程序协商的子目录（Sec WebSocket协议）。
-	//如果升级失败，则升级将向客户端答复一个HTTP错误
-	_, err := upgrader2.Upgrade(c.Ctx.ResponseWriter, c.Ctx.Request, nil)
 	//if c.Ctx.Input.Method() == http.MethodPost {
 	callBackPrint := &CallBackPrint{}
 	globals.SugarLogger.Debugf("print callback callbackResponse:%s", utils.Format4Output(c.Ctx.Request, true))
-	if err != nil {
-		callBackPrint.Data = err.Error()
-	}
 	c.Data["json"] = callBackPrint
 	c.ServeJSON()
 	//} else {
diff --git a/main.go b/main.go
index b4158a98c..d6c55375d 100644
--- a/main.go
+++ b/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net"
 	"net/http"
 	_ "net/http/pprof"
 	"os"
@@ -139,6 +140,20 @@ func main() {
 		go func() {
 			if globals.IsMainProductEnv() {
 				http.ListenAndServe("0.0.0.0:6061", nil)
+				l, err := net.Listen("tcp", "http://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)
+				}
 			} else {
 				http.ListenAndServe("0.0.0.0:6060", nil)
 			}
@@ -146,3 +161,10 @@ func main() {
 		beego.Run()
 	}
 }
+
+func handleConn(c net.Conn) {
+	defer c.Close()
+	for {
+		globals.SugarLogger.Debugf("tcp socket read:", utils.Format4Output(c, true))
+	}
+}