Browse Source

修改命名

zhontai 2 years ago
parent
commit
8c5a4e5843
33 changed files with 53 additions and 53 deletions
  1. 2 2
      src/platform/ZhonTai.Admin/Core/Attributes/TransactionAttribute.cs
  2. 1 1
      src/platform/ZhonTai.Admin/Repositories/Api/ApiRepository.cs
  3. 1 1
      src/platform/ZhonTai.Admin/Repositories/Dictionary/DictionaryRepository.cs
  4. 1 1
      src/platform/ZhonTai.Admin/Repositories/DictionaryType/DictionaryTypeRepository.cs
  5. 1 1
      src/platform/ZhonTai.Admin/Repositories/Document/DocumentRepository.cs
  6. 1 1
      src/platform/ZhonTai.Admin/Repositories/DocumentImage/DocumentImageRepository.cs
  7. 1 1
      src/platform/ZhonTai.Admin/Repositories/LoginLog/LoginLogRepository.cs
  8. 1 1
      src/platform/ZhonTai.Admin/Repositories/OprationLog/OprationLogRepository.cs
  9. 1 1
      src/platform/ZhonTai.Admin/Repositories/Org/OrgRepository.cs
  10. 1 1
      src/platform/ZhonTai.Admin/Repositories/Permission/PermissionRepository.cs
  11. 1 1
      src/platform/ZhonTai.Admin/Repositories/PermissionApi/PermissionApiRepository.cs
  12. 2 2
      src/platform/ZhonTai.Admin/Repositories/RepositoryBase.cs
  13. 1 1
      src/platform/ZhonTai.Admin/Repositories/Role/RoleRepository.cs
  14. 1 1
      src/platform/ZhonTai.Admin/Repositories/RoleOrg/RoleOrgRepository.cs
  15. 1 1
      src/platform/ZhonTai.Admin/Repositories/RolePermission/RolePermissionRepository.cs
  16. 1 1
      src/platform/ZhonTai.Admin/Repositories/Task/TaskLogRepository.cs
  17. 1 1
      src/platform/ZhonTai.Admin/Repositories/Task/TaskRepository.cs
  18. 1 1
      src/platform/ZhonTai.Admin/Repositories/Tenant/TenantRepository.cs
  19. 1 1
      src/platform/ZhonTai.Admin/Repositories/TenantPermission/TenantPermissionRepository.cs
  20. 1 1
      src/platform/ZhonTai.Admin/Repositories/User/UserRepository.cs
  21. 1 1
      src/platform/ZhonTai.Admin/Repositories/UserOrg/UserOrgRepository.cs
  22. 1 1
      src/platform/ZhonTai.Admin/Repositories/UserRole/UserRoleRepository.cs
  23. 1 1
      src/platform/ZhonTai.Admin/Repositories/UserStaff/UserStaffRepository.cs
  24. 1 1
      src/platform/ZhonTai.Admin/Repositories/View/ViewRepositoryRepository.cs
  25. 1 1
      src/platform/ZhonTai.Admin/Services/Api/ApiService.cs
  26. 3 3
      src/platform/ZhonTai.Admin/Services/DictionaryType/DictionaryTypeService.cs
  27. 2 2
      src/platform/ZhonTai.Admin/Services/Org/OrgService.cs
  28. 5 5
      src/platform/ZhonTai.Admin/Services/Permission/PermissionService.cs
  29. 4 4
      src/platform/ZhonTai.Admin/Services/Role/RoleService.cs
  30. 4 4
      src/platform/ZhonTai.Admin/Services/Tenant/TenantService.cs
  31. 6 6
      src/platform/ZhonTai.Admin/Services/User/UserService.cs
  32. 1 1
      src/platform/ZhonTai.Admin/Services/View/ViewService.cs
  33. 1 1
      src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

+ 2 - 2
src/platform/ZhonTai.Admin/Core/Attributes/TransactionAttribute.cs

@@ -40,9 +40,9 @@ public class TransactionAttribute : Attribute
 /// 启用事物
 /// 启用事物
 /// </summary>
 /// </summary>
 [AttributeUsage(AttributeTargets.Method, Inherited = true)]
 [AttributeUsage(AttributeTargets.Method, Inherited = true)]
