From 808f35709b91aa5aab45860cbce919561c98daff Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 17 七月 2019 10:51:59 +0800
Subject: [PATCH] add weedfs config
---
controllers/fileController.go | 4 +++-
config/dev.yaml | 6 +++++-
extend/config/config.go | 9 +++++++++
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/config/dev.yaml b/config/dev.yaml
index 2f2fc7e..c8e48e5 100644
--- a/config/dev.yaml
+++ b/config/dev.yaml
@@ -3,7 +3,11 @@
jwtSecret: BASIC
jwtExpire: 24
url: http://127.0.0.1:8080
- imageUrl: http://192.168.1.182:6080
+ imageUrl: http://192.168.1.203:6080
+weedfs:
+ ip: 192.168.1.203
+ uploadport: 6333
+ visitport: 6080
redis:
host: 127.0.0.1
port: 6379
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 3b641e0..94670be 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -14,8 +14,10 @@
"log"
"mime/multipart"
"net/http"
+ "strconv"
"strings"
"webserver/extend/code"
+ "webserver/extend/config"
"webserver/extend/esutil"
"webserver/extend/util"
"webserver/models"
@@ -34,7 +36,7 @@
//var picUrlField = "fid"
/**涓婁紶鏂规硶**/
-var weedfsUri = "http://192.168.1.182:6333/submit"
+var weedfsUri = "http://"+config.WeedFs.Ip+":"+strconv.Itoa(config.WeedFs.UploadPort)+"/submit"
//var weedfsUri = "http://192.168.1.182:9500/submit"
diff --git a/extend/config/config.go b/extend/config/config.go
index e3ca7ee..4b182ee 100644
--- a/extend/config/config.go
+++ b/extend/config/config.go
@@ -16,6 +16,14 @@
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"`
Port int `mapstructure:"port"`
@@ -70,4 +78,5 @@
viper.UnmarshalKey("server", Server)
viper.UnmarshalKey("redis", RedisConf)
viper.UnmarshalKey("database", DBconf)
+ viper.UnmarshalKey("weedfs", WeedFs)
}
--
Gitblit v1.8.0