From cfeba2dea02c1de54cde6c95f2a3f46c121d34aa Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 16 八月 2019 15:16:14 +0800
Subject: [PATCH] dev add publicDomain
---
middlewares/auth/auth.go | 12 ++++++++++++
config/dev.yaml | 1 +
extend/config/config.go | 1 +
3 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/config/dev.yaml b/config/dev.yaml
index 66a8ee4..350cab2 100644
--- a/config/dev.yaml
+++ b/config/dev.yaml
@@ -4,6 +4,7 @@
jwtExpire: 24
url: http://127.0.0.1:8080
imageUrl: http://192.168.1.203:6080
+ publicDomain: bsic.asuscomm.com
networkAdapter: enp8s0
compare:
url:
diff --git a/extend/config/config.go b/extend/config/config.go
index fdde022..a4edba7 100644
--- a/extend/config/config.go
+++ b/extend/config/config.go
@@ -12,6 +12,7 @@
JwtExpire string `mapstructure: "jwtExpire"`
Url string `mapstructure: "url"`
ImageUrl string `mapstructure: "imageUrl"`
+ PublicDomain string `mapstructure: "publicDomain"`
NetworkAdapter string `mapstructure: "networkAdapter"`
}
diff --git a/middlewares/auth/auth.go b/middlewares/auth/auth.go
index 7bc2ef0..831ba8a 100644
--- a/middlewares/auth/auth.go
+++ b/middlewares/auth/auth.go
@@ -3,6 +3,7 @@
import (
"github.com/gin-gonic/gin"
"net/http"
+ "regexp"
"strings"
"webserver/extend/config"
"webserver/extend/logger"
@@ -28,6 +29,7 @@
func AuthHandler() gin.HandlerFunc {
return func(c *gin.Context) {
urlPath := c.Request.URL.Path
+
if strings.Contains(urlPath,"/data/api-v") && !strings.Contains(urlPath,"login"){
//jwtDriver :=NewJwtAuthDriver()
//if !jwtDriver.Check(c) {
@@ -36,7 +38,17 @@
//}
c.Next()
} else if strings.HasPrefix(urlPath,"/httpImage") {
+ host := c.Request.Host
+ logger.Debug("host:", host)
+
imgUrl := config.Server.ImageUrl
+
+ domain := config.Server.PublicDomain
+ domainReg := regexp.MustCompile(``+domain+``)
+ if domainReg.MatchString(host) {//鍩熷悕璁块棶
+ imgUrl = domain
+ }
+
urlPath = strings.Replace(urlPath, "/httpImage", "", -1)
idx := strings.Index(urlPath, ":")
tmpPath := urlPath
--
Gitblit v1.8.0