-public class AppTransactionAttribute : TransactionAttribute
+public class AdminTransactionAttribute : TransactionAttribute
 {
 {
-    public AppTransactionAttribute():base(DbKeys.AppDb)
+    public AdminTransactionAttribute():base(DbKeys.AppDb)
     {
     {
     }
     }
 }
 }

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/Api/ApiRepository.cs

@@ -3,7 +3,7 @@ using ZhonTai.Admin.Domain.Api;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class ApiRepository : AppRepositoryBase<ApiEntity>, IApiRepository
+public class ApiRepository : AdminRepositoryBase<ApiEntity>, IApiRepository
 {
 {
     public ApiRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     public ApiRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/Dictionary/DictionaryRepository.cs

@@ -3,7 +3,7 @@ using ZhonTai.Admin.Domain.Dictionary;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class DictionaryRepository : AppRepositoryBase<DictionaryEntity>, IDictionaryRepository
+public class DictionaryRepository : AdminRepositoryBase<DictionaryEntity>, IDictionaryRepository
 {
 {
     public DictionaryRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     public DictionaryRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/DictionaryType/DictionaryTypeRepository.cs

@@ -3,7 +3,7 @@ using ZhonTai.Admin.Domain.DictionaryType;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class DictionaryTypeRepository : AppRepositoryBase<DictionaryTypeEntity>, IDictionaryTypeRepository
+public class DictionaryTypeRepository : AdminRepositoryBase<DictionaryTypeEntity>, IDictionaryTypeRepository
 {
 {
     public DictionaryTypeRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     public DictionaryTypeRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/Document/DocumentRepository.cs

@@ -3,7 +3,7 @@ using ZhonTai.Admin.Domain.Document;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class DocumentRepository : AppRepositoryBase<DocumentEntity>, IDocumentRepository
+public class DocumentRepository : AdminRepositoryBase<DocumentEntity>, IDocumentRepository
 {
 {
     public DocumentRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     public DocumentRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/DocumentImage/DocumentImageRepository.cs

@@ -3,7 +3,7 @@ using ZhonTai.Admin.Domain.DocumentImage;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class DocumentImageRepository : AppRepositoryBase<DocumentImageEntity>, IDocumentImageRepository
+public class DocumentImageRepository : AdminRepositoryBase<DocumentImageEntity>, IDocumentImageRepository
 {
 {
     public DocumentImageRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     public DocumentImageRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/LoginLog/LoginLogRepository.cs

@@ -3,7 +3,7 @@ using ZhonTai.Admin.Domain.LoginLog;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class LoginLogRepository : AppRepositoryBase<LoginLogEntity>, ILoginLogRepository
+public class LoginLogRepository : AdminRepositoryBase<LoginLogEntity>, ILoginLogRepository
 {
 {
     public LoginLogRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     public LoginLogRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/OprationLog/OprationLogRepository.cs

@@ -3,7 +3,7 @@ using ZhonTai.Admin.Domain.OprationLog;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class OprationLogRepository : AppRepositoryBase<OprationLogEntity>, IOprationLogRepository
+public class OprationLogRepository : AdminRepositoryBase<OprationLogEntity>, IOprationLogRepository
 {
 {
     public OprationLogRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     public OprationLogRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/Org/OrgRepository.cs

@@ -5,7 +5,7 @@ using ZhonTai.Admin.Domain.Org;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class OrgRepository : AppRepositoryBase<OrgEntity>, IOrgRepository
+public class OrgRepository : AdminRepositoryBase<OrgEntity>, IOrgRepository
 {
 {
     public OrgRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     public OrgRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/Permission/PermissionRepository.cs

@@ -3,7 +3,7 @@ using ZhonTai.Admin.Domain.Permission;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class PermissionRepository : AppRepositoryBase<PermissionEntity>, IPermissionRepository
+public class PermissionRepository : AdminRepositoryBase<PermissionEntity>, IPermissionRepository
 {
 {
     public PermissionRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     public PermissionRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/PermissionApi/PermissionApiRepository.cs

@@ -3,7 +3,7 @@ using ZhonTai.Admin.Domain.PermissionApi;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class PermissionApiRepository : AppRepositoryBase<PermissionApiEntity>, IPermissionApiRepository
+public class PermissionApiRepository : AdminRepositoryBase<PermissionApiEntity>, IPermissionApiRepository
 {
 {
     public PermissionApiRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     public PermissionApiRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {
     {

+ 2 - 2
src/platform/ZhonTai.Admin/Repositories/RepositoryBase.cs

@@ -4,9 +4,9 @@ using ZhonTai.Admin.Core.Repositories;
 
 
 namespace ZhonTai.Admin.Repositories
 namespace ZhonTai.Admin.Repositories
 {
 {
-    public class AppRepositoryBase<TEntity> : RepositoryBase<TEntity> where TEntity : class
+    public class AdminRepositoryBase<TEntity> : RepositoryBase<TEntity> where TEntity : class
     {
     {
-        public AppRepositoryBase(UnitOfWorkManagerCloud uowm) : base(DbKeys.AppDb, uowm) 
+        public AdminRepositoryBase(UnitOfWorkManagerCloud uowm) : base(DbKeys.AppDb, uowm) 
         {
         {
             
             
         }
         }

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/Role/RoleRepository.cs

@@ -3,7 +3,7 @@ using ZhonTai.Admin.Domain.Role;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class RoleRepository : AppRepositoryBase<RoleEntity>, IRoleRepository
+public class RoleRepository : AdminRepositoryBase<RoleEntity>, IRoleRepository
 {
 {
     public RoleRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     public RoleRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/RoleOrg/RoleOrgRepository.cs

@@ -4,7 +4,7 @@ using ZhonTai.Admin.Domain.RoleOrg;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class RoleOrgRepository : AppRepositoryBase<RoleOrgEntity>, IRoleOrgRepository
+public class RoleOrgRepository : AdminRepositoryBase<RoleOrgEntity>, IRoleOrgRepository
 {
 {
     public RoleOrgRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     public RoleOrgRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/RolePermission/RolePermissionRepository.cs

@@ -3,7 +3,7 @@ using ZhonTai.Admin.Domain.RolePermission;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class RolePermissionRepository : AppRepositoryBase<RolePermissionEntity>, IRolePermissionRepository
+public class RolePermissionRepository : AdminRepositoryBase<RolePermissionEntity>, IRolePermissionRepository
 {
 {
     public RolePermissionRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     public RolePermissionRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/Task/TaskLogRepository.cs

@@ -3,7 +3,7 @@ using ZhonTai.Admin.Core.Db.Transaction;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class TaskLogRepository : AppRepositoryBase<TaskLog>, ITaskLogRepository
+public class TaskLogRepository : AdminRepositoryBase<TaskLog>, ITaskLogRepository
 {
 {
     public TaskLogRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     public TaskLogRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/Task/TaskRepository.cs

@@ -3,7 +3,7 @@ using ZhonTai.Admin.Core.Db.Transaction;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class TaskRepository : AppRepositoryBase<TaskInfo>, ITaskRepository
+public class TaskRepository : AdminRepositoryBase<TaskInfo>, ITaskRepository
 {
 {
     public TaskRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     public TaskRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/Tenant/TenantRepository.cs

@@ -3,7 +3,7 @@ using ZhonTai.Admin.Domain.Tenant;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class TenantRepository : AppRepositoryBase<TenantEntity>, ITenantRepository
+public class TenantRepository : AdminRepositoryBase<TenantEntity>, ITenantRepository
 {
 {
     public TenantRepository(UnitOfWorkManagerCloud muowm) : base(muowm)
     public TenantRepository(UnitOfWorkManagerCloud muowm) : base(muowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/TenantPermission/TenantPermissionRepository.cs

@@ -3,7 +3,7 @@ using ZhonTai.Admin.Domain.TenantPermission;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class TenantPermissionRepository : AppRepositoryBase<TenantPermissionEntity>, ITenantPermissionRepository
+public class TenantPermissionRepository : AdminRepositoryBase<TenantPermissionEntity>, ITenantPermissionRepository
 {
 {
     public TenantPermissionRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     public TenantPermissionRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/User/UserRepository.cs

@@ -3,7 +3,7 @@ using ZhonTai.Admin.Domain.User;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class UserRepository : AppRepositoryBase<UserEntity>, IUserRepository
+public class UserRepository : AdminRepositoryBase<UserEntity>, IUserRepository
 {
 {
     public UserRepository(UnitOfWorkManagerCloud muowm) : base(muowm)
     public UserRepository(UnitOfWorkManagerCloud muowm) : base(muowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/UserOrg/UserOrgRepository.cs

@@ -5,7 +5,7 @@ using ZhonTai.Admin.Domain.UserOrg;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class UserOrgRepository : AppRepositoryBase<UserOrgEntity>, IUserOrgRepository
+public class UserOrgRepository : AdminRepositoryBase<UserOrgEntity>, IUserOrgRepository
 {
 {
     public UserOrgRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     public UserOrgRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/UserRole/UserRoleRepository.cs

@@ -3,7 +3,7 @@ using ZhonTai.Admin.Domain.UserRole;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class UserRoleRepository : AppRepositoryBase<UserRoleEntity>, IUserRoleRepository
+public class UserRoleRepository : AdminRepositoryBase<UserRoleEntity>, IUserRoleRepository
 {
 {
     public UserRoleRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     public UserRoleRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/UserStaff/UserStaffRepository.cs

@@ -3,7 +3,7 @@ using ZhonTai.Admin.Domain.UserStaff;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class UserStaffRepository : AppRepositoryBase<UserStaffEntity>, IUserStaffRepository
+public class UserStaffRepository : AdminRepositoryBase<UserStaffEntity>, IUserStaffRepository
 {
 {
     public UserStaffRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     public UserStaffRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/View/ViewRepositoryRepository.cs

@@ -3,7 +3,7 @@ using ZhonTai.Admin.Domain.View;
 
 
 namespace ZhonTai.Admin.Repositories;
 namespace ZhonTai.Admin.Repositories;
 
 
-public class ViewRepository : AppRepositoryBase<ViewEntity>, IViewRepository
+public class ViewRepository : AdminRepositoryBase<ViewEntity>, IViewRepository
 {
 {
     public ViewRepository(UnitOfWorkManagerCloud muowm) : base(muowm)
     public ViewRepository(UnitOfWorkManagerCloud muowm) : base(muowm)
     {
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Services/Api/ApiService.cs

@@ -159,7 +159,7 @@ public class ApiService : BaseService, IApiService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="input"></param>
     /// <param name="input"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> SyncAsync(ApiSyncInput input)
     public virtual async Task<IResultOutput> SyncAsync(ApiSyncInput input)
     {
     {
         //查询所有api
         //查询所有api

+ 3 - 3
src/platform/ZhonTai.Admin/Services/DictionaryType/DictionaryTypeService.cs

@@ -105,7 +105,7 @@ public class DictionaryTypeService : BaseService, IDictionaryTypeService, IDynam
     /// </summary>
     /// </summary>
     /// <param name="id"></param>
     /// <param name="id"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> DeleteAsync(long id)
     public virtual async Task<IResultOutput> DeleteAsync(long id)
     {
     {
         //删除字典数据
         //删除字典数据
@@ -122,7 +122,7 @@ public class DictionaryTypeService : BaseService, IDictionaryTypeService, IDynam
     /// </summary>
     /// </summary>
     /// <param name="id"></param>
     /// <param name="id"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> SoftDeleteAsync(long id)
     public virtual async Task<IResultOutput> SoftDeleteAsync(long id)
     {
     {
         await _dictionaryRepository.SoftDeleteAsync(a => a.DictionaryTypeId == id);
         await _dictionaryRepository.SoftDeleteAsync(a => a.DictionaryTypeId == id);
@@ -136,7 +136,7 @@ public class DictionaryTypeService : BaseService, IDictionaryTypeService, IDynam
     /// </summary>
     /// </summary>
     /// <param name="ids"></param>
     /// <param name="ids"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
     public virtual async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
     {
     {
         await _dictionaryRepository.SoftDeleteAsync(a => ids.Contains(a.DictionaryTypeId));
         await _dictionaryRepository.SoftDeleteAsync(a => ids.Contains(a.DictionaryTypeId));

+ 2 - 2
src/platform/ZhonTai.Admin/Services/Org/OrgService.cs

@@ -129,7 +129,7 @@ public class OrgService : BaseService, IOrgService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="id"></param>
     /// <param name="id"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public async Task<IResultOutput> DeleteAsync(long id)
     public async Task<IResultOutput> DeleteAsync(long id)
     {
     {
         //本部门下是否有员工
         //本部门下是否有员工
@@ -161,7 +161,7 @@ public class OrgService : BaseService, IOrgService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="id"></param>
     /// <param name="id"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public async Task<IResultOutput> SoftDeleteAsync(long id)
     public async Task<IResultOutput> SoftDeleteAsync(long id)
     {
     {
         //本部门下是否有员工
         //本部门下是否有员工

+ 5 - 5
src/platform/ZhonTai.Admin/Services/Permission/PermissionService.cs

@@ -245,7 +245,7 @@ public class PermissionService : BaseService, IPermissionService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="input"></param>
     /// <param name="input"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> AddDotAsync(PermissionAddDotInput input)
     public virtual async Task<IResultOutput> AddDotAsync(PermissionAddDotInput input)
     {
     {
         var entity = Mapper.Map<PermissionEntity>(input);
         var entity = Mapper.Map<PermissionEntity>(input);
@@ -319,7 +319,7 @@ public class PermissionService : BaseService, IPermissionService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="input"></param>
     /// <param name="input"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> UpdateDotAsync(PermissionUpdateDotInput input)
     public virtual async Task<IResultOutput> UpdateDotAsync(PermissionUpdateDotInput input)
     {
     {
         if (!(input?.Id > 0))
         if (!(input?.Id > 0))
@@ -355,7 +355,7 @@ public class PermissionService : BaseService, IPermissionService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="id"></param>
     /// <param name="id"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> DeleteAsync(long id)
     public virtual async Task<IResultOutput> DeleteAsync(long id)
     {
     {
         //递归查询所有权限点
         //递归查询所有权限点
@@ -403,7 +403,7 @@ public class PermissionService : BaseService, IPermissionService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="input"></param>
     /// <param name="input"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> AssignAsync(PermissionAssignInput input)
     public virtual async Task<IResultOutput> AssignAsync(PermissionAssignInput input)
     {
     {
         //分配权限的时候判断角色是否存在
         //分配权限的时候判断角色是否存在
@@ -463,7 +463,7 @@ public class PermissionService : BaseService, IPermissionService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="input"></param>
     /// <param name="input"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> SaveTenantPermissionsAsync(PermissionSaveTenantPermissionsInput input)
     public virtual async Task<IResultOutput> SaveTenantPermissionsAsync(PermissionSaveTenantPermissionsInput input)
     {
     {
         //查询租户权限
         //查询租户权限

+ 4 - 4
src/platform/ZhonTai.Admin/Services/Role/RoleService.cs

@@ -259,7 +259,7 @@ public class RoleService : BaseService, IRoleService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="id"></param>
     /// <param name="id"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> DeleteAsync(long id)
     public virtual async Task<IResultOutput> DeleteAsync(long id)
     {
     {
         var userIds = await _userRoleRepository.Select.Where(a => a.RoleId == id).ToListAsync(a => a.UserId);
         var userIds = await _userRoleRepository.Select.Where(a => a.RoleId == id).ToListAsync(a => a.UserId);
@@ -284,7 +284,7 @@ public class RoleService : BaseService, IRoleService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="ids"></param>
     /// <param name="ids"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> BatchDeleteAsync(long[] ids)
     public virtual async Task<IResultOutput> BatchDeleteAsync(long[] ids)
     {
     {
         var userIds = await _userRoleRepository.Select.Where(a => ids.Contains(a.RoleId)).ToListAsync(a => a.UserId);
         var userIds = await _userRoleRepository.Select.Where(a => ids.Contains(a.RoleId)).ToListAsync(a => a.UserId);
@@ -308,7 +308,7 @@ public class RoleService : BaseService, IRoleService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="id"></param>
     /// <param name="id"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> SoftDeleteAsync(long id)
     public virtual async Task<IResultOutput> SoftDeleteAsync(long id)
     {
     {
         var userIds = await _userRoleRepository.Select.Where(a => a.RoleId == id).ToListAsync(a => a.UserId);
         var userIds = await _userRoleRepository.Select.Where(a => a.RoleId == id).ToListAsync(a => a.UserId);
@@ -327,7 +327,7 @@ public class RoleService : BaseService, IRoleService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="ids"></param>
     /// <param name="ids"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
     public virtual async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
     {
     {
         var userIds = await _userRoleRepository.Select.Where(a => ids.Contains(a.RoleId)).ToListAsync(a => a.UserId);
         var userIds = await _userRoleRepository.Select.Where(a => ids.Contains(a.RoleId)).ToListAsync(a => a.UserId);

+ 4 - 4
src/platform/ZhonTai.Admin/Services/Tenant/TenantService.cs

@@ -84,7 +84,7 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="input"></param>
     /// <param name="input"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> AddAsync(TenantAddInput input)
     public virtual async Task<IResultOutput> AddAsync(TenantAddInput input)
     {
     {
         if (await _tenantRepository.Select.AnyAsync(a => a.Name == input.Name))
         if (await _tenantRepository.Select.AnyAsync(a => a.Name == input.Name))
@@ -210,7 +210,7 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="id"></param>
     /// <param name="id"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> DeleteAsync(long id)
     public virtual async Task<IResultOutput> DeleteAsync(long id)
     {
     {
         //删除角色权限
         //删除角色权限
@@ -242,7 +242,7 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="id"></param>
     /// <param name="id"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> SoftDeleteAsync(long id)
     public virtual async Task<IResultOutput> SoftDeleteAsync(long id)
     {
     {
         //删除用户
         //删除用户
@@ -262,7 +262,7 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="ids"></param>
     /// <param name="ids"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
     public virtual async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
     {
     {
         //删除用户
         //删除用户

+ 6 - 6
src/platform/ZhonTai.Admin/Services/User/UserService.cs

@@ -272,7 +272,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="input"></param>
     /// <param name="input"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> AddAsync(UserAddInput input)
     public virtual async Task<IResultOutput> AddAsync(UserAddInput input)
     {
     {
         if (await _userRepository.Select.AnyAsync(a => a.UserName == input.UserName))
         if (await _userRepository.Select.AnyAsync(a => a.UserName == input.UserName))
@@ -343,7 +343,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="input"></param>
     /// <param name="input"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> UpdateAsync(UserUpdateInput input)
     public virtual async Task<IResultOutput> UpdateAsync(UserUpdateInput input)
     {
     {
         var user = await _userRepository.GetAsync(input.Id);
         var user = await _userRepository.GetAsync(input.Id);
@@ -457,7 +457,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="id"></param>
     /// <param name="id"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> DeleteAsync(long id)
     public virtual async Task<IResultOutput> DeleteAsync(long id)
     {
     {
         var user = await _userRepository.Select.WhereDynamic(id).ToOneAsync(a => new { a.Type });
         var user = await _userRepository.Select.WhereDynamic(id).ToOneAsync(a => new { a.Type });
@@ -490,7 +490,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="ids"></param>
     /// <param name="ids"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> BatchDeleteAsync(long[] ids)
     public virtual async Task<IResultOutput> BatchDeleteAsync(long[] ids)
     {
     {
         var admin = await _userRepository.Select.Where(a => ids.Contains(a.Id) && 
         var admin = await _userRepository.Select.Where(a => ids.Contains(a.Id) && 
@@ -523,7 +523,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="id"></param>
     /// <param name="id"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> SoftDeleteAsync(long id)
     public virtual async Task<IResultOutput> SoftDeleteAsync(long id)
     {
     {
         var user = await _userRepository.Select.WhereDynamic(id).ToOneAsync(a => new { a.Type });
         var user = await _userRepository.Select.WhereDynamic(id).ToOneAsync(a => new { a.Type });
@@ -552,7 +552,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="ids"></param>
     /// <param name="ids"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
     public virtual async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
     {
     {
         var admin = await _userRepository.Select.Where(a => ids.Contains(a.Id) && 
         var admin = await _userRepository.Select.Where(a => ids.Contains(a.Id) && 

+ 1 - 1
src/platform/ZhonTai.Admin/Services/View/ViewService.cs

@@ -133,7 +133,7 @@ public class ViewService : BaseService, IViewService, IDynamicApi
     /// </summary>
     /// </summary>
     /// <param name="input"></param>
     /// <param name="input"></param>
     /// <returns></returns>
     /// <returns></returns>
-    [AppTransaction]
+    [AdminTransaction]
     public virtual async Task<IResultOutput> SyncAsync(ViewSyncInput input)
     public virtual async Task<IResultOutput> SyncAsync(ViewSyncInput input)
     {
     {
         //查询所有视图
         //查询所有视图

+ 1 - 1
src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -39,7 +39,7 @@
             数据库注册键
             数据库注册键
             </summary>
             </summary>
         </member>
         </member>
-        <member name="T:ZhonTai.Admin.Core.Attributes.AppTransactionAttribute">
+        <member name="T:ZhonTai.Admin.Core.Attributes.AdminTransactionAttribute">
             <summary>
             <summary>
             启用事物
             启用事物
             </summary>
             </summary>