From e87b04d7f9d6b25c858d421432bed5443f91b9df Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 16 九月 2019 11:10:34 +0800
Subject: [PATCH] update goffmpeg and capture
---
extend/config/config.go | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/extend/config/config.go b/extend/config/config.go
index 72db39f..450cc18 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 {
@@ -11,9 +10,20 @@
JwtSecret string `mapstructure: "jwtSecret"`
JwtExpire string `mapstructure: "jwtExpire"`
Url string `mapstructure: "url"`
+ ImageUrl string `mapstructure: "imageUrl"`
+ PublicDomain string `mapstructure: "publicDomain"`
+ NetworkAdapter string `mapstructure: "networkAdapter"`
}
var Server = &server{}
+
+type weedfs struct {
+ Ip string `mapstructure: "ip"`
+ UploadPort int `mapstructure: "uploadport"`
+ VisitPort int `mapstructure: "visitport"`
+}
+
+var WeedFs = &weedfs{}
type redis struct {
Host string `mapstructure:"host"`
@@ -43,15 +53,39 @@
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{}
var DBconf = &database{}
+
+type facedetect struct {
+ Url string `mapstructure:"url"`
+}
+
+type dbpersoncompare struct {
+ Url string `mapstructure:"url"`
+}
+
+type espersoncompare struct {
+ Url []string `mapstructure:"url"`
+}
+
+var DbPersonCompInfo = &dbpersoncompare{}
+
+var EsCompServerInfo = &espersoncompare{}
+
+var FaceDetectSet = &facedetect{}
// Init is an exported method that takes the environment starts the viper
// (external lib) and returns the configuration struct.
@@ -69,4 +103,9 @@
viper.UnmarshalKey("server", Server)
viper.UnmarshalKey("redis", RedisConf)
viper.UnmarshalKey("database", DBconf)
+ viper.UnmarshalKey("weedfs", WeedFs)
+ viper.UnmarshalKey("sopath",SoPath)
+ viper.UnmarshalKey("facedetect", FaceDetectSet)
+ viper.UnmarshalKey("dbpersoncompare",DbPersonCompInfo)
+ viper.UnmarshalKey("espersoncompare", EsCompServerInfo)
}
--
Gitblit v1.8.0