0
0
xiaoxue 5 жил өмнө
parent
commit
c79344c4eb
53 өөрчлөгдсөн 231 нэмэгдсэн , 3058 устгасан
  1. 6 1
      Admin.Core.Common/Admin.Core.Common.csproj
  2. 1 0
      Admin.Core.Common/Auth/User.cs
  3. 1 1
      Admin.Core.Common/BaseModel/Entity.cs
  4. 5 5
      Admin.Core.Common/BaseModel/EntityAdd.cs
  5. 9 9
      Admin.Core.Common/BaseModel/EntityBase.cs
  6. 1 1
      Admin.Core.Common/BaseModel/EntitySoftDelete.cs
  7. 6 6
      Admin.Core.Common/BaseModel/EntityUpdate.cs
  8. 1 1
      Admin.Core.Common/BaseModel/EntityVersion.cs
  9. 11 0
      Admin.Core.Common/BaseModel/IEntityAdd.cs
  10. 1 1
      Admin.Core.Common/BaseModel/IEntitySoftDelete.cs
  11. 11 0
      Admin.Core.Common/BaseModel/IEntityUpdate.cs
  12. 1 4
      Admin.Core.Common/BaseModel/IEntityVersion.cs
  13. 1 0
      Admin.Core.Common/Cache/MemoryCache.cs
  14. 2 2
      Admin.Core.Common/Configs/AppConfig.cs
  15. 1 1
      Admin.Core.Common/Configs/JwtConfig.cs
  16. 23 2
      Admin.Core.Common/Configs/UploadConfig.cs
  17. 1 0
      Admin.Core.Common/Extensions/StringExtensions.cs
  18. 1 0
      Admin.Core.Common/Files/FileSize.cs
  19. 3 2
      Admin.Core.Common/Helpers/ConfigHelper.cs
  20. 1 1
      Admin.Core.Common/Helpers/UtilConvert.cs
  21. 1 1
      Admin.Core.Model/Admin.Core.Model.csproj
  22. 1 0
      Admin.Core.Model/Admin/ApiEntity.cs
  23. 1 0
      Admin.Core.Model/Admin/DictionaryEntity.cs
  24. 1 0
      Admin.Core.Model/Admin/DocumentEntity.cs
  25. 1 0
      Admin.Core.Model/Admin/DocumentImageEntity.cs
  26. 1 0
      Admin.Core.Model/Admin/LogAbstract.cs
  27. 1 0
      Admin.Core.Model/Admin/PermissionEntity.cs
  28. 6 2
      Admin.Core.Model/Admin/RoleEntity.cs
  29. 1 0
      Admin.Core.Model/Admin/RolePermissionEntity.cs
  30. 2 1
      Admin.Core.Model/Admin/UserEntity.cs
  31. 2 9
      Admin.Core.Model/Admin/UserRoleEntity.cs
  32. 1 0
      Admin.Core.Model/Admin/ViewEntity.cs
  33. 0 11
      Admin.Core.Model/Base/IEntityAdd.cs
  34. 0 11
      Admin.Core.Model/Base/IEntityUpdate.cs
  35. 2 2
      Admin.Core.Services/Admin.Core.Service.csproj
  36. 2 5
      Admin.Core.Services/Admin/Auth/AuthService.cs
  37. 1 0
      Admin.Core.Services/Admin/Permission/PermissionService.cs
  38. 2 2
      Admin.Core.Services/Admin/User/Input/UserChangePasswordInput.cs
  39. 1 1
      Admin.Core.Services/Admin/User/Input/UserUpdateBasicInput.cs
  40. 59 59
      Admin.Core.Services/Admin/User/UserService.cs
  41. 0 623
      Admin.Core/Admin.Core.Model.xml
  42. 0 1407
      Admin.Core/Admin.Core.Service.xml
  43. 1 7
      Admin.Core/Admin.Core.csproj
  44. 0 793
      Admin.Core/Admin.Core.xml
  45. 0 76
      Admin.Core/Controllers/Admin/ImgController.cs
  46. 38 1
      Admin.Core/Controllers/Admin/UserController.cs
  47. 0 0
      Admin.Core/Db/Data/data.json
  48. 3 1
      Admin.Core/Db/DbHelper.cs
  49. 1 1
      Admin.Core/Db/ServiceCollectionExtensions.cs
  50. 4 2
      Admin.Core/Logs/ApiHelper.cs
  51. 5 0
      Admin.Core/Startup.cs
  52. 3 3
      Admin.Core/configs/logconfig.json
  53. 3 3
      Admin.Core/nlog.config

+ 6 - 1
Admin.Core.Common/Admin.Core.Common.csproj

@@ -4,8 +4,13 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DocumentationFile>..\Admin.Core\bin\Debug\netcoreapp3.1\Admin.Core.Common.xml</DocumentationFile>
+    <NoWarn>1701;1702;1591</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="CSRedisCore" Version="3.6.2" />
+    <PackageReference Include="CSRedisCore" Version="3.6.3" />
     <PackageReference Include="FreeSql" Version="1.4.0" />
     <PackageReference Include="FreeSql.Provider.MySql" Version="1.4.0" />
     <PackageReference Include="FreeSql.Provider.Oracle" Version="1.4.0" />

