From b41c888631e74462dcc0bdcb426d80b2a6c5cb2d Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 17 七月 2019 10:52:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver

---
 extend/config/config.go |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/extend/config/config.go b/extend/config/config.go
index 72db39f..4b182ee 100644
--- a/extend/config/config.go
+++ b/extend/config/config.go
@@ -11,9 +11,18 @@
 	JwtSecret string `mapstructure: "jwtSecret"`
 	JwtExpire string `mapstructure: "jwtExpire"`
 	Url       string `mapstructure: "url"`
+	ImageUrl  string `mapstructure: "imageUrl"`
 }
 
 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 +78,5 @@
 	viper.UnmarshalKey("server", Server)
 	viper.UnmarshalKey("redis", RedisConf)
 	viper.UnmarshalKey("database", DBconf)
+	viper.UnmarshalKey("weedfs", WeedFs)
 }

--
Gitblit v1.8.0