fix logger new

crypto/token/jwt.go

@@ -77,19 +77,19 @@ func (t *tokenJwt) IsExpired(tokenstring string) (bool, error) {
 	// 分割JWT的三个部分
 	parts := strings.Split(tokenstring, ".")
 	if len(parts) != 3 {
-		return false, errcode.ErrTokenDataInvalid
+		return true, errcode.ErrTokenDataInvalid
 	}
 
 	// 解码Payload部分
 	payload, err := base64.RawURLEncoding.DecodeString(parts[1])
 	if err != nil {
-		return false, errcode.String(errcode.ErrTokenBase64Decode, err.Error())
+		return true, errcode.String(errcode.ErrTokenBase64Decode, err.Error())
 	}
 
 	// 解析JSON
 	var claims jwt.RegisteredClaims
 	if err := json.Unmarshal(payload, &claims); err != nil {
-		return false, errcode.String(errcode.ErrTokenJsonDecode, err.Error())
+		return true, errcode.String(errcode.ErrTokenJsonDecode, err.Error())
 	}
 
 	// 检查过期时间

infra/response.go

@@ -3,6 +3,8 @@
 package infra
 
 import (
+	"time"
+
 	"github.com/gin-gonic/gin"
 	"google.golang.org/grpc/status"
 )
@@ -13,7 +15,8 @@ var Response Reply
 type Reply struct {
 	Code    int32  `json:"code"`    // 响应码
 	Message string `json:"message"` // 响应消息
-	Result  any    `json:"result"`  // 响应数据
+	Details any    `json:"details"` // 响应数据
+	Timeseq int64  `json:"timeseq"` // 时间戳序列
 }
 
 // Success 返回成功响应
@@ -21,10 +24,11 @@ type Reply struct {
 // data: 响应数据
 func (reply *Reply) Success(ctx *gin.Context, data any) {
 	reply.Code = 0
-	reply.Result = data
+	reply.Details = data
 	reply.Message = ""
+	reply.Timeseq = time.Now().UnixMilli()
 	if data == nil {
-		reply.Result = ""
+		reply.Details = ""
 	}
 	ctx.JSON(200, reply)
 }
@@ -34,7 +38,7 @@ func (reply *Reply) Success(ctx *gin.Context, data any) {
 // err: 错误对象
 func (reply *Reply) Error(ctx *gin.Context, err error) {
 	reply.Code = 500
-	reply.Result = ""
+	reply.Details = ""
 	// 默认状态码为500
 	e, ok := status.FromError(err)
 	if ok {

logger/logger.go

@@ -41,6 +41,23 @@ var (
 	once         sync.Once
 )
 
+// 初始化Logger配置
+func New(cfg *conf.LogConf) {
+	if cfg == nil {
+		cfg = &conf.LogConf{
+			Name:     strings.ToLower(vars.ServiceKey),
+			Level:    vars.LogLevel(vars.DEBUG),
+			Dir:      "./logs/",
+			Endpoint: "",
+			Console:  true,
+			File:     true,
+			Remote:   false,
+		}
+	}
+
+	InitLogger(cfg)
+}
+
 // InitLogger 初始化全局日志器
 func InitLogger(cfg *conf.LogConf) error {
 	var err error

middleware/jwt.go

@@ -6,9 +6,9 @@ import (
 	"encoding/json"
 	"log"
 	"net/http"
-	"time"
 
-	"git.apinb.com/bsm-sdk/core/crypto/encipher"
+	"git.apinb.com/bsm-sdk/core/crypto/token"
+	"git.apinb.com/bsm-sdk/core/env"
 	"git.apinb.com/bsm-sdk/core/errcode"
 	"git.apinb.com/bsm-sdk/core/types"
 	"github.com/gin-gonic/gin"
@@ -27,19 +27,18 @@ func JwtAuth(time_verify bool) gin.HandlerFunc {
 			c.Abort()
 			return
 		}
-		// 提取Token
-		claims, err := encipher.ParseTokenAes(authHeader)
-		if err != nil || claims == nil {
-			log.Printf("提取token异常:%v\n", err)
-			c.JSON(http.StatusUnauthorized, gin.H{"error": "Token is required"})
-			c.Abort()
-			return
-		}
 
 		// 检测是否需要验证token时间
 		if time_verify {
 			// 判断时间claims.ExpiresAt
-			if time.Now().Unix() > claims.ExpiresAt {
+			isExpire, err := token.New(env.Runtime.JwtSecretKey).IsExpired(authHeader)
+			if err != nil {
+				log.Println("token解析异常:", err)
+				c.JSON(http.StatusUnauthorized, gin.H{"error": "Token is required"})
+				c.Abort()
+				return
+			}
+			if isExpire {
 				log.Println("token过期，请重新获取:", "Token has expired")
 				c.JSON(http.StatusUnauthorized, gin.H{"error": "Token has expired"})
 				c.Abort()
@@ -47,6 +46,15 @@ func JwtAuth(time_verify bool) gin.HandlerFunc {
 			}
 		}
 
+		// 提取Token
+		claims, err := token.New(env.Runtime.JwtSecretKey).ParseJwt(authHeader)
+		if err != nil || claims == nil {
+			log.Printf("提取token异常:%v\n", err)
+			c.JSON(http.StatusUnauthorized, gin.H{"error": "Token is required"})
+			c.Abort()
+			return
+		}
+
 		// 将解析后的 Token 存储到上下文中
 		c.Set("Auth", claims)
 		// 如果 Token 有效，继续处理请求

service/meta.go

@@ -3,9 +3,9 @@ package service
 import (
 	"context"
 
-	"git.apinb.com/bsm-sdk/core/crypto/encipher"
+	"git.apinb.com/bsm-sdk/core/crypto/token"
+	"git.apinb.com/bsm-sdk/core/env"
 	"git.apinb.com/bsm-sdk/core/errcode"
-	"git.apinb.com/bsm-sdk/core/types"
 	"git.apinb.com/bsm-sdk/core/utils"
 	"google.golang.org/grpc/metadata"
 )
@@ -16,7 +16,7 @@ type ParseOptions struct {
 	MustPrivateAllow bool   // 是否只允许私有IP访问
 }
 
-func ParseMetaCtx(ctx context.Context, opts *ParseOptions) (*types.JwtClaims, error) {
+func ParseMetaCtx(ctx context.Context, opts *ParseOptions) (*token.Claims, error) {
 	// 解析metada中的信息并验证
 	md, ok := metadata.FromIncomingContext(ctx)
 	if !ok {
@@ -28,7 +28,7 @@ func ParseMetaCtx(ctx context.Context, opts *ParseOptions) (*types.JwtClaims, er
 		return nil, errcode.ErrTokenAuthNotFound
 	}
 
-	claims, err := encipher.ParseTokenAes(Authorizations[0])
+	claims, err := token.New(env.Runtime.JwtSecretKey).ParseJwt(Authorizations[0])
 	if err != nil {
 		return nil, err
 	}
@@ -48,7 +48,7 @@ func ParseMetaCtx(ctx context.Context, opts *ParseOptions) (*types.JwtClaims, er
 
 }
 
-func checkRole(claims *types.JwtClaims, roleKey, roleValue string) bool {
+func checkRole(claims *token.Claims, roleKey, roleValue string) bool {
 	if roleValue == "" {
 		return true
 	}

with/logger.go

@@ -1,26 +0,0 @@
-package with
-
-import (
-	"strings"
-
-	"git.apinb.com/bsm-sdk/core/conf"
-	"git.apinb.com/bsm-sdk/core/logger"
-	"git.apinb.com/bsm-sdk/core/vars"
-)
-
-// 初始化Logger配置
-func Logger(cfg *conf.LogConf) {
-	if cfg == nil {
-		cfg = &conf.LogConf{
-			Name:     strings.ToLower(vars.ServiceKey),
-			Level:    vars.LogLevel(vars.DEBUG),
-			Dir:      "./logs/",
-			Endpoint: "",
-			Console:  true,
-			File:     true,
-			Remote:   false,
-		}
-	}
-
-	logger.InitLogger(cfg)
-}