From 10c65da3d2af7056f48d9301e83f53f102f76e18 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 30 十月 2023 14:52:11 +0800
Subject: [PATCH] fix
---
conf/config.go | 101 ++++++++++++++++++++++----------------------------
1 files changed, 45 insertions(+), 56 deletions(-)
diff --git a/conf/config.go b/conf/config.go
index f9816ec..1888f21 100644
--- a/conf/config.go
+++ b/conf/config.go
@@ -3,9 +3,7 @@
import (
"apsClient/pkg/convertx"
"apsClient/pkg/logx"
- "apsClient/pkg/mysqlx"
- "apsClient/pkg/redisx"
- "flag"
+ "apsClient/pkg/sqlitex"
"github.com/spf13/viper"
"log"
)
@@ -23,31 +21,13 @@
)
type (
- Captcha struct {
- KeyLong int // 楠岃瘉鐮侀暱搴�
- ImgWidth int // 楠岃瘉鐮佸搴�
- ImgHeight int // 楠岃瘉鐮侀珮搴�
- OpenCaptcha int // 闃茬垎鐮撮獙璇佺爜寮�鍚鏁帮紝0浠ｈ〃姣忔鐧诲綍閮介渶瑕侀獙璇佺爜锛屽叾浠栨暟瀛椾唬琛ㄩ敊璇瘑鐮佹鏁帮紝濡�3浠ｈ〃閿欒涓夋鍚庡嚭鐜伴獙璇佺爜
- OpenCaptchaTimeOut int // 闃茬垎鐮撮獙璇佺爜瓒呮椂鏃堕棿锛屽崟浣嶏細s(绉�)
- }
-
- JWT struct {
- SigningKey string // jwt绛惧悕
- ExpiresTime string // 杩囨湡鏃堕棿
- BufferTime string // 缂撳啿鏃堕棿
- Issuer string // 绛惧彂鑰�
- }
-
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瀵嗙爜
+ Env string // 鐜鍊� develop test public
+ Port int // 绔彛
+ DeviceId string //璁惧id
+ NetSetShellPath string //缃戠粶璁剧疆鑴氭湰璺緞
+ NetUpShellName string //缃戠粶鍋滅敤鑴氭湰
+ NetDownShellName string //缃戠粶寮�鍚剼鏈�
}
Etcd struct {
@@ -76,6 +56,31 @@
IP string // tmp ip
}
+ Services struct {
+ ApsServer string
+ Serial string
+ }
+
+ nsqConf struct {
+ NodeId string
+ NsqdAddr string
+ NsqlookupdAddr string
+ }
+
+ plc struct {
+ FinishNumberTimeInterval int
+ TotalNumberTimeInterval int
+ ModbusIntType string
+ SlaveId int
+ Package string
+ StandbyTime int64
+ }
+
+ Prompt struct {
+ SafeProduce string `json:"safeProduce,omitempty"`
+ PlcNotConnected string `json:"plcNotConnected,omitempty"`
+ }
+
config struct {
// 绯荤粺閰嶇疆
System System
@@ -84,25 +89,18 @@
Log logx.Conf
// mysql閰嶇疆
- Mysql mysqlx.Conf
+ Sqlite sqlitex.Conf
- // redis閰嶇疆
- Redis redisx.Conf
+ //Services Address
+ Services Services
- // 楠岃瘉鐮�
- Captcha Captcha
+ //NsqConf
+ NsqConf nsqConf
- // JWT閰嶇疆
- JWT JWT
+ //PLC
+ PLC plc
- // etcd閰嶇疆
- Etcd Etcd
-
- // rancher閰嶇疆
- Rancher Rancher
-
- // k8s閰嶇疆
- K8s K8s
+ Prompt Prompt
}
)
@@ -112,14 +110,6 @@
)
func init() {
- var configFile string
- flag.StringVar(&configFile, "config", "", "config file in json")
- flag.Parse()
-
- if len(configFile) > 0 {
- configName = configFile
- }
-
Viper = viper.New()
Viper.SetConfigName(configName)
for _, path := range configPaths {
@@ -132,6 +122,9 @@
if err := Viper.Unmarshal(&Conf); err != nil {
log.Fatalf("Unmarshal err:%v", err)
+ }
+ if Conf.PLC.StandbyTime == 0 {
+ Conf.PLC.StandbyTime = 300 //5鍒嗛挓
}
ShowConfig()
}
@@ -149,11 +142,7 @@
log.Println("......................................................")
log.Printf(" System: %+v", Conf.System)
log.Printf(" Log: %+v", Conf.Log)
- log.Printf(" Mysql: %+v", Conf.Mysql)
- log.Printf(" Captcha: %+v", Conf.Captcha)
- log.Printf(" JWT: %+v", Conf.JWT)
- log.Printf(" etcd: %+v", Conf.Etcd)
- log.Printf(" rancher: %+v", Conf.Rancher)
- log.Printf(" k8s: %+v", Conf.K8s)
+ log.Printf(" plc : %+v", Conf.PLC)
+ log.Printf(" services : %+v", Conf.Services)
log.Println("......................................................")
}
--
Gitblit v1.8.0