liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2023-03-16 15:34:34 +08:00
parent 84c1e6806c
commit a39558cac2
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/event/event_tcp.go
View File

@@ -92,7 +92,7 @@ func (t *TcpClient) handleConn(c net.Conn) error {
if t.getClients(printNo) == nil { if t.getClients(printNo) == nil {
t.addConn(c, printNo, status) t.addConn(c, printNo, status)
t.buildAllMap(printNo) t.buildAllMap(printNo)
//t.TimeoutMap[printNo] <- true t.TimeoutMap[printNo] <- true
t.HandleTcpMessages(printNo) t.HandleTcpMessages(printNo)
t.doPrint(printNo) t.doPrint(printNo)
if status == printerStatusOnline { if status == printerStatusOnline {

40
main.go
View File

@@ -3,7 +3,11 @@ package main
import ( import (
"flag" "flag"
"fmt" "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/jxstore/event"
"git.rosy.net.cn/jx-callback/business/jxutils/tasks"
"git.rosy.net.cn/jx-callback/globals/api"
"net/http" "net/http"
_ "net/http/pprof" _ "net/http/pprof"
"os" "os"
@@ -97,21 +101,21 @@ func main() {
if !checkCmdFlags() { if !checkCmdFlags() {
Init() Init()
// 延时的原因是等回调准备好 // 延时的原因是等回调准备好
//if globals.IsMainProductEnv() || beego.BConfig.RunMode == "beta" { if globals.IsMainProductEnv() || beego.BConfig.RunMode == "beta" {
// utils.AfterFuncWithRecover(2*time.Second, func() { utils.AfterFuncWithRecover(2*time.Second, func() {
// if err := tasks.RefreshDingDingToken(); err != nil { if err := tasks.RefreshDingDingToken(); err != nil {
// globals.SugarLogger.Errorf("RefreshDingDingToken failed with error:%s", err) globals.SugarLogger.Errorf("RefreshDingDingToken failed with error:%s", err)
// return return
// } }
// if globals.IsProductEnv() { if globals.IsProductEnv() {
// api.DingDingAPI.DeleteCallback() 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 { 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) globals.SugarLogger.Warnf("dingding RegisterCallback failed with error:%v", err)
// } }
// } }
// }) })
// cms.ResetJobTimers() cms.ResetJobTimers()
//} }
if beego.BConfig.RunMode != "prod" { if beego.BConfig.RunMode != "prod" {
beego.BConfig.WebConfig.DirectoryIndex = true beego.BConfig.WebConfig.DirectoryIndex = true
beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger" beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
@@ -124,9 +128,9 @@ func main() {
} }
}() }()
//if globals.IsPrintEnv() { if globals.IsPrintEnv() {
event.ListenTcp() event.ListenTcp()
//} }
beego.Run() beego.Run()
} }
} }