u

code/go-project/base-farmework/pkg/utils/jwt.go

@@ -1,22 +1,28 @@
 package utils
 
 import (
-	appConfig "base-framework/configs/app"
+	commonConfig "base-framework/pkg/config"
 	"errors"
-	"github.com/golang-jwt/jwt"
 	"time"
+
+	"github.com/golang-jwt/jwt"
 )
 
-// CustomClaims 定义自己的 payload 结构，可以根据需要扩展
+var (
+	ErrTokenExpired = errors.New("token expired")
+	ErrTokenInvalid = errors.New("token invalid")
+)
+
+// CustomClaims 定义自己的 payload 结构
 type CustomClaims struct {
 	OrgID  string `json:"org_id"`
 	UserID string `json:"user_id"`
 	jwt.StandardClaims
 }
 
-// CreateToken 创建一个JWT token
+// CreateToken 创建一个 JWT token
 func CreateToken(orgID, userID string) (string, error) {
-	expireTime := time.Now().Add(appConfig.JWT.Expiry).Unix()
+	expireTime := time.Now().Add(commonConfig.JWT.Expiry).Unix()
 
 	claims := CustomClaims{
 		OrgID:  orgID,
@@ -28,29 +34,35 @@ func CreateToken(orgID, userID string) (string, error) {
 	}
 
 	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
-	signKey := []byte(appConfig.JWT.Secret)
+	signKey := []byte(commonConfig.JWT.Secret)
 	return token.SignedString(signKey)
 }
 
 // VerifyToken 验证并解析 JWT token
 func VerifyToken(tokenString string) (*CustomClaims, error) {
-	signKey := []byte(appConfig.JWT.Secret)
+	signKey := []byte(commonConfig.JWT.Secret)
 
 	token, err := jwt.ParseWithClaims(tokenString, &CustomClaims{}, func(token *jwt.Token) (interface{}, error) {
 		// 校验签名算法
 		if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
-			return nil, errors.New("unexpected signing method")
+			return nil, ErrTokenInvalid
 		}
 		return signKey, nil
 	})
 
 	if err != nil {
-		return nil, err
+		// 判断是否过期错误
+		if ve, ok := err.(*jwt.ValidationError); ok {
+			if ve.Errors&jwt.ValidationErrorExpired != 0 {
+				return nil, ErrTokenExpired
+			}
+		}
+		return nil, ErrTokenInvalid
 	}
 
 	if claims, ok := token.Claims.(*CustomClaims); ok && token.Valid {
 		return claims, nil
 	}
 
-	return nil, errors.New("invalid token")
+	return nil, ErrTokenInvalid
 }

code/go-project/base-farmework/pkg/utils/response/response.go

@@ -12,23 +12,27 @@ type Result struct {
 	Data    interface{} `json:"data,omitempty"`
 }
 
-// 常量状态码
 const (
-	CodeSuccess = "0000"
-	CodeFail    = "9999"
+	// 通用
+	CodeSuccess = "0000" // 成功
+	CodeFail    = "0001" // 失败
+
+	// 鉴权 / 登录
+	CodeNoLogin        = "1001" // 未登录
+	CodeLoginExpired   = "1002" // 登录过期
+	CodeInvalidToken   = "1003" // Token 无效
+	CodeInvalidOrgCode = "1004" // 机构码有误
+	CodeInvalidAccount = "1005" // 账号或密码有误
 )
 
-// code 对应默认提示
 var codeMessages = map[string]string{
-	CodeSuccess: "请求成功",
-	CodeFail:    "请求失败",
-
-	"1001": "缺少用户ID",
-	"1002": "未授权",
-	"1003": "无权限访问",
-	"1004": "资源不存在",
-
-	"9000": "系统内部错误",
+	CodeSuccess:        "请求成功",
+	CodeFail:           "请求失败",
+	CodeNoLogin:        "未登录",
+	CodeLoginExpired:   "登录已过期",
+	CodeInvalidToken:   "Token 无效",
+	CodeInvalidOrgCode: "机构码有误",
+	CodeInvalidAccount: "账号或密码有误",
 }
 
 // 兜底提示
@@ -65,9 +69,7 @@ func Error(c *router.Context) *Builder {
 // Code 设置状态码（自动填充默认提示，除非后面手动改）
 func (b *Builder) Code(code string) *Builder {
 	b.result.Code = code
-	if b.result.Message == "" || b.result.Message == getMessage(b.result.Code) {
-		b.result.Message = getMessage(code)
-	}
+	b.result.Message = getMessage(code)
 	return b
 }