From 1873461012c99801f364bd07fae2c218d245048e Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期一, 11 九月 2023 19:42:39 +0800
Subject: [PATCH] 修复bom第一启动时的全量上报
---
main.go | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/main.go b/main.go
index 2cb348c..c8c8aaf 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,8 @@
package main
import (
+ "kingdee-dbapi/report"
+ "kingdee-dbapi/webserver"
"os"
"strings"
@@ -16,10 +18,8 @@
)
func main() {
- logger.InitLog("kingdee-dbapi.log", "debug", 15, false)
- logger.Info("kdingdee-dbapi start!")
-
- os.Setenv("GODEBUG", "tls10default=1")
+ logger.InitLog("log/kingdee-dbapi.log", "debug", 15, false)
+ logger.Info("kingdee-dbapi start!")
config.Load()
@@ -38,10 +38,29 @@
defer kingdee.CloseDB()
// 鍒涘缓绐楀彛骞惰繍琛�
- window := gui.NewDisplay()
+ dbConnectedChan := make(chan bool)
+ window := gui.NewDisplay(dbConnectedChan)
+
+ // 鏁版嵁搴撹繛鎺ユ垚鍔熷悗鍚姩鍏朵粬鏈嶅姟
+ go onSqlServerConnected(dbConnectedChan)
+
window.ShowMainWindow()
}
+func onSqlServerConnected(dbConnectedChan chan bool) {
+ <-dbConnectedChan
+
+ logger.Debug("鏁版嵁搴撳凡杩炴帴, 鍚姩鎺ュ彛鏈嶅姟")
+ report.Start()
+
+ // 寮�鍚闃匰QL鏌ヨ
+ go nsqclient.InitNsqConsumer(config.Options.SqlQueryTopic, "sensor01", kingdee.SqlQueryHandle)
+ go nsqclient.InitNsqConsumer(config.Options.CSTQueryTopic, "sensor01", kingdee.CSTQueryHandle)
+ go nsqclient.InitNsqConsumer(config.Options.BomQueryTopic, "sensor01", report.HandleBomQuery)
+
+ go webserver.Serve(config.Options.WebPort)
+}
+
func setFont() {
fontPaths := findfont.List()
--
Gitblit v1.8.0