From f11c45b7f0a486f0461caed204846e4e663a3cd8 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 20 八月 2019 20:27:13 +0800
Subject: [PATCH] fix capture
---
middlewares/auth/auth.go | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/middlewares/auth/auth.go b/middlewares/auth/auth.go
index dd7c51c..8a23438 100644
--- a/middlewares/auth/auth.go
+++ b/middlewares/auth/auth.go
@@ -28,6 +28,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,21 +36,28 @@
// c.Abort()
//}
c.Next()
- } else if strings.HasPrefix(urlPath,"/httpImage") {
- imgUrl := config.Server.ImageUrl
+ } 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)
- 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 {//璺緞涓寘鍚湁绔彛,鍙栫鍙ｄ互鍚庤矾寰�
tmpPath = urlPath[idx:]
- imgIndx := strings.Index(imgUrl, ":")
- if imgIndx > -1 {
- imgUrl = imgUrl[:imgIndx-1]
- }
+ } 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