From 59e6096769bc175516c1bcbbc12e4711d1ff294c Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 15 八月 2023 18:08:17 +0800
Subject: [PATCH] 调整代码结构
---
gui/gui.go | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/gui/gui.go b/gui/gui.go
index 94048e8..50080f0 100644
--- a/gui/gui.go
+++ b/gui/gui.go
@@ -6,10 +6,7 @@
"kingdee-dbapi/config"
"kingdee-dbapi/kingdee"
"kingdee-dbapi/logger"
- "kingdee-dbapi/nsqclient"
- "kingdee-dbapi/report"
"kingdee-dbapi/static"
- "kingdee-dbapi/webserver"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/app"
@@ -25,7 +22,7 @@
FullScreen bool
}
-func NewDisplay() *Display {
+func NewDisplay(dbConnectedChan chan bool) *Display {
a := app.New()
// 璁剧疆鍥炬爣
@@ -66,6 +63,7 @@
// //myWindow.Close()
//},
}
+
var submitBtn *widget.Button
submitBtn = widget.NewButtonWithIcon("鍚姩", theme.MailSendIcon(), func() {
config.Options.WebPort = strings.Trim(serverPort.Text, " ")
@@ -87,13 +85,7 @@
submitBtn.Text = "宸插惎鍔�"
submitBtn.Disable()
- report.Start()
-
- // 寮�鍚闃匰QL鏌ヨ
- go nsqclient.InitNsqConsumer(config.Options.SqlQueryTopic, "sensor01", kingdee.SqlQueryHandle)
- go nsqclient.InitNsqConsumer(config.Options.CSTQueryTopic, "sensor01", kingdee.CSTQueryHandle)
-
- go webserver.Serve(serverPort.Text)
+ dbConnectedChan <- true
})
content := container.New(layout.NewGridWrapLayout(fyne.NewSize(300, 200)), form)
--
Gitblit v1.8.0