服务优化，继承BaseService，减少映射和用户接口的注入。

Admin.Core.Services/Admin/Api/ApiService.cs

@@ -1,7 +1,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Collections.Generic;
-using AutoMapper;
 using Admin.Core.Common.Input;
 using Admin.Core.Common.Output;
 using Admin.Core.Model.Admin;
@@ -12,13 +11,11 @@ using Admin.Core.Common.Attributes;
 
 namespace Admin.Core.Service.Admin.Api
 {
-    public class ApiService : IApiService
+    public class ApiService : BaseService, IApiService
     {
-        private readonly IMapper _mapper;
         private readonly IApiRepository _apiRepository;
-        public ApiService(IMapper mapper, IApiRepository moduleRepository)
+        public ApiService(IApiRepository moduleRepository)
         {
-            _mapper = mapper;
             _apiRepository = moduleRepository;
         }
 
@@ -59,7 +56,7 @@ namespace Admin.Core.Service.Admin.Api
 
         public async Task<IResponseOutput> AddAsync(ApiAddInput input)
         {
-            var entity = _mapper.Map<ApiEntity>(input);
+            var entity = Mapper.Map<ApiEntity>(input);
             var id = (await _apiRepository.InsertAsync(entity)).Id;
 
             return ResponseOutput.Result(id > 0);
@@ -78,7 +75,7 @@ namespace Admin.Core.Service.Admin.Api
                 return ResponseOutput.NotOk("½Ó¿Ú²»´æÔÚ£¡");
             }
 
-            _mapper.Map(input, entity);
+            Mapper.Map(input, entity);
             await _apiRepository.UpdateAsync(entity);
             return ResponseOutput.Ok();
         }
@@ -127,7 +124,7 @@ namespace Admin.Core.Service.Admin.Api
             var pApis = (from a in parentApis where !paths.Contains(a.Path) select a).ToList();
             if (pApis.Count > 0)
             {
-                var insertPApis = _mapper.Map<List<ApiEntity>>(pApis);
+                var insertPApis = Mapper.Map<List<ApiEntity>>(pApis);
                 insertPApis = await _apiRepository.InsertAsync(insertPApis);
                 apis.AddRange(insertPApis);
             }
@@ -137,7 +134,7 @@ namespace Admin.Core.Service.Admin.Api
             var cApis = (from a in childApis where !paths.Contains(a.Path) select a).ToList();
             if (cApis.Count > 0)
             {
-                var insertCApis = _mapper.Map<List<ApiEntity>>(cApis);
+                var insertCApis = Mapper.Map<List<ApiEntity>>(cApis);
                 insertCApis = await _apiRepository.InsertAsync(insertCApis);
                 apis.AddRange(insertCApis);
             }

Admin.Core.Services/Admin/Auth/AuthService.cs

@@ -1,17 +1,14 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using AutoMapper;
 using Admin.Core.Model.Admin;
 using Admin.Core.Common.Output;
 using Admin.Core.Repository.Admin;
-using Admin.Core.Common.Auth;
 using Admin.Core.Common.Cache;
 using Admin.Core.Common.Configs;
 using Admin.Core.Common.Helpers;
 using Admin.Core.Service.Admin.Auth.Input;
 using Admin.Core.Service.Admin.Auth.Output;
-using Admin.Core.Common.BaseModel;
 
 namespace Admin.Core.Service.Admin.Auth
 {

Admin.Core.Services/Admin/Cache/CacheService.cs

@@ -1,4 +1,3 @@
-using Admin.Core.Common.Auth;
 using Admin.Core.Common.Cache;
 using Admin.Core.Common.Output;
 using Microsoft.Extensions.Logging;
@@ -10,15 +9,13 @@ using System.Threading.Tasks;
 
 namespace Admin.Core.Service.Admin.Cache
 {
-    public class CacheService : ICacheService
+    public class CacheService : BaseService, ICacheService
     {
         private readonly ICache _cache;
-        private readonly IUser _user;
         private readonly ILogger<CacheService> _logger;
-        public CacheService(ICache cache, IUser user, ILogger<CacheService> logger)
+        public CacheService(ICache cache, ILogger<CacheService> logger)
         {
             _cache = cache;
-            _user = user;
             _logger = logger;
         }
 
@@ -44,7 +41,7 @@ namespace Admin.Core.Service.Admin.Cache
 
         public async Task<IResponseOutput> ClearAsync(string cacheKey)
         {
-            _logger.LogWarning($"{_user.Id}.{_user.Name}清除缓存[{cacheKey}]");
+            _logger.LogWarning($"{User.Id}.{User.Name}清除缓存[{cacheKey}]");
             await _cache.DelByPatternAsync(cacheKey);
             return ResponseOutput.Ok();
         }

Admin.Core.Services/Admin/Dictionary/DictionaryService.cs

@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using AutoMapper;
 using Admin.Core.Common.Output;
 using Admin.Core.Common.Input;
 using Admin.Core.Model.Admin;
@@ -9,14 +8,12 @@ using Admin.Core.Service.Admin.Dictionary.Output;
 
 namespace Admin.Core.Service.Admin.Dictionary
 {
-    public class DictionaryService : IDictionaryService
+    public class DictionaryService : BaseService, IDictionaryService
     {
-        private readonly IMapper _mapper;
         private readonly IDictionaryRepository _dictionaryRepository;
 
-        public DictionaryService(IMapper mapper, IDictionaryRepository dictionaryRepository)
+        public DictionaryService(IDictionaryRepository dictionaryRepository)
         {
-            _mapper = mapper;
             _dictionaryRepository = dictionaryRepository;
         }
 
@@ -48,7 +45,7 @@ namespace Admin.Core.Service.Admin.Dictionary
 
         public async Task<IResponseOutput> AddAsync(DictionaryAddInput input)
         {
-            var dictionary = _mapper.Map<DictionaryEntity>(input);
+            var dictionary = Mapper.Map<DictionaryEntity>(input);
             var id = (await _dictionaryRepository.InsertAsync(dictionary)).Id;
             return ResponseOutput.Result(id > 0);
         }
@@ -66,7 +63,7 @@ namespace Admin.Core.Service.Admin.Dictionary
                 return ResponseOutput.NotOk("数据字典不存在！");
             }
 
-            _mapper.Map(input, entity);
+            Mapper.Map(input, entity);
             await _dictionaryRepository.UpdateAsync(entity);
             return ResponseOutput.Ok();
         }

Admin.Core.Services/Admin/Document/DocumentService.cs

@@ -1,30 +1,25 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using AutoMapper;
 using Admin.Core.Repository.Admin;
 using Admin.Core.Model.Admin;
 using Admin.Core.Common.Output;
 using Admin.Core.Service.Admin.Document.Input;
 using Admin.Core.Service.Admin.Document.Output;
-using Admin.Core.Common.Cache;
 
 
 namespace Admin.Core.Service.Admin.Document
 {	
-	public class DocumentService : IDocumentService
+	public class DocumentService : BaseService, IDocumentService
     {
-        private readonly IMapper _mapper;
         private readonly IDocumentRepository _documentRepository;
         private readonly IDocumentImageRepository _documentImageRepository;
 
         public DocumentService(
-            IMapper mapper,
             IDocumentRepository DocumentRepository,
             IDocumentImageRepository documentImageRepository
         )
         {
-            _mapper = mapper;
             _documentRepository = DocumentRepository;
             _documentImageRepository = documentImageRepository;
         }
@@ -83,7 +78,7 @@ namespace Admin.Core.Service.Admin.Document
 
         public async Task<IResponseOutput> AddGroupAsync(DocumentAddGroupInput input)
         {
-            var entity = _mapper.Map<DocumentEntity>(input);
+            var entity = Mapper.Map<DocumentEntity>(input);
             var id = (await _documentRepository.InsertAsync(entity)).Id;
 
             return ResponseOutput.Result(id > 0);
@@ -91,7 +86,7 @@ namespace Admin.Core.Service.Admin.Document
 
         public async Task<IResponseOutput> AddMenuAsync(DocumentAddMenuInput input)
         {
-            var entity = _mapper.Map<DocumentEntity>(input);
+            var entity = Mapper.Map<DocumentEntity>(input);
             var id = (await _documentRepository.InsertAsync(entity)).Id;
 
             return ResponseOutput.Result(id > 0);
@@ -99,7 +94,7 @@ namespace Admin.Core.Service.Admin.Document
 
         public async Task<IResponseOutput> AddImageAsync(DocumentAddImageInput input)
         {
-            var entity = _mapper.Map<DocumentImageEntity>(input);
+            var entity = Mapper.Map<DocumentImageEntity>(input);
             var id = (await _documentImageRepository.InsertAsync(entity)).Id;
 
             return ResponseOutput.Result(id > 0);
@@ -111,7 +106,7 @@ namespace Admin.Core.Service.Admin.Document
             if (input != null && input.Id > 0)
             {
                 var entity = await _documentRepository.GetAsync(input.Id);
-                entity = _mapper.Map(input, entity);
+                entity = Mapper.Map(input, entity);
                 result = (await _documentRepository.UpdateAsync(entity)) > 0;
             }
 
@@ -124,7 +119,7 @@ namespace Admin.Core.Service.Admin.Document
             if (input != null && input.Id > 0)
             {
                 var entity = await _documentRepository.GetAsync(input.Id);
-                entity = _mapper.Map(input, entity);
+                entity = Mapper.Map(input, entity);
                 result = (await _documentRepository.UpdateAsync(entity)) > 0;
             }
 
@@ -137,7 +132,7 @@ namespace Admin.Core.Service.Admin.Document
             if (input != null && input.Id > 0)
             {
                 var entity = await _documentRepository.GetAsync(input.Id);
-                entity = _mapper.Map(input, entity);
+                entity = Mapper.Map(input, entity);
                 result = (await _documentRepository.UpdateAsync(entity)) > 0;
             }
 

Admin.Core.Services/Admin/LoginLog/LoginLogService.cs

@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using AutoMapper;
 using Admin.Core.Common.Input;
 using Admin.Core.Common.Output;
 using Admin.Core.Model.Admin;
@@ -11,18 +10,15 @@ using Admin.Core.Common.Helpers;
 
 namespace Admin.Core.Service.Admin.LoginLog
 {	
-	public class LoginLogService : ILoginLogService
+	public class LoginLogService : BaseService, ILoginLogService
     {
-        private readonly IMapper _mapper;
         private readonly IHttpContextAccessor _context;
         private readonly ILoginLogRepository _loginLogRepository;
         public LoginLogService(
-            IMapper mapper,
             IHttpContextAccessor context,
             ILoginLogRepository loginLogRepository
         )
         {
-            _mapper = mapper;
             _context = context;
             _loginLogRepository = loginLogRepository;
         }
@@ -64,7 +60,7 @@ namespace Admin.Core.Service.Admin.LoginLog
                 input.Device = device;
                 input.BrowserInfo = ua;
             }
-            var entity = _mapper.Map<LoginLogEntity>(input);
+            var entity = Mapper.Map<LoginLogEntity>(input);
             var id = (await _loginLogRepository.InsertAsync(entity)).Id;
 
             return id > 0 ? res.Ok(id) : res;

Admin.Core.Services/Admin/OprationLog/OprationLogService.cs

@@ -1,7 +1,5 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using AutoMapper;
-using Admin.Core.Common.Auth;
 using Admin.Core.Common.Input;
 using Admin.Core.Common.Output;
 using Admin.Core.Model.Admin;
@@ -9,25 +7,18 @@ using Admin.Core.Repository.Admin;
 using Admin.Core.Service.Admin.OprationLog.Input;
 using Admin.Core.Service.Admin.OprationLog.Output;
 using Admin.Core.Common.Helpers;
-using Admin.Core.Common.Dbs;
 
 namespace Admin.Core.Service.Admin.OprationLog
 {	
-	public class OprationLogService : IOprationLogService
+	public class OprationLogService : BaseService, IOprationLogService
     {
-        private readonly IUser _user;
-        private readonly IMapper _mapper;
         private readonly IHttpContextAccessor _context;
         private readonly IOprationLogRepository _oprationLogRepository;
         public OprationLogService(
-            IUser user,
-            IMapper mapper,
             IHttpContextAccessor context,
             IOprationLogRepository oprationLogRepository
         )
         {
-            _user = user;
-            _mapper = mapper;
             _context = context;
             _oprationLogRepository = oprationLogRepository;
         }
@@ -63,10 +54,10 @@ namespace Admin.Core.Service.Admin.OprationLog
             input.Device = device;
             input.BrowserInfo = ua;
 
-            input.NickName = _user.NickName;
+            input.NickName = User.NickName;
             input.IP = IPHelper.GetIP(_context?.HttpContext?.Request);
 
-            var entity = _mapper.Map<OprationLogEntity>(input);
+            var entity = Mapper.Map<OprationLogEntity>(input);
             var id = (await _oprationLogRepository.InsertAsync(entity)).Id;
 
             return ResponseOutput.Result(id > 0);

Admin.Core.Services/Admin/Permission/PermissionService.cs

@@ -2,7 +2,6 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Collections.Generic;
-using AutoMapper;
 using Admin.Core.Repository.Admin;
 using Admin.Core.Model.Admin;
 using Admin.Core.Common.Output;
@@ -10,21 +9,18 @@ using Admin.Core.Service.Admin.Permission.Input;
 using Admin.Core.Service.Admin.Permission.Output;
 using Admin.Core.Common.Cache;
 using Admin.Core.Common.Attributes;
-using Admin.Core.Common.Helpers;
 using Admin.Core.Common.BaseModel;
 
 namespace Admin.Core.Service.Admin.Permission
 {	
 	public class PermissionService : BaseService,IPermissionService
     {
-        private readonly IMapper _mapper;
         private readonly ICache _cache;
         private readonly IPermissionRepository _permissionRepository;
         private readonly IRoleRepository _roleRepository;
         private readonly IRolePermissionRepository _rolePermissionRepository;
         private readonly IUserRoleRepository _userRoleRepository;
         public PermissionService(
-            IMapper mapper,
             ICache cache,
             IPermissionRepository permissionRepository,
             IRoleRepository roleRepository,
@@ -32,7 +28,6 @@ namespace Admin.Core.Service.Admin.Permission
             IUserRoleRepository userRoleRepository
         )
         {
-            _mapper = mapper;
             _cache = cache;
             _permissionRepository = permissionRepository;
             _roleRepository = roleRepository;
@@ -90,7 +85,7 @@ namespace Admin.Core.Service.Admin.Permission
 
         public async Task<IResponseOutput> AddGroupAsync(PermissionAddGroupInput input)
         {
-            var entity = _mapper.Map<PermissionEntity>(input);
+            var entity = Mapper.Map<PermissionEntity>(input);
             var id = (await _permissionRepository.InsertAsync(entity)).Id;
 
             return ResponseOutput.Ok(id > 0);
@@ -98,7 +93,7 @@ namespace Admin.Core.Service.Admin.Permission
 
         public async Task<IResponseOutput> AddMenuAsync(PermissionAddMenuInput input)
         {
-            var entity = _mapper.Map<PermissionEntity>(input);
+            var entity = Mapper.Map<PermissionEntity>(input);
             var id = (await _permissionRepository.InsertAsync(entity)).Id;
 
             return ResponseOutput.Ok(id > 0);
@@ -106,7 +101,7 @@ namespace Admin.Core.Service.Admin.Permission
 
         public async Task<IResponseOutput> AddApiAsync(PermissionAddApiInput input)
         {
-            var entity = _mapper.Map<PermissionEntity>(input);
+            var entity = Mapper.Map<PermissionEntity>(input);
             var id = (await _permissionRepository.InsertAsync(entity)).Id;
 
             return ResponseOutput.Ok(id > 0);
@@ -114,7 +109,7 @@ namespace Admin.Core.Service.Admin.Permission
 
         public async Task<IResponseOutput> AddDotAsync(PermissionAddDotInput input)
         {
-            var entity = _mapper.Map<PermissionEntity>(input);
+            var entity = Mapper.Map<PermissionEntity>(input);
             var id = (await _permissionRepository.InsertAsync(entity)).Id;
 
             return ResponseOutput.Ok(id > 0);
@@ -126,7 +121,7 @@ namespace Admin.Core.Service.Admin.Permission
             if (input != null && input.Id > 0)
             {
                 var entity = await _permissionRepository.GetAsync(input.Id);
-                entity = _mapper.Map(input, entity);
+                entity = Mapper.Map(input, entity);
                 result = (await _permissionRepository.UpdateAsync(entity)) > 0;
             }
 
@@ -139,7 +134,7 @@ namespace Admin.Core.Service.Admin.Permission
             if (input != null && input.Id > 0)
             {
                 var entity = await _permissionRepository.GetAsync(input.Id);
-                entity = _mapper.Map(input, entity);
+                entity = Mapper.Map(input, entity);
                 result = (await _permissionRepository.UpdateAsync(entity)) > 0;
             }
 
@@ -152,7 +147,7 @@ namespace Admin.Core.Service.Admin.Permission
             if (input != null && input.Id > 0)
             {
                 var entity = await _permissionRepository.GetAsync(input.Id);
-                entity = _mapper.Map(input, entity);
+                entity = Mapper.Map(input, entity);
                 result = (await _permissionRepository.UpdateAsync(entity)) > 0;
             }
 
@@ -165,7 +160,7 @@ namespace Admin.Core.Service.Admin.Permission
             if (input != null && input.Id > 0)
             {
                 var entity = await _permissionRepository.GetAsync(input.Id);
-                entity = _mapper.Map(input, entity);
+                entity = Mapper.Map(input, entity);
                 result = (await _permissionRepository.UpdateAsync(entity)) > 0;
             }
 

Admin.Core.Services/Admin/Role/RoleService.cs

@@ -1,6 +1,4 @@
 using System.Threading.Tasks;
-using AutoMapper;
-using Admin.Core.Common.Auth;
 using Admin.Core.Common.Input;
 using Admin.Core.Common.Output;
 using Admin.Core.Model.Admin;
@@ -11,22 +9,16 @@ using System.Linq;
 
 namespace Admin.Core.Service.Admin.Role
 {
-	public class RoleService : IRoleService
+	public class RoleService : BaseService, IRoleService
     {
-        private readonly IUser _user;
-        private readonly IMapper _mapper;
         private readonly IRoleRepository _roleRepository;
         private readonly IRolePermissionRepository _rolePermissionRepository;
         
         public RoleService(
-            IUser user,
-            IMapper mapper,
             IRoleRepository roleRepository,
             IRolePermissionRepository rolePermissionRepository
         )
         {
-            _user = user;
-            _mapper = mapper;
             _roleRepository = roleRepository;
             _rolePermissionRepository = rolePermissionRepository;
         }
@@ -59,7 +51,7 @@ namespace Admin.Core.Service.Admin.Role
 
         public async Task<IResponseOutput> AddAsync(RoleAddInput input)
         {
-            var entity = _mapper.Map<RoleEntity>(input);
+            var entity = Mapper.Map<RoleEntity>(input);
             var id = (await _roleRepository.InsertAsync(entity)).Id;
 
             return ResponseOutput.Result(id > 0);
@@ -78,7 +70,7 @@ namespace Admin.Core.Service.Admin.Role
                 return ResponseOutput.NotOk("½ÇÉ«²»´æÔÚ£¡");
             }
 
-            _mapper.Map(input, entity);
+            Mapper.Map(input, entity);
             await _roleRepository.UpdateAsync(entity);
             return ResponseOutput.Ok();
         }

Admin.Core.Services/Admin/Tenant/TenantService.cs

@@ -1,6 +1,4 @@
 using System.Threading.Tasks;
-using AutoMapper;
-using Admin.Core.Common.Auth;
 using Admin.Core.Common.Input;
 using Admin.Core.Common.Output;
 using Admin.Core.Model.Admin;
@@ -12,7 +10,7 @@ using Admin.Core.Common.Helpers;
 
 namespace Admin.Core.Service.Admin.Tenant
 {
-    public class TenantService : BaseService,ITenantService
+    public class TenantService : BaseService, ITenantService
     {
         private readonly ITenantRepository _tenantRepository;
         private readonly IRoleRepository _roleRepository;
@@ -81,7 +79,7 @@ namespace Admin.Core.Service.Admin.Tenant
             var userRole = new UserRoleEntity() { UserId = user.Id, RoleId = role.Id };
             await _userRoleRepository.InsertAsync(userRole);
 
-            //更新租户用户
+            //更新租户用户和角色
             tenant.UserId = user.Id;
             tenant.RoleId = role.Id;
             await _tenantRepository.UpdateAsync(tenant);

Admin.Core.Services/Admin/User/UserService.cs

@@ -1,9 +1,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Collections.Generic;
-using AutoMapper;
 using Admin.Core.Common.Helpers;
-using Admin.Core.Common.Auth;
 using Admin.Core.Common.Cache;
 using Admin.Core.Common.Input;
 using Admin.Core.Common.Output;
@@ -19,27 +17,21 @@ namespace Admin.Core.Service.Admin.User
     /// <summary>
     /// 用户服务
     /// </summary>	
-    public class UserService : IUserService
+    public class UserService : BaseService, IUserService
     {
-        private readonly IUser _user;
         private readonly ICache _cache;
-        private readonly IMapper _mapper;
         private readonly IUserRepository _userRepository;
         private readonly IUserRoleRepository _userRoleRepository;
         private readonly IRolePermissionRepository _rolePermissionRepository;
 
         public UserService(
-            IUser user,
             ICache cache,
-            IMapper mapper,
             IUserRepository userRepository,
             IUserRoleRepository userRoleRepository,
             IRolePermissionRepository rolePermissionRepository
         )
         {
-            _user = user;
             _cache = cache;
-            _mapper = mapper;
             _userRepository = userRepository;
             _userRoleRepository = userRoleRepository;
             _rolePermissionRepository = rolePermissionRepository;
@@ -61,24 +53,24 @@ namespace Admin.Core.Service.Admin.User
             .IncludeMany(a => a.Roles.Select(b => new RoleEntity { Id = b.Id }))
             .ToOneAsync();
 
-            var entityDto = _mapper.Map<UserGetOutput>(entity);
+            var entityDto = Mapper.Map<UserGetOutput>(entity);
             return res.Ok(entityDto);
         }
 
         public async Task<IResponseOutput> GetBasicAsync()
         {
-            if (!(_user?.Id > 0))
+            if (!(User?.Id > 0))
             {
                 return ResponseOutput.NotOk("未登录！");
             }
 
-            var data = await _userRepository.GetAsync<UserUpdateBasicInput>(_user.Id);
+            var data = await _userRepository.GetAsync<UserUpdateBasicInput>(User.Id);
             return ResponseOutput.Ok(data);
         }
 
         public async Task<IList<UserPermissionsOutput>> GetPermissionsAsync()
         {
-            var key = string.Format(CacheKey.UserPermissions, _user.Id);
+            var key = string.Format(CacheKey.UserPermissions, User.Id);
             if (await _cache.ExistsAsync(key))
             {
                 try
@@ -92,7 +84,7 @@ namespace Admin.Core.Service.Admin.User
             }
 
             var userPermissoins = await _rolePermissionRepository.Select
-                .InnerJoin<UserRoleEntity>((a, b) => a.RoleId == b.RoleId && b.UserId == _user.Id && a.Permission.Type == PermissionType.Api)
+                .InnerJoin<UserRoleEntity>((a, b) => a.RoleId == b.RoleId && b.UserId == User.Id && a.Permission.Type == PermissionType.Api)
                 .Include(a => a.Permission.Api)
                 .Distinct()
                 .ToListAsync(a => new UserPermissionsOutput { HttpMethods = a.Permission.Api.HttpMethods, Path = a.Permission.Api.Path });
@@ -114,7 +106,7 @@ namespace Admin.Core.Service.Admin.User
 
             var data = new PageOutput<UserListOutput>()
             {
-                List = _mapper.Map<List<UserListOutput>>(list),
+                List = Mapper.Map<List<UserListOutput>>(list),
                 Total = total
             };
 
@@ -131,7 +123,7 @@ namespace Admin.Core.Service.Admin.User
 
             input.Password = MD5Encrypt.Encrypt32(input.Password);
 
-            var entity = _mapper.Map<UserEntity>(input);
+            var entity = Mapper.Map<UserEntity>(input);
             var user = await _userRepository.InsertAsync(entity);
 
             if (!(user?.Id > 0))
@@ -162,7 +154,7 @@ namespace Admin.Core.Service.Admin.User
                 return ResponseOutput.NotOk("用户不存在！");
             }
 
-            _mapper.Map(input, user);
+            Mapper.Map(input, user);
             await _userRepository.UpdateAsync(user);
             await _userRoleRepository.DeleteAsync(a => a.UserId == user.Id);
             if (input.RoleIds != null && input.RoleIds.Any())
@@ -177,7 +169,7 @@ namespace Admin.Core.Service.Admin.User
         public async Task<IResponseOutput> UpdateBasicAsync(UserUpdateBasicInput input)
         {
             var entity = await _userRepository.GetAsync(input.Id);
-            entity = _mapper.Map(input, entity);
+            entity = Mapper.Map(input, entity);
             var result = (await _userRepository.UpdateAsync(entity)) > 0;
 
             return ResponseOutput.Result(result);
@@ -199,7 +191,7 @@ namespace Admin.Core.Service.Admin.User
 
             input.Password = MD5Encrypt.Encrypt32(input.NewPassword);
 
-            entity = _mapper.Map(input, entity);
+            entity = Mapper.Map(input, entity);
             var result = (await _userRepository.UpdateAsync(entity)) > 0;
 
             return ResponseOutput.Result(result);

Admin.Core.Services/Admin/View/ViewService.cs

@@ -1,7 +1,6 @@
 using System.Linq;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using AutoMapper;
 using Admin.Core.Common.Output;
 using Admin.Core.Common.Input;
 using Admin.Core.Model.Admin;
@@ -12,14 +11,12 @@ using Admin.Core.Common.Attributes;
 
 namespace Admin.Core.Service.Admin.View
 {
-    public class ViewService : IViewService
+    public class ViewService : BaseService, IViewService
     {
-        private readonly IMapper _mapper;
         private readonly IViewRepository _viewRepository;
-        public ViewService(IMapper mapper, IViewRepository moduleRepository)
+        public ViewService(IViewRepository moduleRepository)
         {
             _viewRepository = moduleRepository;
-            _mapper = mapper;
         }
 
         public async Task<IResponseOutput> GetAsync(long id)
@@ -62,7 +59,7 @@ namespace Admin.Core.Service.Admin.View
 
         public async Task<IResponseOutput> AddAsync(ViewAddInput input)
         {
-            var entity = _mapper.Map<ViewEntity>(input);
+            var entity = Mapper.Map<ViewEntity>(input);
             var id = (await _viewRepository.InsertAsync(entity)).Id;
 
             return ResponseOutput.Result(id > 0);
@@ -81,7 +78,7 @@ namespace Admin.Core.Service.Admin.View
                 return ResponseOutput.NotOk("ÊÓͼ²»´æÔÚ£¡");
             }
 
-            _mapper.Map(input, entity);
+            Mapper.Map(input, entity);
             await _viewRepository.UpdateAsync(entity);
             return ResponseOutput.Ok();
         }
@@ -132,7 +129,7 @@ namespace Admin.Core.Service.Admin.View
             var pViews = (from a in parentViews where !paths.Contains(a.Path) select a).ToList();
             if (pViews.Count > 0)
             {
-                var insertPViews = _mapper.Map<List<ViewEntity>>(pViews);
+                var insertPViews = Mapper.Map<List<ViewEntity>>(pViews);
                 insertPViews = await _viewRepository.InsertAsync(insertPViews);
                 views.AddRange(insertPViews);
             }
@@ -142,7 +139,7 @@ namespace Admin.Core.Service.Admin.View
             var cViews = (from a in childViews where !paths.Contains(a.Path) select a).ToList();
             if (cViews.Count > 0)
             {
-                var insertCViews = _mapper.Map<List<ViewEntity>>(cViews);
+                var insertCViews = Mapper.Map<List<ViewEntity>>(cViews);
                 insertCViews = await _viewRepository.InsertAsync(insertCViews);
                 views.AddRange(insertCViews);
             }