From 12ece5e87aeb455290c766705e4a624096c1dd2b Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 23 八月 2019 15:59:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
extend/config/config.go | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/extend/config/config.go b/extend/config/config.go
index 20e52bc..35e83f6 100644
--- a/extend/config/config.go
+++ b/extend/config/config.go
@@ -1,9 +1,8 @@
package config
import (
- "log"
-
"github.com/spf13/viper"
+ "log"
)
type server struct {
@@ -54,11 +53,17 @@
Dbtablepersons index `mapstructure:"dbtablepersons"`
Personaction index `mapstructure:"personaction"`
}
-
type index struct {
IndexName string `mapstructure:"index"`
IndexType string `mapstructure:"type"`
}
+
+type sopath struct {
+ Ip string `mapstructure:"ip"`
+ Port string `mapstructure:"port"`
+}
+
+var SoPath = &sopath{}
var EsInfo = &esinfo{}
@@ -94,6 +99,7 @@
viper.UnmarshalKey("redis", RedisConf)
viper.UnmarshalKey("database", DBconf)
viper.UnmarshalKey("weedfs", WeedFs)
+ viper.UnmarshalKey("sopath",SoPath)
viper.UnmarshalKey("dbpersoncompare",DbPersonCompInfo)
viper.UnmarshalKey("espersoncompare", EsCompServerInfo)
}
--
Gitblit v1.8.0