From 7db688079aa8ebf2ad495f0788517653c3984f52 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 16 九月 2019 15:55:26 +0800
Subject: [PATCH] use one config with other proc
---
extend/config/config.go | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/extend/config/config.go b/extend/config/config.go
index 450cc18..4e67b70 100644
--- a/extend/config/config.go
+++ b/extend/config/config.go
@@ -10,6 +10,7 @@
JwtSecret string `mapstructure: "jwtSecret"`
JwtExpire string `mapstructure: "jwtExpire"`
Url string `mapstructure: "url"`
+ AnalyServerId string `mapstructure: "analyServerId"`
ImageUrl string `mapstructure: "imageUrl"`
PublicDomain string `mapstructure: "publicDomain"`
NetworkAdapter string `mapstructure: "networkAdapter"`
@@ -25,15 +26,6 @@
var WeedFs = &weedfs{}
-type redis struct {
- Host string `mapstructure:"host"`
- Port int `mapstructure:"port"`
- Password string `mapstructure:"password`
- DBNum int `mapstructure:"db"`
-}
-
-var RedisConf = &redis{}
-
type database struct {
Drive string `mapstructure:"drive"`
Name string `mapstructure:"name"`
@@ -44,6 +36,7 @@
type esinfo struct {
Masterip string `mapstructure:"masterip"`
Httpport string `mapstructure:"httpport"`
+ Shards string `mapstructure:"shards"`
EsIndex esindexlist `mapstructure:"index"`
}
@@ -70,15 +63,18 @@
var DBconf = &database{}
type facedetect struct {
- Url string `mapstructure:"url"`
+ Ip string `mapstructure:"Ip"`
+ Port int `mapstructure:"port"`
}
type dbpersoncompare struct {
- Url string `mapstructure:"url"`
+ Ip string `mapstructure:"ip"`
+ Port int `mapstructure:"port"`
}
type espersoncompare struct {
- Url []string `mapstructure:"url"`
+ Port int `mapstructure:"port"`
+ Ips []string `mapstructure:"ips"`
}
var DbPersonCompInfo = &dbpersoncompare{}
@@ -93,15 +89,14 @@
var err error
viper.SetConfigType("yaml")
viper.SetConfigName(env)
- viper.AddConfigPath("../config/")
- viper.AddConfigPath("config/")
+ viper.AddConfigPath("/opt/vasystem/config/")
+ viper.AddConfigPath("")
err = viper.ReadInConfig()
if err != nil {
log.Fatal("error on parsing configuration file")
}
viper.UnmarshalKey("es", EsInfo)
viper.UnmarshalKey("server", Server)
- viper.UnmarshalKey("redis", RedisConf)
viper.UnmarshalKey("database", DBconf)
viper.UnmarshalKey("weedfs", WeedFs)
viper.UnmarshalKey("sopath",SoPath)
--
Gitblit v1.8.0