From 7c811247ecf143e08c576986a884bedadc57dd66 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 05 六月 2020 18:29:41 +0800
Subject: [PATCH] add refresh token to resp
---
extend/config/config.go | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/extend/config/config.go b/extend/config/config.go
index a62cdfa..48af440 100644
--- a/extend/config/config.go
+++ b/extend/config/config.go
@@ -11,6 +11,7 @@
Color string `mapstructure: "color"`
}
type server struct {
+ ServerName string `mapstructure: "serverName"`
Runmode string `mapstructure: "runmode"`
JwtSecret string `mapstructure: "jwtSecret"`
JwtExpire string `mapstructure: "jwtExpire"`
@@ -29,6 +30,8 @@
SudoPassword string `mapstructure: "sudoPassword"` //绯荤粺瀵嗙爜
SysThresholds []threshold `mapstructure: "sysThresholds"`
PTZSpeed int `mapstructure: "ptzSpeed"` // 浜戝彴绉诲姩閫熷害
+ PatchPath string `mapstructure:"patchPath"` //绯荤粺鏇存柊鍖呰矾寰�
+ BakPath string `mapstructure:"bakPath"` //绯荤粺鏇存柊鍖呰矾寰�
}
var Server = &server{}
@@ -40,7 +43,7 @@
}
type esindexlist struct {
- AiOcean index `mapstructure:"aiOcean"`
+ AiOcean index `mapstructure:"aiOcean"`
}
type index struct {
IndexName string `mapstructure:"index"`
@@ -52,9 +55,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"`
@@ -83,10 +93,10 @@
var err error
viper.SetConfigType("yaml")
viper.SetConfigName(env)
- viper.AddConfigPath("/opt/vasystem/config/")
+ viper.AddConfigPath("../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)
@@ -94,4 +104,5 @@
viper.UnmarshalKey("facedetect", FaceDetectSet)
viper.UnmarshalKey("dbpersoncompare", DbPersonCompInfo)
viper.UnmarshalKey("espersoncompare", EsCompServerInfo)
+ viper.UnmarshalKey("elastic.basicFS", BasicFS)
}
--
Gitblit v1.8.0