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 | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/main.go b/main.go
index 5f73f19..c8c8aaf 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,8 @@
package main
import (
+ "kingdee-dbapi/report"
+ "kingdee-dbapi/webserver"
"os"
"strings"
@@ -16,8 +18,8 @@
)
func main() {
- logger.InitLog("kdingdee-dbapi.log", "debug", 15, false)
- logger.Info("playletServer start!")
+ logger.InitLog("log/kingdee-dbapi.log", "debug", 15, false)
+ logger.Info("kingdee-dbapi start!")
config.Load()
@@ -30,17 +32,33 @@
// 鍒濆鍖杗sq
nsqclient.InitNsqProducer()
- // 寮�鍚闃�
- go nsqclient.InitNsqConsumer(config.Options.QueryTopic, "sensor01", kingdee.QueryMsgHandle)
-
// 璁剧疆涓枃瀛椾綋
setFont()
defer os.Unsetenv("FYNE_FONT")
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() {
@@ -50,6 +68,13 @@
// 寰蒋闆呴粦-甯歌
if strings.Contains(path, "msyh.ttf") {
os.Setenv("FYNE_FONT", path)
+
+ break
+ }
+ // 榛戜綋-甯歌
+ if strings.Contains(path, "simhei.ttf") {
+ os.Setenv("FYNE_FONT", path)
+
break
}
}
--
Gitblit v1.8.0