Compare commits

...

7 Commits

Author SHA1 Message Date
e30d50845a feat(vars): 添加 OK 状态码
在 status.go 文件中添加了新的状态码 OK,值为 "OK"。这个状态码可以用于表示系统或组件运行正常的情况。
2025-09-12 23:27:14 +08:00
b4cd51a6dc refactor(encipher): 更新 JWT 过期时间变量
- 将 vars.JwtExpireDay 更改为 vars.JwtExpire,使代码更具通用性
- 优化了 GenerateTokenAes 函数中的过期时间计算逻辑
2025-09-12 20:11:49 +08:00
dac969d798 refactor(vars): 修改 JWT 过期时间变量名称
- 将 JwtExpireDay 重命名为 JwtExpire
- 新变量名称更加简洁,同时消除了冗余的 Day 后缀
2025-09-12 18:56:23 +08:00
2f398c73b3 add middleware for CORS and mode configuration 2025-09-02 10:01:09 +08:00
zhaoxiaorong
cb8e9bad4b fix 操作痕迹可选加密 2025-09-01 12:40:23 +08:00
zhaoxiaorong
1005e89e4f Merge branch 'main' of https://git.apinb.com/bsm-sdk/core 2025-08-23 21:17:56 +08:00
zhaoxiaorong
268c7f99c7 fix 取消从redis获取token,改为从token中获取有效时间 2025-08-23 21:17:51 +08:00
7 changed files with 53 additions and 15 deletions

View File

@@ -30,7 +30,7 @@ func GenerateTokenAes(id uint, identity, client, role string, owner any, extend
if !(JwtSecretLen == 16 || JwtSecretLen == 24 || JwtSecretLen == 32) { if !(JwtSecretLen == 16 || JwtSecretLen == 24 || JwtSecretLen == 32) {
return "", errcode.ErrJWTSecretKey return "", errcode.ErrJWTSecretKey
} }
expireTime := time.Now().Add(vars.JwtExpireDay) expireTime := time.Now().Add(vars.JwtExpire)
claims := types.JwtClaims{ claims := types.JwtClaims{
ID: id, ID: id,
Identity: identity, Identity: identity,

18
middleware/cors.go Normal file
View File

@@ -0,0 +1,18 @@
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",
},
})
}

View File

@@ -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(redis *redis.RedisClient) gin.HandlerFunc { func JwtAuth(time_verify bool) 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.Println("获取token异常:", "Authorization header is required") log.Printf("获取token异常:%v\n", "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,21 +25,22 @@ func JwtAuth(redis *redis.RedisClient) 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.Println("提取token异常:", "Token is required") log.Printf("提取token异常:%v\n", err)
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
} }
// 从redis 获取token,判断当前redis 是否为空 // 检测是否需要验证token时间
// tokenKey := fmt.Sprintf("%d-%s-%s", claims.ID, claims.Role, "token") if time_verify {
// redisToken := redis.Client.Get(redis.Ctx, tokenKey) // 判断时间claims.ExpiresAt
// if redisToken.Val() == "" { if time.Now().Unix() > claims.ExpiresAt {
// log.Println("redis异常", "Token status unauthorized") log.Println("token过期请重新获取:", "Token has expired")
// c.JSON(http.StatusUnauthorized, gin.H{"error": "Token status unauthorized"}) c.JSON(http.StatusUnauthorized, gin.H{"error": "Token has expired"})
// c.Abort() c.Abort()
// return return
// } }
}
// 将解析后的 Token 存储到上下文中 // 将解析后的 Token 存储到上下文中
c.Set("Auth", claims) c.Set("Auth", claims)

16
middleware/mode.go Normal file
View File

@@ -0,0 +1,16 @@
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)
}
}

View File

@@ -9,6 +9,7 @@ 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 (

View File

@@ -4,5 +4,5 @@ import "time"
var ( var (
// cache def value // cache def value
JwtExpireDay time.Duration = 1 * 24 * time.Hour JwtExpire time.Duration = 1 * 24 * time.Hour
) )

View File

@@ -5,4 +5,6 @@ const (
NormalStatus = 1 NormalStatus = 1
// DisabledStatus . // DisabledStatus .
DisabledStatus = -1 DisabledStatus = -1
OK string = "OK"
) )