Merge pull request #113 from LyricTian/develop

Fix postgres tinyint
LyricTian · Aug 16, 2021 · 9734b67 · 9734b67
2 parents a904050 + 7798f02
commit 9734b67
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/internal/app/dao/menu/menu.entity.go b/internal/app/dao/menu/menu.entity.go
@@ -33,8 +33,8 @@ type Menu struct {
 	Router     *string `gorm:"size:255;"`                          // 访问路由
 	ParentID   *uint64 `gorm:"index;default:0;"`                   // 父级内码
 	ParentPath *string `gorm:"size:512;index;default:'';"`         // 父级路径
-	IsShow     int     `gorm:"type:tinyint;index;default:0;"`      // 是否显示(1:显示 2:隐藏)
-	Status     int     `gorm:"type:tinyint;index;default:0;"`      // 状态(1:启用 2:禁用)
+	IsShow     int     `gorm:"index;default:0;"`                   // 是否显示(1:显示 2:隐藏)
+	Status     int     `gorm:"index;default:0;"`                   // 状态(1:启用 2:禁用)
 	Sequence   int     `gorm:"index;default:0;"`                   // 排序值
 	Memo       *string `gorm:"size:1024;"`                         // 备注
 	Creator    uint64  `gorm:""`                                   // 创建人

diff --git a/internal/app/dao/role/role.entity.go b/internal/app/dao/role/role.entity.go
@@ -31,7 +31,7 @@ type Role struct {
 	Name     string  `gorm:"size:100;index;default:'';not null;"` // 角色名称
 	Sequence int     `gorm:"index;default:0;"`                    // 排序值
 	Memo     *string `gorm:"size:1024;"`                          // 备注
-	Status   int     `gorm:"type:tinyint;index;default:0;"`       // 状态(1:启用 2:禁用)
+	Status   int     `gorm:"index;default:0;"`                    // 状态(1:启用 2:禁用)
 	Creator  uint64  `gorm:""`                                    // 创建者
 }
 

diff --git a/internal/app/dao/user/user.entity.go b/internal/app/dao/user/user.entity.go
@@ -33,7 +33,7 @@ type User struct {
 	Password string  `gorm:"size:40;default:'';"`                      // 密码(sha1(md5(明文)))
 	Email    *string `gorm:"size:255;"`                                // 邮箱
 	Phone    *string `gorm:"size:20;"`                                 // 手机号
-	Status   int     `gorm:"type:tinyint;index;default:0;"`            // 状态(1:启用 2:停用)
+	Status   int     `gorm:"index;default:0;"`                         // 状态(1:启用 2:停用)
 	Creator  uint64  `gorm:""`                                         // 创建者
 }
 

diff --git a/internal/app/middleware/auth.mw.go b/internal/app/middleware/auth.mw.go
@@ -4,13 +4,14 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/gin-gonic/gin"
+
 	"github.com/LyricTian/gin-admin/v8/internal/app/config"
 	"github.com/LyricTian/gin-admin/v8/internal/app/contextx"
 	"github.com/LyricTian/gin-admin/v8/internal/app/ginx"
 	"github.com/LyricTian/gin-admin/v8/pkg/auth"
 	"github.com/LyricTian/gin-admin/v8/pkg/errors"
 	"github.com/LyricTian/gin-admin/v8/pkg/logger"
-	"github.com/gin-gonic/gin"
 )
 
 func wrapUserAuthContext(c *gin.Context, userID uint64, userName string) {

diff --git a/pkg/auth/jwtauth/auth.go b/pkg/auth/jwtauth/auth.go
@@ -110,9 +110,7 @@ func (a *JWTAuth) GenerateToken(ctx context.Context, userID string) (auth.TokenI
 // 解析令牌
 func (a *JWTAuth) parseToken(tokenString string) (*jwt.StandardClaims, error) {
 	token, err := jwt.ParseWithClaims(tokenString, &jwt.StandardClaims{}, a.opts.keyfunc)
-	if err != nil {
-		return nil, err
-	} else if !token.Valid {
+	if err != nil || !token.Valid {
 		return nil, auth.ErrInvalidToken
 	}
 

diff --git a/pkg/errors/errors.go b/pkg/errors/errors.go
@@ -16,7 +16,7 @@ var (
 
 // 定义错误
 var (
-	ErrInvalidToken            = NewResponse(10000, 401, "令牌失效")
+	ErrInvalidToken            = NewResponse(40001, 401, "令牌失效")
 	ErrNoPerm                  = NewResponse(0, 401, "无访问权限")
 	ErrNotFound                = NewResponse(0, 404, "资源不存在")
 	ErrMethodNotAllow          = NewResponse(0, 405, "方法不被允许")