1
This commit is contained in:
@@ -92,7 +92,7 @@ func (t *TcpClient) handleConn(c net.Conn) error {
|
||||
if t.getClients(printNo) == nil {
|
||||
t.addConn(c, printNo, status)
|
||||
t.buildAllMap(printNo)
|
||||
//t.TimeoutMap[printNo] <- true
|
||||
t.TimeoutMap[printNo] <- true
|
||||
t.HandleTcpMessages(printNo)
|
||||
t.doPrint(printNo)
|
||||
if status == printerStatusOnline {
|
||||
|
||||
38
main.go
38
main.go
@@ -3,7 +3,11 @@ package main
|
||||
import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"git.rosy.net.cn/baseapi/platformapi/dingdingapi"
|
||||
"git.rosy.net.cn/baseapi/utils"
|
||||
"git.rosy.net.cn/jx-callback/business/jxstore/event"
|
||||
"git.rosy.net.cn/jx-callback/business/jxutils/tasks"
|
||||
"git.rosy.net.cn/jx-callback/globals/api"
|
||||
"net/http"
|
||||
_ "net/http/pprof"
|
||||
"os"
|
||||
@@ -97,21 +101,21 @@ func main() {
|
||||
if !checkCmdFlags() {
|
||||
Init()
|
||||
// 延时的原因是等回调准备好
|
||||
//if globals.IsMainProductEnv() || beego.BConfig.RunMode == "beta" {
|
||||
// utils.AfterFuncWithRecover(2*time.Second, func() {
|
||||
// if err := tasks.RefreshDingDingToken(); err != nil {
|
||||
// globals.SugarLogger.Errorf("RefreshDingDingToken failed with error:%s", err)
|
||||
// return
|
||||
// }
|
||||
// if globals.IsProductEnv() {
|
||||
// api.DingDingAPI.DeleteCallback()
|
||||
// if err := api.DingDingAPI.RegisterCallback([]string{dingdingapi.CBTagUserAddOrg, dingdingapi.CBTagUserModifyOrg, dingdingapi.CBTagUserLeaveOrg}, beego.AppConfig.DefaultString("dingdingCallbackToken", ""), beego.AppConfig.DefaultString("dingdingCallbackAESKey", ""), beego.AppConfig.DefaultString("dingdingCallbackURL", "")); err != nil {
|
||||
// globals.SugarLogger.Warnf("dingding RegisterCallback failed with error:%v", err)
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
// cms.ResetJobTimers()
|
||||
//}
|
||||
if globals.IsMainProductEnv() || beego.BConfig.RunMode == "beta" {
|
||||
utils.AfterFuncWithRecover(2*time.Second, func() {
|
||||
if err := tasks.RefreshDingDingToken(); err != nil {
|
||||
globals.SugarLogger.Errorf("RefreshDingDingToken failed with error:%s", err)
|
||||
return
|
||||
}
|
||||
if globals.IsProductEnv() {
|
||||
api.DingDingAPI.DeleteCallback()
|
||||
if err := api.DingDingAPI.RegisterCallback([]string{dingdingapi.CBTagUserAddOrg, dingdingapi.CBTagUserModifyOrg, dingdingapi.CBTagUserLeaveOrg}, beego.AppConfig.DefaultString("dingdingCallbackToken", ""), beego.AppConfig.DefaultString("dingdingCallbackAESKey", ""), beego.AppConfig.DefaultString("dingdingCallbackURL", "")); err != nil {
|
||||
globals.SugarLogger.Warnf("dingding RegisterCallback failed with error:%v", err)
|
||||
}
|
||||
}
|
||||
})
|
||||
cms.ResetJobTimers()
|
||||
}
|
||||
if beego.BConfig.RunMode != "prod" {
|
||||
beego.BConfig.WebConfig.DirectoryIndex = true
|
||||
beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
|
||||
@@ -124,9 +128,9 @@ func main() {
|
||||
}
|
||||
}()
|
||||
|
||||
//if globals.IsPrintEnv() {
|
||||
if globals.IsPrintEnv() {
|
||||
event.ListenTcp()
|
||||
//}
|
||||
}
|
||||
beego.Run()
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user