修复xsf.ID引入的问题

gin/middleware/auth.go

@@ -3,12 +3,12 @@ package middleware
 
 import (
 	"github.com/gin-gonic/gin"
-
 	"gitlab.wanzhuangkj.com/tush/xpkg/errcode"
 	"gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
-	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/xctx"
+	"gitlab.wanzhuangkj.com/tush/xpkg/gin/xctx"
 	"gitlab.wanzhuangkj.com/tush/xpkg/jwt"
 	"gitlab.wanzhuangkj.com/tush/xpkg/logger"
+	"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf"
 )
 
 const (
@@ -101,8 +101,9 @@ func Auth(opts ...JwtOption) gin.HandlerFunc {
 				return
 			}
 		} else {
-			c.Set(ctxUtil.KeyUID, claims.UID)
-			c.Set(ctxUtil.KeyUName, claims.Name)
+			xsfID, _ := xsf.ParseString(claims.UID)
+			c.Set(xctx.KeyUID, xsfID)
+			c.Set(xctx.KeyUName, claims.Name)
 		}
 
 		c.Next()

gin/xctx/ctx.go

@@ -82,35 +82,19 @@ func CtxTraceIDField(c context.Context) zap.Field {
 }
 
 func GetGinUserID(c *gin.Context) xsf.ID {
-	uid, exists := c.Get(KeyUID)
-	if exists {
-		return xsf.ParseInt64(cast.ToInt64(uid))
-	}
-	return 0
+	return getGinSfID(c, KeyUID)
 }
 
 func GetGinShopID(c *gin.Context) xsf.ID {
-	uid, exists := c.Get(KeyShopID)
-	if exists {
-		return xsf.ParseInt64(cast.ToInt64(uid))
-	}
-	return 0
+	return getGinSfID(c, KeyShopID)
 }
 
 func GetCtxUserID(c context.Context) xsf.ID {
-	uid := c.Value(KeyUID)
-	if uid != nil {
-		return xsf.ParseInt64(cast.ToInt64(uid))
-	}
-	return 0
+	return getCtxSfID(c, KeyUID)
 }
 
 func GetCtxShopID(c context.Context) xsf.ID {
-	uid := c.Value(KeyShopID)
-	if uid != nil {
-		return xsf.ParseInt64(cast.ToInt64(uid))
-	}
-	return 0
+	return getCtxSfID(c, KeyShopID)
 }
 func GetCtxString(c context.Context, key string) string {
 	val := c.Value(key)
@@ -213,3 +197,23 @@ func GetCtxCompanyID(c context.Context) uint {
 	}
 	return 0
 }
+
+func getGinSfID(c *gin.Context, key string) xsf.ID {
+	val, exists := c.Get(key)
+	if exists {
+		if ret, ok := val.(xsf.ID); ok {
+			return ret
+		}
+	}
+	return xsf.ID(0)
+}
+
+func getCtxSfID(c context.Context, key string) xsf.ID {
+	val := c.Value(key)
+	if val != nil {
+		if ret, ok := val.(xsf.ID); ok {
+			return ret
+		}
+	}
+	return xsf.ID(0)
+}