From 0718b07276198334437f52aa5c6c07cca2002225 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 10 八月 2023 18:17:32 +0800
Subject: [PATCH] 完善数据上报程序, 添加测试
---
config/config.go | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/config/config.go b/config/config.go
index 091e4f8..a963dd8 100644
--- a/config/config.go
+++ b/config/config.go
@@ -9,12 +9,12 @@
)
type Config struct {
- NsqServer string `json:"nsq_server"` // nsq TCP鏈嶅姟绔湴鍧�
- PubPLCDataTopic string `json:"plc_data_topic"` // 鍙戝竷plc鏁版嵁鐨則opic
- PLCSetTopic string `json:"plc_set_topic"` // 鎺ユ敹plc閰嶇疆鏁版嵁鐨則opic
- SubDeviceTopic string `json:"sub_device_topic"` // 鎺ユ敹璁惧鍙樻洿閫氱煡鐨則opic
- ApsDeviceWebApi string `json:"aps_device_webapi"` // 鑾峰彇璁惧鍒楄〃鐨勬帴鍙�, aps 鎻愪緵, http鎺ュ彛
- ApsPLCDataWebApi string `json:"aps_plc_data_webapi"` // 涓婁紶缁檃ps plc鏁版嵁鐨勬帴鍙ｅ湴鍧�. aps 鎻愪緵, http鎺ュ彛
+ NsqServer string `json:"nsq_server"` // nsq TCP鏈嶅姟绔湴鍧�
+ PubPLCDataTopic string `json:"pub_plc_data_topic"` // 鍙戝竷plc鏁版嵁鐨則opic
+ WritePLCDataTopic string `json:"write_plc_data_topic"` // 鎺ユ敹plc閰嶇疆鏁版嵁鐨則opic
+ SubDeviceTopic string `json:"sub_device_topic"` // 鎺ユ敹璁惧鍙樻洿閫氱煡鐨則opic
+ DeviceListWebApi string `json:"device_List_webapi"` // 鑾峰彇璁惧鍒楄〃鐨勬帴鍙�, aps 鎻愪緵, http鎺ュ彛
+ PostPLCDataWebApi string `json:"post_plc_data_webapi"` // 涓婁紶缁檃ps plc鏁版嵁鐨勬帴鍙ｅ湴鍧�. aps 鎻愪緵, http鎺ュ彛
}
const configPath = "config.json"
@@ -24,9 +24,10 @@
func DefaultConfig() {
Options.NsqServer = "fai365.com:4150"
Options.PubPLCDataTopic = "aps.factory.plc.livedata"
- Options.PLCSetTopic = ""
- Options.ApsDeviceWebApi = ""
- Options.ApsPLCDataWebApi = ""
+ Options.WritePLCDataTopic = "aps.factory.plc.write"
+ Options.SubDeviceTopic = ""
+ Options.DeviceListWebApi = "aps.factory.plc.device"
+ Options.PostPLCDataWebApi = ""
}
func Load() {
--
Gitblit v1.8.0