From e8164f07ec594bf7d9574a7f2227e90b87a9f85d Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 20 八月 2019 11:16:22 +0800
Subject: [PATCH] fix arg
---
middlewares/auth/auth.go | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/middlewares/auth/auth.go b/middlewares/auth/auth.go
index b029741..3bac107 100644
--- a/middlewares/auth/auth.go
+++ b/middlewares/auth/auth.go
@@ -1,11 +1,12 @@
package auth
import (
- "fmt"
"github.com/gin-gonic/gin"
"net/http"
+ "regexp"
"strings"
"webserver/extend/config"
+ "webserver/extend/logger"
)
const (
@@ -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) {
@@ -35,18 +37,29 @@
// c.Abort()
//}
c.Next()
- } else if strings.HasPrefix(urlPath,"/httpImage") {
+ } else if strings.Contains(urlPath,"/httpImage") {
+ host := c.Request.URL.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
if idx >-1 {//璺緞涓寘鍚湁绔彛,鍙栫鍙ｄ互鍚庤矾寰�
tmpPath = urlPath[idx:]
- imgIndx := strings.Index(imgUrl, ":")
+ imgIndx := strings.LastIndex(imgUrl, ":")
if imgIndx > -1 {
- imgUrl = imgUrl[:imgIndx-1]
+ imgUrl = imgUrl[:imgIndx]
}
}
- fmt.Println("imgUrl+tmpPath:", imgUrl+tmpPath)
+ logger.Debug("imgUrl+tmpPath:", imgUrl+tmpPath)
c.Header("Access-Control-Allow-Origin","*")
c.Redirect(http.StatusMovedPermanently, imgUrl+tmpPath)
return
--
Gitblit v1.8.0