diff --git a/business/jxstore/event/event_tcp.go b/business/jxstore/event/event_tcp.go index 93c66e361..3cebbabce 100644 --- a/business/jxstore/event/event_tcp.go +++ b/business/jxstore/event/event_tcp.go @@ -7,7 +7,6 @@ import ( "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/globals" - "github.com/astaxie/beego/client/orm" "io" "net" "strconv" @@ -48,12 +47,7 @@ type TcpClient struct { s *sync.RWMutex } -func Init() { - listenTcp() - go handleTcpMessages() -} - -func listenTcp() { +func ListenTcp() { tcpClient.Clients = make(map[string]net.Conn) l, err := net.Listen("tcp", ":8000") if err != nil { @@ -76,7 +70,6 @@ func handleConn(c net.Conn) { printNo string //打印机编号 db = dao.GetDB() ) - db.Db = orm.NewOrmUsingDB("api") //读写这个库 if c == nil { globals.SugarLogger.Debugf("conn is nil") return @@ -145,14 +138,13 @@ func changePrintMsg(db *dao.DaoDB, data string) (err error) { return err } -func handleTcpMessages() { +func HandleTcpMessages() { var ( db = dao.GetDB() offset, pageSize = 0, 10 c net.Conn data []byte ) - db.Db = orm.NewOrmUsingDB("api") //读写这个库 for { //一直读? var err error diff --git a/conf/app.conf b/conf/app.conf index 87548d77b..1dd3ff89d 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -275,7 +275,7 @@ pddAppSecret = "fa40c1fe356eebc1376ace1d2380ed44e553c602" httpport = 8088 EnableDocs = false -dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true" +dbConnectStr = "root:WebServer@1@tcp(gold1.jxc4.com:3306)/api?charset=utf8mb4&loc=Local&parseTime=true" enableStoreWrite = true enableJdStoreWrite = true diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go index c4c7a349f..a3636bb0f 100644 --- a/globals/beegodb/beegodb.go +++ b/globals/beegodb/beegodb.go @@ -10,7 +10,7 @@ import ( func Init() { // set default database orm.RegisterDataBase("default", "mysql", beego.AppConfig.String("dbConnectStr")) - orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(gold1.jxc4.com:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") + //orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(gold1.jxc4.com:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") //用户 orm.RegisterModel(&model.AuthBind{}, &model.User{}) diff --git a/main.go b/main.go index 29c8f5682..d4e018176 100644 --- a/main.go +++ b/main.go @@ -115,8 +115,8 @@ func main() { } } }) + cms.ResetJobTimers() } - cms.ResetJobTimers() if beego.BConfig.RunMode != "prod" { beego.BConfig.WebConfig.DirectoryIndex = true beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger" @@ -129,7 +129,8 @@ func main() { } }() if globals.IsPrintEnv() { - event.Init() + event.ListenTcp() + go event.HandleTcpMessages() } beego.Run() }