diff --git a/server/service/system/jwt_black_list.go b/server/service/system/jwt_black_list.go index a73c32bed617b2140568d7dd35cf2e8359b4b45b..6a97619f97a46f2eb89e5301dd6b7f1dbc8aed97 100644 --- a/server/service/system/jwt_black_list.go +++ b/server/service/system/jwt_black_list.go @@ -2,6 +2,7 @@ package system import ( "context" + "go.uber.org/zap" "time" "github.com/flipped-aurora/gin-vue-admin/server/global" @@ -22,8 +23,7 @@ func (jwtService *JwtService) JsonInBlacklist(jwtList system.JwtBlacklist) (err if err != nil { return } - global.BlackCache.SetDefault(jwtList.Jwt, struct { - }{}) + global.BlackCache.SetDefault(jwtList.Jwt, struct{}{}) return } @@ -67,12 +67,12 @@ func (jwtService *JwtService) SetRedisJWT(jwt string, userName string) (err erro func LoadAll() { var data []string - err := global.GVA_DB.Find(&system.JwtBlacklist{}).Select("jwt").Find(&data).Error + err := global.GVA_DB.Model(&system.JwtBlacklist{}).Select("jwt").Find(&data).Error if err != nil { - // 从db加载jwt数据 - for i := range data { - global.BlackCache.SetDefault(data[i], struct { - }{}) - } + global.GVA_LOG.Error("加载数据库jwt黑名单失败!", zap.Error(err)) + return } + for i := 0; i < len(data); i++ { + global.BlackCache.SetDefault(data[i], struct{}{}) + } // jwt黑名单 加入 BlackCache 中 } diff --git a/server/service/system/sys_dictionary.go b/server/service/system/sys_dictionary.go index 1335218db07871d4cb1b2459f09efed6d10c9a04..37f05b69eac848da7dc16d294b923285dcbe0ad4 100644 --- a/server/service/system/sys_dictionary.go +++ b/server/service/system/sys_dictionary.go @@ -52,15 +52,12 @@ func (dictionaryService *DictionaryService) UpdateSysDictionary(sysDictionary *s "Desc": sysDictionary.Desc, } db := global.GVA_DB.Where("id = ?", sysDictionary.ID).First(&dict) - if dict.Type == sysDictionary.Type { - err = db.Updates(sysDictionaryMap).Error - } else { - if (!errors.Is(global.GVA_DB.First(&system.SysDictionary{}, "type = ?", sysDictionary.Type).Error, gorm.ErrRecordNotFound)) { + if dict.Type != sysDictionary.Type { + if !errors.Is(global.GVA_DB.First(&system.SysDictionary{}, "type = ?", sysDictionary.Type).Error, gorm.ErrRecordNotFound) { return errors.New("存在相同的type,不允许创建") } - err = db.Updates(sysDictionaryMap).Error - } + err = db.Updates(sysDictionaryMap).Error return err }