Compare commits
No commits in common. "main" and "v0.0.62" have entirely different histories.
|
@ -1,18 +0,0 @@
|
||||||
package middleware
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/gin-contrib/cors"
|
|
||||||
"github.com/gin-gonic/gin"
|
|
||||||
)
|
|
||||||
|
|
||||||
func Cors() gin.HandlerFunc {
|
|
||||||
return cors.New(cors.Config{
|
|
||||||
AllowAllOrigins: true,
|
|
||||||
AllowHeaders: []string{
|
|
||||||
"Origin", "Content-Length", "Content-Type", "Workspace", "Request-Id", "Authorization", "Token",
|
|
||||||
},
|
|
||||||
AllowMethods: []string{
|
|
||||||
"GET", "POST", "PUT", "DELETE", "HEAD", "OPTIONS",
|
|
||||||
},
|
|
||||||
})
|
|
||||||
}
|
|
|
@ -4,20 +4,20 @@ import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
|
||||||
|
|
||||||
|
"git.apinb.com/bsm-sdk/core/cache/redis"
|
||||||
"git.apinb.com/bsm-sdk/core/crypto/encipher"
|
"git.apinb.com/bsm-sdk/core/crypto/encipher"
|
||||||
"git.apinb.com/bsm-sdk/core/errcode"
|
"git.apinb.com/bsm-sdk/core/errcode"
|
||||||
"git.apinb.com/bsm-sdk/core/types"
|
"git.apinb.com/bsm-sdk/core/types"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
)
|
)
|
||||||
|
|
||||||
func JwtAuth(time_verify bool) gin.HandlerFunc {
|
func JwtAuth(redis *redis.RedisClient) gin.HandlerFunc {
|
||||||
return func(c *gin.Context) {
|
return func(c *gin.Context) {
|
||||||
// 从请求头中获取 Authorization
|
// 从请求头中获取 Authorization
|
||||||
authHeader := c.GetHeader("Authorization")
|
authHeader := c.GetHeader("Authorization")
|
||||||
if authHeader == "" {
|
if authHeader == "" {
|
||||||
log.Printf("获取token异常:%v\n", "Authorization header is required")
|
log.Println("获取token异常:", "Authorization header is required")
|
||||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Authorization header is required"})
|
c.JSON(http.StatusUnauthorized, gin.H{"error": "Authorization header is required"})
|
||||||
c.Abort()
|
c.Abort()
|
||||||
return
|
return
|
||||||
|
@ -25,22 +25,21 @@ func JwtAuth(time_verify bool) gin.HandlerFunc {
|
||||||
// 提取Token
|
// 提取Token
|
||||||
claims, err := encipher.ParseTokenAes(authHeader)
|
claims, err := encipher.ParseTokenAes(authHeader)
|
||||||
if err != nil || claims == nil {
|
if err != nil || claims == nil {
|
||||||
log.Printf("提取token异常:%v\n", err)
|
log.Println("提取token异常:", "Token is required")
|
||||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Token is required"})
|
c.JSON(http.StatusUnauthorized, gin.H{"error": "Token is required"})
|
||||||
c.Abort()
|
c.Abort()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 检测是否需要验证token时间
|
// 从redis 获取token,判断当前redis 是否为空
|
||||||
if time_verify {
|
// tokenKey := fmt.Sprintf("%d-%s-%s", claims.ID, claims.Role, "token")
|
||||||
// 判断时间claims.ExpiresAt
|
// redisToken := redis.Client.Get(redis.Ctx, tokenKey)
|
||||||
if time.Now().Unix() > claims.ExpiresAt {
|
// if redisToken.Val() == "" {
|
||||||
log.Println("token过期,请重新获取:", "Token has expired")
|
// log.Println("redis异常", "Token status unauthorized")
|
||||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Token has expired"})
|
// c.JSON(http.StatusUnauthorized, gin.H{"error": "Token status unauthorized"})
|
||||||
c.Abort()
|
// c.Abort()
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
}
|
|
||||||
|
|
||||||
// 将解析后的 Token 存储到上下文中
|
// 将解析后的 Token 存储到上下文中
|
||||||
c.Set("Auth", claims)
|
c.Set("Auth", claims)
|
||||||
|
|
|
@ -1,16 +0,0 @@
|
||||||
package middleware
|
|
||||||
|
|
||||||
import (
|
|
||||||
"git.apinb.com/bsm-sdk/core/env"
|
|
||||||
"git.apinb.com/bsm-sdk/core/vars"
|
|
||||||
"github.com/gin-gonic/gin"
|
|
||||||
)
|
|
||||||
|
|
||||||
func Mode(app *gin.Engine) {
|
|
||||||
// 设置gin模式
|
|
||||||
if env.Runtime.Mode == vars.RUN_MODE_PROD {
|
|
||||||
gin.SetMode(gin.ReleaseMode)
|
|
||||||
} else {
|
|
||||||
gin.SetMode(gin.DebugMode)
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -9,7 +9,6 @@ type LogItem struct {
|
||||||
Level uint `json:"level"`
|
Level uint `json:"level"`
|
||||||
Ip string `json:"ip"`
|
Ip string `json:"ip"`
|
||||||
Module string `json:"module"`
|
Module string `json:"module"`
|
||||||
Encry bool `json:"encry"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
|
Loading…
Reference in New Issue