From dfddbbf858b4f24f515746d74d2a6830d8835f1d Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期二, 19 十一月 2019 15:57:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
extend/config/config.go | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/extend/config/config.go b/extend/config/config.go
index a62cdfa..61e5126 100644
--- a/extend/config/config.go
+++ b/extend/config/config.go
@@ -40,6 +40,10 @@
}
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 {
@@ -86,7 +90,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)
--
Gitblit v1.8.0