update

internal/erpserver/service/v1/system/config.go

@@ -8,8 +8,8 @@ import (
 
 	"management/internal/erpserver/model/dto"
 	"management/internal/erpserver/model/system"
-	"management/internal/erpserver/service"
-	v1 "management/internal/erpserver/service/v1"
+	"management/internal/erpserver/service/util"
+	"management/internal/erpserver/service/v1"
 	"management/internal/pkg/know"
 	"management/internal/pkg/know/pearadmin"
 
@@ -17,11 +17,11 @@ import (
 )
 
 type configService struct {
-	*service.Service
+	*v1.Service
 	repo system.ConfigRepository
 }
 
-func NewConfigService(service *service.Service, repo system.ConfigRepository) v1.ConfigService {
+func NewConfigService(service *v1.Service, repo system.ConfigRepository) v1.ConfigService {
 	return &configService{
 		Service: service,
 		repo:    repo,
@@ -45,28 +45,12 @@ func (s *configService) List(ctx context.Context, q dto.SearchDto) ([]*system.Co
 }
 
 func (s *configService) Pear(ctx context.Context) (*dto.PearConfig, error) {
-	// 判断redis是否存储
+	var res *dto.PearConfig
 	key := know.GetManageKey(ctx, know.PearAdmin)
-	bs, err := s.Redis.GetBytes(ctx, key)
-	if err == nil {
-		var res *dto.PearConfig
-		if err := json.Unmarshal(bs, &res); err == nil {
-			return res, nil
-		}
-	}
-
-	conf, err := s.repo.GetByKey(ctx, pearadmin.PearKey)
-	if err != nil {
-		return nil, err
-	}
-
-	var pear dto.PearConfig
-	if err := json.Unmarshal([]byte(conf.Value), &pear); err != nil {
-		return nil, err
-	}
-
-	_ = s.Redis.Set(ctx, key, conf.Value, time.Hour*6)
-	return &pear, nil
+	err := util.GetOrSetCache(ctx, s.Redis, key, util.GetCacheExpire(), func() (any, error) {
+		return s.repo.GetByKey(ctx, pearadmin.PearKey)
+	}, &res)
+	return res, err
 }
 
 func (s *configService) RefreshCache(ctx context.Context, key string) error {