From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:58:17 +0800
Subject: [PATCH] fix
---
main.go | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/main.go b/main.go
index b1a14d7..39420ab 100644
--- a/main.go
+++ b/main.go
@@ -11,10 +11,10 @@
"apsClient/router"
"apsClient/serf"
"apsClient/service"
- "apsClient/service/plc_address"
"fmt"
"log"
"net/http"
+ _ "net/http/pprof"
"time"
)
@@ -29,7 +29,7 @@
}
//鍔犺浇plc鍐欏叆鍦板潃
- plc_address.LoadAddressFromFile()
+ //plc_address.LoadAddressFromFile()
// 鍚姩鏁版嵁鍚屾
var serfStartChan = make(chan bool)
@@ -43,6 +43,10 @@
"task_status_sync",
"device",
"device_plc",
+ "system_status",
+ "process_model_plc_address",
+ "reports_to_cloud",
+ "report_work",
}
agent := serf.InitAgent("apsClient", syncTables, sqlitex.GetDB())
@@ -54,12 +58,17 @@
return
}
- //浠庢枃浠堕噷璇诲彇褰撳墠鐢熶骇璁惧id
- conf.Conf.CurrentDeviceID = service.ReadDeviceIDFromFile()
- if conf.Conf.CurrentDeviceID == "" {
- conf.Conf.CurrentDeviceID = conf.Conf.System.DeviceId
+ //浠庢枃浠堕噷璇诲彇褰撳墠鐢熶骇璁惧id鑾峰彇璁惧鍒楄〃绗竴涓�
+ err := service.InitCurrentDeviceID(serf.Vasystem.ServerID)
+ if err != nil {
+ logx.Errorf("InitCurrentDeviceID error: %v, exit", err)
+ return
}
+ go func() {
+ service.ReportsSystemDeviceToCloud(serf.Vasystem.ServerID)
+ }()
+
// 鍒ゆ柇褰撳墠闆嗙兢鐘舵��
logx.Infof("current agent.ClusterStatus:%v", agent.ClusterStatus)
log.Println("current agent.ClusterStatus:", agent.ClusterStatus)
--
Gitblit v1.8.0