From a1ef2d42d320f075c75e8cef52a879114441c103 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期三, 30 十月 2019 15:54:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
extend/config/config.go | 56 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/extend/config/config.go b/extend/config/config.go
index 0a7b6b0..c775712 100644
--- a/extend/config/config.go
+++ b/extend/config/config.go
@@ -1,33 +1,41 @@
package config
import (
- "github.com/spf13/viper"
"log"
+
+ "github.com/spf13/viper"
)
+type threshold struct {
+ Value int `mapstructure: "value"`
+ Color string `mapstructure: "color"`
+}
type server struct {
- Runmode string `mapstructure: "runmode"`
- JwtSecret string `mapstructure: "jwtSecret"`
- JwtExpire string `mapstructure: "jwtExpire"`
- Url string `mapstructure: "url"`
- AnalyServerId string `mapstructure: "analyServerId"`
+ Runmode string `mapstructure: "runmode"`
+ JwtSecret string `mapstructure: "jwtSecret"`
+ JwtExpire string `mapstructure: "jwtExpire"`
+ Url string `mapstructure: "url"`
+ AnalyServerId string `mapstructure: "analyServerId"`
NetworkAdapter string `mapstructure: "networkAdapter"`
- DeviceNum string `mapstructure: "deviceNum"` //璁惧缂栧彿
- DeviceType string `mapstructure: "deviceType"` //璁惧鍨嬪彿
- DeviceSerialNum string `mapstructure: "deviceSerialNum"` //璁惧搴忓垪鍙�
- MasterVersion string `mapstructure: "masterVersion"` //涓绘帶鐗堟湰
- WebVersion string `mapstructure: "webVersion"` //web鐗堟湰
- ChannelCount string `mapstructure: "channelCount"` //閫氶亾涓暟
- DiskCount string `mapstructure: "diskCount"` //纭洏涓暟
+ DeviceNum string `mapstructure: "deviceNum"` //璁惧缂栧彿
+ DeviceType string `mapstructure: "deviceType"` //璁惧鍨嬪彿
+ DeviceSerialNum string `mapstructure: "deviceSerialNum"` //璁惧搴忓垪鍙�
+ MasterVersion string `mapstructure: "masterVersion"` //涓绘帶鐗堟湰
+ WebVersion string `mapstructure: "webVersion"` //web鐗堟湰
+ ChannelCount string `mapstructure: "channelCount"` //閫氶亾涓暟
+ DiskCount string `mapstructure: "diskCount"` //纭洏涓暟
+
+ SudoPassword string `mapstructure: "sudoPassword"`
+ SysThresholds []threshold `mapstructure: "sysThresholds"`
}
var Server = &server{}
// wp add es 绱㈠紩 浠ュ強 IP port
type esinfo struct {
- Shards string `mapstructure:"shards"`
- EsIndex esindexlist `mapstructure:"index"`
+ Shards string `mapstructure:"shards"`
+ EsIndex esindexlist `mapstructure:"index"`
}
type esindexlist struct {
@@ -42,7 +50,7 @@
}
type sopath struct {
- Ip string `mapstructure:"ip"`
+ Ip string `mapstructure:"ip"`
Port string `mapstructure:"port"`
}
@@ -51,18 +59,18 @@
var EsInfo = &esinfo{}
type facedetect struct {
- Ip string `mapstructure:"Ip"`
- Port int `mapstructure:"port"`
+ Ip string `mapstructure:"Ip"`
+ Port int `mapstructure:"port"`
}
type dbpersoncompare struct {
- Ip string `mapstructure:"ip"`
- Port int `mapstructure:"port"`
+ Ip string `mapstructure:"ip"`
+ Port int `mapstructure:"port"`
}
type espersoncompare struct {
- Port int `mapstructure:"port"`
- Ips []string `mapstructure:"ips"`
+ Port int `mapstructure:"port"`
+ Ips []string `mapstructure:"ips"`
}
var DbPersonCompInfo = &dbpersoncompare{}
@@ -84,8 +92,8 @@
}
viper.UnmarshalKey("es", EsInfo)
viper.UnmarshalKey("server", Server)
- viper.UnmarshalKey("sopath",SoPath)
+ viper.UnmarshalKey("sopath", SoPath)
viper.UnmarshalKey("facedetect", FaceDetectSet)
- viper.UnmarshalKey("dbpersoncompare",DbPersonCompInfo)
+ viper.UnmarshalKey("dbpersoncompare", DbPersonCompInfo)
viper.UnmarshalKey("espersoncompare", EsCompServerInfo)
}
--
Gitblit v1.8.0