From f4e8f206a6760bdc31734dfcb1c65916b5b76311 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 22 八月 2019 12:05:58 +0800
Subject: [PATCH] add cluster

---
 middlewares/auth/auth.go |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/middlewares/auth/auth.go b/middlewares/auth/auth.go
index 55f505c..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,20 +36,28 @@
 			//	c.Abort()
 			//}
 			c.Next()
-		} else if strings.HasPrefix(urlPath,"/httpImage") {
-			imgUrl := config.Server.ImageUrl
-			idx := strings.Index(urlPath, ":")
-			tmpPath := urlPath
+		} 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 {//璺緞涓寘鍚湁绔彛,鍙栫鍙d互鍚庤矾寰�
 				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