+ 1 - 0
Admin.Core.Common/Auth/User.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Http;
+using Admin.Core.Common.Helpers;
 
 namespace Admin.Core.Common.Auth
 {

+ 1 - 1
Admin.Core.Model/Base/Entity.cs → Admin.Core.Common/BaseModel/Entity.cs

@@ -1,6 +1,6 @@
 using FreeSql.DataAnnotations;
 
-namespace Admin.Core.Model
+namespace Admin.Core.Common.BaseModel
 {
     public interface IEntity
     {

+ 5 - 5
Admin.Core.Model/Base/EntityAdd.cs → Admin.Core.Common/BaseModel/EntityAdd.cs

@@ -1,19 +1,19 @@
-using FreeSql.DataAnnotations;
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
+using FreeSql.DataAnnotations;
 
-namespace Admin.Core.Model
+namespace Admin.Core.Common.BaseModel
 {
     /// <summary>
     /// 实体创建审计
     /// </summary>
-    public class EntityAdd<TKey> : Entity<TKey>, IEntityAdd
+    public class EntityAdd<TKey> : Entity<TKey>, IEntityAdd<TKey> where TKey : struct
     {
         /// <summary>
         /// 创建者Id
         /// </summary>
         [Column(Position = -3, CanUpdate = false)]
-        public long? CreatedUserId { get; set; }
+        public TKey? CreatedUserId { get; set; }
 
         /// <summary>
         /// 创建者

+ 9 - 9
Admin.Core.Model/Base/EntityBase.cs → Admin.Core.Common/BaseModel/EntityBase.cs

@@ -1,13 +1,13 @@
-using FreeSql.DataAnnotations;
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
+using FreeSql.DataAnnotations;
 
-namespace Admin.Core.Model
+namespace Admin.Core.Common.BaseModel
 {
     /// <summary>
     /// 实体审计
     /// </summary>
-    public class EntityBase<TKey> : Entity<TKey>, IEntityVersion, IEntitySoftDelete,IEntityAdd,IEntityUpdate
+    public class EntityBase<TKey> : Entity<TKey>, IEntityVersion, IEntitySoftDelete, IEntityAdd<TKey>, IEntityUpdate<TKey> where TKey : struct
     {
         /// <summary>
         /// 版本
@@ -25,12 +25,12 @@ namespace Admin.Core.Model
         /// 创建者Id
         /// </summary>
         [Column(Position = -7, CanUpdate = false)]
-        public long? CreatedUserId { get; set; }
+        public TKey? CreatedUserId { get; set; }
 
         /// <summary>
         /// 创建者
         /// </summary>
-        [Column(Position = -6, CanUpdate = false),MaxLength(50)]
+        [Column(Position = -6, CanUpdate = false), MaxLength(50)]
         public string CreatedUserName { get; set; }
 
         /// <summary>
@@ -43,18 +43,18 @@ namespace Admin.Core.Model
         /// 修改者Id
         /// </summary>
         [Column(Position = -4, CanInsert = false)]
-        public long? ModifiedUserId { get; set; }
+        public TKey? ModifiedUserId { get; set; }
 
         /// <summary>
         /// 修改者
         /// </summary>
-        [Column(Position = -2, CanInsert = false),MaxLength(50)]
+        [Column(Position = -2, CanInsert = false), MaxLength(50)]
         public string ModifiedUserName { get; set; }
 
         /// <summary>
         /// 修改时间
         /// </summary>
-        [Column(Position = -1, CanInsert = false,ServerTime = DateTimeKind.Local)]
+        [Column(Position = -1, CanInsert = false, ServerTime = DateTimeKind.Local)]
         public DateTime? ModifiedTime { get; set; }
     }
 

+ 1 - 1
Admin.Core.Model/Base/EntitySoftDelete.cs → Admin.Core.Common/BaseModel/EntitySoftDelete.cs

@@ -1,6 +1,6 @@
 using FreeSql.DataAnnotations;
 
-namespace Admin.Core.Model
+namespace Admin.Core.Common.BaseModel
 {
     /// <summary>
     /// 实体软删除

+ 6 - 6
Admin.Core.Model/Base/EntityUpdate.cs → Admin.Core.Common/BaseModel/EntityUpdate.cs

@@ -1,19 +1,19 @@
-using FreeSql.DataAnnotations;
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
+using FreeSql.DataAnnotations;
 
-namespace Admin.Core.Model
+namespace Admin.Core.Common.BaseModel
 {
     /// <summary>
     /// 实体修改审计
     /// </summary>
-    public class EntityUpdate<TKey> : Entity<TKey>, IEntityUpdate
+    public class EntityUpdate<TKey> : Entity<TKey>, IEntityUpdate<TKey> where TKey : struct
     {
         /// <summary>
         /// 修改者Id
         /// </summary>
         [Column(Position = -3, CanInsert = false)]
-        public long? ModifiedUserId { get; set; }
+        public TKey? ModifiedUserId { get; set; }
 
         /// <summary>
         /// 修改者
@@ -24,7 +24,7 @@ namespace Admin.Core.Model
         /// <summary>
         /// 修改时间
         /// </summary>
-        [Column(Position = -1, CanInsert = false,ServerTime = DateTimeKind.Local)]
+        [Column(Position = -1, CanInsert = false, ServerTime = DateTimeKind.Local)]
         public DateTime? ModifiedTime { get; set; }
     }
 

+ 1 - 1
Admin.Core.Model/Base/EntityVersion.cs → Admin.Core.Common/BaseModel/EntityVersion.cs

@@ -1,6 +1,6 @@
 using FreeSql.DataAnnotations;
 
-namespace Admin.Core.Model
+namespace Admin.Core.Common.BaseModel
 {
     /// <summary>
     /// 实体版本

+ 11 - 0
Admin.Core.Common/BaseModel/IEntityAdd.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace Admin.Core.Common.BaseModel
+{
+    public interface IEntityAdd<TKey> where TKey: struct
+    {
+        TKey? CreatedUserId { get; set; }
+        string CreatedUserName { get; set; }
+        DateTime? CreatedTime { get; set; }
+    }
+}

+ 1 - 1
Admin.Core.Model/Base/IEntitySoftDelete.cs → Admin.Core.Common/BaseModel/IEntitySoftDelete.cs

@@ -1,5 +1,5 @@
 
-namespace Admin.Core.Model
+namespace Admin.Core.Common.BaseModel
 {
     public interface IEntitySoftDelete
     {

+ 11 - 0
Admin.Core.Common/BaseModel/IEntityUpdate.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace Admin.Core.Common.BaseModel
+{
+    public interface IEntityUpdate<TKey> where TKey : struct
+    {
+        TKey? ModifiedUserId { get; set; }
+        string ModifiedUserName { get; set; }
+        DateTime? ModifiedTime { get; set; }
+    }
+}

+ 1 - 4
Admin.Core.Model/Base/IEntityVersion.cs → Admin.Core.Common/BaseModel/IEntityVersion.cs

@@ -1,7 +1,4 @@
-using FreeSql.DataAnnotations;
-using Newtonsoft.Json;
-
-namespace Admin.Core.Model
+namespace Admin.Core.Common.BaseModel
 {
     public interface IEntityVersion
     {

+ 1 - 0
Admin.Core.Common/Cache/MemoryCache.cs

@@ -7,6 +7,7 @@ using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Caching.Memory;
+using Admin.Core.Common.Helpers;
 
 namespace Admin.Core.Common.Cache
 {

+ 2 - 2
Admin.Core.Common/Configs/AppConfig.cs

@@ -11,9 +11,9 @@
         public bool Swagger { get; set; }
 
         /// <summary>
-        /// Api地址,默认 http://*:8081
+        /// Api地址,默认 http://*:8888
         /// </summary>
-        public string Urls { get; set; } = "http://*:8081";
+        public string Urls { get; set; } = "http://*:8888";
 
         /// <summary>
         /// Aop配置

+ 1 - 1
Admin.Core.Common/Configs/JwtConfig.cs

@@ -19,7 +19,7 @@ namespace Admin.Core.Common.Configs
         public string Audience { get; set; }
 
         /// <summary>
-        /// 
+        /// 
         /// </summary>
         public string SecurityKey { get; set; }
 

+ 23 - 2
Admin.Core.Common/Configs/UploadConfig.cs

@@ -1,4 +1,7 @@
-namespace Admin.Core.Common.Configs
+using System;
+using System.IO;
+
+namespace Admin.Core.Common.Configs
 {
     /// <summary>
     /// 上传配置
@@ -21,10 +24,28 @@
     /// </summary>
     public class FileUploadConfig
     {
+        private string _uploadPath;
         /// <summary>
         /// 上传路径
         /// </summary>
-        public string UploadPath { get; set; }
+        public string UploadPath 
+        {
+            get
+            {
+                if (_uploadPath.IsNull())
+                {
+                    _uploadPath = Path.Combine(AppContext.BaseDirectory, "upload").ToPath();
+                }
+
+                if (!Path.IsPathRooted(_uploadPath))
+                {
+                    _uploadPath = Path.Combine(AppContext.BaseDirectory, _uploadPath).ToPath();
+                }
+
+                return _uploadPath;
+            }
+            set => _uploadPath = value;
+        }
 
         /// <summary>
         /// 请求路径

+ 1 - 0
Admin.Core.Common/Extensions/StringExtensions.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Text;
+using Admin.Core.Common.Helpers;
 
 namespace Admin.Core
 {

+ 1 - 0
Admin.Core.Common/Files/FileSize.cs

@@ -1,4 +1,5 @@
 using Admin.Core.Common.Extensions;
+using Admin.Core.Common.Helpers;
 
 namespace Admin.Core.Common.Files
 {

+ 3 - 2
Admin.Core.Common/Helpers/ConfigHelper.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using Microsoft.Extensions.Configuration;
 
 namespace Admin.Core.Common.Helpers
@@ -28,7 +29,7 @@ namespace Admin.Core.Common.Helpers
         /// <returns></returns>
         public IConfiguration Load(string fileName, string environmentName = "", bool reloadOnChange = false)
         {
-            var filePath = Path.Combine(Directory.GetCurrentDirectory(), "configs");
+            var filePath = Path.Combine(AppContext.BaseDirectory, "configs");
             if (!Directory.Exists(filePath))
                 return null;
 

+ 1 - 1
Admin.Core.Common/Helpers/UtilConvert.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Text;
 
-namespace Admin.Core
+namespace Admin.Core.Common.Helpers
 {
     /// <summary>
     /// 数据类型转换

+ 1 - 1
Admin.Core.Model/Admin.Core.Model.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>..\Admin.Core\Admin.Core.Model.xml</DocumentationFile>
+    <DocumentationFile>..\Admin.Core\bin\Debug\netcoreapp3.1\Admin.Core.Model.xml</DocumentationFile>
     <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
 

+ 1 - 0
Admin.Core.Model/Admin/ApiEntity.cs

@@ -1,4 +1,5 @@
 using System;
+using Admin.Core.Common.BaseModel;
 using FreeSql.DataAnnotations;
 
 namespace Admin.Core.Model.Admin

+ 1 - 0
Admin.Core.Model/Admin/DictionaryEntity.cs

@@ -1,3 +1,4 @@
+using Admin.Core.Common.BaseModel;
 using FreeSql.DataAnnotations;
 
 namespace Admin.Core.Model.Admin 

+ 1 - 0
Admin.Core.Model/Admin/DocumentEntity.cs

@@ -1,3 +1,4 @@
+using Admin.Core.Common.BaseModel;
 using FreeSql.DataAnnotations;
 
 namespace Admin.Core.Model.Admin

+ 1 - 0
Admin.Core.Model/Admin/DocumentImageEntity.cs

@@ -1,3 +1,4 @@
+using Admin.Core.Common.BaseModel;
 using FreeSql.DataAnnotations;
 
 namespace Admin.Core.Model.Admin

+ 1 - 0
Admin.Core.Model/Admin/LogAbstract.cs

@@ -1,3 +1,4 @@
+using Admin.Core.Common.BaseModel;
 using FreeSql.DataAnnotations;
 
 namespace Admin.Core.Model.Admin

+ 1 - 0
Admin.Core.Model/Admin/PermissionEntity.cs

@@ -1,3 +1,4 @@
+using Admin.Core.Common.BaseModel;
 using FreeSql.DataAnnotations;
 
 namespace Admin.Core.Model.Admin

+ 6 - 2
Admin.Core.Model/Admin/RoleEntity.cs

@@ -1,6 +1,7 @@
 using System;
-using FreeSql.DataAnnotations;
 using System.Collections.Generic;
+using Admin.Core.Common.BaseModel;
+using FreeSql.DataAnnotations;
 
 namespace Admin.Core.Model.Admin
 {
@@ -34,7 +35,10 @@ namespace Admin.Core.Model.Admin
 		public int Sort { get; set; }
 
         [Navigate(ManyToMany = typeof(UserRoleEntity))]
-        public virtual ICollection<UserEntity> Users { get; set; }
+        public ICollection<UserEntity> Users { get; set; }
+
+        [Navigate(ManyToMany = typeof(RolePermissionEntity))]
+        public ICollection<PermissionEntity> Permissions { get; set; }
     }
 
 }

+ 1 - 0
Admin.Core.Model/Admin/RolePermissionEntity.cs

@@ -1,3 +1,4 @@
+using Admin.Core.Common.BaseModel;
 using FreeSql.DataAnnotations;
 
 namespace Admin.Core.Model.Admin

+ 2 - 1
Admin.Core.Model/Admin/UserEntity.cs

@@ -1,6 +1,7 @@
 using System;
-using FreeSql.DataAnnotations;
 using System.Collections.Generic;
+using Admin.Core.Common.BaseModel;
+using FreeSql.DataAnnotations;
 
 namespace Admin.Core.Model.Admin
 {

+ 2 - 9
Admin.Core.Model/Admin/UserRoleEntity.cs

@@ -1,3 +1,4 @@
+using Admin.Core.Common.BaseModel;
 using FreeSql.DataAnnotations;
 
 namespace Admin.Core.Model.Admin
@@ -6,17 +7,9 @@ namespace Admin.Core.Model.Admin
     /// 用户角色
     /// </summary>
 	[Table(Name = "ad_user_role")]
-    [Index("uk_role_userid_roleid", nameof(UserId) + "," + nameof(RoleId), true)]
+    [Index("uk_user_role_userid_roleid", nameof(UserId) + "," + nameof(RoleId), true)]
     public class UserRoleEntity: EntityAdd
     {
-        public UserRoleEntity() { }
-
-        public UserRoleEntity(long userId, long roleId)
-        {
-            UserId = userId;
-            RoleId = roleId;
-        }
-
         /// <summary>
         /// 用户Id
         /// </summary>

+ 1 - 0
Admin.Core.Model/Admin/ViewEntity.cs

@@ -1,4 +1,5 @@
 using System;
+using Admin.Core.Common.BaseModel;
 using FreeSql.DataAnnotations;
 
 namespace Admin.Core.Model.Admin

+ 0 - 11
Admin.Core.Model/Base/IEntityAdd.cs

@@ -1,11 +0,0 @@
-using System;
-
-namespace Admin.Core.Model
-{
-    public interface IEntityAdd
-    {
-        long? CreatedUserId { get; set; }
-        string CreatedUserName { get; set; }
-        DateTime? CreatedTime { get; set; }
-    }
-}

+ 0 - 11
Admin.Core.Model/Base/IEntityUpdate.cs

@@ -1,11 +0,0 @@
-using System;
-
-namespace Admin.Core.Model
-{
-    public interface IEntityUpdate
-    {
-        long? ModifiedUserId { get; set; }
-        string ModifiedUserName { get; set; }
-        DateTime? ModifiedTime { get; set; }
-    }
-}

+ 2 - 2
Admin.Core.Services/Admin.Core.Service.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\Admin.Core\bin\Debug\</OutputPath>
-    <DocumentationFile>..\Admin.Core\Admin.Core.Service.xml</DocumentationFile>
+    <OutputPath></OutputPath>
+    <DocumentationFile>..\Admin.Core\bin\Debug\netcoreapp3.1\Admin.Core.Service.xml</DocumentationFile>
     <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
 

+ 2 - 5
Admin.Core.Services/Admin/Auth/AuthService.cs

@@ -21,7 +21,6 @@ namespace Admin.Core.Service.Admin.Auth
         private readonly VerifyCodeHelper _verifyCodeHelper;
         private readonly IUserRepository _userRepository;
         private readonly IPermissionRepository _permissionRepository;
-        private readonly IRolePermissionRepository _rolePermissionRepository;
 
         public AuthService(
             IUser user,
@@ -29,8 +28,7 @@ namespace Admin.Core.Service.Admin.Auth
             IMapper mapper,
             VerifyCodeHelper verifyCodeHelper,
             IUserRepository userRepository,
-            IPermissionRepository permissionRepository,
-            IRolePermissionRepository rolePermissionRepository
+            IPermissionRepository permissionRepository
         )
         {
             _user = user;
@@ -39,7 +37,6 @@ namespace Admin.Core.Service.Admin.Auth
             _verifyCodeHelper = verifyCodeHelper;
             _userRepository = userRepository;
             _permissionRepository = permissionRepository;
-            _rolePermissionRepository = rolePermissionRepository;
         }
 
         public async Task<IResponseOutput> LoginAsync(AuthLoginInput input)
@@ -123,7 +120,7 @@ namespace Admin.Core.Service.Admin.Auth
             var menus = await _permissionRepository.Select
                 .Where(a => new[] { PermissionType.Group, PermissionType.Menu }.Contains(a.Type))
                 .Where(a =>
-                    _rolePermissionRepository.Select
+                    _permissionRepository.Orm.Select<RolePermissionEntity>()
                     .InnerJoin<UserRoleEntity>((b, c) => b.RoleId == c.RoleId && c.UserId == _user.Id)
                     .Where(b => b.PermissionId == a.Id)
                     .Any()

+ 1 - 0
Admin.Core.Services/Admin/Permission/PermissionService.cs

@@ -10,6 +10,7 @@ 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;
 
 namespace Admin.Core.Service.Admin.Permission
 {	

+ 2 - 2
Admin.Core.Services/Admin/User/Input/UserChangePasswordInput.cs

@@ -1,5 +1,5 @@
-using Admin.Core.Model;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
+using Admin.Core.Common.BaseModel;
 
 namespace Admin.Core.Service.Admin.User.Input
 {

+ 1 - 1
Admin.Core.Services/Admin/User/Input/UserUpdateBasicInput.cs

@@ -1,4 +1,4 @@
-using Admin.Core.Model;
+using Admin.Core.Common.BaseModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Admin.Core.Service.Admin.User.Input

+ 59 - 59
Admin.Core.Services/Admin/User/UserService.cs

@@ -58,6 +58,38 @@ namespace Admin.Core.FrameWork.Service.User
             return res.Ok(entityDto);
         }
 
+        public async Task<IResponseOutput> GetBasicAsync()
+        {
+            if (!(_user?.Id > 0))
+            {
+                return ResponseOutput.NotOk("未登录!");
+            }
+
+            var data = await _userRepository.GetAsync<UserUpdateBasicInput>(_user.Id);
+            return ResponseOutput.Ok(data);
+        }
+
+        public async Task<IList<string>> GetPermissionsAsync()
+        {
+            var key = string.Format(CacheKey.UserPermissions, _user.Id);
+            if (await _cache.ExistsAsync(key))
+            {
+                return await _cache.GetAsync<IList<string>>(key);
+            }
+            else
+            {
+                var userPermissoins = await _rolePermissionRepository.Select
+                .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 => a.Permission.Api.Path);
+
+                await _cache.SetAsync(key, userPermissoins);
+
+                return userPermissoins;
+            }
+        }
+
         public async Task<IResponseOutput> PageAsync(PageInput<UserEntity> input)
         {
             var key = input.Filter?.UserName;
@@ -99,7 +131,7 @@ namespace Admin.Core.FrameWork.Service.User
 
             if (input.RoleIds != null && input.RoleIds.Any())
             {
-                var roles = input.RoleIds.Select(d => new UserRoleEntity(user.Id, d));
+                var roles = input.RoleIds.Select(a => new UserRoleEntity { UserId = user.Id, RoleId = a });
                 await _userRoleRepository.InsertAsync(roles);
             }
 
@@ -114,45 +146,29 @@ namespace Admin.Core.FrameWork.Service.User
                 return ResponseOutput.NotOk();
             }
 
-            var entity = await _userRepository.GetAsync(input.Id);
-            if (!(entity?.Id > 0))
+            var user = await _userRepository.GetAsync(input.Id);
+            if (!(user?.Id > 0))
             {
                 return ResponseOutput.NotOk("用户不存在!");
             }
 
-            _mapper.Map(input, entity);
-            await _userRepository.UpdateAsync(entity);
-            await _userRoleRepository.DeleteAsync(a => a.UserId == entity.Id);
+            _mapper.Map(input, user);
+            await _userRepository.UpdateAsync(user);
+            await _userRoleRepository.DeleteAsync(a => a.UserId == user.Id);
             if (input.RoleIds != null && input.RoleIds.Any())
             {
-                var roles = input.RoleIds.Select(d => new UserRoleEntity(entity.Id, d));
+                var roles = input.RoleIds.Select(a => new UserRoleEntity { UserId = user.Id, RoleId = a });
                 await _userRoleRepository.InsertAsync(roles);
             }
 
             return ResponseOutput.Ok();
         }
 
-        public async Task<IResponseOutput> DeleteAsync(long id)
-        {
-            var result = false;
-            if (id > 0)
-            {
-                result = (await _userRepository.DeleteAsync(m => m.Id == id)) > 0;
-            }
-
-            return ResponseOutput.Result(result);
-        }
-
-        public async Task<IResponseOutput> SoftDeleteAsync(long id)
-        {
-            var result = await _userRepository.SoftDeleteAsync(id);
-
-            return ResponseOutput.Result(result);
-        }
-
-        public async Task<IResponseOutput> BatchSoftDeleteAsync(long[] ids)
+        public async Task<IResponseOutput> UpdateBasicAsync(UserUpdateBasicInput input)
         {
-            var result = await _userRepository.SoftDeleteAsync(ids);
+            var entity = await _userRepository.GetAsync(input.Id);
+            entity = _mapper.Map(input, entity);
+            var result = (await _userRepository.UpdateAsync(entity)) > 0;
 
             return ResponseOutput.Result(result);
         }
@@ -163,7 +179,7 @@ namespace Admin.Core.FrameWork.Service.User
             {
                 return ResponseOutput.NotOk("新密码和确认密码不一致!");
             }
-            
+
             var entity = await _userRepository.GetAsync(input.Id);
             var oldPassword = MD5Encrypt.Encrypt32(input.OldPassword);
             if (oldPassword != entity.Password)
@@ -172,52 +188,36 @@ namespace Admin.Core.FrameWork.Service.User
             }
 
             input.Password = MD5Encrypt.Encrypt32(input.NewPassword);
-            
-            entity = _mapper.Map(input, entity);
-            var result = (await _userRepository.UpdateAsync(entity))>0;
-            
-            return ResponseOutput.Result(result);
-        }
 
-        public async Task<IResponseOutput> UpdateBasicAsync(UserUpdateBasicInput input)
-        {
-            var entity = await _userRepository.GetAsync(input.Id);
             entity = _mapper.Map(input, entity);
             var result = (await _userRepository.UpdateAsync(entity)) > 0;
 
             return ResponseOutput.Result(result);
         }
 
-        public async Task<IResponseOutput> GetBasicAsync()
+        public async Task<IResponseOutput> DeleteAsync(long id)
         {
-            if (!(_user?.Id > 0))
+            var result = false;
+            if (id > 0)
             {
-                return ResponseOutput.NotOk("未登录!");
+                result = (await _userRepository.DeleteAsync(m => m.Id == id)) > 0;
             }
 
-            var data = await _userRepository.Select.WhereDynamic(_user.Id).ToOneAsync<UserUpdateBasicInput>();
-            return ResponseOutput.Ok(data);
+            return ResponseOutput.Result(result);
         }
 
-        public async Task<IList<string>> GetPermissionsAsync()
+        public async Task<IResponseOutput> SoftDeleteAsync(long id)
         {
-            var key = string.Format(CacheKey.UserPermissions, _user.Id);
-            if(await _cache.ExistsAsync(key))
-            {
-                return await _cache.GetAsync<IList<string>>(key);
-            }
-            else
-            {
-                var userPermissoins = await _rolePermissionRepository.Select
-                .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 => a.Permission.Api.Path);
+            var result = await _userRepository.SoftDeleteAsync(id);
 
-                await _cache.SetAsync(key, userPermissoins);
-                
-                return userPermissoins;
-            }
+            return ResponseOutput.Result(result);
+        }
+
+        public async Task<IResponseOutput> BatchSoftDeleteAsync(long[] ids)
+        {
+            var result = await _userRepository.SoftDeleteAsync(ids);
+
+            return ResponseOutput.Result(result);
         }
     }
 }

+ 0 - 623
Admin.Core/Admin.Core.Model.xml

@@ -1,623 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>Admin.Core.Model</name>
-    </assembly>
-    <members>
-        <member name="T:Admin.Core.Model.Admin.ApiEntity">
-            <summary>
-            接口管理
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.ApiEntity.ParentId">
-            <summary>
-            所属模块
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.ApiEntity.Name">
-            <summary>
-            接口命名
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.ApiEntity.Label">
-            <summary>
-            接口名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.ApiEntity.Path">
-            <summary>
-            接口地址
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.ApiEntity.HttpMethods">
-            <summary>
-            接口提交方法
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.ApiEntity.Description">
-            <summary>
-            说明
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.ApiEntity.Sort">
-            <summary>
-            排序
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.ApiEntity.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Model.Admin.DictionaryEntity">
-            <summary>
-            数据字典
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.DictionaryEntity.ParentId">
-            <summary>
-            字典父级
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.DictionaryEntity.Name">
-            <summary>
-            字典名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.DictionaryEntity.Code">
-            <summary>
-            字典编码
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.DictionaryEntity.Value">
-            <summary>
-            字典值
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.DictionaryEntity.Description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.DictionaryEntity.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.DictionaryEntity.Sort">
-            <summary>
-            排序
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Model.Admin.DocumentEntity">
-            <summary>
-            文档
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.DocumentEntity.ParentId">
-            <summary>
-            父级节点
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.DocumentEntity.Label">
-            <summary>
-            名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.DocumentEntity.Type">
-            <summary>
-            类型
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.DocumentEntity.Name">
-            <summary>
-            命名
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.DocumentEntity.Content">
-            <summary>
-            内容
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.DocumentEntity.Html">
-            <summary>
-            Html
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.DocumentEntity.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.DocumentEntity.Opened">
-            <summary>
-            打开组
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.DocumentEntity.Sort">
-            <summary>
-            排序
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.DocumentEntity.Description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Model.Admin.DocumentImageEntity">
-            <summary>
-            文档图片
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.DocumentImageEntity.DocumentId">
-            <summary>
-            用户Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.DocumentImageEntity.Url">
-            <summary>
-            请求路径
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Model.Admin.DocumentType">
-            <summary>
-            文档类型
-            </summary>
-        </member>
-        <member name="F:Admin.Core.Model.Admin.DocumentType.Group">
-            <summary>
-            分组
-            </summary>
-        </member>
-        <member name="F:Admin.Core.Model.Admin.DocumentType.Markdown">
-            <summary>
-            Markdown文档
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Model.Admin.LogAbstract">
-            <summary>
-            日志
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.LogAbstract.NickName">
-            <summary>
-            昵称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.LogAbstract.IP">
-            <summary>
-            IP
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.LogAbstract.Browser">
-            <summary>
-            浏览器
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.LogAbstract.Os">
-            <summary>
-            操作系统
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.LogAbstract.Device">
-            <summary>
-            设备
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.LogAbstract.BrowserInfo">
-            <summary>
-            浏览器信息
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.LogAbstract.ElapsedMilliseconds">
-            <summary>
-            耗时(毫秒)
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.LogAbstract.Status">
-            <summary>
-            操作状态
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.LogAbstract.Msg">
-            <summary>
-            操作消息
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.LogAbstract.Result">
-            <summary>
-            操作结果
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Model.Admin.LoginLogEntity">
-            <summary>
-            操作日志
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Model.Admin.OprationLogEntity">
-            <summary>
-            操作日志
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.OprationLogEntity.ApiLabel">
-            <summary>
-            接口名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.OprationLogEntity.ApiPath">
-            <summary>
-            接口地址
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.OprationLogEntity.ApiMethod">
-            <summary>
-            接口提交方法
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.OprationLogEntity.Params">
-            <summary>
-            操作参数
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Model.Admin.PermissionEntity">
-            <summary>
-            权限
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.PermissionEntity.ParentId">
-            <summary>
-            父级节点
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.PermissionEntity.Label">
-            <summary>
-            权限名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.PermissionEntity.Type">
-            <summary>
-            权限类型
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.PermissionEntity.ViewId">
-            <summary>
-            视图
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.PermissionEntity.ApiId">
-            <summary>
-            接口
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.PermissionEntity.Path">
-            <summary>
-            菜单访问地址
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.PermissionEntity.Icon">
-            <summary>
-            图标
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.PermissionEntity.Hidden">
-            <summary>
-            隐藏
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.PermissionEntity.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.PermissionEntity.Closable">
-            <summary>
-            可关闭
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.PermissionEntity.Opened">
-            <summary>
-            打开组
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.PermissionEntity.NewWindow">
-            <summary>
-            打开新窗口
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.PermissionEntity.External">
-            <summary>
-            链接外显
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.PermissionEntity.Sort">
-            <summary>
-            排序
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.PermissionEntity.Description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Model.Admin.PermissionType">
-            <summary>
-            权限类型
-            </summary>
-        </member>
-        <member name="F:Admin.Core.Model.Admin.PermissionType.Group">
-            <summary>
-            分组
-            </summary>
-        </member>
-        <member name="F:Admin.Core.Model.Admin.PermissionType.Menu">
-            <summary>
-            菜单
-            </summary>
-        </member>
-        <member name="F:Admin.Core.Model.Admin.PermissionType.Api">
-            <summary>
-            接口
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Model.Admin.RoleEntity">
-            <summary>
-            角色
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.RoleEntity.Name">
-            <summary>
-            名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.RoleEntity.Description">
-            <summary>
-            说明
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.RoleEntity.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.RoleEntity.Sort">
-            <summary>
-            排序
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Model.Admin.RolePermissionEntity">
-            <summary>
-            角色权限
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.RolePermissionEntity.RoleId">
-            <summary>
-            角色Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.RolePermissionEntity.PermissionId">
-            <summary>
-            权限Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.RolePermissionEntity.Role">
-            <summary>
-            角色
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.RolePermissionEntity.Permission">
-            <summary>
-            权限
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Model.Admin.UserEntity">
-            <summary>
-            用户
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.UserEntity.UserName">
-            <summary>
-            账号
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.UserEntity.Password">
-            <summary>
-            密码
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.UserEntity.NickName">
-            <summary>
-            昵称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.UserEntity.Avatar">
-            <summary>
-            头像
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.UserEntity.Status">
-            <summary>
-            状态
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.UserEntity.Remark">
-            <summary>
-            备注
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Model.Admin.UserRoleEntity">
-            <summary>
-            用户角色
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.UserRoleEntity.UserId">
-            <summary>
-            用户Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.UserRoleEntity.RoleId">
-            <summary>
-            角色Id
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Model.Admin.ViewEntity">
-            <summary>
-            视图管理
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.ViewEntity.ParentId">
-            <summary>
-            所属节点
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.ViewEntity.Name">
-            <summary>
-            视图命名
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.ViewEntity.Label">
-            <summary>
-            视图名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.ViewEntity.Path">
-            <summary>
-            视图路径
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.ViewEntity.Description">
-            <summary>
-            说明
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.ViewEntity.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.ViewEntity.Sort">
-            <summary>
-            排序
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Entity`1.Id">
-            <summary>
-            编号
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Model.EntityAdd`1">
-            <summary>
-            实体创建审计
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.EntityAdd`1.CreatedUserId">
-            <summary>
-            创建者Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.EntityAdd`1.CreatedUserName">
-            <summary>
-            创建者
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.EntityAdd`1.CreatedTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Model.EntityBase`1">
-            <summary>
-            实体审计
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.EntityBase`1.Version">
-            <summary>
-            版本
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.EntityBase`1.IsDeleted">
-            <summary>
-            是否删除
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.EntityBase`1.CreatedUserId">
-            <summary>
-            创建者Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.EntityBase`1.CreatedUserName">
-            <summary>
-            创建者
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.EntityBase`1.CreatedTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.EntityBase`1.ModifiedUserId">
-            <summary>
-            修改者Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.EntityBase`1.ModifiedUserName">
-            <summary>
-            修改者
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.EntityBase`1.ModifiedTime">
-            <summary>
-            修改时间
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Model.EntitySoftDelete`1">
-            <summary>
-            实体软删除
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.EntitySoftDelete`1.IsDeleted">
-            <summary>
-            是否删除
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Model.EntityUpdate`1">
-            <summary>
-            实体修改审计
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.EntityUpdate`1.ModifiedUserId">
-            <summary>
-            修改者Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.EntityUpdate`1.ModifiedUserName">
-            <summary>
-            修改者
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.EntityUpdate`1.ModifiedTime">
-            <summary>
-            修改时间
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Model.EntityVersion`1">
-            <summary>
-            实体版本
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.EntityVersion`1.Version">
-            <summary>
-            版本
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.IEntitySoftDelete.IsDeleted">
-            <summary>
-            是否删除
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.IEntityVersion.Version">
-            <summary>
-            版本
-            </summary>
-        </member>
-    </members>
-</doc>

+ 0 - 1407
Admin.Core/Admin.Core.Service.xml

@@ -1,1407 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>Admin.Core.Service</name>
-    </assembly>
-    <members>
-        <member name="T:Admin.Core.Service.Admin.Api.IApiService">
-            <summary>
-            接口服务
-            </summary>	
-        </member>
-        <member name="M:Admin.Core.Service.Admin.Api.IApiService.GetAsync(System.Int64)">
-            <summary>
-            获得一条记录
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Service.Admin.Api.IApiService.ListAsync(System.String)">
-            <summary>
-            获得列表
-            </summary>
-            <param name="key"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Service.Admin.Api.IApiService.PageAsync(Admin.Core.Common.Input.PageInput{Admin.Core.Model.Admin.ApiEntity})">
-            <summary>
-            获得分页
-            </summary>
-            <param name="model"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Service.Admin.Api.IApiService.AddAsync(Admin.Core.Service.Admin.Api.Input.ApiAddInput)">
-            <summary>
-            添加
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Service.Admin.Api.IApiService.UpdateAsync(Admin.Core.Service.Admin.Api.Input.ApiUpdateInput)">
-            <summary>
-            修改
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Service.Admin.Api.IApiService.DeleteAsync(System.Int64)">
-            <summary>
-            删除
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Service.Admin.Api.IApiService.SoftDeleteAsync(System.Int64)">
-            <summary>
-            软删除
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Service.Admin.Api.IApiService.BatchSoftDeleteAsync(System.Int64[])">
-            <summary>
-            批量软删除
-            </summary>
-            <param name="ids"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Service.Admin.Api.IApiService.SyncAsync(Admin.Core.Service.Admin.Api.Input.ApiSyncInput)">
-            <summary>
-            同步
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.Api.Input.ApiAddInput">
-            <summary>
-            添加
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Input.ApiAddInput.ParentId">
-            <summary>
-            所属模块
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Input.ApiAddInput.Label">
-            <summary>
-            接口名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Input.ApiAddInput.Path">
-            <summary>
-            接口地址
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Input.ApiAddInput.HttpMethods">
-            <summary>
-            接口提交方法
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Input.ApiAddInput.Description">
-            <summary>
-            说明
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Input.ApiAddInput.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.Api.Input.ApiSyncDto">
-            <summary>
-            接口同步Dto
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Input.ApiSyncDto.Label">
-            <summary>
-            接口名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Input.ApiSyncDto.Path">
-            <summary>
-            接口地址
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Input.ApiSyncDto.ParentPath">
-            <summary>
-            父级路径
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Input.ApiSyncDto.HttpMethods">
-            <summary>
-            接口提交方法
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.Api.Input.ApiSyncInput">
-            <summary>
-            接口同步
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.Api.Input.ApiUpdateInput">
-            <summary>
-            修改
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Input.ApiUpdateInput.Id">
-            <summary>
-            接口Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Input.ApiUpdateInput.Version">
-            <summary>
-            版本
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Output.ApiListOutput.Id">
-            <summary>
-            接口Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Output.ApiListOutput.ParentId">
-            <summary>
-            接口父级
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Output.ApiListOutput.Name">
-            <summary>
-            接口命名
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Output.ApiListOutput.Label">
-            <summary>
-            接口名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Output.ApiListOutput.Path">
-            <summary>
-            接口地址
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Output.ApiListOutput.HttpMethods">
-            <summary>
-            接口提交方法
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Output.ApiListOutput.Description">
-            <summary>
-            说明
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Api.Output.ApiListOutput.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.Api.MapConfig">
-            <summary>
-            映射配置
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.Auth.IAuthService">
-            <summary>
-            权限服务
-            </summary>	
-        </member>
-        <member name="T:Admin.Core.Service.Admin.Auth.Input.AuthLoginInput">
-            <summary>
-            登录信息
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Auth.Input.AuthLoginInput.UserName">
-            <summary>
-            账号
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Auth.Input.AuthLoginInput.Password">
-            <summary>
-            密码
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Auth.Input.AuthLoginInput.PasswordKey">
-            <summary>
-            密码键
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Auth.Input.AuthLoginInput.VerifyCode">
-            <summary>
-            验证码
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Auth.Input.AuthLoginInput.VerifyCodeKey">
-            <summary>
-            验证码键
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Auth.Output.AuthLoginOutput.Id">
-            <summary>
-            主键Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Auth.Output.AuthLoginOutput.UserName">
-            <summary>
-            账号
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Auth.Output.AuthLoginOutput.NickName">
-            <summary>
-            姓名
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.Auth.MapConfig">
-            <summary>
-            映射配置
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.Cache.ICacheService">
-            <summary>
-            缓存服务
-            </summary>	
-        </member>
-        <member name="M:Admin.Core.Service.Admin.Cache.ICacheService.List">
-            <summary>
-            缓存列表
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Service.Admin.Cache.ICacheService.ClearAsync(System.String)">
-            <summary>
-            清除缓存
-            </summary>
-            <param name="cacheKey"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.Dictionary.Input.DictionaryAddInput">
-            <summary>
-            添加
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Dictionary.Input.DictionaryAddInput.ParentId">
-            <summary>
-            字典父级
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Dictionary.Input.DictionaryAddInput.Name">
-            <summary>
-            字典名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Dictionary.Input.DictionaryAddInput.Code">
-            <summary>
-            字典编码
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Dictionary.Input.DictionaryAddInput.Value">
-            <summary>
-            字典值
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Dictionary.Input.DictionaryAddInput.Description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Dictionary.Input.DictionaryAddInput.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.Dictionary.Input.DictionaryUpdateInput">
-            <summary>
-            修改
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Dictionary.Input.DictionaryUpdateInput.Id">
-            <summary>
-            主键Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Dictionary.Input.DictionaryUpdateInput.Version">
-            <summary>
-            版本
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Dictionary.Output.DictionaryListOutput.Id">
-            <summary>
-            主键Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Dictionary.Output.DictionaryListOutput.ParentId">
-            <summary>
-            字典父级
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Dictionary.Output.DictionaryListOutput.Name">
-            <summary>
-            字典名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Dictionary.Output.DictionaryListOutput.Code">
-            <summary>
-            字典编码
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Dictionary.Output.DictionaryListOutput.Value">
-            <summary>
-            字典值
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Dictionary.Output.DictionaryListOutput.Description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Dictionary.Output.DictionaryListOutput.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Dictionary.Output.DictionaryListOutput.CreatedTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.Dictionary.MapConfig">
-            <summary>
-            映射配置
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentAddGroupInput.ParentId">
-            <summary>
-            父级节点
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentAddGroupInput.Type">
-            <summary>
-            类型
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentAddGroupInput.Label">
-            <summary>
-            名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentAddGroupInput.Name">
-            <summary>
-            命名
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentAddGroupInput.Opened">
-            <summary>
-            打开
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentAddImageInput.DocumentId">
-            <summary>
-            用户Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentAddImageInput.Url">
-            <summary>
-            请求路径
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentAddMenuInput.ParentId">
-            <summary>
-            父级节点
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentAddMenuInput.Type">
-            <summary>
-            类型
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentAddMenuInput.Name">
-            <summary>
-            命名
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentAddMenuInput.Label">
-            <summary>
-            名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentAddMenuInput.Description">
-            <summary>
-            说明
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentUpdateContentInput.Id">
-            <summary>
-            编号
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentUpdateContentInput.Label">
-            <summary>
-            名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentUpdateContentInput.Content">
-            <summary>
-            内容
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentUpdateContentInput.Html">
-            <summary>
-            Html
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentUpdateContentInput.Version">
-            <summary>
-            版本
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentUpdateGroupInput.Id">
-            <summary>
-            编号
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentUpdateGroupInput.Version">
-            <summary>
-            版本
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentUpdateMenuInput.Id">
-            <summary>
-            编号
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentUpdateMenuInput.Version">
-            <summary>
-            版本
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentUploadImageInput.File">
-            <summary>
-            上传文件
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Input.DocumentUploadImageInput.Id">
-            <summary>
-            文档编号
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Output.DocumentGetContentOutput.Id">
-            <summary>
-            编号
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Output.DocumentGetContentOutput.Label">
-            <summary>
-            名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Output.DocumentGetContentOutput.Content">
-            <summary>
-            内容
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Output.DocumentGetContentOutput.Version">
-            <summary>
-            版本
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Output.DocumentListOutput.Id">
-            <summary>
-            编号
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Output.DocumentListOutput.ParentId">
-            <summary>
-            父级节点
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Output.DocumentListOutput.Label">
-            <summary>
-            名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Output.DocumentListOutput.Type">
-            <summary>
-            类型
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Output.DocumentListOutput.Name">
-            <summary>
-            命名
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Output.DocumentListOutput.Description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Document.Output.DocumentListOutput.Opened">
-            <summary>
-            组打开
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.Document.MapConfig">
-            <summary>
-            映射配置
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.LoginLog.Input.LoginLogAddInput">
-            <summary>
-            添加
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Input.LoginLogAddInput.NickName">
-            <summary>
-            昵称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Input.LoginLogAddInput.IP">
-            <summary>
-            IP
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Input.LoginLogAddInput.Browser">
-            <summary>
-            浏览器
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Input.LoginLogAddInput.Os">
-            <summary>
-            操作系统
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Input.LoginLogAddInput.Device">
-            <summary>
-            设备
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Input.LoginLogAddInput.BrowserInfo">
-            <summary>
-            浏览器信息
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Input.LoginLogAddInput.ElapsedMilliseconds">
-            <summary>
-            耗时(毫秒)
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Input.LoginLogAddInput.Status">
-            <summary>
-            操作状态
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Input.LoginLogAddInput.Msg">
-            <summary>
-            操作消息
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Input.LoginLogAddInput.Result">
-            <summary>
-            操作结果
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Input.LoginLogAddInput.CreatedUserId">
-            <summary>
-            创建者Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Input.LoginLogAddInput.CreatedUserName">
-            <summary>
-            创建者
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Output.LoginLogListOutput.Id">
-            <summary>
-            编号
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Output.LoginLogListOutput.NickName">
-            <summary>
-            昵称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Output.LoginLogListOutput.CreatedUserName">
-            <summary>
-            创建者
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Output.LoginLogListOutput.IP">
-            <summary>
-            IP
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Output.LoginLogListOutput.Browser">
-            <summary>
-            浏览器
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Output.LoginLogListOutput.Os">
-            <summary>
-            操作系统
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Output.LoginLogListOutput.Device">
-            <summary>
-            设备
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Output.LoginLogListOutput.ElapsedMilliseconds">
-            <summary>
-            耗时(毫秒)
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Output.LoginLogListOutput.Status">
-            <summary>
-            操作状态
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Output.LoginLogListOutput.Msg">
-            <summary>
-            操作消息
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.LoginLog.Output.LoginLogListOutput.CreatedTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.LoginLog.MapConfig">
-            <summary>
-            映射配置
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.OprationLog.Input.OprationLogAddInput">
-            <summary>
-            添加
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Input.OprationLogAddInput.NickName">
-            <summary>
-            昵称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Input.OprationLogAddInput.ApiLabel">
-            <summary>
-            接口名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Input.OprationLogAddInput.ApiPath">
-            <summary>
-            接口地址
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Input.OprationLogAddInput.ApiMethod">
-            <summary>
-            接口提交方法
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Input.OprationLogAddInput.IP">
-            <summary>
-            IP
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Input.OprationLogAddInput.Browser">
-            <summary>
-            浏览器
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Input.OprationLogAddInput.Os">
-            <summary>
-            操作系统
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Input.OprationLogAddInput.Device">
-            <summary>
-            设备
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Input.OprationLogAddInput.BrowserInfo">
-            <summary>
-            浏览器信息
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Input.OprationLogAddInput.ElapsedMilliseconds">
-            <summary>
-            耗时(毫秒)
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Input.OprationLogAddInput.Status">
-            <summary>
-            操作状态
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Input.OprationLogAddInput.Msg">
-            <summary>
-            操作消息
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Input.OprationLogAddInput.Params">
-            <summary>
-            操作参数
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Input.OprationLogAddInput.Result">
-            <summary>
-            操作结果
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Output.OprationLogListOutput.Id">
-            <summary>
-            编号
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Output.OprationLogListOutput.NickName">
-            <summary>
-            昵称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Output.OprationLogListOutput.CreatedUserName">
-            <summary>
-            创建者
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Output.OprationLogListOutput.ApiLabel">
-            <summary>
-            接口名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Output.OprationLogListOutput.ApiPath">
-            <summary>
-            接口地址
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Output.OprationLogListOutput.ApiMethod">
-            <summary>
-            接口提交方法
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Output.OprationLogListOutput.IP">
-            <summary>
-            IP
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Output.OprationLogListOutput.Browser">
-            <summary>
-            浏览器
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Output.OprationLogListOutput.Os">
-            <summary>
-            操作系统
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Output.OprationLogListOutput.Device">
-            <summary>
-            设备
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Output.OprationLogListOutput.ElapsedMilliseconds">
-            <summary>
-            耗时(毫秒)
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Output.OprationLogListOutput.Status">
-            <summary>
-            操作状态
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Output.OprationLogListOutput.Msg">
-            <summary>
-            操作消息
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.OprationLog.Output.OprationLogListOutput.CreatedTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.OprationLog.MapConfig">
-            <summary>
-            映射配置
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddApiInput.Type">
-            <summary>
-            权限类型
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddApiInput.ParentId">
-            <summary>
-            父级节点
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddApiInput.ApiId">
-            <summary>
-            接口
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddApiInput.Label">
-            <summary>
-            权限名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddApiInput.Description">
-            <summary>
-            说明
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddApiInput.Hidden">
-            <summary>
-            隐藏
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddApiInput.Icon">
-            <summary>
-            图标
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddGroupInput.Type">
-            <summary>
-            权限类型
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddGroupInput.ParentId">
-            <summary>
-            父级节点
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddGroupInput.Label">
-            <summary>
-            权限名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddGroupInput.Hidden">
-            <summary>
-            隐藏
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddGroupInput.Icon">
-            <summary>
-            图标
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddGroupInput.Opened">
-            <summary>
-            打开
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddMenuInput.Type">
-            <summary>
-            权限类型
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddMenuInput.ParentId">
-            <summary>
-            父级节点
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddMenuInput.ViewId">
-            <summary>
-            视图
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddMenuInput.Path">
-            <summary>
-            访问地址
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddMenuInput.Label">
-            <summary>
-            权限名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddMenuInput.Description">
-            <summary>
-            说明
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddMenuInput.Hidden">
-            <summary>
-            隐藏
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddMenuInput.Icon">
-            <summary>
-            图标
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddMenuInput.Closable">
-            <summary>
-            可关闭
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddMenuInput.NewWindow">
-            <summary>
-            打开新窗口
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddMenuInput.External">
-            <summary>
-            链接外显
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionUpdateApiInput.Id">
-            <summary>
-            权限Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionUpdateApiInput.Version">
-            <summary>
-            版本
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionUpdateGroupInput.Id">
-            <summary>
-            权限Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionUpdateGroupInput.Version">
-            <summary>
-            版本
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionUpdateMenuInput.Id">
-            <summary>
-            权限Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionUpdateMenuInput.Version">
-            <summary>
-            版本
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Output.PermissionListOutput.Id">
-            <summary>
-            权限Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Output.PermissionListOutput.ParentId">
-            <summary>
-            父级节点
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Output.PermissionListOutput.Label">
-            <summary>
-            权限名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Output.PermissionListOutput.Name">
-            <summary>
-            权限命名
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Output.PermissionListOutput.Type">
-            <summary>
-            权限类型
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Output.PermissionListOutput.Path">
-            <summary>
-            访问地址
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Output.PermissionListOutput.ApiPath">
-            <summary>
-            接口路径
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Output.PermissionListOutput.Description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Output.PermissionListOutput.Icon">
-            <summary>
-            图标
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Output.PermissionListOutput.Opened">
-            <summary>
-            组打开
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Output.PermissionListOutput.Hidden">
-            <summary>
-            隐藏
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Permission.Output.PermissionListOutput.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.Permission.MapConfig">
-            <summary>
-            映射配置
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.Role.Input.RoleAddInput">
-            <summary>
-            添加
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Role.Input.RoleAddInput.Name">
-            <summary>
-            名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Role.Input.RoleAddInput.Description">
-            <summary>
-            说明
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Role.Input.RoleAddInput.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.Role.Input.RoleUpdateInput">
-            <summary>
-            修改
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Role.Input.RoleUpdateInput.Id">
-            <summary>
-            接口Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Role.Input.RoleUpdateInput.Version">
-            <summary>
-            版本
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Role.Output.RoleListOutput.Id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Role.Output.RoleListOutput.Name">
-            <summary>
-            名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Role.Output.RoleListOutput.Description">
-            <summary>
-            说明
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Role.Output.RoleListOutput.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Role.Output.RoleListOutput.CreatedTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.Role.MapConfig">
-            <summary>
-            映射配置
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.User.Input.UserAddInput">
-            <summary>
-            添加
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserAddInput.UserName">
-            <summary>
-            账号
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserAddInput.Password">
-            <summary>
-            密码
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserAddInput.NickName">
-            <summary>
-            昵称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserAddInput.Status">
-            <summary>
-            状态
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserAddInput.Remark">
-            <summary>
-            备注
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserAddInput.RoleIds">
-            <summary>
-            角色
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.User.Input.UserChangePasswordInput">
-            <summary>
-            修改密码
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserChangePasswordInput.OldPassword">
-            <summary>
-            旧密码
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserChangePasswordInput.NewPassword">
-            <summary>
-            新密码
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserChangePasswordInput.ConfirmPassword">
-            <summary>
-            确认新密码
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserChangePasswordInput.Password">
-            <summary>
-            密码
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserChangePasswordInput.Version">
-            <summary>
-            版本
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.User.Input.UserUpdateBasicInput">
-            <summary>
-            更新基本信息
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserUpdateBasicInput.Avatar">
-            <summary>
-            头像
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserUpdateBasicInput.NickName">
-            <summary>
-            昵称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserUpdateBasicInput.Remark">
-            <summary>
-            备注
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserUpdateBasicInput.Version">
-            <summary>
-            版本
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.User.Input.UserUpdateInput">
-            <summary>
-            修改
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserUpdateInput.Id">
-            <summary>
-            主键Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserUpdateInput.UserName">
-            <summary>
-            账号
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserUpdateInput.NickName">
-            <summary>
-            昵称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserUpdateInput.Status">
-            <summary>
-            状态
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserUpdateInput.Remark">
-            <summary>
-            备注
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserUpdateInput.RoleIds">
-            <summary>
-            角色
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserUpdateInput.Version">
-            <summary>
-            版本
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.User.IUserService">
-            <summary>
-            用户服务
-            </summary>	
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Output.UserListOutput.Id">
-            <summary>
-            主键Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Output.UserListOutput.UserName">
-            <summary>
-            账号
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Output.UserListOutput.Name">
-            <summary>
-            姓名
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Output.UserListOutput.NickName">
-            <summary>
-            昵称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Output.UserListOutput.Status">
-            <summary>
-            状态
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Output.UserListOutput.RoleNames">
-            <summary>
-            角色
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Output.UserListOutput.Remark">
-            <summary>
-            备注
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.User.Output.UserListOutput.CreatedTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.User.MapConfig">
-            <summary>
-            映射配置
-            双向映射 .ReverseMap()
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.View.Input.ViewAddInput">
-            <summary>
-            添加
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.View.Input.ViewAddInput.ParentId">
-            <summary>
-            所属节点
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.View.Input.ViewAddInput.Name">
-            <summary>
-            视图命名
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.View.Input.ViewAddInput.Label">
-            <summary>
-            视图名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.View.Input.ViewAddInput.Path">
-            <summary>
-            视图路径
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.View.Input.ViewAddInput.Description">
-            <summary>
-            说明
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.View.Input.ViewAddInput.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.View.Input.ViewSyncDto.Name">
-            <summary>
-            视图命名
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.View.Input.ViewSyncDto.Label">
-            <summary>
-            名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.View.Input.ViewSyncDto.Path">
-            <summary>
-            地址
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.View.Input.ViewSyncDto.ParentPath">
-            <summary>
-            父级路径
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.View.Input.ViewUpdateInput">
-            <summary>
-            修改
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.View.Input.ViewUpdateInput.Id">
-            <summary>
-            视图Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.View.Input.ViewUpdateInput.Version">
-            <summary>
-            版本
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.View.Input.MapConfig">
-            <summary>
-            映射配置
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.View.IViewService">
-            <summary>
-            视图服务
-            </summary>
-        </member>
-        <member name="M:Admin.Core.Service.Admin.View.IViewService.GetAsync(System.Int64)">
-            <summary>
-            获得一条记录
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.View.Output.ViewListOutput.Id">
-            <summary>
-            视图Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.View.Output.ViewListOutput.ParentId">
-            <summary>
-            视图父级
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.View.Output.ViewListOutput.Name">
-            <summary>
-            视图命名
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.View.Output.ViewListOutput.Label">
-            <summary>
-            视图名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.View.Output.ViewListOutput.Path">
-            <summary>
-            视图路径
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.View.Output.ViewListOutput.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.View.Output.ViewListOutput.Description">
-            <summary>
-            说明
-            </summary>
-        </member>
-        <member name="T:Admin.Core.FrameWork.Service.User.UserService">
-            <summary>
-            用户服务
-            </summary>	
-        </member>
-    </members>
-</doc>

+ 1 - 7
Admin.Core/Admin.Core.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>..\Admin.Core\Admin.Core.xml</DocumentationFile>
+    <DocumentationFile>..\Admin.Core\bin\Debug\netcoreapp3.1\Admin.Core.xml</DocumentationFile>
     <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
 
@@ -48,12 +48,6 @@
     <None Update="Admin.Core.Model.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Admin.Core.Service.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="Admin.Core.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
 
   <ItemGroup>

+ 0 - 793
Admin.Core/Admin.Core.xml

@@ -1,793 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>Admin.Core</name>
-    </assembly>
-    <members>
-        <member name="T:Admin.Core.Attributes.LoginAttribute">
-            <summary>
-            启用登录
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Attributes.NoOprationLogAttribute">
-            <summary>
-            禁用操作日志
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Attributes.PermissionAttribute">
-            <summary>
-            启用权限
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Attributes.ValidateInputAttribute">
-            <summary>
-            输入模型验证
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Attributes.VersionRouteAttribute">
-            <summary>
-            自定义路由 /api/{version}/[area]/[controler]/[action]
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Auth.IPermissionHandler">
-            <summary>
-            权限处理接口
-            </summary>
-        </member>
-        <member name="M:Admin.Core.Auth.IPermissionHandler.ValidateAsync(System.String,System.String)">
-            <summary>
-            权限验证
-            </summary>
-            <param name="api"></param>
-            <param name="httpMethod"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Admin.Core.Auth.PermissionHandler">
-            <summary>
-            权限处理
-            </summary>
-        </member>
-        <member name="M:Admin.Core.Auth.PermissionHandler.ValidateAsync(System.String,System.String)">
-            <summary>
-            权限验证
-            </summary>
-            <param name="api">接口路径</param>
-            <param name="httpMethod">http请求方法</param>
-            <returns></returns>
-        </member>
-        <member name="T:Admin.Core.Auth.ResponseAuthenticationHandler">
-            <summary>
-            响应认证处理器
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Controllers.Admin.ApiController">
-            <summary>
-            接口管理
-            </summary>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.ApiController.Get(System.Int64)">
-            <summary>
-            查询单条接口
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.ApiController.GetList(System.String)">
-            <summary>
-            查询全部接口
-            </summary>
-            <param name="key"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.ApiController.GetPage(Admin.Core.Common.Input.PageInput{Admin.Core.Model.Admin.ApiEntity})">
-            <summary>
-            查询分页接口
-            </summary>
-            <param name="model">分页模型</param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.ApiController.Add(Admin.Core.Service.Admin.Api.Input.ApiAddInput)">
-            <summary>
-            新增接口
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.ApiController.Update(Admin.Core.Service.Admin.Api.Input.ApiUpdateInput)">
-            <summary>
-            修改接口
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.ApiController.SoftDelete(System.Int64)">
-            <summary>
-            删除接口
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.ApiController.BatchSoftDelete(System.Int64[])">
-            <summary>
-            批量删除接口
-            </summary>
-            <param name="ids"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.ApiController.Sync(Admin.Core.Service.Admin.Api.Input.ApiSyncInput)">
-            <summary>
-            同步接口
-            支持新增和修改接口
-            根据接口是否存在自动禁用和启用api
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Admin.Core.Controllers.Admin.AreaController">
-            <summary>
-            域控制器
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Controllers.Admin.AuthController">
-            <summary>
-            授权管理
-            </summary>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.AuthController.GetVerifyCode(System.String)">
-            <summary>
-            获取验证码
-            </summary>
-            <param name="lastKey">上次验证码键</param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.AuthController.GetPassWordEncryptKey">
-            <summary>
-            获取密钥
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.AuthController.GetUserInfo">
-            <summary>
-            查询用户信息
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.AuthController.Login(Admin.Core.Service.Admin.Auth.Input.AuthLoginInput)">
-            <summary>
-            用户登录
-            根据登录信息生成Token
-            </summary>
-            <param name="input">登录信息</param>
-            <returns></returns>
-        </member>
-        <member name="T:Admin.Core.Controllers.Admin.CacheController">
-            <summary>
-            缓存管理
-            </summary>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.CacheController.List">
-            <summary>
-            获取缓存列表
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.CacheController.Clear(System.String)">
-            <summary>
-            清除缓存
-            </summary>
-            <param name="cacheKey"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Admin.Core.Controllers.Admin.DictionaryController">
-            <summary>
-            数据字典
-            </summary>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.DictionaryController.Get(System.Int64)">
-            <summary>
-            查询单条数据字典
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.DictionaryController.GetPage(Admin.Core.Common.Input.PageInput{Admin.Core.Model.Admin.DictionaryEntity})">
-            <summary>
-            查询分页数据字典
-            </summary>
-            <param name="model"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.DictionaryController.Add(Admin.Core.Service.Admin.Dictionary.Input.DictionaryAddInput)">
-            <summary>
-            新增数据字典
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.DictionaryController.Update(Admin.Core.Service.Admin.Dictionary.Input.DictionaryUpdateInput)">
-            <summary>
-            修改数据字典
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.DictionaryController.SoftDelete(System.Int64)">
-            <summary>
-            删除数据字典
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Admin.Core.Controllers.Admin.DocumentController">
-            <summary>
-            文档管理
-            </summary>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.DocumentController.GetList(System.String,System.Nullable{System.DateTime},System.Nullable{System.DateTime})">
-            <summary>
-            查询文档列表
-            </summary>
-            <param name="key"></param>
-            <param name="start"></param>
-            <param name="end"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.DocumentController.GetImageList(System.Int64)">
-            <summary>
-            查询文档图片列表
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.DocumentController.GetGroup(System.Int64)">
-            <summary>
-            查询单条分组
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.DocumentController.GetMenu(System.Int64)">
-            <summary>
-            查询单条菜单
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.DocumentController.GetContent(System.Int64)">
-            <summary>
-            查询单条文档内容
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.DocumentController.GetPlainList">
-            <summary>
-            查询精简文档列表
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.DocumentController.AddGroup(Admin.Core.Service.Admin.Document.Input.DocumentAddGroupInput)">
-            <summary>
-            新增分组
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.DocumentController.AddMenu(Admin.Core.Service.Admin.Document.Input.DocumentAddMenuInput)">
-            <summary>
-            新增菜单
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.DocumentController.UpdateGroup(Admin.Core.Service.Admin.Document.Input.DocumentUpdateGroupInput)">
-            <summary>
-            修改分组
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.DocumentController.UpdateMenu(Admin.Core.Service.Admin.Document.Input.DocumentUpdateMenuInput)">
-            <summary>
-            修改菜单
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.DocumentController.UpdateContent(Admin.Core.Service.Admin.Document.Input.DocumentUpdateContentInput)">
-            <summary>
-            修改文档内容
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.DocumentController.SoftDelete(System.Int64)">
-            <summary>
-            删除文档
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.DocumentController.DeleteImage(System.Int64,System.String)">
-            <summary>
-            删除图片
-            </summary>
-            <param name="documentId"></param>
-            <param name="url"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.DocumentController.UploadImage(Admin.Core.Service.Admin.Document.Input.DocumentUploadImageInput)">
-            <summary>
-            上传文档图片
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Admin.Core.Controllers.Admin.ImgController">
-            <summary>
-            图片管理
-            </summary>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.ImgController.AvatarUpload(Microsoft.AspNetCore.Http.IFormFile)">
-            <summary>
-            上传头像
-            </summary>
-            <param name="file"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Admin.Core.Controllers.Admin.LoginLogController">
-            <summary>
-            登录日志管理
-            </summary>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.LoginLogController.GetPage(Admin.Core.Common.Input.PageInput{Admin.Core.Model.Admin.LoginLogEntity})">
-            <summary>
-            查询分页登录日志
-            </summary>
-            <param name="model"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Admin.Core.Controllers.Admin.OprationLogController">
-            <summary>
-            操作日志管理
-            </summary>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.OprationLogController.GetPage(Admin.Core.Common.Input.PageInput{Admin.Core.Model.Admin.OprationLogEntity})">
-            <summary>
-            查询分页操作日志
-            </summary>
-            <param name="model"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Admin.Core.Controllers.Admin.PermissionController">
-            <summary>
-            权限管理
-            </summary>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.PermissionController.GetList(System.String,System.Nullable{System.DateTime},System.Nullable{System.DateTime})">
-            <summary>
-            查询权限列表
-            </summary>
-            <param name="key"></param>
-            <param name="start"></param>
-            <param name="end"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.PermissionController.GetGroup(System.Int64)">
-            <summary>
-            查询单条分组
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.PermissionController.GetMenu(System.Int64)">
-            <summary>
-            查询单条菜单
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.PermissionController.GetApi(System.Int64)">
-            <summary>
-            查询单条接口
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.PermissionController.GetPermissionList">
-            <summary>
-            查询角色权限-权限列表
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.PermissionController.GetRolePermissionList(System.Int64)">
-            <summary>
-            查询角色权限
-            </summary>
-            <param name="roleId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.PermissionController.AddGroup(Admin.Core.Service.Admin.Permission.Input.PermissionAddGroupInput)">
-            <summary>
-            新增分组
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.PermissionController.AddMenu(Admin.Core.Service.Admin.Permission.Input.PermissionAddMenuInput)">
-            <summary>
-            新增菜单
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.PermissionController.AddApi(Admin.Core.Service.Admin.Permission.Input.PermissionAddApiInput)">
-            <summary>
-            新增接口
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.PermissionController.UpdateGroup(Admin.Core.Service.Admin.Permission.Input.PermissionUpdateGroupInput)">
-            <summary>
-            修改分组
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.PermissionController.UpdateMenu(Admin.Core.Service.Admin.Permission.Input.PermissionUpdateMenuInput)">
-            <summary>
-            修改菜单
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.PermissionController.UpdateApi(Admin.Core.Service.Admin.Permission.Input.PermissionUpdateApiInput)">
-            <summary>
-            修改接口
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.PermissionController.SoftDelete(System.Int64)">
-            <summary>
-            删除权限
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.PermissionController.Assign(Admin.Core.Service.Admin.Permission.Input.PermissionAssignInput)">
-            <summary>
-            保存角色权限
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Admin.Core.Controllers.Admin.RoleController">
-            <summary>
-            角色管理
-            </summary>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.RoleController.Get(System.Int64)">
-            <summary>
-            查询单条角色
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.RoleController.GetPage(Admin.Core.Common.Input.PageInput{Admin.Core.Model.Admin.RoleEntity})">
-            <summary>
-            查询分页角色
-            </summary>
-            <param name="model"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.RoleController.Add(Admin.Core.Service.Admin.Role.Input.RoleAddInput)">
-            <summary>
-            新增角色
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.RoleController.Update(Admin.Core.Service.Admin.Role.Input.RoleUpdateInput)">
-            <summary>
-            修改角色
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.RoleController.SoftDelete(System.Int64)">
-            <summary>
-            删除角色
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.RoleController.BatchSoftDelete(System.Int64[])">
-            <summary>
-            批量删除角色
-            </summary>
-            <param name="ids"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Admin.Core.Controllers.Admin.UserController">
-            <summary>
-            用户管理
-            </summary>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.UserController.GetBasic">
-            <summary>
-            查询用户基本信息
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.UserController.Get(System.Int64)">
-            <summary>
-            查询单条用户
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.UserController.GetPage(Admin.Core.Common.Input.PageInput{Admin.Core.Model.Admin.UserEntity})">
-            <summary>
-            查询分页用户
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.UserController.Add(Admin.Core.Service.Admin.User.Input.UserAddInput)">
-            <summary>
-            新增用户
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.UserController.Update(Admin.Core.Service.Admin.User.Input.UserUpdateInput)">
-            <summary>
-            修改用户
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.UserController.SoftDelete(System.Int64)">
-            <summary>
-            删除用户
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.UserController.BatchSoftDelete(System.Int64[])">
-            <summary>
-            批量删除用户
-            </summary>
-            <param name="ids"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.UserController.ChangePassword(Admin.Core.Service.Admin.User.Input.UserChangePasswordInput)">
-            <summary>
-            更新用户密码
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.UserController.UpdateBasic(Admin.Core.Service.Admin.User.Input.UserUpdateBasicInput)">
-            <summary>
-            更新用户基本信息
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Admin.Core.Controllers.Admin.ViewController">
-            <summary>
-            视图管理
-            </summary>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.ViewController.Get(System.Int64)">
-            <summary>
-            查询单条视图
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.ViewController.GetList(System.String)">
-            <summary>
-            查询全部视图
-            </summary>
-            <param name="key"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.ViewController.GetPage(Admin.Core.Common.Input.PageInput{Admin.Core.Model.Admin.ViewEntity})">
-            <summary>
-            查询分页视图
-            </summary>
-            <param name="model">分页模型</param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.ViewController.Add(Admin.Core.Service.Admin.View.Input.ViewAddInput)">
-            <summary>
-            新增视图
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.ViewController.Update(Admin.Core.Service.Admin.View.Input.ViewUpdateInput)">
-            <summary>
-            修改视图
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.ViewController.SoftDelete(System.Int64)">
-            <summary>
-            删除视图
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.ViewController.BatchSoftDelete(System.Int64[])">
-            <summary>
-            批量删除视图
-            </summary>
-            <param name="ids"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.ViewController.Sync(Admin.Core.Service.Admin.View.Input.ViewSyncInput)">
-            <summary>
-            同步视图
-            支持新增和修改视图
-            根据视图是否存在自动禁用和启用视图
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Admin.Core.Controllers.BaseController">
-            <summary>
-            基础控制器
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Db.Data">
-            <summary>
-            数据
-            </summary>
-        </member>
-        <member name="M:Admin.Core.Db.DbHelper.CreateDatabase(Admin.Core.Common.Configs.DbConfig)">
-            <summary>
-            创建数据库
-            </summary>
-            <param name="dbConfig"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Db.DbHelper.SyncStructure(IFreeSql,System.String,Admin.Core.Common.Configs.DbConfig)">
-            <summary>
-            同步结构
-            </summary>
-        </member>
-        <member name="M:Admin.Core.Db.DbHelper.InitDtData``1(IFreeSql,``0[],System.Data.Common.DbTransaction,Admin.Core.Common.Configs.DbConfig)">
-            <summary>
-            初始化数据表数据
-            </summary>
-            <typeparam name="T"></typeparam>
-            <param name="db"></param>
-            <param name="data"></param>
-            <param name="tran"></param>
-            <param name="dbConfig"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Db.DbHelper.SyncDataAuditValue(System.Object,FreeSql.Aop.AuditValueEventArgs)">
-            <summary>
-            同步数据审计方法
-            </summary>
-            <param name="s"></param>
-            <param name="e"></param>
-        </member>
-        <member name="M:Admin.Core.Db.DbHelper.SyncData(IFreeSql,Admin.Core.Common.Configs.DbConfig)">
-            <summary>
-            同步数据
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Db.DbHelper.GenerateSimpleJsonData(IFreeSql)">
-            <summary>
-            生成极简数据
-            </summary>
-            <param name="db"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Db.ServiceCollectionExtensions.AddDb(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Hosting.IHostEnvironment,Admin.Core.Common.Configs.AppConfig)">
-            <summary>
-            添加数据库
-            </summary>
-            <param name="services"></param>
-            <param name="env"></param>
-            <param name="appConfig"></param>
-        </member>
-        <member name="T:Admin.Core.Enums.ApiVersion">
-            <summary>
-            接口版本
-            </summary>
-        </member>
-        <member name="F:Admin.Core.Enums.ApiVersion.V1">
-            <summary>
-            V1 版本
-            </summary>
-        </member>
-        <member name="F:Admin.Core.Enums.ApiVersion.V2">
-            <summary>
-            V2 版本
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Enums.StatusCodes">
-            <summary>
-            状态码枚举
-            </summary>
-        </member>
-        <member name="F:Admin.Core.Enums.StatusCodes.Status0NotOk">
-            <summary>
-            操作失败
-            </summary>
-        </member>
-        <member name="F:Admin.Core.Enums.StatusCodes.Status1Ok">
-            <summary>
-            操作成功
-            </summary>
-        </member>
-        <member name="F:Admin.Core.Enums.StatusCodes.Status401Unauthorized">
-            <summary>
-            未登录(需要重新登录)
-            </summary>
-        </member>
-        <member name="F:Admin.Core.Enums.StatusCodes.Status403Forbidden">
-            <summary>
-            权限不足
-            </summary>
-        </member>
-        <member name="F:Admin.Core.Enums.StatusCodes.Status404NotFound">
-            <summary>
-            资源不存在
-            </summary>
-        </member>
-        <member name="F:Admin.Core.Enums.StatusCodes.Status500InternalServerError">
-            <summary>
-            系统内部错误(非业务代码里显式抛出的异常,例如由于数据不正确导致空指针异常、数据库异常等等)
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Filters.AdminExceptionFilter">
-            <summary>
-            Admin异常错误过滤
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Logs.ApiHelper">
-            <summary>
-            Api帮助类
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Logs.ApiHelperDto.Label">
-            <summary>
-            接口名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Logs.ApiHelperDto.Path">
-            <summary>
-            接口地址
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Logs.ILogHandler">
-            <summary>
-            操作日志处理接口
-            </summary>
-        </member>
-        <member name="M:Admin.Core.Logs.ILogHandler.LogAsync(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext,Microsoft.AspNetCore.Mvc.Filters.ActionExecutionDelegate)">
-            <summary>
-            写操作日志
-            </summary>
-            <param name="context"></param>
-            <param name="next"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Admin.Core.Logs.LogHandler">
-            <summary>
-            操作日志处理
-            </summary>
-        </member>
-    </members>
-</doc>

+ 0 - 76
Admin.Core/Controllers/Admin/ImgController.cs

@@ -1,76 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
-using Admin.Core.Common.Output;
-using Admin.Core.Attributes;
-using Admin.Core.Common.Helpers;
-using Admin.Core.Common.Configs;
-using Admin.Core.Common.Auth;
-
-namespace Admin.Core.Controllers.Admin
-{
-    /// <summary>
-    /// 图片管理
-    /// </summary>
-    public class ImgController : AreaController
-    {
-        private readonly IUser _user;
-        private readonly UploadConfig _uploadConfig;
-        private readonly UploadHelper _uploadHelper;
-
-        public ImgController(
-            IUser user, 
-            IOptionsMonitor<UploadConfig> uploadConfig, 
-            UploadHelper uploadHelper
-        )
-        {
-            _user = user;
-            _uploadConfig = uploadConfig.CurrentValue;
-            _uploadHelper = uploadHelper;
-        }
-
-        /*
-        /// <summary>
-        /// 获取头像
-        /// </summary>
-        /// <param name="environment"></param>
-        /// <param name="fileName"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Route("{fileName}")]
-        [NoOprationLog]
-        [AllowAnonymous]
-        public FileStreamResult Avatar([FromServices]IWebHostEnvironment environment, string fileName = "")
-        {
-            string filePath = Path.Combine(environment.WebRootPath,"avatar", fileName).ToPath();
-            var stream = System.IO.File.OpenRead(filePath);
-            string fileExt = Path.GetExtension(filePath);
-            var contentTypeProvider = new Microsoft.AspNetCore.StaticFiles.FileExtensionContentTypeProvider();
-            var contentType = contentTypeProvider.Mappings[fileExt];
-            var fileDownloadName = Path.GetFileName(filePath);
-
-            return File(stream, contentType, fileDownloadName);
-        }
-        */
-
-        /// <summary>
-        /// 上传头像
-        /// </summary>
-        /// <param name="file"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Login]
-        public async Task<IResponseOutput> AvatarUpload([FromForm]IFormFile file)
-        {
-            var config = _uploadConfig.Avatar;
-            var res = await _uploadHelper.UploadAsync(file, config, new { _user.Id });
-            if (res.Success)
-            {
-                return ResponseOutput.Ok(res.Data.FileRelativePath);
-            }
-
-            return ResponseOutput.NotOk("上传失败!");
-        }
-    }
-}

+ 38 - 1
Admin.Core/Controllers/Admin/UserController.cs

@@ -5,6 +5,12 @@ using Admin.Core.Common.Input;
 using Admin.Core.Model.Admin;
 using Admin.Core.Service.Admin.User.Input;
 using Microsoft.AspNetCore.Mvc;
+using Admin.Core.Attributes;
+using Microsoft.AspNetCore.Http;
+using Admin.Core.Common.Auth;
+using Admin.Core.Common.Configs;
+using Admin.Core.Common.Helpers;
+using Microsoft.Extensions.Options;
 
 namespace Admin.Core.Controllers.Admin
 {
@@ -13,10 +19,22 @@ namespace Admin.Core.Controllers.Admin
     /// </summary>
     public class UserController : AreaController
     {
+        private readonly IUser _user;
+        private readonly UploadConfig _uploadConfig;
+        private readonly UploadHelper _uploadHelper;
+
         private readonly IUserService _userServices;
 
-        public UserController(IUserService userServices)
+        public UserController(
+            IUser user,
+            IOptionsMonitor<UploadConfig> uploadConfig,
+            UploadHelper uploadHelper, 
+            IUserService userServices
+        )
         {
+            _user = user;
+            _uploadConfig = uploadConfig.CurrentValue;
+            _uploadHelper = uploadHelper;
             _userServices = userServices;
         }
 
@@ -118,5 +136,24 @@ namespace Admin.Core.Controllers.Admin
         {
             return await _userServices.UpdateBasicAsync(input);
         }
+
+        /// <summary>
+        /// 上传头像
+        /// </summary>
+        /// <param name="file"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Login]
+        public async Task<IResponseOutput> AvatarUpload([FromForm]IFormFile file)
+        {
+            var config = _uploadConfig.Avatar;
+            var res = await _uploadHelper.UploadAsync(file, config, new { _user.Id });
+            if (res.Success)
+            {
+                return ResponseOutput.Ok(res.Data.FileRelativePath);
+            }
+
+            return ResponseOutput.NotOk("上传失败!");
+        }
     }
 }

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
Admin.Core/Db/Data/data.json


+ 3 - 1
Admin.Core/Db/DbHelper.cs

@@ -10,6 +10,7 @@ using FreeSql.DataAnnotations;
 using Admin.Core.Common.Configs;
 using Admin.Core.Common.Helpers;
 using Admin.Core.Model.Admin;
+using System.Reflection;
 
 namespace Admin.Core.Db
 {
@@ -195,7 +196,8 @@ namespace Admin.Core.Db
                 Console.WriteLine("\r\nsync data started");
 
                 db.Aop.AuditValue += SyncDataAuditValue;
-                var filePath = Path.Combine(Directory.GetCurrentDirectory(), "Db/Data/data.json").ToPath();
+               
+                var filePath = Path.Combine(AppContext.BaseDirectory, "Db/Data/data.json").ToPath();
                 var jsonData = FileHelper.ReadFile(filePath);
                 var data = JsonConvert.DeserializeObject<Data>(jsonData);
 

+ 1 - 1
Admin.Core/Db/ServiceCollectionExtensions.cs

@@ -4,8 +4,8 @@ using Microsoft.Extensions.Hosting;
 using FreeSql;
 using Admin.Core.Common.Configs;
 using Admin.Core.Common.Helpers;
-using Admin.Core.Model;
 using Admin.Core.Common.Auth;
+using Admin.Core.Common.BaseModel;
 
 namespace Admin.Core.Db
 {

+ 4 - 2
Admin.Core/Logs/ApiHelper.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Linq;
 using System.Collections.Generic;
 using Newtonsoft.Json;
@@ -6,6 +7,7 @@ using Admin.Core.Common.Helpers;
 using Admin.Core.Db;
 using Admin.Core.Common.Attributes;
 
+
 namespace Admin.Core.Logs
 {
     /// <summary>
@@ -28,7 +30,7 @@ namespace Admin.Core.Logs
                     return _apis;
 
                 _apis = new List<ApiHelperDto>();
-                var filePath = Path.Combine(Directory.GetCurrentDirectory(), "Db/Data/data.json").ToPath();
+                var filePath = Path.Combine(AppContext.BaseDirectory, "Db/Data/data.json").ToPath();
                 var jsonData = FileHelper.ReadFile(filePath);
                 var apis = JsonConvert.DeserializeObject<Data>(jsonData).Apis;
                 foreach (var api in apis)

+ 5 - 0
Admin.Core/Startup.cs

@@ -94,6 +94,9 @@ namespace Admin.Core
                     var xmlPath = Path.Combine(basePath, "Admin.Core.xml");
                     c.IncludeXmlComments(xmlPath, true);
 
+                    var xmlCommonPath = Path.Combine(basePath, "Admin.Core.Common.xml");
+                    c.IncludeXmlComments(xmlCommonPath, true);
+
                     var xmlModelPath = Path.Combine(basePath, "Admin.Core.Model.xml");
                     c.IncludeXmlComments(xmlModelPath);
 
@@ -305,6 +308,8 @@ namespace Admin.Core
                         c.SwaggerEndpoint($"/swagger/{version}/swagger.json", $"Admin.Core {version}");
                     });
                     c.RoutePrefix = "";//直接根目录访问
+                    c.DocExpansion(Swashbuckle.AspNetCore.SwaggerUI.DocExpansion.None);//折叠Api
+                    c.DefaultModelsExpandDepth(-1);//不显示Models
                 });
             }
             #endregion

+ 3 - 3
Admin.Core/configs/logconfig.json

@@ -30,19 +30,19 @@
       //调试
       "debug": {
         "type": "File",
-        "fileName": "logs\\debug-${shortdate}.log",
+        "fileName": "logs/debug-${shortdate}.log",
         "layout": "${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}"
       },
       //警告
       "warn": {
         "type": "File",
-        "fileName": "logs\\warn-${shortdate}.log",
+        "fileName": "logs/warn-${shortdate}.log",
         "layout": "${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}"
       },
       //错误
       "error": {
         "type": "File",
-        "fileName": "logs\\error-${shortdate}.log",
+        "fileName": "logs/error-${shortdate}.log",
         "layout": "${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}"
       }
     },

+ 3 - 3
Admin.Core/nlog.config

@@ -7,11 +7,11 @@
   <!-- 写入日志的目标配置 archiveAboveSize="102400" maxArchiveDays="60" -->
   <targets>
     <!-- 调试  -->
-    <target xsi:type="File" name="debug" fileName="logs\debug-${shortdate}.log" layout="${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}" />
+    <target xsi:type="File" name="debug" fileName="logs/debug-${shortdate}.log" layout="${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}" />
     <!-- 警告  -->
-    <target xsi:type="File" name="warn" fileName="logs\warn-${shortdate}.log" layout="${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}" />
+    <target xsi:type="File" name="warn" fileName="logs/warn-${shortdate}.log" layout="${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}" />
     <!-- 错误  -->
-    <target xsi:type="File" name="error" fileName="logs\error-${shortdate}.log" layout="${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}" />
+    <target xsi:type="File" name="error" fileName="logs/error-${shortdate}.log" layout="${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}" />
   </targets>
   <!-- 映射规则 -->
   <rules>

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно