diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Navigation.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Navigation.cs index 846dfcfd..1757e13b 100644 --- a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Navigation.cs +++ b/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Navigation.cs @@ -1,14 +1,12 @@ // Copyright (c) Argo Zhang (argo@163.com). All rights reserved. using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; namespace BootstrapAdmin.DataAccess.Models; /// /// Bootstrap Admin 后台管理菜单相关操作实体类 /// -[Table("Navigations")] public class Navigation { /// diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/AppService.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/AppService.cs index 939fbd66..787d27a9 100644 --- a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/AppService.cs +++ b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/AppService.cs @@ -3,8 +3,10 @@ using PetaPoco; namespace BootstrapAdmin.DataAccess.PetaPoco.Services; -class AppService : BaseDatabase, IApp +class AppService : IApp { + private IDatabase Database { get; } + public AppService(IDatabase db) { Database = db; diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/Database.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/Database.cs deleted file mode 100644 index d25a6c4b..00000000 --- a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/Database.cs +++ /dev/null @@ -1,12 +0,0 @@ -using PetaPoco; - -namespace BootstrapAdmin.DataAccess.PetaPoco.Services; - -abstract class BaseDatabase -{ - /// - /// - /// - [NotNull] - protected IDatabase? Database { get; set; } -} diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/DictService.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/DictService.cs index b70b02b4..0d7caf36 100644 --- a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/DictService.cs +++ b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/DictService.cs @@ -7,8 +7,10 @@ using PetaPoco; namespace BootstrapAdmin.DataAccess.PetaPoco.Services; -class DictService : BaseDatabase, IDict +class DictService : IDict { + private IDatabase Database { get; } + private string AppId { get; set; } /// diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/ExceptionService.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/ExceptionService.cs index 3aabff26..b5d9565c 100644 --- a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/ExceptionService.cs +++ b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/ExceptionService.cs @@ -4,8 +4,10 @@ using PetaPoco; namespace BootstrapAdmin.DataAccess.PetaPoco.Services; -class ExceptionService : BaseDatabase, IException +class ExceptionService : IException { + private IDatabase Database { get; } + public ExceptionService(IDatabase db) => Database = db; public bool Log(Error exception) diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/GroupService.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/GroupService.cs index 6e685c13..4320abe0 100644 --- a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/GroupService.cs +++ b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/GroupService.cs @@ -4,8 +4,10 @@ using PetaPoco; namespace BootstrapAdmin.DataAccess.PetaPoco.Services; -class GroupService : BaseDatabase, IGroup +class GroupService : IGroup { + private IDatabase Database { get; } + /// /// /// diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/NavigationService.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/NavigationService.cs index 012469cc..b0989a9a 100644 --- a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/NavigationService.cs +++ b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/NavigationService.cs @@ -7,8 +7,10 @@ namespace BootstrapAdmin.DataAccess.PetaPoco.Services; /// /// /// -class NavigationService : BaseDatabase, INavigation +class NavigationService : INavigation { + private IDatabase Database { get; } + /// /// /// diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/RoleService.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/RoleService.cs index 7b85a150..3e07f49d 100644 --- a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/RoleService.cs +++ b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/RoleService.cs @@ -4,8 +4,10 @@ using PetaPoco; namespace BootstrapAdmin.DataAccess.PetaPoco.Services; -class RoleService : BaseDatabase, IRole +class RoleService : IRole { + private IDatabase Database { get; } + /// /// /// diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/UserService.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/UserService.cs index 2e67767c..51976d34 100644 --- a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/UserService.cs +++ b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/UserService.cs @@ -5,8 +5,10 @@ using PetaPoco; namespace BootstrapAdmin.DataAccess.PetaPoco.Services; -class UserService : BaseDatabase, IUser +class UserService : IUser { + private IDatabase Database { get; } + /// /// ///