fix: fix staticcheck errors - errors.Is parameter order and deprecated ioutil

This commit is contained in:
2026-04-19 23:43:33 +08:00
parent 35e37a8142
commit 1685aa4428
11 changed files with 40 additions and 40 deletions
+17 -17
View File
@@ -25,24 +25,24 @@ type backupService struct {
baseService
}
func (service backupService) Export() (error, *dto.Backup) {
func (service backupService) Export() (*dto.Backup, error) {
ctx := context.TODO()
users, err := repository.UserRepository.FindAll(ctx)
if err != nil {
return err, nil
return nil, err
}
for i := range users {
users[i].Password = ""
}
userGroups, err := repository.UserGroupRepository.FindAll(ctx)
if err != nil {
return err, nil
return nil, err
}
if len(userGroups) > 0 {
for i := range userGroups {
members, err := repository.UserGroupMemberRepository.FindUserIdsByUserGroupId(ctx, userGroups[i].ID)
if err != nil {
return err, nil
return nil, err
}
userGroups[i].Members = members
}
@@ -50,54 +50,54 @@ func (service backupService) Export() (error, *dto.Backup) {
storages, err := repository.StorageRepository.FindAll(ctx)
if err != nil {
return err, nil
return nil, err
}
strategies, err := repository.StrategyRepository.FindAll(ctx)
if err != nil {
return err, nil
return nil, err
}
jobs, err := repository.JobRepository.FindAll(ctx)
if err != nil {
return err, nil
return nil, err
}
accessSecurities, err := repository.SecurityRepository.FindAll(ctx)
if err != nil {
return err, nil
return nil, err
}
accessGateways, err := repository.GatewayRepository.FindAll(ctx)
if err != nil {
return err, nil
return nil, err
}
commands, err := repository.CommandRepository.FindAll(ctx)
if err != nil {
return err, nil
return nil, err
}
credentials, err := repository.CredentialRepository.FindAll(ctx)
if err != nil {
return err, nil
return nil, err
}
if len(credentials) > 0 {
for i := range credentials {
if err := CredentialService.Decrypt(&credentials[i], config.GlobalCfg.EncryptionPassword); err != nil {
return err, nil
return nil, err
}
}
}
assets, err := repository.AssetRepository.FindAll(ctx)
if err != nil {
return err, nil
return nil, err
}
var assetMaps = make([]map[string]interface{}, 0)
if len(assets) > 0 {
for i := range assets {
asset := assets[i]
if err := AssetService.Decrypt(&asset, config.GlobalCfg.EncryptionPassword); err != nil {
return err, nil
return nil, err
}
attributeMap, err := repository.AssetRepository.FindAssetAttrMapByAssetId(ctx, asset.ID)
if err != nil {
return err, nil
return nil, err
}
itemMap := utils.StructToMap(asset)
for key := range attributeMap {
@@ -120,7 +120,7 @@ func (service backupService) Export() (error, *dto.Backup) {
Credentials: credentials,
Assets: assetMaps,
}
return nil, &backup
return &backup, nil
}
func (service backupService) Import(backup *dto.Backup) error {
@@ -162,7 +162,7 @@ func (service backupService) Import(backup *dto.Backup) error {
userGroup, err := UserGroupService.Create(ctx, item.Name, members)
if err != nil {
if errors.Is(nt.ErrNameAlreadyUsed, err) {
if errors.Is(err, nt.ErrNameAlreadyUsed) {
// 删除名称重复的用户组
delete(userGroupIdMapping, oldId)
continue