From 31ad9a7e8bf9b60c5a26f6408a5455c10bb5b9e4 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 21 八月 2023 10:47:22 +0800
Subject: [PATCH] 下发工艺参数模拟改真实写入
---
conf/config.go | 33 ++++++++++-----------------------
1 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/conf/config.go b/conf/config.go
index 4e9f6b0..0216051 100644
--- a/conf/config.go
+++ b/conf/config.go
@@ -3,7 +3,6 @@
import (
"apsClient/pkg/convertx"
"apsClient/pkg/logx"
- "apsClient/pkg/redisx"
"apsClient/pkg/sqlitex"
"github.com/spf13/viper"
"log"
@@ -25,13 +24,6 @@
System struct {
Env string // 鐜鍊� develop test public
Port int // 绔彛
- DbType string // 鏁版嵁搴撶被鍨�
- UseMultipoint bool // 澶氱偣鐧诲綍鎷︽埅
- UseRedis bool // 浣跨敤redis
- LimitCountIP int
- LimitTimeIP int
- RouterPrefix string // 璺敱鍓嶇紑
- SudoPassword string // sudo瀵嗙爜
DeviceId string //璁惧id
NetSetShellPath string //缃戠粶璁剧疆鑴氭湰璺緞
NetUpShellName string //缃戠粶鍋滅敤鑴氭湰
@@ -74,6 +66,11 @@
NsqlookupdAddr string
}
+ PLCAddressItem struct {
+ FieldName string
+ Address int
+ }
+
config struct {
// 绯荤粺閰嶇疆
System System
@@ -84,22 +81,14 @@
// mysql閰嶇疆
Sqlite sqlitex.Conf
- // redis閰嶇疆
- Redis redisx.Conf
-
- // etcd閰嶇疆
- Etcd Etcd
-
- // rancher閰嶇疆
- Rancher Rancher
-
- // k8s閰嶇疆
- K8s K8s
-
//Services Address
Services Services
+ //NsqConf
NsqConf nsqConf
+
+ //PLC write address
+ PLCAddresses []PLCAddressItem
}
)
@@ -138,8 +127,6 @@
log.Println("......................................................")
log.Printf(" System: %+v", Conf.System)
log.Printf(" Log: %+v", Conf.Log)
- log.Printf(" etcd: %+v", Conf.Etcd)
- log.Printf(" rancher: %+v", Conf.Rancher)
- log.Printf(" k8s: %+v", Conf.K8s)
+ log.Printf(" plc address: %+v", Conf.PLCAddresses)
log.Println("......................................................")
}
--
Gitblit v1.8.0