From 41ac67f13587ff76631167d6050c3f27f7b97c2a Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 15 十月 2019 18:55:21 +0800
Subject: [PATCH] rm no use config
---
middlewares/auth/auth.go | 25 -------------------------
config/test.yaml | 2 --
config/dev.yaml | 2 --
config/pro.yaml | 2 --
extend/config/config.go | 2 --
5 files changed, 0 insertions(+), 33 deletions(-)
diff --git a/config/dev.yaml b/config/dev.yaml
index 0150370..a4e7f65 100644
--- a/config/dev.yaml
+++ b/config/dev.yaml
@@ -4,8 +4,6 @@
jwtExpire: 24
url: http://127.0.0.1:8080
analyServerId: DSVAD010120190622
- imageUrl: http://192.168.1.203:6080
- publicDomain: http://bsic.asuscomm.com
networkAdapter: enp8s0
#璁惧缂栧彿
deviceNum: 001
diff --git a/config/pro.yaml b/config/pro.yaml
index ecc5bc4..f3882e1 100644
--- a/config/pro.yaml
+++ b/config/pro.yaml
@@ -4,8 +4,6 @@
jwtExpire: 24
url: http://127.0.0.1:8080
analyServerId: DSVAD010120190703
- imageUrl: http://192.168.1.203:6080
- publicDomain: http://bsic.asuscomm.com
networkAdapter: enp8s0
#璁惧缂栧彿
deviceNum: 001
diff --git a/config/test.yaml b/config/test.yaml
index 8b54455..b75ad1b 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -4,8 +4,6 @@
jwtExpire: 24
url: http://127.0.0.1:8080
analyServerId: DSVAD010120190703
- imageUrl: http://192.168.1.203:6080
- publicDomain: http://bsic.asuscomm.com
networkAdapter: enp8s0
#璁惧缂栧彿
deviceNum: 001
diff --git a/extend/config/config.go b/extend/config/config.go
index 5e9d97e..0a7b6b0 100644
--- a/extend/config/config.go
+++ b/extend/config/config.go
@@ -11,8 +11,6 @@
JwtExpire string `mapstructure: "jwtExpire"`
Url string `mapstructure: "url"`
AnalyServerId string `mapstructure: "analyServerId"`
- ImageUrl string `mapstructure: "imageUrl"`
- PublicDomain string `mapstructure: "publicDomain"`
NetworkAdapter string `mapstructure: "networkAdapter"`
DeviceNum string `mapstructure: "deviceNum"` //璁惧缂栧彿
diff --git a/middlewares/auth/auth.go b/middlewares/auth/auth.go
index 98d4836..fe7fe5f 100644
--- a/middlewares/auth/auth.go
+++ b/middlewares/auth/auth.go
@@ -5,8 +5,6 @@
"net/http"
"strings"
"webserver/extend/code"
- "webserver/extend/config"
- "basic.com/valib/logger.git"
"webserver/extend/util"
)
@@ -38,29 +36,6 @@
c.Abort()
}
c.Next()
- } else if strings.Contains(urlPath,"/httpImage") {
- domain := config.Server.PublicDomain
- //domainReg := regexp.MustCompile(``+domain+``)
- //if domainReg.MatchString(host) {//鍩熷悕璁块棶
- // imgUrl = domain
- //}
-
- urlPath = strings.Replace(urlPath, "/httpImage", "", -1)
- if strings.Contains(urlPath,domain) {
- urlPath = strings.Replace(urlPath,"/"+domain,"",-1)
- }
- logger.Debug("urlPath:",urlPath)
- idx := strings.LastIndex(urlPath, ":")
- tmpPath := ""
- if idx >-1 {//璺緞涓寘鍚湁绔彛,鍙栫鍙ｄ互鍚庤矾寰�
- tmpPath = urlPath[idx:]
- } else {
- tmpPath = ":6080"+tmpPath
- }
- c.Header("Access-Control-Allow-Origin","*")
- logger.Debug("domain+tmpPath:",domain+tmpPath)
- c.Redirect(http.StatusMovedPermanently, domain+tmpPath)
- return
} else {
c.Next()
}
--
Gitblit v1.8.0