优化结构

internal/service/system/version.go

@@ -219,9 +219,6 @@ func (s *VersionService) Export(ctx context.Context, name, code, description str
 	}
 	return nil
 }
-func (s *VersionService) Import(ctx context.Context, bundle *system.VersionBundle) error {
-	return s.uc.ImportVersionBundle(ctx, bundle)
-}
 func versionMenuDomain(value dto.VersionMenuRequest) *system.Menu {
 	menu := &system.Menu{Path: value.Path, Name: value.Name, Hidden: value.Hidden, Component: value.Component, Sort: value.Sort, ActiveName: value.Meta.ActiveName, KeepAlive: value.Meta.KeepAlive, DefaultMenu: value.Meta.DefaultMenu, Title: value.Meta.Title, Icon: value.Meta.Icon, CloseTab: value.Meta.CloseTab, TransitionType: value.Meta.TransitionType}
 	for _, button := range value.MenuButtons {
@@ -253,20 +250,15 @@ func (s *VersionService) ImportRequest(ctx context.Context, req *dto.ImportVersi
 		}
 		bundle.Dictionaries = append(bundle.Dictionaries, item)
 	}
-	if err := s.Import(ctx, bundle); err != nil {
-		return err
-	}
 	raw, err := json.Marshal(req)
 	if err != nil {
 		return &system.VersionStageError{Stage: system.VersionStageJSON, Err: err}
 	}
-	if err = s.uc.CreateVersion(ctx, &system.Version{
+	audit := &system.Version{
 		Name:        versionPointer(req.Version.Name),
 		Code:        versionPointer(req.Version.Code + "_imported_" + time.Now().Format("20060102150405")),
 		Description: versionPointer("导入版本: " + req.Version.Description),
 		Data:        versionPointer(string(raw)),
-	}); err != nil {
-		return &system.VersionStageError{Stage: system.VersionStageSave, Err: err}
 	}
-	return nil
+	return s.uc.ImportVersionBundle(ctx, bundle, audit)
 }