From bae7a9a30b89c519460746cfa19cd7e66a0196e2 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期日, 19 一月 2020 17:13:07 +0800
Subject: [PATCH] update _source list and struct
---
extend/config/config.go | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/extend/config/config.go b/extend/config/config.go
index 605482a..64baeb5 100644
--- a/extend/config/config.go
+++ b/extend/config/config.go
@@ -26,8 +26,11 @@
ChannelCount string `mapstructure: "channelCount"` //閫氶亾涓暟
DiskCount string `mapstructure: "diskCount"` //纭洏涓暟
- SysServerPort string `mapstructure: "sysServerPort"`
+ SudoPassword string `mapstructure: "sudoPassword"` //绯荤粺瀵嗙爜
SysThresholds []threshold `mapstructure: "sysThresholds"`
+ PTZSpeed int `mapstructure: "ptzSpeed"` // 浜戝彴绉诲姩閫熷害
+ PatchPath string `mapstructure:"patchPath"` //绯荤粺鏇存柊鍖呰矾寰�
+ BakPath string `mapstructure:"bakPath"` //绯荤粺鏇存柊鍖呰矾寰�
}
var Server = &server{}
@@ -39,10 +42,7 @@
}
type esindexlist struct {
- VideoPersons index `mapstructure:"videopersons"`
- DbTables index `mapstructure:"dbtables"`
- Dbtablepersons index `mapstructure:"dbtablepersons"`
- Personaction index `mapstructure:"personaction"`
+ AiOcean index `mapstructure:"aiOcean"`
}
type index struct {
IndexName string `mapstructure:"index"`
@@ -54,9 +54,16 @@
Port string `mapstructure:"port"`
}
+type elastic struct {
+ IndexName string `mapstructure: "indexName"`
+ IndexType string `mapstructure: "indexType"`
+}
+
var SoPath = &sopath{}
var EsInfo = &esinfo{}
+
+var BasicFS = &elastic{}
type facedetect struct {
Ip string `mapstructure:"Ip"`
@@ -88,7 +95,7 @@
viper.AddConfigPath("/opt/vasystem/config/")
err = viper.ReadInConfig()
if err != nil {
- log.Fatal("error on parsing configuration file")
+ log.Fatal("error on parsing configuration file", err)
}
viper.UnmarshalKey("es", EsInfo)
viper.UnmarshalKey("server", Server)
@@ -96,4 +103,5 @@
viper.UnmarshalKey("facedetect", FaceDetectSet)
viper.UnmarshalKey("dbpersoncompare", DbPersonCompInfo)
viper.UnmarshalKey("espersoncompare", EsCompServerInfo)
+ viper.UnmarshalKey("elastic.basicFS", BasicFS)
}
--
Gitblit v1.8.0