From cae4c8e777e577ddc5d13ed4484b706df0e4bafc Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期二, 23 七月 2019 20:51:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
extend/config/config.go | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/extend/config/config.go b/extend/config/config.go
index 72db39f..3de0097 100644
--- a/extend/config/config.go
+++ b/extend/config/config.go
@@ -11,9 +11,19 @@
JwtSecret string `mapstructure: "jwtSecret"`
JwtExpire string `mapstructure: "jwtExpire"`
Url string `mapstructure: "url"`
+ ImageUrl string `mapstructure: "imageUrl"`
+ 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"`
@@ -69,4 +79,5 @@
viper.UnmarshalKey("server", Server)
viper.UnmarshalKey("redis", RedisConf)
viper.UnmarshalKey("database", DBconf)
+ viper.UnmarshalKey("weedfs", WeedFs)
}
--
Gitblit v1.8.0