From 369026325416d187b7b0a0fbe8b5fd1895515bbb Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 22 八月 2023 18:18:15 +0800
Subject: [PATCH] 获取工艺参数用nsq方式获取
---
conf/config.go | 47 ++++++++++++++++-------------------------------
1 files changed, 16 insertions(+), 31 deletions(-)
diff --git a/conf/config.go b/conf/config.go
index c28317b..0216051 100644
--- a/conf/config.go
+++ b/conf/config.go
@@ -3,8 +3,6 @@
import (
"apsClient/pkg/convertx"
"apsClient/pkg/logx"
- "apsClient/pkg/mysqlx"
- "apsClient/pkg/redisx"
"apsClient/pkg/sqlitex"
"github.com/spf13/viper"
"log"
@@ -24,16 +22,12 @@
type (
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
+ Env string // 鐜鍊� develop test public
+ Port int // 绔彛
+ DeviceId string //璁惧id
+ NetSetShellPath string //缃戠粶璁剧疆鑴氭湰璺緞
+ NetUpShellName string //缃戠粶鍋滅敤鑴氭湰
+ NetDownShellName string //缃戠粶寮�鍚剼鏈�
}
Etcd struct {
@@ -72,6 +66,11 @@
NsqlookupdAddr string
}
+ PLCAddressItem struct {
+ FieldName string
+ Address int
+ }
+
config struct {
// 绯荤粺閰嶇疆
System System
@@ -80,27 +79,16 @@
Log logx.Conf
// mysql閰嶇疆
- Mysql mysqlx.Conf
-
- // 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
}
)
@@ -139,9 +127,6 @@
log.Println("......................................................")
log.Printf(" System: %+v", Conf.System)
log.Printf(" Log: %+v", Conf.Log)
- log.Printf(" Mysql: %+v", Conf.Mysql)
- 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