From 4c7890a506f95bfc8d06a75dbf6150bb8fcad1bb Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 28 九月 2019 15:28:32 +0800
Subject: [PATCH] add logger
---
middlewares/auth/auth.go | 50 ++++++++++++++++++++++++--------------------------
1 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/middlewares/auth/auth.go b/middlewares/auth/auth.go
index 831ba8a..98d4836 100644
--- a/middlewares/auth/auth.go
+++ b/middlewares/auth/auth.go
@@ -3,10 +3,11 @@
import (
"github.com/gin-gonic/gin"
"net/http"
- "regexp"
"strings"
+ "webserver/extend/code"
"webserver/extend/config"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
+ "webserver/extend/util"
)
const (
@@ -31,37 +32,34 @@
urlPath := c.Request.URL.Path
if strings.Contains(urlPath,"/data/api-v") && !strings.Contains(urlPath,"login"){
- //jwtDriver :=NewJwtAuthDriver()
- //if !jwtDriver.Check(c) {
- // util.ResponseFormat(c,code.TokenNotFound,"灏氭湭鐧诲綍锛岃鐧诲綍")
- // c.Abort()
- //}
- 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
+ jwtDriver :=NewJwtAuthDriver()
+ if !jwtDriver.Check(c) {
+ util.ResponseFormat(c,code.TokenNotFound,"灏氭湭鐧诲綍锛岃鐧诲綍")
+ c.Abort()
}
+ c.Next()
+ } 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.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