From 55c9b1a6cb3c2c9697fad6158dd09ee2675109b0 Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期二, 20 八月 2019 13:15:47 +0800 Subject: [PATCH] fix httpImage --- middlewares/auth/auth.go | 32 ++++++++++++++------------------ 1 files changed, 14 insertions(+), 18 deletions(-) diff --git a/middlewares/auth/auth.go b/middlewares/auth/auth.go index 3bac107..8a23438 100644 --- a/middlewares/auth/auth.go +++ b/middlewares/auth/auth.go @@ -3,7 +3,6 @@ import ( "github.com/gin-gonic/gin" "net/http" - "regexp" "strings" "webserver/extend/config" "webserver/extend/logger" @@ -38,30 +37,27 @@ //} c.Next() } 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 - } + //domainReg := regexp.MustCompile(``+domain+``) + //if domainReg.MatchString(host) {//鍩熷悕璁块棶 + // imgUrl = domain + //} urlPath = strings.Replace(urlPath, "/httpImage", "", -1) - idx := strings.Index(urlPath, ":") - tmpPath := urlPath + if strings.Contains(urlPath,domain) { + urlPath = strings.Replace(urlPath,"/"+domain,"",-1) + } + logger.Debug("urlPath:",urlPath) + idx := strings.LastIndex(urlPath, ":") + tmpPath := "" if idx >-1 {//璺緞涓寘鍚湁绔彛,鍙栫鍙d互鍚庤矾寰� tmpPath = urlPath[idx:] - imgIndx := strings.LastIndex(imgUrl, ":") - if imgIndx > -1 { - imgUrl = imgUrl[:imgIndx] - } + } else { + tmpPath = ":6080"+tmpPath } - logger.Debug("imgUrl+tmpPath:", imgUrl+tmpPath) c.Header("Access-Control-Allow-Origin","*") - c.Redirect(http.StatusMovedPermanently, imgUrl+tmpPath) + logger.Debug("domain+tmpPath:",domain+tmpPath) + c.Redirect(http.StatusMovedPermanently, domain+tmpPath) return } else { c.Next() -- Gitblit v1.8.0