fix: error judgement in database

suyuan32 · Oct 21, 2022 · 08954ca · 08954ca
1 parent 9e7b929
commit 08954ca
Show file tree

Hide file tree

Showing 21 changed files with 317 additions and 205 deletions.
diff --git a/api/api_desc/token.api b/api/api_desc/token.api
@@ -29,7 +29,7 @@ type (
  Source string `json:"source"`
 
  // JWT status 0 ban 1 active | JWT状态， 0 禁止 1 正常
- Status bool `json:"status"`
+ Status uint32 `json:"status"`
 
  // Expire time | 过期时间
  ExpireAt int64 `json:"expireAt"`
@@ -62,7 +62,7 @@ type (
 
  // JWT status 0 ban 1 active | JWT状态， 0 禁止 1 正常
  // Required: true
- Status bool `json:"status" validate:"boolean"`
+ Status uint32 `json:"status" validate:"number"`
 
  // Expire time | 过期时间
  // Required: true

diff --git a/api/internal/logic/oauth/oauthcallbacklogic.go b/api/internal/logic/oauth/oauthcallbacklogic.go
@@ -3,6 +3,7 @@ package oauth
 import (
  "context"
  "net/http"
+ "strings"
  "time"
 
  "github.com/suyuan32/simple-admin-core/api/internal/logic/user"
@@ -42,6 +43,22 @@ func (l *OauthCallbackLogic) OauthCallback() (resp *types.CallbackResp, err erro
  token, err := user.GetJwtToken(l.svcCtx.Config.Auth.AccessSecret, result.Id, time.Now().Unix(),
  l.svcCtx.Config.Auth.AccessExpire, int64(result.RoleId))
 
+ // add token into database
+ expireAt := time.Now().Add(time.Second * 259200).Unix()
+ _, err = l.svcCtx.CoreRpc.CreateOrUpdateToken(context.Background(), &core.TokenInfo{
+ Id: 0,
+ CreateAt: 0,
+ UUID: result.Id,
+ Token: token,
+ Source: strings.Split(l.r.FormValue("state"), "-")[1],
+ Status: 1,
+ ExpireAt: expireAt,
+ })
+
+ if err != nil {
+ return nil, err
+ }
+
  return &types.CallbackResp{
  UserId: result.Id,
  Role: types.RoleInfoSimple{

diff --git a/api/internal/logic/token/gettokenlistlogic.go b/api/internal/logic/token/gettokenlistlogic.go
@@ -30,6 +30,7 @@ func (l *GetTokenListLogic) GetTokenList(req *types.TokenListReq) (resp *types.T
  Page: req.Page,
  PageSize: req.PageSize,
  },
+ UUID: req.UUID,
  Username: req.Username,
  Nickname: req.Nickname,
  Email: req.Email,

diff --git a/api/internal/logic/user/loginlogic.go b/api/internal/logic/user/loginlogic.go
@@ -46,10 +46,27 @@ func (l *LoginLogic) Login(req *types.LoginReq) (resp *types.LoginResp, err erro
  if err != nil {
  return nil, err
  }
+
+ // add token into database
+ expireAt := time.Now().Add(time.Second * 259200).Unix()
+ _, err = l.svcCtx.CoreRpc.CreateOrUpdateToken(context.Background(), &core.TokenInfo{
+ Id: 0,
+ CreateAt: 0,
+ UUID: user.Id,
+ Token: token,
+ Source: "core",
+ Status: 1,
+ ExpireAt: expireAt,
+ })
+
+ if err != nil {
+ return nil, err
+ }
+
  resp = &types.LoginResp{
  UserId: user.Id,
  Token: token,
- Expire: uint64(time.Now().Add(time.Second * 259200).Unix()),
+ Expire: uint64(expireAt),
  Role: types.RoleInfoSimple{
  Value: user.RoleValue,
  RoleName: user.RoleName,

diff --git a/api/internal/middleware/authoritymiddleware.go b/api/internal/middleware/authoritymiddleware.go
@@ -47,6 +47,19 @@ func (m *AuthorityMiddleware) Handle(next http.HandlerFunc) http.HandlerFunc {
  return
  }
 
+ // check jwt blacklist
+ res, err := m.Rds.Get("token_" + r.Header.Get("Authorization"))
+ if err != nil {
+ logx.Errorw("Redis error in jwt", logx.Field("Detail", err.Error()))
+ httpx.Error(w, errorx.NewApiError(http.StatusInternalServerError, err.Error()))
+ return
+ }
+ if res == "1" {
+ logx.Errorw("Token in blacklist", logx.Field("Detail", r.Header.Get("Authorization")))
+ httpx.Error(w, errorx.NewApiErrorWithoutMsg(http.StatusUnauthorized))
+ return
+ }
+
  sub := roleId
  result, err := m.Cbn.Enforce(sub, obj, act)
  if err != nil {

diff --git a/api/internal/svc/servicecontext_test.go b/api/internal/svc/servicecontext_test.go
@@ -37,3 +37,7 @@ func TestAddTrans(t *testing.T) {
  t.Error(result)
  }
 }
+
+func TestRedis(t *testing.T) {
+
+}
diff --git a/api/internal/types/types.go b/api/internal/types/types.go
diff --git a/rpc/core.proto b/rpc/core.proto
@@ -355,6 +355,7 @@ message TokenListReq {
  string username = 2;
  string nickname = 3;
  string email = 4;
+ string UUID = 5;
 }
 
 // service

diff --git a/rpc/internal/logic/changepasswordlogic.go b/rpc/internal/logic/changepasswordlogic.go
@@ -2,6 +2,9 @@ package logic
 
 import (
  "context"
+ "errors"
+
+ "gorm.io/gorm"
 
  "github.com/suyuan32/simple-admin-core/common/logmessage"
  "github.com/suyuan32/simple-admin-core/common/message"
@@ -33,14 +36,15 @@ func NewChangePasswordLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Ch
 func (l *ChangePasswordLogic) ChangePassword(in *core.ChangePasswordReq) (*core.BaseResp, error) {
  var target model.User
  result := l.svcCtx.DB.Where("uuid = ?", in.Uuid).First(&target)
+ if errors.Is(result.Error, gorm.ErrRecordNotFound) {
+ logx.Errorw("User does not exist", logx.Field("UUID", in.Uuid))
+ return nil, status.Error(codes.NotFound, errorx.TargetNotExist)
+ }
+
  if result.Error != nil {
  logx.Errorw(logmessage.DatabaseError, logx.Field("Detail", result.Error.Error()))
  return nil, status.Error(codes.Internal, errorx.DatabaseError)
  }
- if result.RowsAffected == 0 {
- logx.Errorw("User does not exist", logx.Field("UUID", in.Uuid))
- return nil, status.Error(codes.NotFound, errorx.TargetNotExist)
- }
 
  if ok := util.BcryptCheck(in.OldPassword, target.Password); ok {
  target.Password = util.BcryptEncrypt(in.NewPassword)

diff --git a/rpc/internal/logic/createorupdateapilogic.go b/rpc/internal/logic/createorupdateapilogic.go
@@ -2,6 +2,7 @@ package logic
 
 import (
  "context"
+ "errors"
  "time"
 
  "github.com/suyuan32/simple-admin-core/common/logmessage"
@@ -60,14 +61,16 @@ func (l *CreateOrUpdateApiLogic) CreateOrUpdateApi(in *core.ApiInfo) (*core.Base
  } else {
  var origin *model.Api
  check := l.svcCtx.DB.Where("id = ?", in.Id).First(&origin)
+
+ if errors.Is(check.Error, gorm.ErrRecordNotFound) {
+ logx.Errorw(errorx.TargetNotExist, logx.Field("id", in.Id))
+ return nil, status.Error(codes.InvalidArgument, errorx.UpdateFailed)
+ }
+
  if check.Error != nil {
  logx.Errorw(logmessage.DatabaseError, logx.Field("Detail", check.Error.Error()))
  return nil, status.Error(codes.Internal, check.Error.Error())
  }
- if check.RowsAffected == 0 {
- logx.Errorw(errorx.TargetNotExist, logx.Field("id", in.Id))
- return nil, status.Error(codes.InvalidArgument, errorx.UpdateFailed)
- }
 
  data := &model.Api{
  Model: gorm.Model{ID: origin.ID, CreatedAt: origin.CreatedAt, UpdatedAt: time.Now()},

diff --git a/rpc/internal/logic/createorupdatedictionarydetaillogic.go b/rpc/internal/logic/createorupdatedictionarydetaillogic.go
@@ -2,16 +2,19 @@ package logic
 
 import (
  "context"
- "github.com/suyuan32/simple-admin-core/common/logmessage"
- "github.com/suyuan32/simple-admin-core/common/message"
- "github.com/suyuan32/simple-admin-core/rpc/internal/model"
- "github.com/suyuan32/simple-admin-core/rpc/internal/svc"
- "github.com/suyuan32/simple-admin-core/rpc/types/core"
+ "errors"
+
  "github.com/zeromicro/go-zero/core/errorx"
  "github.com/zeromicro/go-zero/core/logx"
  "google.golang.org/grpc/codes"
  "google.golang.org/grpc/status"
  "gorm.io/gorm"
+
+ "github.com/suyuan32/simple-admin-core/common/logmessage"
+ "github.com/suyuan32/simple-admin-core/common/message"
+ "github.com/suyuan32/simple-admin-core/rpc/internal/model"
+ "github.com/suyuan32/simple-admin-core/rpc/internal/svc"
+ "github.com/suyuan32/simple-admin-core/rpc/types/core"
 )
 
 type CreateOrUpdateDictionaryDetailLogic struct {
@@ -31,16 +34,16 @@ func NewCreateOrUpdateDictionaryDetailLogic(ctx context.Context, svcCtx *svc.Ser
 func (l *CreateOrUpdateDictionaryDetailLogic) CreateOrUpdateDictionaryDetail(in *core.DictionaryDetail) (*core.BaseResp, error) {
  var parent model.Dictionary
  check := l.svcCtx.DB.Where("id = ?", in.ParentId).First(&parent)
- if check.Error != nil {
- logx.Errorw(logmessage.DatabaseError, logx.Field("Detail", check.Error.Error()))
- return nil, status.Error(codes.Internal, check.Error.Error())
- }
 
- if check.RowsAffected == 0 {
+ if errors.Is(check.Error, gorm.ErrRecordNotFound) {
  logx.Errorw(message.ParentNotExist, logx.Field("Detail", in))
  return nil, status.Error(codes.InvalidArgument, message.ParentNotExist)
  }
 
+ if check.Error != nil {
+ logx.Errorw(logmessage.DatabaseError, logx.Field("Detail", check.Error.Error()))
+ return nil, status.Error(codes.Internal, check.Error.Error())
+ }
  if in.Id == 0 {
  result := l.svcCtx.DB.Create(&model.DictionaryDetail{
  Model: gorm.Model{},
@@ -63,16 +66,16 @@ func (l *CreateOrUpdateDictionaryDetailLogic) CreateOrUpdateDictionaryDetail(in
  var origin model.DictionaryDetail
  checkOrigin := l.svcCtx.DB.Where("id = ?", in.Id).First(&origin)
 
+ if errors.Is(checkOrigin.Error, gorm.ErrRecordNotFound) {
+ logx.Errorw(logmessage.TargetNotFound, logx.Field("Detail", in))
+ return nil, status.Error(codes.InvalidArgument, errorx.TargetNotExist)
+ }
+
  if checkOrigin.Error != nil {
  logx.Errorw(logmessage.DatabaseError, logx.Field("Detail", checkOrigin.Error.Error()))
  return nil, status.Error(codes.Internal, checkOrigin.Error.Error())
  }
 
- if checkOrigin.RowsAffected == 0 {
- logx.Errorw(logmessage.TargetNotFound, logx.Field("Detail", in))
- return nil, status.Error(codes.InvalidArgument, errorx.TargetNotExist)
- }
-
  origin.Title = in.Title
  origin.Key = in.Key
  origin.Value = in.Value

diff --git a/rpc/internal/logic/createorupdatedictionarylogic.go b/rpc/internal/logic/createorupdatedictionarylogic.go
@@ -2,14 +2,17 @@ package logic
 
 import (
  "context"
- "github.com/suyuan32/simple-admin-core/common/logmessage"
- "github.com/suyuan32/simple-admin-core/common/message"
- "github.com/suyuan32/simple-admin-core/rpc/internal/model"
+ "errors"
+
  "github.com/zeromicro/go-zero/core/errorx"
  "google.golang.org/grpc/codes"
  "google.golang.org/grpc/status"
  "gorm.io/gorm"
 
+ "github.com/suyuan32/simple-admin-core/common/logmessage"
+ "github.com/suyuan32/simple-admin-core/common/message"
+ "github.com/suyuan32/simple-admin-core/rpc/internal/model"
+
  "github.com/suyuan32/simple-admin-core/rpc/internal/svc"
  "github.com/suyuan32/simple-admin-core/rpc/types/core"
 
@@ -59,7 +62,7 @@ func (l *CreateOrUpdateDictionaryLogic) CreateOrUpdateDictionary(in *core.Dictio
  return nil, status.Error(codes.Internal, check.Error.Error())
  }
 
- if check.RowsAffected == 0 {
+ if errors.Is(check.Error, gorm.ErrRecordNotFound) {
  logx.Errorw(logmessage.TargetNotFound, logx.Field("Detail", in))
  return nil, status.Error(codes.InvalidArgument, errorx.TargetNotExist)
  }

diff --git a/rpc/internal/logic/createorupdatemenulogic.go b/rpc/internal/logic/createorupdatemenulogic.go
@@ -2,6 +2,7 @@ package logic
 
 import (
  "context"
+ "errors"
  "time"
 
  "github.com/suyuan32/simple-admin-core/common/logmessage"
@@ -37,14 +38,14 @@ func (l *CreateOrUpdateMenuLogic) CreateOrUpdateMenu(in *core.CreateOrUpdateMenu
  if in.ParentId != 0 {
  var parent model.Menu
  result := l.svcCtx.DB.Where("id = ?", in.ParentId).First(&parent)
+ if errors.Is(result.Error, gorm.ErrRecordNotFound) {
+ logx.Errorw("Wrong parent ID", logx.Field("parentId", in.ParentId))
+ return nil, status.Error(codes.InvalidArgument, message.ParentNotExist)
+ }
  if result.Error != nil {
  logx.Errorw(logmessage.DatabaseError, logx.Field("Detail", result.Error.Error()))
  return nil, status.Error(codes.Internal, result.Error.Error())
  }
- if result.RowsAffected == 0 {
- logx.Errorw("Wrong parent ID", logx.Field("parentId", in.ParentId))
- return nil, status.Error(codes.InvalidArgument, message.ParentNotExist)
- }
  menuLevel = parent.MenuLevel + 1
  } else {
  in.ParentId = 1
@@ -94,13 +95,15 @@ func (l *CreateOrUpdateMenuLogic) CreateOrUpdateMenu(in *core.CreateOrUpdateMenu
  } else {
  var origin *model.Menu
  result := l.svcCtx.DB.Where("id = ?", in.Id).First(&origin)
+ if errors.Is(result.Error, gorm.ErrRecordNotFound) {
+ return nil, status.Error(codes.InvalidArgument, message.MenuNotExists)
+ }
+
  if result.Error != nil {
  logx.Errorw(logmessage.DatabaseError, logx.Field("Detail", result.Error.Error()))
  return nil, status.Error(codes.Internal, errorx.DatabaseError)
  }
- if result.RowsAffected == 0 {
- return nil, status.Error(codes.InvalidArgument, message.MenuNotExists)
- }
+
  data = &model.Menu{
  Model: gorm.Model{ID: uint(in.Id), CreatedAt: origin.CreatedAt, UpdatedAt: time.Now()},
  MenuLevel: menuLevel,

diff --git a/rpc/internal/logic/createorupdatemenuparamlogic.go b/rpc/internal/logic/createorupdatemenuparamlogic.go
@@ -2,13 +2,16 @@ package logic
 
 import (
  "context"
- "github.com/suyuan32/simple-admin-core/common/logmessage"
- "github.com/suyuan32/simple-admin-core/rpc/internal/model"
+ "errors"
+
  "github.com/zeromicro/go-zero/core/errorx"
  "google.golang.org/grpc/codes"
  "google.golang.org/grpc/status"
  "gorm.io/gorm"
 
+ "github.com/suyuan32/simple-admin-core/common/logmessage"
+ "github.com/suyuan32/simple-admin-core/rpc/internal/model"
+
  "github.com/suyuan32/simple-admin-core/rpc/internal/svc"
  "github.com/suyuan32/simple-admin-core/rpc/types/core"
 
@@ -51,14 +54,14 @@ func (l *CreateOrUpdateMenuParamLogic) CreateOrUpdateMenuParam(in *core.CreateOr
  } else {
  var origin model.MenuParam
  check := l.svcCtx.DB.Where("id = ?", in.Id).First(&origin)
+ if errors.Is(check.Error, gorm.ErrRecordNotFound) {
+ logx.Errorw("Update menu parameter error, menu parameter does not find", logx.Field("Detail", in))
+ return nil, status.Error(codes.InvalidArgument, errorx.TargetNotExist)
+ }
  if check.Error != nil {
  logx.Errorw(logmessage.DatabaseError, logx.Field("Detail", check.Error.Error()))
  return nil, status.Error(codes.Internal, check.Error.Error())
  }
- if check.RowsAffected == 0 {
- logx.Errorw("Update menu parameter error, menu parameter does not find", logx.Field("Detail", in))
- return nil, status.Error(codes.InvalidArgument, errorx.TargetNotExist)
- }
  origin.MenuId = uint(in.MenuId)
  origin.Type = in.Type
  origin.Value = in.Value